diff --git a/src/client/cstrike/progs.src b/src/client/cstrike/progs.src
index 117114dc..fe1c9854 100755
--- a/src/client/cstrike/progs.src
+++ b/src/client/cstrike/progs.src
@@ -5,13 +5,13 @@
 #define CSTRIKE
 
 #includelist
-../../builtins.h
-../../defs.h
+../../shared/fteextensions.qc
+../../shared/defs.h
 ../../shared/cstrike/defs.h
-../../math.h
-../../materials.h
-../../events.h
-../../entities.h
+../../shared/math.h
+../../shared/materials.h
+../../shared/events.h
+../../shared/entities.h
 defs.h
 ../defs.h
 
diff --git a/src/client/rewolf/progs.src b/src/client/rewolf/progs.src
index b98b70d9..19fb493c 100755
--- a/src/client/rewolf/progs.src
+++ b/src/client/rewolf/progs.src
@@ -6,12 +6,12 @@
 #define REWOLF
 
 #includelist
-../../builtins.h
-../../defs.h
-../../math.h
-../../materials.h
-../../events.h
-../../entities.h
+../../shared/fteextensions.qc
+../../shared/defs.h
+../../shared/math.h
+../../shared/materials.h
+../../shared/events.h
+../../shared/entities.h
 ../valve/defs.h
 ../valve/particles.h
 ../defs.h
diff --git a/src/client/scihunt/progs.src b/src/client/scihunt/progs.src
index 82b59eba..65c9fa1e 100644
--- a/src/client/scihunt/progs.src
+++ b/src/client/scihunt/progs.src
@@ -5,12 +5,12 @@
 #define VALVE
 
 #includelist
-../../builtins.h
-../../defs.h
-../../math.h
-../../materials.h
-../../events.h
-../../entities.h
+../../shared/fteextensions.qc
+../../shared/defs.h
+../../shared/math.h
+../../shared/materials.h
+../../shared/events.h
+../../shared/entities.h
 ../valve/defs.h
 ../valve/particles.h
 ../defs.h
diff --git a/src/client/valve/progs.src b/src/client/valve/progs.src
index a39c3fa7..9586d394 100755
--- a/src/client/valve/progs.src
+++ b/src/client/valve/progs.src
@@ -5,12 +5,12 @@
 #define VALVE
 
 #includelist
-../../builtins.h
-../../defs.h
-../../math.h
-../../materials.h
-../../events.h
-../../entities.h
+../../shared/fteextensions.qc
+../../shared/defs.h
+../../shared/math.h
+../../shared/materials.h
+../../shared/events.h
+../../shared/entities.h
 defs.h
 particles.h
 ../defs.h
diff --git a/src/menu-fn/progs.src b/src/menu-fn/progs.src
index 851f43b1..dcc39d7c 100644
--- a/src/menu-fn/progs.src
+++ b/src/menu-fn/progs.src
@@ -3,8 +3,8 @@
 #define MENU
 
 #includelist
-../builtins.h
-../math.h
+../shared/fteextensions.qc
+../shared/math.h
 defs.h
 bitmaps.h
 strings.h
diff --git a/src/server/cstrike/progs.src b/src/server/cstrike/progs.src
index f3557700..82f883a3 100755
--- a/src/server/cstrike/progs.src
+++ b/src/server/cstrike/progs.src
@@ -5,14 +5,14 @@
 #define CSTRIKE
 
 #includelist
-../../builtins.h
-../../defs.h
+../../shared/fteextensions.qc
+../../shared/defs.h
 defs.h
 ../../shared/cstrike/defs.h
-../../math.h
-../../materials.h
-../../events.h
-../../entities.h
+../../shared/math.h
+../../shared/materials.h
+../../shared/events.h
+../../shared/entities.h
 ../defs.h
 defsfields.h
 
diff --git a/src/server/rewolf/progs.src b/src/server/rewolf/progs.src
index dc2c1fa9..a5bbbc69 100755
--- a/src/server/rewolf/progs.src
+++ b/src/server/rewolf/progs.src
@@ -5,13 +5,13 @@
 #define VALVE
 
 #includelist
-../../builtins.h
-../../defs.h
+../../shared/fteextensions.qc
+../../shared/defs.h
 ../valve/defs.h
-../../math.h
-../../materials.h
-../../events.h
-../../entities.h
+../../shared/math.h
+../../shared/materials.h
+../../shared/events.h
+../../shared/entities.h
 ../../shared/valve/animations.h
 ../defs.h
 
diff --git a/src/server/scihunt/progs.src b/src/server/scihunt/progs.src
index 7522e455..7ee3f05d 100755
--- a/src/server/scihunt/progs.src
+++ b/src/server/scihunt/progs.src
@@ -6,13 +6,13 @@
 #define SCIHUNT
 
 #includelist
-../../builtins.h
-../../defs.h
+../../shared/fteextensions.qc
+../../shared/defs.h
 ../valve/defs.h
-../../math.h
-../../materials.h
-../../events.h
-../../entities.h
+../../shared/math.h
+../../shared/materials.h
+../../shared/events.h
+../../shared/entities.h
 ../../shared/valve/animations.h
 ../defs.h
 
diff --git a/src/server/valve/progs.src b/src/server/valve/progs.src
index e401af9a..a9cbb9f5 100755
--- a/src/server/valve/progs.src
+++ b/src/server/valve/progs.src
@@ -5,13 +5,13 @@
 #define VALVE
 
 #includelist
-../../builtins.h
-../../defs.h
+../../shared/fteextensions.qc
+../../shared/defs.h
 defs.h
-../../math.h
-../../materials.h
-../../events.h
-../../entities.h
+../../shared/math.h
+../../shared/materials.h
+../../shared/events.h
+../../shared/entities.h
 ../../shared/valve/animations.h
 ../defs.h
 
diff --git a/src/defs.h b/src/shared/defs.h
similarity index 100%
rename from src/defs.h
rename to src/shared/defs.h
diff --git a/src/entities.h b/src/shared/entities.h
similarity index 100%
rename from src/entities.h
rename to src/shared/entities.h
diff --git a/src/events.h b/src/shared/events.h
similarity index 100%
rename from src/events.h
rename to src/shared/events.h
diff --git a/src/builtins.h b/src/shared/fteextensions.qc
similarity index 100%
rename from src/builtins.h
rename to src/shared/fteextensions.qc
diff --git a/src/materials.h b/src/shared/materials.h
similarity index 100%
rename from src/materials.h
rename to src/shared/materials.h
diff --git a/src/math.h b/src/shared/math.h
similarity index 100%
rename from src/math.h
rename to src/shared/math.h