diff --git a/src/combat.cc b/src/combat.cc
index 6d4102c..045d0fa 100644
--- a/src/combat.cc
+++ b/src/combat.cc
@@ -36,6 +36,7 @@
 #include "trait.h"
 #include "window_manager.h"
 
+#include <limits.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/src/core.cc b/src/core.cc
index 6807ee8..bf3ba77 100644
--- a/src/core.cc
+++ b/src/core.cc
@@ -12,6 +12,7 @@
 #include "window_manager.h"
 #include "window_manager_private.h"
 
+#include <limits.h>
 #include <SDL.h>
 #include <SDL_syswm.h>
 
diff --git a/src/endgame.cc b/src/endgame.cc
index 8d81c60..92dac41 100644
--- a/src/endgame.cc
+++ b/src/endgame.cc
@@ -26,6 +26,7 @@
 #include "world_map.h"
 
 #include <ctype.h>
+#include <limits.h>
 #include <math.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/interpreter.cc b/src/interpreter.cc
index ecce1ab..63ceda7 100644
--- a/src/interpreter.cc
+++ b/src/interpreter.cc
@@ -9,6 +9,7 @@
 #include "platform_compat.h"
 
 #include <assert.h>
+#include <limits.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/interpreter_extra.cc b/src/interpreter_extra.cc
index f6ef27a..0557437 100644
--- a/src/interpreter_extra.cc
+++ b/src/interpreter_extra.cc
@@ -37,6 +37,7 @@
 #include "trait.h"
 #include "world_map.h"
 
+#include <limits.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/src/main.cc b/src/main.cc
index 964dd94..ce7ceeb 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -31,6 +31,8 @@
 #include "word_wrap.h"
 #include "world_map.h"
 
+#include <limits.h>
+
 #define MAIN_MENU_WINDOW_WIDTH 640
 #define MAIN_MENU_WINDOW_HEIGHT 480
 
diff --git a/src/skill.cc b/src/skill.cc
index ba01e2f..b3a73a3 100644
--- a/src/skill.cc
+++ b/src/skill.cc
@@ -23,6 +23,7 @@
 #include "trait.h"
 
 #include <stdio.h>
+#include <string.h>
 
 // Damage flags which can be repaired using "Repair" skill.
 //