diff --git a/configure.py b/configure.py
index e10a82de0..fe663da47 100644
--- a/configure.py
+++ b/configure.py
@@ -154,6 +154,7 @@ cflags_base = [
     "-str reuse",
     "-multibyte",
     "-i include",
+    "-i src",
     f"-DVERSION={version_num}",
 ]
 if config.debug:
diff --git a/docs/vscode.md b/docs/vscode.md
index 3b5360145..37fd2b7ad 100644
--- a/docs/vscode.md
+++ b/docs/vscode.md
@@ -46,7 +46,8 @@ Recommended `.vscode/c_cpp_properties.json`:
         {
             "name": "Linux",
             "includePath": [
-                "${workspaceFolder}/include/**"
+                "${workspaceFolder}/include/**",
+                "${workspaceFolder}/src/**"
             ],
             "cStandard": "c99",
             "cppStandard": "c++98",
@@ -55,7 +56,8 @@ Recommended `.vscode/c_cpp_properties.json`:
             "configurationProvider": "ms-vscode.makefile-tools",
             "browse": {
                 "path": [
-                    "${workspaceFolder}/include"
+                    "${workspaceFolder}/include",
+                    "${workspaceFolder}/src"
                 ],
                 "limitSymbolsToIncludedHeaders": true
             }
diff --git a/src/d/actor/d_a_bomb.cpp b/src/d/actor/d_a_bomb.cpp
index f200239b1..6ed079ead 100644
--- a/src/d/actor/d_a_bomb.cpp
+++ b/src/d/actor/d_a_bomb.cpp
@@ -1147,7 +1147,7 @@ BOOL daBomb_Delete(daBomb_c* i_this) {
     return true;
 }
 
-#include "src/d/actor/d_a_bomb3.inc"
+#include "d/actor/d_a_bomb3.inc"
 
 int daBomb_createHeap(fopAc_ac_c* i_this) {
     static_cast<daBomb_c*>(i_this)->createHeap();
diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp
index d46eaf8d6..e79c99773 100644
--- a/src/d/actor/d_a_player_main.cpp
+++ b/src/d/actor/d_a_player_main.cpp
@@ -17,7 +17,7 @@
 #include "JSystem/JKernel/JKRSolidHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 
-#include "src/d/actor/d_a_player_HIO.inc"
+#include "d/actor/d_a_player_HIO.inc"
 
 char l_arcName[] = "Link";
 
@@ -1942,53 +1942,53 @@ BOOL daPy_lk_c::getBokoFlamePos(cXyz*) {
     /* Nonmatching */
 }
 
-#include "src/d/actor/d_a_player_particle.inc"
+#include "d/actor/d_a_player_particle.inc"
 
-#include "src/d/actor/d_a_player_dproc.inc"
+#include "d/actor/d_a_player_dproc.inc"
 
-#include "src/d/actor/d_a_player_ladder.inc"
+#include "d/actor/d_a_player_ladder.inc"
 
-#include "src/d/actor/d_a_player_hang.inc"
+#include "d/actor/d_a_player_hang.inc"
 
-#include "src/d/actor/d_a_player_climb.inc"
+#include "d/actor/d_a_player_climb.inc"
 
-#include "src/d/actor/d_a_player_whide.inc"
+#include "d/actor/d_a_player_whide.inc"
 
-#include "src/d/actor/d_a_player_crawl.inc"
+#include "d/actor/d_a_player_crawl.inc"
 
-#include "src/d/actor/d_a_player_grab.inc"
+#include "d/actor/d_a_player_grab.inc"
 
-#include "src/d/actor/d_a_player_swim.inc"
+#include "d/actor/d_a_player_swim.inc"
 
-#include "src/d/actor/d_a_player_battle.inc"
+#include "d/actor/d_a_player_battle.inc"
 
-#include "src/d/actor/d_a_player_ship.inc"
+#include "d/actor/d_a_player_ship.inc"
 
-#include "src/d/actor/d_a_player_rope.inc"
+#include "d/actor/d_a_player_rope.inc"
 
-#include "src/d/actor/d_a_player_boomerang.inc"
+#include "d/actor/d_a_player_boomerang.inc"
 
-#include "src/d/actor/d_a_player_bow.inc"
+#include "d/actor/d_a_player_bow.inc"
 
-#include "src/d/actor/d_a_player_hook.inc"
+#include "d/actor/d_a_player_hook.inc"
 
-#include "src/d/actor/d_a_player_fan.inc"
+#include "d/actor/d_a_player_fan.inc"
 
-#include "src/d/actor/d_a_player_tact.inc"
+#include "d/actor/d_a_player_tact.inc"
 
-#include "src/d/actor/d_a_player_vomit.inc"
+#include "d/actor/d_a_player_vomit.inc"
 
-#include "src/d/actor/d_a_player_hammer.inc"
+#include "d/actor/d_a_player_hammer.inc"
 
-#include "src/d/actor/d_a_player_pushpull.inc"
+#include "d/actor/d_a_player_pushpull.inc"
 
-#include "src/d/actor/d_a_player_bottle.inc"
+#include "d/actor/d_a_player_bottle.inc"
 
-#include "src/d/actor/d_a_player_weapon.inc"
+#include "d/actor/d_a_player_weapon.inc"
 
-#include "src/d/actor/d_a_player_food.inc"
+#include "d/actor/d_a_player_food.inc"
 
-#include "src/d/actor/d_a_player_sword.inc"
+#include "d/actor/d_a_player_sword.inc"
 
 actor_method_class l_daPy_Method = {
     (process_method_func)daPy_Create,
diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp
index 1f4f0fcb8..52bcb6837 100644
--- a/src/d/d_kankyo.cpp
+++ b/src/d/d_kankyo.cpp
@@ -24,7 +24,7 @@
 class sub_kankyo__class : public kankyo_class {
 };
 
-#include "src/d/d_kankyo_dayproc.inc"
+#include "d/d_kankyo_dayproc.inc"
 
 // stripped or compiler generated?
 static Vec unused_lit_2100[] = {1.0f, 1.0f, 1.0f};
diff --git a/src/f_pc/f_pc_manager.cpp b/src/f_pc/f_pc_manager.cpp
index d2b2f2836..abc8dd2d1 100644
--- a/src/f_pc/f_pc_manager.cpp
+++ b/src/f_pc/f_pc_manager.cpp
@@ -25,7 +25,7 @@
 #include "dolphin/dvd/DVD.h"
 #include "dolphin/gx/GX.h"
 
-#include "src/f_pc/f_pc_manager_data.inc"
+#include "f_pc/f_pc_manager_data.inc"
 
 /* 8003E318-8003E338       .text fpcM_Draw__FPv */
 void fpcM_Draw(void* i_proc) {