From eaa02d5ab4f644b6f8240ed025ada5c0765451f5 Mon Sep 17 00:00:00 2001
From: rexy712 <rexerton.rexy@tutamail.com>
Date: Mon, 23 Mar 2020 10:38:39 -0700
Subject: [PATCH] Cleanup rjp++ includes

---
 rjp++/include/array.hpp      |  5 ++---
 rjp++/include/object.hpp     | 10 ++++------
 rjp++/include/string_val.hpp |  2 +-
 rjp++/src/rjp.cpp            |  4 ++++
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/rjp++/include/array.hpp b/rjp++/include/array.hpp
index e36ef69..9f4d0e9 100644
--- a/rjp++/include/array.hpp
+++ b/rjp++/include/array.hpp
@@ -1,10 +1,9 @@
 #ifndef RJP_ARRAY_HPP
 #define RJP_ARRAY_HPP
 
-#include "value.hpp"
-#include "integral.hpp"
-#include "iterator.hpp"
 #include <rjp.h>
+#include "iterator.hpp"
+#include "value.hpp"
 
 namespace rjp{
 
diff --git a/rjp++/include/object.hpp b/rjp++/include/object.hpp
index d3a1d7d..1202146 100644
--- a/rjp++/include/object.hpp
+++ b/rjp++/include/object.hpp
@@ -1,13 +1,11 @@
 #ifndef RJP_OBJECT_HPP
 #define RJP_OBJECT_HPP
 
-#include "value.hpp"
-#include "integral.hpp"
-#include "string.hpp"
-#include "string_val.hpp"
-#include "iterator.hpp"
 #include <rjp.h>
-#include <rexy/string.hpp>
+#include <rexy/string_base.hpp>
+#include "value.hpp"
+#include "iterator.hpp"
+#include "member.hpp"
 
 namespace rjp{
 
diff --git a/rjp++/include/string_val.hpp b/rjp++/include/string_val.hpp
index b26988b..a6fc085 100644
--- a/rjp++/include/string_val.hpp
+++ b/rjp++/include/string_val.hpp
@@ -2,7 +2,7 @@
 #define RJP_STRING_VAL_HPP
 
 #include <rjp.h>
-#include <rexy/string.hpp>
+#include <rexy/string_base.hpp>
 #include "string.hpp"
 #include "value.hpp"
 
diff --git a/rjp++/src/rjp.cpp b/rjp++/src/rjp.cpp
index 25261e7..9a4e73f 100644
--- a/rjp++/src/rjp.cpp
+++ b/rjp++/src/rjp.cpp
@@ -16,7 +16,11 @@
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <rjp.h>
+#include <rexy/string_base.hpp>
+
 #include "rjp_internal.hpp"
+#include "string.hpp"
 #include "value.hpp"
 
 namespace rjp{