diff --git a/TitanEngine/Global.Engine.Extension.cpp b/TitanEngine/Global.Engine.Extension.cpp
index b1d1446..356ecc9 100644
--- a/TitanEngine/Global.Engine.Extension.cpp
+++ b/TitanEngine/Global.Engine.Extension.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "definitions.h"
 #include "Global.Engine.Extension.h"
-#include <vector>
+
 
 static std::vector<PluginInformation> Plugin;
 
diff --git a/TitanEngine/Global.Engine.GUI.cpp b/TitanEngine/Global.Engine.GUI.cpp
index 0a490cd..04e89b5 100644
--- a/TitanEngine/Global.Engine.GUI.cpp
+++ b/TitanEngine/Global.Engine.GUI.cpp
@@ -2,8 +2,7 @@
 #include "definitions.h"
 #include "Global.Engine.GUI.h"
 #include "Global.Engine.h"
-#include <commdlg.h>
-#include <shellapi.h>
+
 
 #define TE_VER_MAJOR 2
 #define TE_VER_MIDDLE 1
diff --git a/TitanEngine/Global.Engine.Importer.cpp b/TitanEngine/Global.Engine.Importer.cpp
index 0dc6354..3af35f0 100644
--- a/TitanEngine/Global.Engine.Importer.cpp
+++ b/TitanEngine/Global.Engine.Importer.cpp
@@ -2,7 +2,6 @@
 #include "definitions.h"
 #include "Global.Engine.Importer.h"
 #include "Global.Debugger.h"
-#include <psapi.h>
 
 ULONG_PTR EngineGetProcAddressRemote(HANDLE hProcess, const wchar_t* szDLLName, const char* szAPIName)
 {
diff --git a/TitanEngine/Global.Engine.cpp b/TitanEngine/Global.Engine.cpp
index 2d45b6c..e343820 100644
--- a/TitanEngine/Global.Engine.cpp
+++ b/TitanEngine/Global.Engine.cpp
@@ -6,7 +6,6 @@
 #include "Global.Engine.Extension.h"
 #include "Global.Engine.Hash.h"
 #include "Global.Debugger.h"
-#include <psapi.h>
 
 bool engineCheckForwarders = true;
 bool engineAlowModuleLoading = false;
diff --git a/TitanEngine/Global.Garbage.cpp b/TitanEngine/Global.Garbage.cpp
index ed28236..015b67b 100644
--- a/TitanEngine/Global.Garbage.cpp
+++ b/TitanEngine/Global.Garbage.cpp
@@ -3,8 +3,7 @@
 #include "Global.Garbage.h"
 #include "Global.Handle.h"
 #include "Global.Engine.h"
-#include <stdlib.h>
-#include <time.h>
+
 
 wchar_t engineSzEngineGarbageFolder[MAX_PATH];
 
diff --git a/TitanEngine/Global.OEPFinder.cpp b/TitanEngine/Global.OEPFinder.cpp
index 274c5a2..d8d01a8 100644
--- a/TitanEngine/Global.OEPFinder.cpp
+++ b/TitanEngine/Global.OEPFinder.cpp
@@ -6,7 +6,6 @@
 #include "Global.Debugger.h"
 #include "Global.Mapping.h"
 #include "Global.Handle.h"
-#include <psapi.h>
 
 GenericOEPTracerData glbEntryTracerData = {};
 
diff --git a/TitanEngine/TitanEngine.Debugger.Control.cpp b/TitanEngine/TitanEngine.Debugger.Control.cpp
index 5de0164..448c34f 100644
--- a/TitanEngine/TitanEngine.Debugger.Control.cpp
+++ b/TitanEngine/TitanEngine.Debugger.Control.cpp
@@ -4,7 +4,6 @@
 #include "Global.Handle.h"
 #include "Global.Threader.h"
 #include "Global.Librarian.h"
-#include <vector>
 
 __declspec(dllexport) void TITCALL ForceClose()
 {
diff --git a/TitanEngine/TitanEngine.Debugger.DebugLoop.cpp b/TitanEngine/TitanEngine.Debugger.DebugLoop.cpp
index afdc837..539cb2d 100644
--- a/TitanEngine/TitanEngine.Debugger.DebugLoop.cpp
+++ b/TitanEngine/TitanEngine.Debugger.DebugLoop.cpp
@@ -8,7 +8,6 @@
 #include "Global.Threader.h"
 #include "Global.Librarian.h"
 #include "Global.TLS.h"
-#include <psapi.h>
 
 #define UE_MODULEx86 0x2000;
 #define UE_MODULEx64 0x2000;
diff --git a/TitanEngine/TitanEngine.Debugger.Memory.cpp b/TitanEngine/TitanEngine.Debugger.Memory.cpp
index 505af2f..ca6a758 100644
--- a/TitanEngine/TitanEngine.Debugger.Memory.cpp
+++ b/TitanEngine/TitanEngine.Debugger.Memory.cpp
@@ -2,7 +2,6 @@
 #include "definitions.h"
 #include "Global.Debugger.h"
 #include "Global.Breakpoints.h"
-#include <stdlib.h>
 
 __declspec(dllexport) bool TITCALL MatchPatternEx(HANDLE hProcess, void* MemoryToCheck, int SizeOfMemoryToCheck, void* PatternToMatch, int SizeOfPatternToMatch, PBYTE WildCard)
 {
diff --git a/TitanEngine/TitanEngine.Debugger.cpp b/TitanEngine/TitanEngine.Debugger.cpp
index f4ab0f0..9cc6f19 100644
--- a/TitanEngine/TitanEngine.Debugger.cpp
+++ b/TitanEngine/TitanEngine.Debugger.cpp
@@ -5,7 +5,6 @@
 #include "Global.Handle.h"
 #include "Global.Breakpoints.h"
 #include "Global.Threader.h"
-#include <vector>
 
 static wchar_t szBackupDebuggedFileName[512];
 
diff --git a/TitanEngine/TitanEngine.Dumper.cpp b/TitanEngine/TitanEngine.Dumper.cpp
index bfa34dd..2973df8 100644
--- a/TitanEngine/TitanEngine.Dumper.cpp
+++ b/TitanEngine/TitanEngine.Dumper.cpp
@@ -2,7 +2,6 @@
 #include "definitions.h"
 #include "Global.Engine.h"
 #include "Global.Handle.h"
-#include <psapi.h>
 
 //TitanEngine.Dumper.functions:
 __declspec(dllexport) bool TITCALL DumpProcess(HANDLE hProcess, LPVOID ImageBase, char* szDumpFileName, ULONG_PTR EntryPoint)
diff --git a/TitanEngine/TitanEngine.Hooks.cpp b/TitanEngine/TitanEngine.Hooks.cpp
index b5324fe..d91e68b 100644
--- a/TitanEngine/TitanEngine.Hooks.cpp
+++ b/TitanEngine/TitanEngine.Hooks.cpp
@@ -5,8 +5,6 @@
 #include "Global.Engine.h"
 #include "Global.Handle.h"
 #include "Global.Mapping.h"
-#include <vector>
-#include <psapi.h>
 
 // Global.Engine.Hooks:
 static std::vector<HOOK_ENTRY> hookEntry;
diff --git a/TitanEngine/TitanEngine.Importer.cpp b/TitanEngine/TitanEngine.Importer.cpp
index e4a3c66..e9aa657 100644
--- a/TitanEngine/TitanEngine.Importer.cpp
+++ b/TitanEngine/TitanEngine.Importer.cpp
@@ -6,7 +6,6 @@
 #include "Global.Engine.Importer.h"
 #include "Global.Debugger.h"
 #include "scylla_wrapper.h"
-#include <psapi.h>
 
 // TitanEngine.Importer.functions:
 __declspec(dllexport) void TITCALL ImporterAddNewDll(char* szDLLName, ULONG_PTR FirstThunk)
diff --git a/TitanEngine/TitanEngine.Process.cpp b/TitanEngine/TitanEngine.Process.cpp
index e688077..78a9ee6 100644
--- a/TitanEngine/TitanEngine.Process.cpp
+++ b/TitanEngine/TitanEngine.Process.cpp
@@ -2,7 +2,6 @@
 #include "definitions.h"
 #include "Global.Handle.h"
 #include "Global.Engine.h"
-#include <psapi.h>
 
 // TitanEngine.Process.functions:
 __declspec(dllexport) long TITCALL GetActiveProcessId(char* szImageName)
diff --git a/TitanEngine/TitanEngine.Realigner.cpp b/TitanEngine/TitanEngine.Realigner.cpp
index 50d02b7..1415a7c 100644
--- a/TitanEngine/TitanEngine.Realigner.cpp
+++ b/TitanEngine/TitanEngine.Realigner.cpp
@@ -3,7 +3,6 @@
 #include "Global.Engine.h"
 #include "Global.Mapping.h"
 #include "Global.Garbage.h"
-#include <imagehlp.h>
 
 // TitanEngine.Realigner.functions:
 __declspec(dllexport) bool TITCALL FixHeaderCheckSum(char* szFileName)
diff --git a/TitanEngine/TitanEngine.Static.cpp b/TitanEngine/TitanEngine.Static.cpp
index 74c5866..cc83aeb 100644
--- a/TitanEngine/TitanEngine.Static.cpp
+++ b/TitanEngine/TitanEngine.Static.cpp
@@ -4,7 +4,6 @@
 #include "Global.Handle.h"
 #include "Global.Engine.h"
 #include "Global.Engine.Hash.h"
-#include <wincrypt.h>
 
 // TitanEngine.StaticUnpacker.functions:
 __declspec(dllexport) bool TITCALL StaticFileLoad(char* szFileName, DWORD DesiredAccess, bool SimulateLoad, LPHANDLE FileHandle, LPDWORD LoadedSize, LPHANDLE FileMap, PULONG_PTR FileMapVA)
diff --git a/TitanEngine/TitanEngine.Threader.cpp b/TitanEngine/TitanEngine.Threader.cpp
index c75a441..2a9d980 100644
--- a/TitanEngine/TitanEngine.Threader.cpp
+++ b/TitanEngine/TitanEngine.Threader.cpp
@@ -4,7 +4,6 @@
 #include "Global.Engine.h"
 #include "Global.Threader.h"
 #include "Global.Debugger.h"
-#include <tlhelp32.h>
 
 // TitanEngine.Threader.functions:
 __declspec(dllexport) bool TITCALL ThreaderImportRunningThreadData(DWORD ProcessId)
diff --git a/TitanEngine/TitanEngine.Tracer.cpp b/TitanEngine/TitanEngine.Tracer.cpp
index 1522f07..f194f00 100644
--- a/TitanEngine/TitanEngine.Tracer.cpp
+++ b/TitanEngine/TitanEngine.Tracer.cpp
@@ -5,7 +5,7 @@
 #include "Global.Mapping.h"
 #include "Global.Engine.Hash.h"
 #include "Global.Injector.h"
-#include <psapi.h>
+
 
 // Global.Engine.Tracer.functions:
 static long long EngineGlobalTracerHandler1(HANDLE hProcess, ULONG_PTR AddressToTrace, bool HashInstructions, DWORD InputNumberOfInstructions)
diff --git a/TitanEngine/stdafx.h b/TitanEngine/stdafx.h
index cdd203a..6b55c12 100644
--- a/TitanEngine/stdafx.h
+++ b/TitanEngine/stdafx.h
@@ -11,8 +11,23 @@
 //#define TITANENGINE_BUILD_ASM_LIB
 
 #define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
+
 // Windows Header Files:
 #include <windows.h>
+
+#include <imagehlp.h>
+#include <wincrypt.h>
+#include <psapi.h>
+#include <commdlg.h>
+#include <shellapi.h>
+#include <tlhelp32.h>
+
+
+//stl/crt
+#include <vector>
+#include <stdlib.h>
+#include <time.h>
+
 //#include <winternl.h>
 #include "ntdll.h"
 #include "aplib.h"