diff --git a/rjp++/CMakeLists.txt b/rjp++/CMakeLists.txt
index 0efbe15..64acff1 100644
--- a/rjp++/CMakeLists.txt
+++ b/rjp++/CMakeLists.txt
@@ -33,7 +33,7 @@ set_target_properties(rjp++ PROPERTIES PUBLIC_HEADER ${INCLUDE_PATH}/rjp.hpp)
 set(CPP_HEADERS ${INCLUDE_PATH}/array.hpp ${INCLUDE_PATH}/integral.hpp ${INCLUDE_PATH}/iterator.hpp
                 ${INCLUDE_PATH}/member.hpp ${INCLUDE_PATH}/object.hpp ${INCLUDE_PATH}/parse.hpp
                 ${INCLUDE_PATH}/string.hpp ${INCLUDE_PATH}/string_val.hpp ${INCLUDE_PATH}/value.hpp
-                ${INCLUDE_PATH}/rjp_util.hpp ${INCLUDE_PATH}/dispatch.hpp)
+                ${INCLUDE_PATH}/rjp_util.hpp ${INCLUDE_PATH}/dispatch.hpp ${INCLUDE_PATH}/container.hpp)
 
 
 if(ENABLE_PROFILING)
diff --git a/rjp++/include/dispatch.hpp b/rjp++/include/dispatch.hpp
index 5b944e7..53f48aa 100644
--- a/rjp++/include/dispatch.hpp
+++ b/rjp++/include/dispatch.hpp
@@ -19,7 +19,10 @@
 #ifndef RJP_DISPATCH_HPP
 #define RJP_DISPATCH_HPP
 
-#include "rjp_internal.hpp"
+#include "object.hpp"
+#include "integral.hpp"
+#include "array.hpp"
+#include "value.hpp"
 #include <type_traits> //is_same, true_type, false_type
 #include <utility> //forward
 #include <exception>
diff --git a/rjp++/include/rjp.hpp b/rjp++/include/rjp.hpp
index 1fe5f4f..77d00a4 100644
--- a/rjp++/include/rjp.hpp
+++ b/rjp++/include/rjp.hpp
@@ -24,7 +24,6 @@
 #include <rjp++/iterator.hpp>
 #include <rjp++/member.hpp>
 #include <rjp++/object.hpp>
-#include <rjp++/rjp_internal.hpp>
 #include <rjp++/string.hpp>
 #include <rjp++/string_val.hpp>
 #include <rjp++/value.hpp>