diff --git a/Providers/Display/Display.cpp b/Providers/Display/Display.cpp
index b29b30c..17ad096 100644
--- a/Providers/Display/Display.cpp
+++ b/Providers/Display/Display.cpp
@@ -1,17 +1,10 @@
-#pragma once
+#ifdef __linux__
+#include <cstring>
+#endif
 
 #include "Display.h"
 #include "Input/Input.h"
-#include "UnityInterfaces.h"
-#include "OpenVRProviderContext.h"
-#include "CommonTypes.h"
-#include "ProviderInterface/UnityXRDisplayStats.h"
-#include "ProviderInterface/XRMath.h"
-#include "UserProjectSettings.h"
 
-#ifdef __linux__
-#include <cstring>
-#endif
 
 // Interfaces
 static IUnityXRDisplayInterface *s_pXRDisplay = nullptr;
diff --git a/Providers/Display/Display.h b/Providers/Display/Display.h
index f7a03e2..90bb0a4 100644
--- a/Providers/Display/Display.h
+++ b/Providers/Display/Display.h
@@ -2,12 +2,18 @@
 
 #include <vector>
 #include <limits>
+#include <CommonTypes.h>
 
-#include "ProviderInterface/IUnityXRDisplay.h"
 #include "OpenVRSystem.h"
 #include "OpenVRProviderContext.h"
+
+#include "UnityInterfaces.h"
+
+#include "ProviderInterface/IUnityXRDisplay.h"
 #include "ProviderInterface/IUnityGraphics.h"
 #include "ProviderInterface/IUnityGraphicsVulkan.h"
+#include "ProviderInterface/UnityXRDisplayStats.h"
+#include "ProviderInterface/XRMath.h"
 
 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(_WIN64) || defined(WINAPI_FAMILY)
 #include "d3d11.h"
@@ -16,7 +22,6 @@
 #else
 #define XR_WIN 0
 #endif
-#include <CommonTypes.h>
 
 
 #define kPI 3.14159265358979323846264338327950288419716939937510F
diff --git a/Providers/Input/Input.cpp b/Providers/Input/Input.cpp
index f9a6421..92d26aa 100644
--- a/Providers/Input/Input.cpp
+++ b/Providers/Input/Input.cpp
@@ -1,17 +1,11 @@
-#pragma once
-
-#include "Input.h"
-#include "UnityInterfaces.h"
-#include "ProviderInterface/XRMath.h"
-
-#include "UserProjectSettings.h"
-
 #include <cassert>
 #include <array>
 #include <algorithm>
 #include <sstream>
 #include <chrono>
 
+#include "Input.h"
+
 static OpenVRProviderContext *s_pProviderContext;
 static IUnityXRInputInterface *s_Input = nullptr;
 int OpenVRInputProvider::hmdFeatureIndices[static_cast< int >( HMDFeature::Total )] = {};
diff --git a/Providers/Input/Input.h b/Providers/Input/Input.h
index 691a8d6..9bde51d 100644
--- a/Providers/Input/Input.h
+++ b/Providers/Input/Input.h
@@ -1,15 +1,19 @@
 #pragma once
 
-#include "ProviderInterface/IUnityXRInput.h"
+#include <string>
+#include <optional>
+#include <variant>
+#include <vector>
+
 #include "OpenVRSystem.h"
 #include "OpenVRProviderContext.h"
+
 #include "Singleton.h"
 #include "CommonTypes.h"
+#include "UnityInterfaces.h"
 
-#include <string>
-#include <optional>
-#include <variant>
-#include <vector>
+#include "ProviderInterface/XRMath.h"
+#include "ProviderInterface/IUnityXRInput.h"
 
 
 bool RegisterInputLifecycleProvider( OpenVRProviderContext *pOpenProviderContext );
diff --git a/Providers/OpenVRProviderContext.h b/Providers/OpenVRProviderContext.h
index 7e57c48..93cba06 100644
--- a/Providers/OpenVRProviderContext.h
+++ b/Providers/OpenVRProviderContext.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <cassert>
+
 #include "ProviderInterface/IUnityXRDisplay.h"
 
 struct IUnityXRTrace;
diff --git a/Providers/OpenVRSystem.cpp b/Providers/OpenVRSystem.cpp
index fe5a274..ec19b2c 100644
--- a/Providers/OpenVRSystem.cpp
+++ b/Providers/OpenVRSystem.cpp
@@ -1,13 +1,6 @@
-#pragma once
+#include <cassert>
 
 #include "OpenVRSystem.h"
-#include "UnityInterfaces.h"
-#include "CommonTypes.h"
-#include "ProviderInterface/IUnityGraphics.h"
-#include "ProviderInterface/IUnityInterface.h"
-#include "UserProjectSettings.h"
-
-#include <cassert>
 
 
 OpenVRSystem::OpenVRSystem() :
diff --git a/Providers/OpenVRSystem.h b/Providers/OpenVRSystem.h
index 8af54de..a052638 100644
--- a/Providers/OpenVRSystem.h
+++ b/Providers/OpenVRSystem.h
@@ -1,9 +1,16 @@
 #pragma once
 
-#include "OpenVR/openvr.h"
+#include "UserProjectSettings.h"
+
+#include "CommonTypes.h"
 #include "Singleton.h"
+
+#include "UnityInterfaces.h"
+#include "ProviderInterface/IUnityGraphics.h"
+#include "ProviderInterface/IUnityInterface.h"
 #include "ProviderInterface/IUnityXRPreInit.h"
 
+
 extern "C" typedef void( *TickCallback )( int );
 
 class OpenVRSystem : public Singleton<OpenVRSystem>
diff --git a/Providers/UserProjectSettings.cpp b/Providers/UserProjectSettings.cpp
index 2295bdc..0859808 100644
--- a/Providers/UserProjectSettings.cpp
+++ b/Providers/UserProjectSettings.cpp
@@ -1,10 +1,6 @@
-#pragma once
-#define _SILENCE_ALL_CXX17_DEPRECATION_WARNINGS TRUE
+#define _SILENCE_ALL_CXX17_DEPRECATION_WARNINGS TRUE
 
 #include "UserProjectSettings.h"
-#include "CommonTypes.h"
-#include "UnityInterfaces.h"
-#include "Display/Display.h"
 
 using namespace std;
 using namespace std::string_view_literals;
diff --git a/Providers/UserProjectSettings.h b/Providers/UserProjectSettings.h
index 0c2bc05..43041e1 100644
--- a/Providers/UserProjectSettings.h
+++ b/Providers/UserProjectSettings.h
@@ -8,6 +8,9 @@
 #include <string>
 
 #include "OpenVR/openvr.h"
+#include "UnityInterfaces.h"
+#include "CommonTypes.h"
+#include "ProviderInterface/IUnityXRDisplay.h"
 
 enum EVRMirrorViewMode
 {
diff --git a/Providers/dllmain.cpp b/Providers/dllmain.cpp
index f045bcf..8779343 100644
--- a/Providers/dllmain.cpp
+++ b/Providers/dllmain.cpp
@@ -1,17 +1,14 @@
-#pragma once
-
-#include "ProviderInterface/IUnityInterface.h"
 #include "UnityInterfaces.h"
 #include "CommonTypes.h"
-#include "ProviderInterface/IUnityXRPreInit.h"
-#include "ProviderInterface/IUnityXRTrace.h"
-#include "ProviderInterface/UnitySubsystemTypes.h"
 
 #include "OpenVRSystem.h"
-#include "OpenVRProviderContext.h"
 #include "Display/Display.h"
 #include "Input/Input.h"
-#include "UserProjectSettings.h"
+
+#include "ProviderInterface/IUnityXRPreInit.h"
+#include "ProviderInterface/IUnityXRTrace.h"
+#include "ProviderInterface/UnitySubsystemTypes.h"
+#include "ProviderInterface/IUnityInterface.h"
 
 static OpenVRProviderContext *s_pOpenVRProviderContext {};