diff --git a/MANIFEST.in b/MANIFEST.in
index 1cfeb5b..0e7c94b 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,7 @@
 include wutils.py waf waf.bat wscript
-recursive-include test pybindgen
-recursive-include examples
-recursive-include include
-recursive-include waf-tools
+recursive-include tests *.py wscript *.cc *.c *.h
+recursive-include examples *.py wscript *.cc *.h
+recursive-include include *.h
+recursive-include waf-tools *.py
+recursive-include benchmarks *.py wscript *.i *.sip *.h *.cc
+recursive-include pybindgen *.py wscript
diff --git a/setup.py b/setup.py
index 5ce5095..d9d48db 100644
--- a/setup.py
+++ b/setup.py
@@ -1,13 +1,10 @@
 #!/usr/bin/env python
 import sys
 import os
-
-sys.path.insert(0, os.path.dirname(__file__))
-
-from wutils import get_version, generate_version_py
-
 from distutils.core import setup
 
+sys.path.insert(0, os.path.dirname(__file__))
+from wutils import get_version, generate_version_py
 generate_version_py(force=False)
 
 setup(name='pybindgen',