diff --git a/controller/gamepad.c b/controller/gamepad.c
index e7a325d2..de0f2354 100644
--- a/controller/gamepad.c
+++ b/controller/gamepad.c
@@ -11,7 +11,7 @@
 #include <malloc.h>
 
 #define GAMEPAD_EXPORT 1
-#include "gamepad.h"
+#include "controller/gamepad.h"
 
 /* Platform-specific includes */
 #if defined(_WIN32)
diff --git a/dll/auth.cpp b/dll/auth.cpp
index 83c178d0..49628667 100644
--- a/dll/auth.cpp
+++ b/dll/auth.cpp
@@ -1,4 +1,4 @@
-#include "auth.h"
+#include "dll/auth.h"
 
 static inline int generate_random_int() {
     int a;
diff --git a/dll/base.cpp b/dll/base.cpp
index 4a935f4e..573c410c 100644
--- a/dll/base.cpp
+++ b/dll/base.cpp
@@ -15,7 +15,7 @@
    License along with the Goldberg Emulator; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include "base.h"
+#include "dll/base.h"
 
 #ifdef __WINDOWS__
 
@@ -481,7 +481,7 @@ static void load_dll()
     }
 }
 
-#include "local_storage.h"
+#include "dll/local_storage.h"
 static void load_dlls()
 {
     std::string path = Local_Storage::get_game_settings_path();
diff --git a/dll/dll.cpp b/dll/dll.cpp
index 3b26b733..5ae1b40a 100644
--- a/dll/dll.cpp
+++ b/dll/dll.cpp
@@ -16,7 +16,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #define STEAM_API_FUNCTIONS_IMPL
-#include "dll.h"
+#include "dll/dll.h"
 
 
 static char old_client[128] = STEAMCLIENT_INTERFACE_VERSION; //"SteamClient017";
diff --git a/dll/dll/steam_client.h b/dll/dll/steam_client.h
index 4baba763..b7c08561 100644
--- a/dll/dll/steam_client.h
+++ b/dll/dll/steam_client.h
@@ -51,7 +51,7 @@
 #include "steam_gameserverstats.h"
 #include "steam_masterserver_updater.h"
 
-#include "overlay_experimental/steam_overlay.h"
+#include "overlay/steam_overlay.h"
 
 enum Steam_Pipe {
     NO_USER,
diff --git a/dll/dll/steam_friends.h b/dll/dll/steam_friends.h
index 3b2ae8eb..4940acfe 100644
--- a/dll/dll/steam_friends.h
+++ b/dll/dll/steam_friends.h
@@ -19,7 +19,7 @@
 #define __INCLUDED_STEAM_FRIENDS_H__
 
 #include "base.h"
-#include "overlay_experimental/steam_overlay.h"
+#include "overlay/steam_overlay.h"
 
 #define SEND_FRIEND_RATE 4.0
 
diff --git a/dll/dll/steam_user_stats.h b/dll/dll/steam_user_stats.h
index 3d69b269..69eac028 100644
--- a/dll/dll/steam_user_stats.h
+++ b/dll/dll/steam_user_stats.h
@@ -20,7 +20,7 @@
 
 #include <limits>
 #include "base.h"
-#include "overlay_experimental/steam_overlay.h"
+#include "overlay/steam_overlay.h"
 
 struct Steam_Leaderboard_Score {
     CSteamID steam_id;
diff --git a/dll/dll/steam_utils.h b/dll/dll/steam_utils.h
index fc868b2e..2582615c 100644
--- a/dll/dll/steam_utils.h
+++ b/dll/dll/steam_utils.h
@@ -17,7 +17,7 @@
 
 #include "base.h"
 #include "local_storage.h"
-#include "overlay_experimental/steam_overlay.h"
+#include "overlay/steam_overlay.h"
 
 static std::chrono::time_point<std::chrono::steady_clock> app_initialized_time = std::chrono::steady_clock::now();
 
diff --git a/dll/flat.cpp b/dll/flat.cpp
index b0906cfd..844e9348 100644
--- a/dll/flat.cpp
+++ b/dll/flat.cpp
@@ -17,8 +17,8 @@
 
 #ifndef STEAMCLIENT_DLL
 #define STEAM_API_FUNCTIONS_IMPL
-#include "dll.h"
-#include "sdk_includes/steam_api_flat.h"
+#include "dll/dll.h"
+#include "steam/steam_api_flat.h"
 
 STEAMAPI_API HSteamPipe SteamAPI_ISteamClient_CreateSteamPipe( ISteamClient* self )
 {
diff --git a/dll/local_storage.cpp b/dll/local_storage.cpp
index b0ab1a5c..34798cc4 100644
--- a/dll/local_storage.cpp
+++ b/dll/local_storage.cpp
@@ -15,7 +15,7 @@
    License along with the Goldberg Emulator; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include "local_storage.h"
+#include "dll/local_storage.h"
 
 #define STB_IMAGE_IMPLEMENTATION
 #define STB_IMAGE_STATIC
@@ -24,14 +24,14 @@
 #if defined(__WINDOWS__)
 #define STBI_WINDOWS_UTF8
 #endif
-#include "../stb/stb_image.h"
+#include "stb/stb_image.h"
 
 #define STB_IMAGE_WRITE_IMPLEMENTATION
 #define STB_IMAGE_WRITE_STATIC
-#include "../stb/stb_image_write.h"
+#include "stb/stb_image_write.h"
 
 #define STB_IMAGE_RESIZE_IMPLEMENTATION
-#include "../stb/stb_image_resize.h"
+#include "stb/stb_image_resize.h"
 
 struct File_Data {
     std::string name;
diff --git a/dll/network.cpp b/dll/network.cpp
index 520422e7..be34cc89 100644
--- a/dll/network.cpp
+++ b/dll/network.cpp
@@ -15,8 +15,8 @@
    License along with the Goldberg Emulator; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include "network.h"
-#include "dll.h"
+#include "dll/network.h"
+#include "dll/dll.h"
 
 #define MAX_BROADCASTS 16
 static int number_broadcasts = -1;
diff --git a/dll/settings.cpp b/dll/settings.cpp
index 304810bc..185b62c9 100644
--- a/dll/settings.cpp
+++ b/dll/settings.cpp
@@ -15,7 +15,7 @@
    License along with the Goldberg Emulator; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include "settings.h"
+#include "dll/settings.h"
 
 
 std::string Settings::sanitize(std::string name)
diff --git a/dll/settings_parser.cpp b/dll/settings_parser.cpp
index aa1e3241..dbeeb1f8 100644
--- a/dll/settings_parser.cpp
+++ b/dll/settings_parser.cpp
@@ -15,7 +15,7 @@
    License along with the Goldberg Emulator; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include "settings_parser.h"
+#include "dll/settings_parser.h"
 
 static void consume_bom(std::ifstream &input)
 {
diff --git a/dll/source_query.cpp b/dll/source_query.cpp
index cae53ef4..f4dace4e 100644
--- a/dll/source_query.cpp
+++ b/dll/source_query.cpp
@@ -15,8 +15,8 @@
    License along with the Goldberg Emulator; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include "source_query.h"
-#include "dll.h"
+#include "dll/source_query.h"
+#include "dll/dll.h"
 
 using lock_t = std::lock_guard<std::mutex>;
 
diff --git a/dll/steam_applist.cpp b/dll/steam_applist.cpp
index a19e7e28..5b6bec18 100644
--- a/dll/steam_applist.cpp
+++ b/dll/steam_applist.cpp
@@ -15,7 +15,7 @@
    License along with the Goldberg Emulator; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include "steam_applist.h"
+#include "dll/steam_applist.h"
 
 uint32 Steam_Applist::GetNumInstalledApps()
 {
diff --git a/dll/steam_apps.cpp b/dll/steam_apps.cpp
index 8eb594f3..4889829c 100644
--- a/dll/steam_apps.cpp
+++ b/dll/steam_apps.cpp
@@ -15,8 +15,8 @@
    License along with the Goldberg Emulator; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include "steam_apps.h"
-#include "../sha/sha1.hpp"
+#include "dll/steam_apps.h"
+#include "sha/sha1.hpp"
 
 Steam_Apps::Steam_Apps(Settings *settings, class SteamCallResults *callback_results)
 {
diff --git a/dll/steam_client.cpp b/dll/steam_client.cpp
index 225ae7c4..1b926ab5 100644
--- a/dll/steam_client.cpp
+++ b/dll/steam_client.cpp
@@ -15,8 +15,8 @@
    License along with the Goldberg Emulator; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include "steam_client.h"
-#include "settings_parser.h"
+#include "dll/steam_client.h"
+#include "dll/settings_parser.h"
 
 static std::mutex kill_background_thread_mutex;
 static std::condition_variable kill_background_thread_cv;
diff --git a/dll/steam_gameserver.cpp b/dll/steam_gameserver.cpp
index 1e9f7b5b..a03a8044 100644
--- a/dll/steam_gameserver.cpp
+++ b/dll/steam_gameserver.cpp
@@ -15,8 +15,8 @@
    License along with the Goldberg Emulator; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include "steam_gameserver.h"
-#include "source_query.h"
+#include "dll/steam_gameserver.h"
+#include "dll/source_query.h"
 
 #define SEND_SERVER_RATE 5.0
 
diff --git a/dll/steam_gameserverstats.cpp b/dll/steam_gameserverstats.cpp
index a9447da8..84497394 100644
--- a/dll/steam_gameserverstats.cpp
+++ b/dll/steam_gameserverstats.cpp
@@ -15,7 +15,7 @@
    License along with the Goldberg Emulator; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include "steam_gameserverstats.h"
+#include "dll/steam_gameserverstats.h"
 
 Steam_GameServerStats::Steam_GameServerStats(class Settings *settings, class Networking *network, class SteamCallResults *callback_results, class SteamCallBacks *callbacks)
 {
diff --git a/dll/steam_http.cpp b/dll/steam_http.cpp
index aaea15d9..4e8de131 100644
--- a/dll/steam_http.cpp
+++ b/dll/steam_http.cpp
@@ -15,7 +15,7 @@
    License along with the Goldberg Emulator; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include "steam_http.h"
+#include "dll/steam_http.h"
 
 Steam_HTTP::Steam_HTTP(class Settings *settings, class Networking *network, class SteamCallResults *callback_results, class SteamCallBacks *callbacks)
 {
diff --git a/dll/steam_matchmaking_servers.cpp b/dll/steam_matchmaking_servers.cpp
index 944b8667..fc4b1596 100644
--- a/dll/steam_matchmaking_servers.cpp
+++ b/dll/steam_matchmaking_servers.cpp
@@ -15,7 +15,7 @@
    License along with the Goldberg Emulator; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include "steam_matchmaking_servers.h"
+#include "dll/steam_matchmaking_servers.h"
 
 
 static void network_callback(void *object, Common_Message *msg)
diff --git a/dll/steam_music.cpp b/dll/steam_music.cpp
index 1ae6ba90..d30307ff 100644
--- a/dll/steam_music.cpp
+++ b/dll/steam_music.cpp
@@ -15,7 +15,7 @@
    License along with the Goldberg Emulator; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include "steam_music.h" 
+#include "dll/steam_music.h" 
 
 Steam_Music::Steam_Music(class SteamCallBacks *callbacks)
 {
diff --git a/dll/steam_musicremote.cpp b/dll/steam_musicremote.cpp
index b5c87eb6..958e4461 100644
--- a/dll/steam_musicremote.cpp
+++ b/dll/steam_musicremote.cpp
@@ -15,7 +15,7 @@
    License along with the Goldberg Emulator; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include "steam_musicremote.h" 
+#include "dll/steam_musicremote.h" 
 
 // Service Definition
 bool Steam_MusicRemote::RegisterSteamMusicRemote( const char *pchName )
diff --git a/dll/steam_parental.cpp b/dll/steam_parental.cpp
index d3952f4d..00fd3d21 100644
--- a/dll/steam_parental.cpp
+++ b/dll/steam_parental.cpp
@@ -15,7 +15,7 @@
    License along with the Goldberg Emulator; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include "steam_parental.h"
+#include "dll/steam_parental.h"
 
 bool Steam_Parental::BIsParentalLockEnabled()
 {
diff --git a/dll/steam_screenshots.cpp b/dll/steam_screenshots.cpp
index f4e0d450..ce33ba96 100644
--- a/dll/steam_screenshots.cpp
+++ b/dll/steam_screenshots.cpp
@@ -15,7 +15,7 @@
    License along with the Goldberg Emulator; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include "steam_screenshots.h" 
+#include "dll/steam_screenshots.h" 
 
 Steam_Screenshots::Steam_Screenshots(class Local_Storage* local_storage, class SteamCallBacks* callbacks) :
     local_storage(local_storage),
diff --git a/dll/steam_video.cpp b/dll/steam_video.cpp
index 6d3beeed..4349281a 100644
--- a/dll/steam_video.cpp
+++ b/dll/steam_video.cpp
@@ -15,7 +15,7 @@
    License along with the Goldberg Emulator; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include "steam_video.h" 
+#include "dll/steam_video.h" 
 
 // Get a URL suitable for streaming the given Video app ID's video
 void Steam_Video::GetVideoURL( AppId_t unVideoAppID )
diff --git a/dll/wrap.cpp b/dll/wrap.cpp
index 7cabf7ce..085d11ff 100644
--- a/dll/wrap.cpp
+++ b/dll/wrap.cpp
@@ -26,8 +26,8 @@
 #else
 #define STEAM_API_FUNCTIONS_IMPL
 
-#include "base.h"
-#include "dll.h"
+#include "dll/base.h"
+#include "dll/dll.h"
 
 #define PATH_SEPARATOR_CHAR '/'
 #define STEAM_PATH_CACHE_SIZE 4096
diff --git a/overlay_experimental/Base_Hook.cpp b/overlay_experimental/Base_Hook.cpp
index 6a732ea4..45cb826e 100644
--- a/overlay_experimental/Base_Hook.cpp
+++ b/overlay_experimental/Base_Hook.cpp
@@ -1,11 +1,11 @@
-#include "Base_Hook.h"
+#include "overlay/Base_Hook.h"
 
 #include <algorithm>
 
 #ifdef EMU_OVERLAY
 #ifdef STEAM_WIN32
 
-#include "../detours/detours.h"
+#include "detours/detours.h"
 
 Base_Hook::Base_Hook():
     _library(nullptr)
diff --git a/overlay_experimental/Renderer_Detector.cpp b/overlay_experimental/Renderer_Detector.cpp
index 687b12fc..a3d871af 100644
--- a/overlay_experimental/Renderer_Detector.cpp
+++ b/overlay_experimental/Renderer_Detector.cpp
@@ -19,7 +19,7 @@
 
 #include <cassert>
 
-#include "Renderer_Detector.h"
+#include "overlay/Renderer_Detector.h"
 
 #include "System/Encoding.hpp"
 #include "System/String.hpp"
diff --git a/overlay_experimental/linux/OpenGLX_Hook.h b/overlay_experimental/linux/OpenGLX_Hook.h
index ea868c6c..c0d6d8a3 100644
--- a/overlay_experimental/linux/OpenGLX_Hook.h
+++ b/overlay_experimental/linux/OpenGLX_Hook.h
@@ -21,7 +21,7 @@
 
 #include <ingame_overlay/Renderer_Hook.h>
 
-#include "../internal_includes.h"
+#include "overlay/internal_includes.h"
 
 #include <GL/glx.h>
 
diff --git a/overlay_experimental/linux/X11_Hook.h b/overlay_experimental/linux/X11_Hook.h
index 436469ac..6c8d1a50 100644
--- a/overlay_experimental/linux/X11_Hook.h
+++ b/overlay_experimental/linux/X11_Hook.h
@@ -21,7 +21,7 @@
 
 #include <ingame_overlay/Renderer_Hook.h>
 
-#include "../internal_includes.h"
+#include "overlay/internal_includes.h"
 
 #include <X11/X.h> // XEvent types
 #include <X11/Xlib.h> // XEvent structure
diff --git a/overlay_experimental/steam_overlay.cpp b/overlay_experimental/steam_overlay.cpp
index 5504a9e9..a5c1844a 100644
--- a/overlay_experimental/steam_overlay.cpp
+++ b/overlay_experimental/steam_overlay.cpp
@@ -1,5 +1,5 @@
-#include "steam_overlay.h"
-#include "steam_overlay_translations.h"
+#include "overlay/steam_overlay.h"
+#include "overlay/steam_overlay_translations.h"
 
 #ifdef EMU_OVERLAY
 
@@ -9,10 +9,10 @@
 #include <cctype>
 #include <imgui.h>
 
-#include "../dll/dll.h"
-#include "../dll/settings_parser.h"
+#include "dll/dll.h"
+#include "dll/settings_parser.h"
 
-#include "Renderer_Detector.h"
+#include "overlay/Renderer_Detector.h"
 
 static constexpr int max_window_id = 10000;
 static constexpr int base_notif_window_id  = 0 * max_window_id;
@@ -100,7 +100,7 @@ int find_free_notification_id(std::vector<Notification> const& notifications)
 #include "windows/Windows_Hook.h"
 #endif
 
-#include "notification.h"
+#include "overlay/notification.h"
 char *notif_achievement_wav_custom;
 char *notif_invite_wav_custom;
 bool notif_achievement_wav_custom_inuse = false;
diff --git a/overlay_experimental/windows/DX10_Hook.h b/overlay_experimental/windows/DX10_Hook.h
index cf475b00..02ce5364 100644
--- a/overlay_experimental/windows/DX10_Hook.h
+++ b/overlay_experimental/windows/DX10_Hook.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "../internal_includes.h"
+#include "overlay/internal_includes.h"
 
 #include <d3d10.h>
 #include <dxgi1_2.h>
diff --git a/overlay_experimental/windows/DX11_Hook.h b/overlay_experimental/windows/DX11_Hook.h
index d064c13f..976370fb 100644
--- a/overlay_experimental/windows/DX11_Hook.h
+++ b/overlay_experimental/windows/DX11_Hook.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "../internal_includes.h"
+#include "overlay/internal_includes.h"
 
 #include <d3d11.h>
 #include <dxgi1_2.h>
diff --git a/overlay_experimental/windows/DX12_Hook.h b/overlay_experimental/windows/DX12_Hook.h
index 730a0265..11f533b5 100644
--- a/overlay_experimental/windows/DX12_Hook.h
+++ b/overlay_experimental/windows/DX12_Hook.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "../internal_includes.h"
+#include "overlay/internal_includes.h"
 
 #include <d3d12.h>
 #include <dxgi1_4.h>
diff --git a/overlay_experimental/windows/DX9_Hook.h b/overlay_experimental/windows/DX9_Hook.h
index a580856f..bae0cf06 100644
--- a/overlay_experimental/windows/DX9_Hook.h
+++ b/overlay_experimental/windows/DX9_Hook.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "../internal_includes.h"
+#include "overlay/internal_includes.h"
 
 #include <d3d9.h>
 
diff --git a/overlay_experimental/windows/OpenGL_Hook.h b/overlay_experimental/windows/OpenGL_Hook.h
index 4d8c4839..e59aca7f 100644
--- a/overlay_experimental/windows/OpenGL_Hook.h
+++ b/overlay_experimental/windows/OpenGL_Hook.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "../internal_includes.h"
+#include "overlay/internal_includes.h"
 
 class OpenGL_Hook :
     public ingame_overlay::Renderer_Hook,
diff --git a/overlay_experimental/windows/Vulkan_Hook.h b/overlay_experimental/windows/Vulkan_Hook.h
index d6e090f4..e4e7b92a 100644
--- a/overlay_experimental/windows/Vulkan_Hook.h
+++ b/overlay_experimental/windows/Vulkan_Hook.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "../internal_includes.h"
+#include "overlay/internal_includes.h"
 
 #include <vulkan/vulkan.h>
 
diff --git a/overlay_experimental/windows/Windows_Hook.h b/overlay_experimental/windows/Windows_Hook.h
index 1f11fdba..a065df60 100644
--- a/overlay_experimental/windows/Windows_Hook.h
+++ b/overlay_experimental/windows/Windows_Hook.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "../internal_includes.h"
+#include "overlay/internal_includes.h"
 
 class Windows_Hook :
     public Base_Hook
diff --git a/overlay_experimental/windows/vulkan_lib.cpp b/overlay_experimental/windows/vulkan_lib.cpp
index 747d5461..5d478e0a 100644
--- a/overlay_experimental/windows/vulkan_lib.cpp
+++ b/overlay_experimental/windows/vulkan_lib.cpp
@@ -1,5 +1,5 @@
 #include "Vulkan_Hook.h"
-#include "../vulkan/vulkan.h"
+#include "vulkan/vulkan.h"
 #define VULKAN_DLL (Vulkan_Hook::DLL_NAME)
 
 void VKAPI_CALL vkGetPhysicalDeviceMemoryProperties(
diff --git a/steamnetworkingsockets.cpp b/steamnetworkingsockets.cpp
index 95260694..74eedef4 100644
--- a/steamnetworkingsockets.cpp
+++ b/steamnetworkingsockets.cpp
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #define NETWORKSOCKETS_DLL
 #define STEAM_API_EXPORTS
-#include "sdk_includes/steam_gameserver.h"
+#include "steam/steam_gameserver.h"
 
 #if defined(WIN32) || defined(_WIN32)
 #include <Windows.h>
diff --git a/tools/lobby_connect/lobby_connect.cpp b/tools/lobby_connect/lobby_connect.cpp
index d330b268..93b19c5e 100644
--- a/tools/lobby_connect/lobby_connect.cpp
+++ b/tools/lobby_connect/lobby_connect.cpp
@@ -18,7 +18,7 @@
 /*
 */
 
-#include "sdk_includes/steam_api.h"
+#include "steam/steam_api.h"
 #include "dll/common_includes.h"
 
 #include <iostream>