diff --git a/r5dev/core/shared_pch.h b/r5dev/core/shared_pch.h
index 37792299..f46a2834 100644
--- a/r5dev/core/shared_pch.h
+++ b/r5dev/core/shared_pch.h
@@ -10,6 +10,7 @@
 #pragma message ("Profiling is turned on; do not release this binary!\n")
 #endif // _DEBUG || _PROFILE
 
+// System includes.
 #define WIN32_LEAN_AND_MEAN // Prevent winsock2 redefinition.
 #include <windows.h>
 #include <WinSock2.h>
@@ -50,24 +51,6 @@
 
 #include <smmintrin.h>
 
-// Windows specifics, to support compiling the SDK with older versions of the Windows 10 SDK.
-#ifndef FILE_SUPPORTS_GHOSTING
-#define FILE_SUPPORTS_GHOSTING 0x40000000  // winnt
-#endif
-#ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING
-#define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004
-#endif
-
-// Thirdparty includes.
-#include "thirdparty/detours/include/detours.h"
-#include "thirdparty/detours/include/idetour.h"
-
-#include "thirdparty/lzham/include/lzham_assert.h"
-#include "thirdparty/lzham/include/lzham_types.h"
-#include "thirdparty/lzham/include/lzham.h"
-
-#include "thirdparty/curl/include/curl/curl.h"
-
 // Core includes.
 #include "core/assert.h"
 #include "core/termutil.h"
@@ -78,16 +61,12 @@
 #include "common/x86defs.h"
 #include "common/sdkdefs.h"
 
-// Tier0 includes.
-#include "tier0/utility.h"
-#include "tier0/memaddr.h"
-#include "tier0/module.h"
-#include "tier0/basetypes.h"
-#include "tier0/platform.h"
-#include "tier0/annotations.h"
-#include "tier0/commonmacros.h"
-#include "tier0/memalloc.h"
-#include "tier0/tier0_iface.h"
-#include "tier0/dbg.h"
+// Windows specifics, to support compiling the SDK with older versions of the Windows 10 SDK.
+#ifndef FILE_SUPPORTS_GHOSTING
+#define FILE_SUPPORTS_GHOSTING 0x40000000  // winnt
+#endif
+#ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING
+#define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004
+#endif
 
 #endif // SHARED_PCH_H
diff --git a/r5dev/core/stdafx.h b/r5dev/core/stdafx.h
index b1b776c7..afa376fe 100644
--- a/r5dev/core/stdafx.h
+++ b/r5dev/core/stdafx.h
@@ -1,32 +1,21 @@
 #pragma once
 #include "shared_pch.h"
-
-#if !defined(DEDICATED) && !defined(SDKLAUNCHER) && !defined (NETCONSOLE) && !defined(PLUGINSDK)
+#if !defined(DEDICATED) && !defined (NETCONSOLE) && !defined(PLUGINSDK)
 #include <d3d11.h>
-#endif // !DEDICATED && !SDKLAUNCHER && !NETCONSOLE && !PLUGINSDK
-
-#include "thirdparty/nlohmann/json.hpp"
+#endif // !DEDICATED && !NETCONSOLE && !PLUGINSDK
 
+// Thirdparty includes.
 #include "thirdparty/detours/include/detours.h"
 #include "thirdparty/detours/include/idetour.h"
 
-#if defined(SDKLAUNCHER)
-#include "thirdparty/cppnet/cppkore/Kore.h"
-#include "thirdparty/cppnet/cppkore/UIXTheme.h"
-#include "thirdparty/cppnet/cppkore/UIXLabel.h"
-#include "thirdparty/cppnet/cppkore/UIXListView.h"
-#include "thirdparty/cppnet/cppkore/UIXCheckBox.h"
-#include "thirdparty/cppnet/cppkore/UIXComboBox.h"
-#include "thirdparty/cppnet/cppkore/UIXTextBox.h"
-#include "thirdparty/cppnet/cppkore/UIXGroupBox.h"
-#include "thirdparty/cppnet/cppkore/UIXButton.h"
-#include "thirdparty/cppnet/cppkore/UIXRadioButton.h"
-#include "thirdparty/cppnet/cppkore/KoreTheme.h"
+#include "thirdparty/lzham/include/lzham_assert.h"
+#include "thirdparty/lzham/include/lzham_types.h"
+#include "thirdparty/lzham/include/lzham.h"
 
-#include "launcher/launcherdefs.h"
-#endif // SDKLAUNCHER
+#include "thirdparty/curl/include/curl/curl.h"
+#include "thirdparty/nlohmann/json.hpp"
 
-#if !defined(DEDICATED) && !defined(SDKLAUNCHER) && !defined (NETCONSOLE) && !defined(PLUGINSDK)
+#if !defined(DEDICATED) && !defined (NETCONSOLE) && !defined(PLUGINSDK)
 #include "thirdparty/imgui/imgui.h"
 #include "thirdparty/imgui/imgui_internal.h"
 #include "thirdparty/imgui/misc/imgui_logger.h"
@@ -35,13 +24,7 @@
 #include "thirdparty/imgui/misc/cpp/imgui_stdlib.h"
 #include "thirdparty/imgui/backends/imgui_impl_dx11.h"
 #include "thirdparty/imgui/backends/imgui_impl_win32.h"
-#endif // !DEDICATED && !SDKLAUNCHER && !NETCONSOLE && !PLUGINSDK
-
-#if !defined(SDKLAUNCHER) && !defined (NETCONSOLE) && !defined(PLUGINSDK)
-#include "thirdparty/lzham/include/lzham_assert.h"
-#include "thirdparty/lzham/include/lzham_types.h"
-#include "thirdparty/lzham/include/lzham.h"
-#endif // !SDKLAUNCHER && !NETCONSOLE && !PLUGINSDK
+#endif // !DEDICATED && !NETCONSOLE && !PLUGINSDK
 
 #include "thirdparty/spdlog/spdlog.h"
 #include "thirdparty/spdlog/async.h"
@@ -52,8 +35,19 @@
 #include "thirdparty/spdlog/sinks/ansicolor_sink.h"
 #include "thirdparty/spdlog/sinks/rotating_file_sink.h"
 
-#include "thirdparty/curl/include/curl/curl.h"
+// Tier0 includes.
+#include "tier0/utility.h"
+#include "tier0/memaddr.h"
+#include "tier0/module.h"
+#include "tier0/basetypes.h"
+#include "tier0/platform.h"
+#include "tier0/annotations.h"
+#include "tier0/commonmacros.h"
+#include "tier0/memalloc.h"
+#include "tier0/tier0_iface.h"
+#include "tier0/dbg.h"
 
+// Tier1 includes.
 #include "tier1/cvar.h"
 #include "tier1/cmd.h"
 #include "common/global.h"
diff --git a/r5dev/tier0/tier0_pch.h b/r5dev/tier0/tier0_pch.h
index 582c0179..a2f74356 100644
--- a/r5dev/tier0/tier0_pch.h
+++ b/r5dev/tier0/tier0_pch.h
@@ -8,4 +8,24 @@
 
 #include "core/shared_pch.h"
 
+#include "thirdparty/detours/include/detours.h"
+#include "thirdparty/detours/include/idetour.h"
+
+#include "thirdparty/lzham/include/lzham_assert.h"
+#include "thirdparty/lzham/include/lzham_types.h"
+#include "thirdparty/lzham/include/lzham.h"
+
+#include "thirdparty/curl/include/curl/curl.h"
+
+#include "tier0/utility.h"
+#include "tier0/memaddr.h"
+#include "tier0/module.h"
+#include "tier0/basetypes.h"
+#include "tier0/platform.h"
+#include "tier0/annotations.h"
+#include "tier0/commonmacros.h"
+#include "tier0/memalloc.h"
+#include "tier0/tier0_iface.h"
+#include "tier0/dbg.h"
+
 #endif // TIER0_PCH_H