diff --git a/build_package.sh b/build_package.sh
index fd78dc3..ca345c3 100755
--- a/build_package.sh
+++ b/build_package.sh
@@ -3,6 +3,6 @@
 cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .
 make install
 
-INCLUDED_FILES="dispatchkit/bootstrap_stl.hpp dispatchkit/bootstrap.hpp dispatchkit/boxed_value.hpp dispatchkit/dispatchkit.hpp dispatchkit/function_call.hpp dispatchkit/proxy_constructors.hpp dispatchkit/proxy_functions.hpp dispatchkit/type_info.hpp chaiscript/chaiscript_engine.hpp chaiscript/chaiscript_eval.hpp chaiscript/chaiscript_parser.hpp chaiscript/chaiscript_prelude.hpp chaiscript/chaiscript.hpp bin/chaiscript_eval"
+INCLUDED_FILES="include/chaiscript/*.hpp include/chaiscript/dispatchkit/*.hpp include/chaiscript/language/*.hpp bin/chaiscript_eval"
 
-zip chaiscript-1.0.zip $INCLUDED_FILES
+zip -r chaiscript-1.0.zip $INCLUDED_FILES
diff --git a/include/chaiscript/dispatchkit/proxy_constructors.hpp b/include/chaiscript/dispatchkit/proxy_constructors.hpp
index 694c7ae..65901e0 100644
--- a/include/chaiscript/dispatchkit/proxy_constructors.hpp
+++ b/include/chaiscript/dispatchkit/proxy_constructors.hpp
@@ -10,7 +10,6 @@
 
 
 #define BOOST_PP_ITERATION_LIMITS ( 0, 10 )
-//#define BOOST_PP_FILENAME_1 "proxy_constructors.hpp"
 #define BOOST_PP_FILENAME_1 <chaiscript/dispatchkit/proxy_constructors.hpp>
 #include BOOST_PP_ITERATE()
 # endif
diff --git a/include/chaiscript/dispatchkit/proxy_functions.hpp b/include/chaiscript/dispatchkit/proxy_functions.hpp
index 55bf24f..fade861 100644
--- a/include/chaiscript/dispatchkit/proxy_functions.hpp
+++ b/include/chaiscript/dispatchkit/proxy_functions.hpp
@@ -109,7 +109,6 @@ namespace dispatchkit
 }
 
 #define BOOST_PP_ITERATION_LIMITS ( 0, 10 )
-//#define BOOST_PP_FILENAME_1 "proxy_functions.hpp"
 #define BOOST_PP_FILENAME_1 <chaiscript/dispatchkit/proxy_functions.hpp>
 #include BOOST_PP_ITERATE()
 
diff --git a/include/chaiscript/dispatchkit/register_function.hpp b/include/chaiscript/dispatchkit/register_function.hpp
index e7ec21a..c01809d 100644
--- a/include/chaiscript/dispatchkit/register_function.hpp
+++ b/include/chaiscript/dispatchkit/register_function.hpp
@@ -24,7 +24,6 @@ namespace dispatchkit
 }
 
 #define BOOST_PP_ITERATION_LIMITS ( 0, 10 )
-//#define BOOST_PP_FILENAME_1 "register_function.hpp"
 #define BOOST_PP_FILENAME_1 <chaiscript/dispatchkit/register_function.hpp>
 #include BOOST_PP_ITERATE()