diff --git a/ruamoko/lib/crudefile.r b/ruamoko/lib/crudefile.r
index ecb8faa36..c8d4b9e27 100644
--- a/ruamoko/lib/crudefile.r
+++ b/ruamoko/lib/crudefile.r
@@ -1,8 +1,8 @@
 #include "crudefile.h"
 
-float (string path, string mode) cfopen = #103;
-void (float desc) cfclose = #104;
-string (float desc) cfread = #105;
-float (float desc, string buf) cfwrite = #106;
-float (float desc) cfeof = #107;
-float () cfquota = #108;
+float (string path, string mode) cfopen = #0x000f0000 + 103;
+void (float desc) cfclose = #0x000f0000 + 104;
+string (float desc) cfread = #0x000f0000 + 105;
+float (float desc, string buf) cfwrite = #0x000f0000 + 106;
+float (float desc) cfeof = #0x000f0000 + 107;
+float () cfquota = #0x000f0000 + 108;
diff --git a/ruamoko/lib/infokey.r b/ruamoko/lib/infokey.r
index ec0193890..d0049a4fd 100644
--- a/ruamoko/lib/infokey.r
+++ b/ruamoko/lib/infokey.r
@@ -1,4 +1,4 @@
 #include "infokey.h"
 
 string (entity e, string key) infokey = #80;
-void (entity ent, string key, string value) setinfokey = #102;
+void (entity ent, string key, string value) setinfokey = #0x000f0000 + 102;
diff --git a/ruamoko/lib/math.r b/ruamoko/lib/math.r
index f0968bec8..290de5289 100644
--- a/ruamoko/lib/math.r
+++ b/ruamoko/lib/math.r
@@ -3,8 +3,8 @@
 vector v_forward, v_up, v_right;
 
 float () random = #7;
-integer (float f) ftoi = #110;
-float (integer i) itof = #111;
+integer (float f) ftoi = #0x000f0000 + 110;
+float (integer i) itof = #0x000f0000 + 111;
 vector (vector v) normalize = #9;
 float (vector v) vlen = #12;
 float (vector v) vectoyaw = #13;
diff --git a/ruamoko/lib/physics.r b/ruamoko/lib/physics.r
index a1d2a265a..29a9d14df 100644
--- a/ruamoko/lib/physics.r
+++ b/ruamoko/lib/physics.r
@@ -22,8 +22,8 @@ float (vector v) pointcontents = #41;
 vector (entity e, float speed) aim = #44;
 void () ChangeYaw = #49;
 void (float step) movetogoal = #67;
-integer (entity ent, vector point) hullpointcontents = #93;
-vector (integer hull, integer max) getboxbounds = #94;
-integer () getboxhull = #95;
-void (integer hull) freeboxhull = #96;
-void (integer hull, vector right, vector forward, vector up, vector mins, vector maxs) rotate_bbox = #97;
+integer (entity ent, vector point) hullpointcontents = #0x000f0000 + 93;
+vector (integer hull, integer max) getboxbounds = #0x000f0000 + 94;
+integer () getboxhull = #0x000f0000 + 95;
+void (integer hull) freeboxhull = #0x000f0000 + 96;
+void (integer hull, vector right, vector forward, vector up, vector mins, vector maxs) rotate_bbox = #0x000f0000 + 97;
diff --git a/ruamoko/lib/qw_physics.r b/ruamoko/lib/qw_physics.r
index 9e33538b9..431e97e63 100644
--- a/ruamoko/lib/qw_physics.r
+++ b/ruamoko/lib/qw_physics.r
@@ -1,4 +1,4 @@
 #include "qw_physics.h"
 
-entity (entity ent) testentitypos = #92;
-void (vector start, vector mins, vector maxs, vector end, float type, entity passent) checkmove = #98;
+entity (entity ent) testentitypos = #0x000f0000 + 92;
+void (vector start, vector mins, vector maxs, vector end, float type, entity passent) checkmove = #0x000f0000 + 98;
diff --git a/ruamoko/lib/server.r b/ruamoko/lib/server.r
index a746347ef..42bd99eb5 100644
--- a/ruamoko/lib/server.r
+++ b/ruamoko/lib/server.r
@@ -9,4 +9,4 @@ string (string s) precache_file = #68;
 string (string s) precache_model2 = #75;
 string (string s) precache_sound2 = #76;
 string (string s) precache_file2 = #77;
-float () checkextension = #99;
+float () checkextension = #0x000f0000 + 99;
diff --git a/ruamoko/lib/string.r b/ruamoko/lib/string.r
index dabe6f202..00ed3bae5 100644
--- a/ruamoko/lib/string.r
+++ b/ruamoko/lib/string.r
@@ -3,9 +3,9 @@
 string (float f) ftos = #26;
 string (vector v) vtos = #27;
 float (string s) stof = #81;
-float (string s) strlen = #100;
-float (string goal, string s) charcount = #101;
-string (...) sprintf = #109;
-string (integer i) itos = #112;
-integer (string s) stoi = #113;
-vector (string s) stov = #114;
+float (string s) strlen = #0x000f0000 + 100;
+float (string goal, string s) charcount = #0x000f0000 + 101;
+string (...) sprintf = #0x000f0000 + 109;
+string (integer i) itos = #0x000f0000 + 112;
+integer (string s) stoi = #0x000f0000 + 113;
+vector (string s) stov = #0x000f0000 + 114;
diff --git a/ruamoko/lib/system.r b/ruamoko/lib/system.r
index 2c1859de3..0d3a8465d 100644
--- a/ruamoko/lib/system.r
+++ b/ruamoko/lib/system.r
@@ -4,4 +4,4 @@ float time;
 
 float (string s) cvar = #45;
 void (string var, string val) cvar_set = #72;
-string () gametype = #115;
+string () gametype = #0x000f0000 + 115;