diff --git a/LibUsageExample/LibUsageExample.cpp b/LibUsageExample/LibUsageExample.cpp
index 36d7d36..e5eff03 100644
--- a/LibUsageExample/LibUsageExample.cpp
+++ b/LibUsageExample/LibUsageExample.cpp
@@ -4,9 +4,14 @@
 // Check project properties -> Linker -> Input -> Additional Dependencies
 //
 
-#include <kdmapper.hpp>
+#include <Windows.h>
+#include <string>
+#include <vector>
 #include <filesystem>
 
+#include <kdmapper.hpp>
+
+
 HANDLE iqvw64e_device_handle;
 
 
diff --git a/LibUsageExample/LibUsageExample.sln b/LibUsageExample/LibUsageExample.sln
index 67712c0..319be3e 100644
--- a/LibUsageExample/LibUsageExample.sln
+++ b/LibUsageExample/LibUsageExample.sln
@@ -8,19 +8,13 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
 		Release|x64 = Release|x64
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{705D4143-89E6-48AF-99A2-BB119AA2624A}.Debug|x64.ActiveCfg = Debug|x64
 		{705D4143-89E6-48AF-99A2-BB119AA2624A}.Debug|x64.Build.0 = Debug|x64
-		{705D4143-89E6-48AF-99A2-BB119AA2624A}.Debug|x86.ActiveCfg = Debug|Win32
-		{705D4143-89E6-48AF-99A2-BB119AA2624A}.Debug|x86.Build.0 = Debug|Win32
 		{705D4143-89E6-48AF-99A2-BB119AA2624A}.Release|x64.ActiveCfg = Release|x64
 		{705D4143-89E6-48AF-99A2-BB119AA2624A}.Release|x64.Build.0 = Release|x64
-		{705D4143-89E6-48AF-99A2-BB119AA2624A}.Release|x86.ActiveCfg = Release|Win32
-		{705D4143-89E6-48AF-99A2-BB119AA2624A}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/kdmapper/include/intel_driver.hpp b/kdmapper/include/intel_driver.hpp
index 776d7a0..73d7026 100644
--- a/kdmapper/include/intel_driver.hpp
+++ b/kdmapper/include/intel_driver.hpp
@@ -2,14 +2,12 @@
 #include <Windows.h>
 #include <iostream>
 #include <string>
-#include <filesystem>
-#include <atlstr.h>
 #include <memory>
+#include <stdint.h>
 
 #include "intel_driver_resource.hpp"
 #include "service.hpp"
 #include "utils.hpp"
-#include <assert.h>
 
 namespace intel_driver
 {
diff --git a/kdmapper/include/kdmapper.hpp b/kdmapper/include/kdmapper.hpp
index 5d4b889..f04c5f0 100644
--- a/kdmapper/include/kdmapper.hpp
+++ b/kdmapper/include/kdmapper.hpp
@@ -1,10 +1,8 @@
 #pragma once
 #include <Windows.h>
-#include <stdint.h>
 #include <iostream>
-#include <vector>
 #include <string>
-#include <filesystem>
+#include <stdint.h>
 
 #include "portable_executable.hpp"
 #include "utils.hpp"
diff --git a/kdmapper/include/service.hpp b/kdmapper/include/service.hpp
index 5f7fe79..6598645 100644
--- a/kdmapper/include/service.hpp
+++ b/kdmapper/include/service.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include <Windows.h>
 #include <string>
-#include <filesystem>
+
 #include "intel_driver.hpp"
 
 namespace service
diff --git a/kdmapper/main.cpp b/kdmapper/main.cpp
index 33d3eb5..9c7081d 100644
--- a/kdmapper/main.cpp
+++ b/kdmapper/main.cpp
@@ -1,8 +1,12 @@
-#include "kdmapper.hpp"
-
-
 #ifndef KDLIBMODE
 
+#include <Windows.h>
+#include <string>
+#include <vector>
+#include <filesystem>
+
+#include "kdmapper.hpp"
+
 HANDLE iqvw64e_device_handle;