diff --git a/cpp/render/render_opengles.cpp b/cpp/render/render_opengles.cpp
index a31fc23..0b2680b 100644
--- a/cpp/render/render_opengles.cpp
+++ b/cpp/render/render_opengles.cpp
@@ -13,10 +13,9 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "../render.hpp"
 #include "render_opengles.hpp"
 #include "../display/display_glx.hpp"
-#include "../cmp_memcpy.hpp"
+#include "../utils/cmp_memcpy.hpp"
 #include <cstdlib>
 #include <cstdio>
 #include <cstring>
diff --git a/cpp/render/render_opengles.hpp b/cpp/render/render_opengles.hpp
index 1f725b0..6ee78b9 100644
--- a/cpp/render/render_opengles.hpp
+++ b/cpp/render/render_opengles.hpp
@@ -16,8 +16,7 @@
 #ifndef _RK_ENGINE_RENDER_OPENGLES_H
 #define _RK_ENGINE_RENDER_OPENGLES_H
 
-#include "../types.hpp"
-#include "../math.hpp"
+#include "../render.hpp"
 #include <GLES3/gl32.h>
 #include <GLES3/gl3ext.h>
 #include <GLES3/gl3platform.h>
diff --git a/cpp/cmp_memcpy.hpp b/cpp/utils/cmp_memcpy.hpp
similarity index 99%
rename from cpp/cmp_memcpy.hpp
rename to cpp/utils/cmp_memcpy.hpp
index 6ec6aa4..a1fc329 100644
--- a/cpp/cmp_memcpy.hpp
+++ b/cpp/utils/cmp_memcpy.hpp
@@ -16,7 +16,7 @@
 #ifndef RK_ENGINE_CMP_MEMCPY_H
 #define RK_ENGINE_CMP_MEMCPY_H
 
-#include "types.hpp"
+#include "../types.hpp"
 
 template<typename _small>
 bool _rk_cmp_memcpy_small(