diff --git a/src/kernel/ally.c b/src/kernel/ally.c
index 5e1742559..d53973328 100644
--- a/src/kernel/ally.c
+++ b/src/kernel/ally.c
@@ -12,6 +12,7 @@
 
 #include <util/attrib.h>
 #include <assert.h>
+#include <string.h>
 #include <stdlib.h>
 
 ally * ally_find(ally *al, const struct faction *f) {
diff --git a/src/kernel/ally.h b/src/kernel/ally.h
index cd3f4c031..58d6ff4a8 100644
--- a/src/kernel/ally.h
+++ b/src/kernel/ally.h
@@ -24,6 +24,9 @@ extern "C" {
 #endif
 
     struct attrib_type;
+    struct plane;
+    struct faction;
+    struct unit;
     extern struct attrib_type at_npcfaction;
 
     typedef struct ally {
diff --git a/src/kernel/unit.c b/src/kernel/unit.c
index 5b3fae62c..b56c8220b 100644
--- a/src/kernel/unit.c
+++ b/src/kernel/unit.c
@@ -64,6 +64,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 /* libc includes */
 #include <assert.h>
+#include <ctype.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>