diff --git a/project/engine.cpp b/project/engine.cpp
index 1462479..c3d318c 100644
--- a/project/engine.cpp
+++ b/project/engine.cpp
@@ -1,4 +1,4 @@
-#include "engine.h"
+#include "engine.hpp"
 //#include "win32.h"
 
 NS_ENGINE_BEGIN
diff --git a/project/engine.h b/project/engine.hpp
similarity index 99%
rename from project/engine.h
rename to project/engine.hpp
index c3623f2..43722b1 100644
--- a/project/engine.h
+++ b/project/engine.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "platform/platform.h"
+#include "platform/platform.hpp"
 
 #define NS_ENGINE_BEGIN namespace engine {
 #define NS_ENGINE_END }
diff --git a/project/handmade.cpp b/project/handmade.cpp
index 482856c..5ae0d3b 100644
--- a/project/handmade.cpp
+++ b/project/handmade.cpp
@@ -4,5 +4,5 @@
 
 #pragma once
 
-#include "engine.h"
+#include "engine.hpp"
 
diff --git a/project/platform/generics.h b/project/platform/generics.hpp
similarity index 100%
rename from project/platform/generics.h
rename to project/platform/generics.hpp
diff --git a/project/platform/grime.h b/project/platform/grime.hpp
similarity index 100%
rename from project/platform/grime.h
rename to project/platform/grime.hpp
diff --git a/project/platform/jsl.h b/project/platform/jsl.hpp
similarity index 94%
rename from project/platform/jsl.h
rename to project/platform/jsl.hpp
index 8e376d7..997d9ce 100644
--- a/project/platform/jsl.h
+++ b/project/platform/jsl.hpp
@@ -1,6 +1,6 @@
 // Joyshock grime wrapper
 
-#include "grime.h"
+#include "grime.hpp"
 
 #ifdef COMPILER_CLANG
 #	pragma clang diagnostic push
diff --git a/project/platform/macros.h b/project/platform/macros.hpp
similarity index 100%
rename from project/platform/macros.h
rename to project/platform/macros.hpp
diff --git a/project/platform/math_constants.h b/project/platform/math_constants.hpp
similarity index 100%
rename from project/platform/math_constants.h
rename to project/platform/math_constants.hpp
diff --git a/project/platform/platform.h b/project/platform/platform.hpp
similarity index 95%
rename from project/platform/platform.h
rename to project/platform/platform.hpp
index e0c529f..b9db09c 100644
--- a/project/platform/platform.h
+++ b/project/platform/platform.hpp
@@ -20,11 +20,11 @@
 #include <math.h> // TODO : Implement math ourselves
 #include <stdio.h> // TODO : Implement output logging ourselves
 
-#include "grime.h"
-#include "macros.h"
-#include "generics.h"
-#include "math_constants.h"
-#include "types.h"
+#include "grime.hpp"
+#include "macros.hpp"
+#include "generics.hpp"
+#include "math_constants.hpp"
+#include "types.hpp"
 
 #define NS_PLATFORM_BEGIN namespace platform {
 #define NS_PLATFORM_END }
diff --git a/project/platform/platform_engine_api.h b/project/platform/platform_engine_api.hpp
similarity index 94%
rename from project/platform/platform_engine_api.h
rename to project/platform/platform_engine_api.hpp
index 6e227b0..2558e78 100644
--- a/project/platform/platform_engine_api.h
+++ b/project/platform/platform_engine_api.hpp
@@ -2,7 +2,7 @@
 	This represents the API only accessible to the platform layer to fullfill for the engine layer.
 */
 #pragma once
-#include "engine.h"
+#include "engine.hpp"
 
 NS_ENGINE_BEGIN
 
diff --git a/project/platform/platform_win32.cpp b/project/platform/platform_win32.cpp
index ff6159a..fc4343f 100644
--- a/project/platform/platform_win32.cpp
+++ b/project/platform/platform_win32.cpp
@@ -18,14 +18,14 @@
 */
 
 // Platform Layer headers
-#include "platform.h"
-#include "jsl.h" // Using this to get dualsense controllers
-#include "win32.h"
+#include "platform.hpp"
+#include "jsl.hpp" // Using this to get dualsense controllers
+#include "win32.hpp"
 #include <malloc.h>
 
 // Engine layer headers
-#include "engine.h"
-#include "platform_engine_api.h"
+#include "engine.hpp"
+#include "platform_engine_api.hpp"
 
 
 // TOOD(Ed): Redo these macros properly later.
diff --git a/project/platform/types.h b/project/platform/types.hpp
similarity index 100%
rename from project/platform/types.h
rename to project/platform/types.hpp
diff --git a/project/platform/win32.h b/project/platform/win32.hpp
similarity index 100%
rename from project/platform/win32.h
rename to project/platform/win32.hpp