diff --git a/MANIFEST.in b/MANIFEST.in
index 70080b48c5159aa974658cc8f2fa7be8a819fa61..e85f07147744aa9ac92b29d8665d3fb86278ad86 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,12 @@
-include src/*.h
-include src/*.hpp
+include src/cpp/*.h
+include src/cpp/*.hpp
+include src/wrapper/*.h
+include src/wrapper/*.hpp
 include LICENSE
 include test/*.py
 include test/clean.sh
+
+include ez_setup.py
+include configure
+include Makefile.in
+include aksetup_helper.py
diff --git a/setup.py b/setup.py
index a1fb05d4f9795364e6df783ebf84af7562a69e7b..7b45987ef80505aede44b3b34ef1c2f612f4399a 100644
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,7 @@ def main():
       ("SELF_CHECK", 1) ,
       ]
 
-    INCLUDE_DIRS = conf["BOOST_INC_DIR"]
+    INCLUDE_DIRS = conf["BOOST_INC_DIR"] + ["src/cpp"]
     LIBRARY_DIRS = conf["BOOST_LIB_DIR"]
     LIBRARIES = conf["BOOST_PYTHON_LIBNAME"]