diff --git a/polymer/eduke32/build/src/util/compat_tools.c b/polymer/eduke32/build/src/util/compat_tools.c
index 631efc4c8..08edfe83e 100644
--- a/polymer/eduke32/build/src/util/compat_tools.c
+++ b/polymer/eduke32/build/src/util/compat_tools.c
@@ -2,6 +2,10 @@
 
 #include "compat.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 //
 // initprintf() -- prints a string
 //
@@ -16,3 +20,7 @@ void initprintf(const char *f, ...)
 }
 
 int32_t editstatus = 1;
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/polymer/eduke32/build/src/util/kextract.c b/polymer/eduke32/build/src/util/kextract.c
index 386dec5e7..6fab3c60a 100644
--- a/polymer/eduke32/build/src/util/kextract.c
+++ b/polymer/eduke32/build/src/util/kextract.c
@@ -6,6 +6,7 @@
 // by Jonathon Fowler (jf@jonof.id.au)
 
 #include "compat.h"
+#include "kplib.h"
 
 #include <utime.h>
 
diff --git a/polymer/eduke32/build/src/util/kgroup.c b/polymer/eduke32/build/src/util/kgroup.c
index e5987ca5c..e7703d044 100644
--- a/polymer/eduke32/build/src/util/kgroup.c
+++ b/polymer/eduke32/build/src/util/kgroup.c
@@ -6,6 +6,7 @@
 // by Jonathon Fowler (jf@jonof.id.au)
 
 #include "compat.h"
+#include "kplib.h"
 
 // Glibc doesn't provide this function, so for the sake of less ugliess
 // for all platforms, here's a replacement just for this program.