diff --git a/GeometryView.cpp b/GeometryView.cpp
index 12910d5..5160053 100644
--- a/GeometryView.cpp
+++ b/GeometryView.cpp
@@ -27,7 +27,6 @@
 #include <glm/gtc/matrix_access.hpp>
 #include <glm/gtx/vector_angle.hpp>
 
-#include "imgui.h"
 #include "ImGuiToolkit.h"
 
 #include "Mixer.h"
diff --git a/ImGuiToolkit.cpp b/ImGuiToolkit.cpp
index bf7521f..48084c6 100644
--- a/ImGuiToolkit.cpp
+++ b/ImGuiToolkit.cpp
@@ -27,12 +27,6 @@
 #  include <shellapi.h>
 #endif
 
-#include "imgui.h"
-#ifndef IMGUI_DEFINE_MATH_OPERATORS
-#define IMGUI_DEFINE_MATH_OPERATORS
-#endif
-#include "imgui_internal.h"
-
 #define MILISECOND 1000000UL
 #define SECOND 1000000000UL
 #define MINUTE 60000000000UL
diff --git a/ImGuiToolkit.h b/ImGuiToolkit.h
index bc5b496..8ccc442 100644
--- a/ImGuiToolkit.h
+++ b/ImGuiToolkit.h
@@ -6,6 +6,13 @@
 #include <list>
 #include <vector>
 
+
+#include "imgui.h"
+#ifndef IMGUI_DEFINE_MATH_OPERATORS
+#define IMGUI_DEFINE_MATH_OPERATORS
+#endif
+#include "imgui_internal.h"
+
 #include "rsc/fonts/IconsFontAwesome5.h"
 
 namespace ImGuiToolkit
diff --git a/LayerView.cpp b/LayerView.cpp
index 0b32d6c..37a3e68 100644
--- a/LayerView.cpp
+++ b/LayerView.cpp
@@ -23,7 +23,6 @@
 #include <glm/gtc/matrix_access.hpp>
 #include <glm/gtx/vector_angle.hpp>
 
-#include "imgui.h"
 #include "ImGuiToolkit.h"
 
 #include <string>
diff --git a/Log.cpp b/Log.cpp
index f1b5d7e..02083f0 100644
--- a/Log.cpp
+++ b/Log.cpp
@@ -22,12 +22,6 @@
 #include <mutex>
 using namespace std;
 
-#include "imgui.h"
-#ifndef IMGUI_DEFINE_MATH_OPERATORS
-#define IMGUI_DEFINE_MATH_OPERATORS
-#endif
-#include "imgui_internal.h"
-
 #include "defines.h"
 #include "ImGuiToolkit.h"
 #include "DialogToolkit.h"
diff --git a/MixingView.cpp b/MixingView.cpp
index 574a9c0..fce2c3a 100644
--- a/MixingView.cpp
+++ b/MixingView.cpp
@@ -27,7 +27,6 @@
 #include <glm/gtc/matrix_access.hpp>
 #include <glm/gtx/vector_angle.hpp>
 
-#include "imgui.h"
 #include "ImGuiToolkit.h"
 
 #include "Mixer.h"
diff --git a/TextureView.cpp b/TextureView.cpp
index 0065255..3ad9cb9 100644
--- a/TextureView.cpp
+++ b/TextureView.cpp
@@ -27,7 +27,6 @@
 #include <sstream>
 #include <iomanip>
 
-#include "imgui.h"
 #include "ImGuiToolkit.h"
 
 #include "defines.h"
diff --git a/TransitionView.cpp b/TransitionView.cpp
index 0b97a4f..1f6721d 100644
--- a/TransitionView.cpp
+++ b/TransitionView.cpp
@@ -23,7 +23,6 @@
 #include <glm/gtc/matrix_access.hpp>
 #include <glm/gtx/vector_angle.hpp>
 
-#include "imgui.h"
 #include "ImGuiToolkit.h"
 
 #include <string>
diff --git a/View.cpp b/View.cpp
index 68f3595..980d9d5 100644
--- a/View.cpp
+++ b/View.cpp
@@ -26,7 +26,6 @@
 #include <sstream>
 #include <regex>
 
-#include "imgui.h"
 #include "ImGuiToolkit.h"
 
 #include "defines.h"