diff --git a/Kiseki.Patcher/Header/Discord.hpp b/Kiseki.Patcher/Header/Discord.hpp
index e6e22c4..c3d5523 100644
--- a/Kiseki.Patcher/Header/Discord.hpp
+++ b/Kiseki.Patcher/Header/Discord.hpp
@@ -6,10 +6,9 @@
 #include <discord_register.h>
 #include <rapidjson/document.h>
 
-#include "Globals.hpp"
-
 #include "Hooks/CRoblox.hpp"
 
+#include "Globals.hpp"
 
 class Discord {
 public:
diff --git a/Kiseki.Patcher/Header/Helpers.hpp b/Kiseki.Patcher/Header/Helpers.hpp
index 5c53241..e4dab6c 100644
--- a/Kiseki.Patcher/Header/Helpers.hpp
+++ b/Kiseki.Patcher/Header/Helpers.hpp
@@ -1,5 +1,9 @@
 #pragma once
 
+#include <string>
+#include <vector>
+#include <map>
+
 #include <curl/curl.h>
 
 #include "Globals.hpp"
diff --git a/Kiseki.Patcher/Header/Hooks/CRoblox.hpp b/Kiseki.Patcher/Header/Hooks/CRoblox.hpp
index a970dd1..6a58fb4 100644
--- a/Kiseki.Patcher/Header/Hooks/CRoblox.hpp
+++ b/Kiseki.Patcher/Header/Hooks/CRoblox.hpp
@@ -8,6 +8,10 @@
 #include "Helpers.hpp"
 #include "Discord.hpp"
 
+#ifdef SERVER
+#include "Server.hpp"
+#endif
+
 class CWorkspace;
 
 const auto CWorkspace__ExecUrlScript = (HRESULT(__stdcall*)(CWorkspace * workspace, LPCWSTR, VARIANTARG, VARIANTARG, VARIANTARG, VARIANTARG, LPVOID))ADDRESS_CWORKSPACE__EXECURLSCRIPT;
diff --git a/Kiseki.Patcher/Header/Hooks/Crypt.hpp b/Kiseki.Patcher/Header/Hooks/Crypt.hpp
index 1a51ca2..ef381d3 100644
--- a/Kiseki.Patcher/Header/Hooks/Crypt.hpp
+++ b/Kiseki.Patcher/Header/Hooks/Crypt.hpp
@@ -1,8 +1,12 @@
 #pragma once
 
+#include <string>
+
 #include <wincrypt.h>
 
 #include "Globals.hpp"
+#include "Helpers.hpp"
+#include "Patcher.hpp"
 
 typedef void(__thiscall* Crypt__verifySignatureBase64_t)(HCRYPTPROV* _this, int a2, BYTE* pbData, int a4, int a5, int a6, DWORD dwDataLen, int a8, int a9, int a10, int a11, int a12, int a13, int a14, int a15);
 void __fastcall Crypt__verifySignatureBase64_hook(HCRYPTPROV* _this, void*, int a2, BYTE* pbData, int a4, int a5, int a6, DWORD dwDataLen, int a8, int a9, int a10, int a11, int a12, int a13, int a14, int a15);
diff --git a/Kiseki.Patcher/Header/Hooks/Http.hpp b/Kiseki.Patcher/Header/Hooks/Http.hpp
index 4cf4d6d..f886c82 100644
--- a/Kiseki.Patcher/Header/Hooks/Http.hpp
+++ b/Kiseki.Patcher/Header/Hooks/Http.hpp
@@ -1,3 +1,7 @@
+#pragma once
+
+#include <string>
+
 #include <curl/curl.h>
 #include <rapidjson/document.h>
 
diff --git a/Kiseki.Patcher/Header/Patcher.hpp b/Kiseki.Patcher/Header/Patcher.hpp
index 95a3cd4..e3d3b9d 100644
--- a/Kiseki.Patcher/Header/Patcher.hpp
+++ b/Kiseki.Patcher/Header/Patcher.hpp
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <vector>
+#include <utility>
+
 #include <detours/detours.h>
 
 namespace Patcher
diff --git a/Kiseki.Patcher/Header/Server.hpp b/Kiseki.Patcher/Header/Server.hpp
index d31aafa..6f479a4 100644
--- a/Kiseki.Patcher/Header/Server.hpp
+++ b/Kiseki.Patcher/Header/Server.hpp
@@ -2,11 +2,11 @@
 
 #pragma once
 
+#include "Hooks/StandardOut.hpp"
+
 #include "Globals.hpp"
 #include "Helpers.hpp"
 
-#include "Hooks/StandardOut.hpp"
-
 enum class RequestType {
 	POST,
 	GET
diff --git a/Kiseki.Patcher/Resource/Information.h b/Kiseki.Patcher/Resource/Information.h
index 48bf3fa..35a20c0 100644
--- a/Kiseki.Patcher/Resource/Information.h
+++ b/Kiseki.Patcher/Resource/Information.h
@@ -4,9 +4,9 @@
 #define VERSION_MAJOR_MINOR_PATCH_STR "1.0.0"
 #define VERSION_FULL_STR              "1.0.0.0"
 #define VERSION_RESOURCE              1, 0, 0, 0
-#define VERSION_RESOURCE_STR          VERSION_FULL_STR "\0"
+#define VERSION_RESOURCE_STR          VERSION_FULL_STR
 
 #define APP_NAME                     "Kiseki.Patcher"
 #define APP_DESCRIPTION              "Client Functionality Library"
 #define APP_ORGANIZATION             "Kiseki"
-#define APP_COPYRIGHT                "Copyright (c) Kiseki 2023"
\ No newline at end of file
+#define APP_COPYRIGHT                "Copyright (c) Kiseki 2023"
diff --git a/Kiseki.Patcher/Source/Hooks/CRoblox.cpp b/Kiseki.Patcher/Source/Hooks/CRoblox.cpp
index 0e4b17c..aecbeed 100644
--- a/Kiseki.Patcher/Source/Hooks/CRoblox.cpp
+++ b/Kiseki.Patcher/Source/Hooks/CRoblox.cpp
@@ -2,10 +2,6 @@
 
 #include "Hooks/CRoblox.hpp"
 
-#ifdef SERVER
-#include "Server.h"
-#endif
-
 bool hasAuthenticationUrl = false;
 bool hasAuthenticationTicket = false;
 bool hasJoinScriptUrl = false;
diff --git a/Kiseki.Patcher/Source/Hooks/Crypt.cpp b/Kiseki.Patcher/Source/Hooks/Crypt.cpp
index 4e66b5f..73ca1c1 100644
--- a/Kiseki.Patcher/Source/Hooks/Crypt.cpp
+++ b/Kiseki.Patcher/Source/Hooks/Crypt.cpp
@@ -1,8 +1,5 @@
 #include "Hooks/Crypt.hpp"
 
-#include "Helpers.hpp"
-#include "Patcher.hpp"
-
 Crypt::Crypt()
 {
     if (!CryptAcquireContext(&context, NULL, MS_ENH_RSA_AES_PROV, PROV_RSA_AES, CRYPT_VERIFYCONTEXT))
diff --git a/Kiseki.Patcher/Source/main.cpp b/Kiseki.Patcher/Source/main.cpp
index 0934fb4..bb15068 100644
--- a/Kiseki.Patcher/Source/main.cpp
+++ b/Kiseki.Patcher/Source/main.cpp
@@ -1,4 +1,6 @@
 
+#include <windows.h>
+
 #include "Globals.hpp"
 #include "Patcher.hpp"