diff --git a/arogue7/command.c b/arogue7/command.c
index 437992d..091b5d4 100644
--- a/arogue7/command.c
+++ b/arogue7/command.c
@@ -19,6 +19,8 @@
 
 #include "curses.h"
 #include <ctype.h>
+#include <string.h>
+#include <stdlib.h>
 #include <signal.h>
 #include "mach_dep.h"
 #include "rogue.h"
diff --git a/arogue7/effects.c b/arogue7/effects.c
index 01626fc..3074de6 100644
--- a/arogue7/effects.c
+++ b/arogue7/effects.c
@@ -12,6 +12,7 @@
  * See the file LICENSE.TXT for full copyright and licensing information.
  */
 
+#include <string.h>
 #include "curses.h"
 #include "rogue.h"
 
diff --git a/arogue7/fight.c b/arogue7/fight.c
index 50874e5..f487ca8 100644
--- a/arogue7/fight.c
+++ b/arogue7/fight.c
@@ -19,6 +19,7 @@
 
 #include "curses.h"
 #include <ctype.h>
+#include <string.h>
 #include "rogue.h"
 
 int hit(struct object *weapon, bool see_att, bool see_def, char *er, char *ee, bool back_stab, bool thrown, bool short_msg);
@@ -335,7 +336,6 @@ bool back_stab;
     bool did_hit = FALSE;
     int prop_hplus, prop_dplus;
     int vampiric_damage;
-    char *strchr();
 
     /* Get statistics */
     att = &att_er->t_stats;
diff --git a/arogue7/init.c b/arogue7/init.c
index 820fede..71269ab 100644
--- a/arogue7/init.c
+++ b/arogue7/init.c
@@ -19,6 +19,7 @@
 
 #include "curses.h"
 #include <ctype.h>
+#include <string.h>
 #include "rogue.h"
 #include "mach_dep.h"
 
diff --git a/arogue7/io.c b/arogue7/io.c
index 2b36d64..0230498 100644
--- a/arogue7/io.c
+++ b/arogue7/io.c
@@ -19,6 +19,7 @@
 #include "curses.h"
 #include <stdarg.h>
 #include <ctype.h>
+#include <string.h>
 #include "rogue.h"
 
 /*
diff --git a/arogue7/main.c b/arogue7/main.c
index c477768..00cd576 100644
--- a/arogue7/main.c
+++ b/arogue7/main.c
@@ -13,6 +13,8 @@
  */
 
 #include "curses.h"
+#include <stdlib.h>
+#include <string.h>
 #include <signal.h>
 #ifdef BSD
 #include <sys/time.h>
diff --git a/arogue7/mdport.c b/arogue7/mdport.c
index 2df9449..1768b78 100644
--- a/arogue7/mdport.c
+++ b/arogue7/mdport.c
@@ -62,6 +62,7 @@
 #endif
 
 #include <stdio.h>
+#include <string.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <sys/stat.h>
diff --git a/arogue7/misc.c b/arogue7/misc.c
index 15e9512..758119f 100644
--- a/arogue7/misc.c
+++ b/arogue7/misc.c
@@ -13,6 +13,7 @@
  */
 
 #include "curses.h"
+#include <stdlib.h>
 #include <ctype.h>
 #include "rogue.h"
 #ifdef PC7300
diff --git a/arogue7/monsters.c b/arogue7/monsters.c
index 0937768..94e3c0e 100644
--- a/arogue7/monsters.c
+++ b/arogue7/monsters.c
@@ -20,6 +20,7 @@
 #include "curses.h"
 #include "rogue.h"
 #include <ctype.h>
+#include <string.h>
 
 
 /*
@@ -211,7 +212,6 @@ bool max_monster;
     register char *ip, *hitp;
     register int i, min_intel, max_intel;
     register int num_dice, num_sides=8, num_extra=0;
-    char *strchr();
 
     attach(mlist, item);
     tp = THINGPTR(item);
diff --git a/arogue7/options.c b/arogue7/options.c
index f3fcdd5..642047e 100644
--- a/arogue7/options.c
+++ b/arogue7/options.c
@@ -21,6 +21,7 @@
 
 #include "curses.h"
 #include <ctype.h>
+#include <string.h>
 #include "rogue.h"
 
 #define	NUM_OPTS	(sizeof optlist / sizeof (OPTION))
diff --git a/arogue7/pack.c b/arogue7/pack.c
index 190fb59..87eca73 100644
--- a/arogue7/pack.c
+++ b/arogue7/pack.c
@@ -14,6 +14,7 @@
 
 #include "curses.h"
 #include <ctype.h>
+#include <string.h>
 #include "rogue.h"
 #ifdef PC7300
 #include "menu.h"
diff --git a/arogue7/potions.c b/arogue7/potions.c
index 853a8fe..eafea60 100644
--- a/arogue7/potions.c
+++ b/arogue7/potions.c
@@ -16,6 +16,7 @@
  * Function(s) for dealing with potions
  */
 
+#include <stdlib.h>
 #include "curses.h"
 #include "rogue.h"
 
diff --git a/arogue7/rings.c b/arogue7/rings.c
index 3d675e3..161d494 100644
--- a/arogue7/rings.c
+++ b/arogue7/rings.c
@@ -11,6 +11,7 @@
  * See the file LICENSE.TXT for full copyright and licensing information.
  */
 
+#include <stdlib.h>
 #include "curses.h"
 #include "rogue.h"
 
diff --git a/arogue7/rip.c b/arogue7/rip.c
index 329b7bc..28cfb94 100644
--- a/arogue7/rip.c
+++ b/arogue7/rip.c
@@ -33,6 +33,8 @@
 #endif
 #include <signal.h>
 #include <ctype.h>
+#include <string.h>
+#include <stdlib.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include "mach_dep.h"
diff --git a/arogue7/rooms.c b/arogue7/rooms.c
index de7797d..d915db7 100644
--- a/arogue7/rooms.c
+++ b/arogue7/rooms.c
@@ -17,6 +17,7 @@
  *
  */
 
+#include <stdlib.h>
 #include "curses.h"
 #include "rogue.h"
 
diff --git a/arogue7/save.c b/arogue7/save.c
index cdaee73..a88b418 100644
--- a/arogue7/save.c
+++ b/arogue7/save.c
@@ -19,6 +19,8 @@
 
 #include "curses.h"
 #include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <signal.h>
diff --git a/arogue7/scrolls.c b/arogue7/scrolls.c
index 4ed5de9..85682a9 100644
--- a/arogue7/scrolls.c
+++ b/arogue7/scrolls.c
@@ -18,6 +18,7 @@
  */
 
 #include "curses.h"
+#include <stdlib.h>
 #include <ctype.h>
 #include "rogue.h"
 
diff --git a/arogue7/state.c b/arogue7/state.c
index d12d9e2..80c6a74 100644
--- a/arogue7/state.c
+++ b/arogue7/state.c
@@ -61,6 +61,7 @@
 #include <curses.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include "rogue.h"
 
 #define READSTAT (format_error || read_error )
diff --git a/arogue7/sticks.c b/arogue7/sticks.c
index 6d228db..829f5c0 100644
--- a/arogue7/sticks.c
+++ b/arogue7/sticks.c
@@ -19,6 +19,7 @@
 
 #include "curses.h"
 #include <ctype.h>
+#include <string.h>
 #include "rogue.h"
 
 
diff --git a/arogue7/things.c b/arogue7/things.c
index c174ece..105d81f 100644
--- a/arogue7/things.c
+++ b/arogue7/things.c
@@ -20,6 +20,7 @@
 
 #include "curses.h"
 #include <ctype.h>
+#include <string.h>
 #include "rogue.h"
 
 /*
diff --git a/arogue7/util.c b/arogue7/util.c
index 577b4da..c3b40d3 100644
--- a/arogue7/util.c
+++ b/arogue7/util.c
@@ -15,6 +15,7 @@
 #include "curses.h"
 #include "rogue.h"
 #include <ctype.h>
+#include <string.h>
 #ifdef PC7300
 #include <track.h>
 #include <kcodes.h>
diff --git a/arogue7/weapons.c b/arogue7/weapons.c
index 89d7875..9958211 100644
--- a/arogue7/weapons.c
+++ b/arogue7/weapons.c
@@ -19,6 +19,7 @@
 
 #include "curses.h"
 #include <ctype.h>
+#include <string.h>
 #include "rogue.h"
 
 boomerang(ydelta, xdelta, item, tp)
diff --git a/arogue7/wear.c b/arogue7/wear.c
index 92896f4..27a315f 100644
--- a/arogue7/wear.c
+++ b/arogue7/wear.c
@@ -16,6 +16,7 @@
  * This file contains misc functions for dealing with armor
  */
 
+#include <stdlib.h>
 #include "curses.h"
 #include "rogue.h"
 
diff --git a/arogue7/wizard.c b/arogue7/wizard.c
index e9f159c..283fbb6 100644
--- a/arogue7/wizard.c
+++ b/arogue7/wizard.c
@@ -18,6 +18,7 @@
  */
 
 #include "curses.h"
+#include <stdlib.h>
 #include <ctype.h>
 #include "rogue.h"
 #ifdef PC7300