diff --git a/include/chaiscript/chaiscript.hpp b/include/chaiscript/chaiscript.hpp
index 61f2e6a..504c0ea 100644
--- a/include/chaiscript/chaiscript.hpp
+++ b/include/chaiscript/chaiscript.hpp
@@ -14,9 +14,9 @@
 #include <fstream>
 #include <boost/shared_ptr.hpp>
 
-#include <chaiscript/dispatchkit/dispatchkit.hpp>
-#include <chaiscript/dispatchkit/bootstrap.hpp>
-#include <chaiscript/dispatchkit/bootstrap_stl.hpp>
+#include "dispatchkit/dispatchkit.hpp"
+#include "dispatchkit/bootstrap.hpp"
+#include "dispatchkit/bootstrap_stl.hpp"
 
 namespace chaiscript
 {
@@ -133,7 +133,7 @@ namespace chaiscript
     };
 }
 
-#include <chaiscript/language/chaiscript_eval.hpp>
-#include <chaiscript/language/chaiscript_engine.hpp>
+#include "language/chaiscript_eval.hpp"
+#include "language/chaiscript_engine.hpp"
 
 #endif /* CHAISCRIPT_HPP_ */
diff --git a/include/chaiscript/dispatchkit/bootstrap.hpp b/include/chaiscript/dispatchkit/bootstrap.hpp
index f3e73da..c518333 100644
--- a/include/chaiscript/dispatchkit/bootstrap.hpp
+++ b/include/chaiscript/dispatchkit/bootstrap.hpp
@@ -1,8 +1,8 @@
 #ifndef __bootstrap_hpp
 #define __bootstrap_hpp__
 
-#include <chaiscript/dispatchkit/dispatchkit.hpp>
-#include <chaiscript/dispatchkit/register_function.hpp>
+#include "dispatchkit.hpp"
+#include "register_function.hpp"
 
 namespace dispatchkit
 {
diff --git a/include/chaiscript/dispatchkit/bootstrap_stl.hpp b/include/chaiscript/dispatchkit/bootstrap_stl.hpp
index 7a96c2a..cd225ce 100644
--- a/include/chaiscript/dispatchkit/bootstrap_stl.hpp
+++ b/include/chaiscript/dispatchkit/bootstrap_stl.hpp
@@ -1,8 +1,8 @@
 #ifndef __bootstrap_stl_hpp
 #define __bootstrap_stl_hpp__
 
-#include <chaiscript/dispatchkit/dispatchkit.hpp>
-#include <chaiscript/dispatchkit/register_function.hpp>
+#include "dispatchkit.hpp"
+#include "register_function.hpp"
 
 
 namespace dispatchkit
diff --git a/include/chaiscript/dispatchkit/boxed_value.hpp b/include/chaiscript/dispatchkit/boxed_value.hpp
index 88bc402..924216e 100644
--- a/include/chaiscript/dispatchkit/boxed_value.hpp
+++ b/include/chaiscript/dispatchkit/boxed_value.hpp
@@ -1,7 +1,7 @@
 #ifndef __boxed_value_hpp__
 #define __boxed_value_hpp__
 
-#include <chaiscript/dispatchkit/type_info.hpp>
+#include "type_info.hpp"
 #include <map>
 #include <boost/shared_ptr.hpp>
 #include <boost/any.hpp>
diff --git a/include/chaiscript/dispatchkit/dispatchkit.hpp b/include/chaiscript/dispatchkit/dispatchkit.hpp
index 557468e..2741819 100644
--- a/include/chaiscript/dispatchkit/dispatchkit.hpp
+++ b/include/chaiscript/dispatchkit/dispatchkit.hpp
@@ -12,10 +12,10 @@
 #include <iostream>
 #include <deque>
 
-#include <chaiscript/dispatchkit/boxed_value.hpp>
-#include <chaiscript/dispatchkit/type_info.hpp>
-#include <chaiscript/dispatchkit/proxy_functions.hpp>
-#include <chaiscript/dispatchkit/proxy_constructors.hpp>
+#include "boxed_value.hpp"
+#include "type_info.hpp"
+#include "proxy_functions.hpp"
+#include "proxy_constructors.hpp"
 
 namespace dispatchkit
 {
diff --git a/include/chaiscript/dispatchkit/function_call.hpp b/include/chaiscript/dispatchkit/function_call.hpp
index c08bbeb..1c16e46 100644
--- a/include/chaiscript/dispatchkit/function_call.hpp
+++ b/include/chaiscript/dispatchkit/function_call.hpp
@@ -13,7 +13,7 @@
 #include <boost/function.hpp>
 #include <string>
 #include <vector>
-#include <chaiscript/dispatchkit/proxy_functions.hpp>
+#include "proxy_functions.hpp"
 
 namespace dispatchkit
 {
diff --git a/include/chaiscript/dispatchkit/proxy_functions.hpp b/include/chaiscript/dispatchkit/proxy_functions.hpp
index fade861..fff5bbd 100644
--- a/include/chaiscript/dispatchkit/proxy_functions.hpp
+++ b/include/chaiscript/dispatchkit/proxy_functions.hpp
@@ -10,8 +10,8 @@
 #ifndef __proxy_functions_hpp__
 #define __proxy_functions_hpp__
 
-#include <chaiscript/dispatchkit/boxed_value.hpp>
-#include <chaiscript/dispatchkit/type_info.hpp>
+#include "boxed_value.hpp"
+#include "type_info.hpp"
 #include <string>
 #include <boost/function.hpp>
 #include <boost/bind.hpp>
diff --git a/include/chaiscript/dispatchkit/register_function.hpp b/include/chaiscript/dispatchkit/register_function.hpp
index c01809d..265a63b 100644
--- a/include/chaiscript/dispatchkit/register_function.hpp
+++ b/include/chaiscript/dispatchkit/register_function.hpp
@@ -4,7 +4,7 @@
 #ifndef __register_function_hpp__
 #define __register_function_hpp__
 
-#include <chaiscript/dispatchkit/dispatchkit.hpp>
+#include "dispatchkit.hpp"
 #include <boost/function.hpp>
 #include <boost/bind.hpp>
 
diff --git a/include/chaiscript/language/chaiscript_engine.hpp b/include/chaiscript/language/chaiscript_engine.hpp
index 5614df7..f4324df 100644
--- a/include/chaiscript/language/chaiscript_engine.hpp
+++ b/include/chaiscript/language/chaiscript_engine.hpp
@@ -8,8 +8,8 @@
 #include <fstream>
 
 
-#include <chaiscript/language/chaiscript_prelude.hpp>
-#include <chaiscript/language/chaiscript_parser.hpp>
+#include "chaiscript_prelude.hpp"
+#include "chaiscript_parser.hpp"
 
 namespace chaiscript
 {