diff --git a/klik/mapents/mapents.qc b/klik/mapents/mapents.qc
index 16a3d15..4835e40 100644
--- a/klik/mapents/mapents.qc
+++ b/klik/mapents/mapents.qc
@@ -3,6 +3,9 @@
 #include "mapents_util.qh"
 #include "damage.qh"
 
+#define IMPLEMENT_MAPENTS
+#include "mapents.qh"
+
 /*QUAKED info_intermission (1 0.5 0.5) (-16 -16 -16) (16 16 16)
 This is the camera point for the intermission.
 Use mangle instead of angle, so you can set pitch or roll as well as yaw.  'pitch roll yaw'
diff --git a/klik/mapents/mapents.qh b/klik/mapents/mapents.qh
new file mode 100644
index 0000000..30aa2dc
--- /dev/null
+++ b/klik/mapents/mapents.qh
@@ -0,0 +1,10 @@
+#ifndef IMPLEMENT_MAPENTS
+@extern {
+#endif
+
+entity intermission_head;
+entity spawn_head;
+
+#ifndef IMPLEMENT_MAPENTS
+};
+#endif
diff --git a/klik/qw/system.qc b/klik/qw/sys_defs.qc
similarity index 100%
rename from klik/qw/system.qc
rename to klik/qw/sys_defs.qc
diff --git a/klik/qw/system.qh b/klik/qw/sys_defs.qh
similarity index 71%
rename from klik/qw/system.qh
rename to klik/qw/sys_defs.qh
index 09a7e72..62faf7a 100644
--- a/klik/qw/system.qh
+++ b/klik/qw/sys_defs.qh
@@ -2,7 +2,7 @@
 #define QW_SYSTEM_qh 1
 
 @extern {
-#include "qw/system.qc"
+#include "qw/sys_defs.qc"
 };
 
 #endif
diff --git a/klik/server.qc b/klik/server.qc
index 958b458..293b142 100644
--- a/klik/server.qc
+++ b/klik/server.qc
@@ -15,6 +15,8 @@
 
 #include "delays.qh"
 
+#include "mapents.qh"
+
 #define	SV_FRAMES_BEFORE_SPAWN	3
 
 void() main = {
diff --git a/klik/system.qc b/klik/system.qc
index f4480c2..d78602c 100644
--- a/klik/system.qc
+++ b/klik/system.qc
@@ -1,3 +1,6 @@
+#ifndef SYSTEM_qh
+#include "sys_defs.qc"
+#endif
 
 void() NOTHING_function = {};
 
diff --git a/klik/system.qh b/klik/system.qh
index c6c4668..d5fed91 100644
--- a/klik/system.qh
+++ b/klik/system.qh
@@ -1,6 +1,8 @@
 #ifndef SYSTEM_qh
 #define SYSTEM_qh 1
 
+#include "sys_defs.qh"
+
 @extern {
 #include "system.qc"
 };