diff --git a/utils/Renderer/Renderer.cpp b/utils/Renderer/Renderer.cpp
index 1ac91e1..c070f1d 100644
--- a/utils/Renderer/Renderer.cpp
+++ b/utils/Renderer/Renderer.cpp
@@ -1,5 +1,7 @@
 #include "Renderer.h"
 
+#include "pch.hpp"
+
 namespace Archimedes {
 
     void Renderer::render() {
diff --git a/utils/Renderer/Renderer.h b/utils/Renderer/Renderer.h
index d3f7a1f..a3384b0 100644
--- a/utils/Renderer/Renderer.h
+++ b/utils/Renderer/Renderer.h
@@ -1,7 +1,6 @@
 #ifndef RENDERER_H
 #define RENDERER_H
 
-#include "pch.hpp"
 
 #include "RendererOpenGL/RendererOpenGL.h"
 
diff --git a/utils/Renderer/RendererOpenGL/RendererOpenGL.cpp b/utils/Renderer/RendererOpenGL/RendererOpenGL.cpp
index 5eee66f..1b36bd6 100644
--- a/utils/Renderer/RendererOpenGL/RendererOpenGL.cpp
+++ b/utils/Renderer/RendererOpenGL/RendererOpenGL.cpp
@@ -1,4 +1,3 @@
-#define RENDERER_OPENGL
 #include "RendererOpenGL.h"
 
 #define GLEW_STATIC
diff --git a/utils/Window/Window.cpp b/utils/Window/Window.cpp
index 435511b..aa39877 100644
--- a/utils/Window/Window.cpp
+++ b/utils/Window/Window.cpp
@@ -1,5 +1,7 @@
 #include "Window.h"
 
+#include "pch.hpp"
+
 namespace Archimedes {
     
     void Window::doFrame() {
diff --git a/utils/Window/Window.h b/utils/Window/Window.h
index 7b1ed72..548985e 100644
--- a/utils/Window/Window.h
+++ b/utils/Window/Window.h
@@ -1,7 +1,6 @@
 #ifndef WINDOW_H
 #define WINDOW_H
 
-#include "pch.hpp"
 
 #include "Renderer/Renderer.h"
 #include "WindowGLFW/WindowGLFW.h"
diff --git a/utils/Window/WindowGLFW/WindowGLFW.cpp b/utils/Window/WindowGLFW/WindowGLFW.cpp
index d15b4eb..50eabb8 100644
--- a/utils/Window/WindowGLFW/WindowGLFW.cpp
+++ b/utils/Window/WindowGLFW/WindowGLFW.cpp
@@ -1,4 +1,4 @@
-#include "Archimedes.h"
+#include "pch.hpp"
 #include "WindowGLFW.h"
 
 namespace Archimedes {
diff --git a/utils/Window/WindowGLFW/WindowGLFW.h b/utils/Window/WindowGLFW/WindowGLFW.h
index c4cc0d0..efbd9fe 100644
--- a/utils/Window/WindowGLFW/WindowGLFW.h
+++ b/utils/Window/WindowGLFW/WindowGLFW.h
@@ -1,8 +1,6 @@
 #ifdef WINDOW_GLFW
 #undef WINDOW_GLFW
 
-#include "pch.hpp"
-
 #include <GLFW/glfw3.h>
 
 namespace Archimedes {