diff --git a/sfw/render_core/app_window.cpp b/sfw/render_core/app_window.cpp
index 2f55154..ac5c26b 100644
--- a/sfw/render_core/app_window.cpp
+++ b/sfw/render_core/app_window.cpp
@@ -36,7 +36,6 @@
 #include "core/error_macros.h"
 #include "core/sfw_time.h"
 #include "core/ustring.h"
-#include "core/vector4.h"
 #include "render_core/application.h"
 #include "render_core/input.h"
 #include "render_core/render_state.h"
diff --git a/sfw/render_gui/gui.cpp b/sfw/render_gui/gui.cpp
index 5345f3f..ae159ce 100644
--- a/sfw/render_gui/gui.cpp
+++ b/sfw/render_gui/gui.cpp
@@ -6,15 +6,7 @@
 
 #include "gui.h"
 
-#include "core/math_defs.h"
-
-#include "core/sfw_time.h"
 #include "render_core/app_window.h"
-#include "render_core/input.h"
-#include "render_core/input_map.h"
-
-#include "core/sfw_core.h"
-#include "object/core_string_names.h"
 
 #include "imgui.h"
 #include "imgui_impl_glfw.h"
diff --git a/sfw/render_gui/gui.h b/sfw/render_gui/gui.h
index b852d47..a930f3a 100644
--- a/sfw/render_gui/gui.h
+++ b/sfw/render_gui/gui.h
@@ -5,10 +5,7 @@
 
 //--STRIP
 #include "core/int_types.h"
-#include <stdio.h>
-
 #include "object/object.h"
-#include "object/reference.h"
 //--STRIP
 
 class GUI : public Object {
diff --git a/sfw/render_gui/imgui.h b/sfw/render_gui/imgui.h
index a6766e2..452f9b4 100644
--- a/sfw/render_gui/imgui.h
+++ b/sfw/render_gui/imgui.h
@@ -54,14 +54,19 @@ Index of this file:
 
 */
 
+//--STRIP
 #pragma once
+//--STRIP
 
 // Configuration file with compile-time options
 // (edit imconfig.h or '#define IMGUI_USER_CONFIG "myfilename.h" from your build system)
 #ifdef IMGUI_USER_CONFIG
 #include IMGUI_USER_CONFIG
 #endif
+
+//--STRIP
 #include "imconfig.h"
+//--STRIP
 
 #ifndef IMGUI_DISABLE