<string.h> is ISO C, no need to #if it.

src/lib/commands/arm.c

@@ -33,9 +33,7 @@
  *     Steve McClure, 2000
  */
 
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include "misc.h"
 #include "player.h"
 #include "var.h"

src/lib/commands/budg.c

@@ -33,9 +33,7 @@
  *     Steve McClure, 1997-2000
  */
 
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include "misc.h"
 #include "player.h"
 #include "var.h"

src/lib/commands/buil.c

@@ -32,9 +32,7 @@
  */
 
 #include <math.h>
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include "misc.h"
 #include "player.h"
 #include "var.h"

src/lib/commands/edit.c

@@ -36,9 +36,7 @@
 
 #include <stdio.h>
 #include <ctype.h>
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include "misc.h"
 #include "player.h"
 #include "var.h"

src/lib/commands/improve.c

@@ -31,9 +31,7 @@
  *     Steve McClure, 1996-2000
  */
 
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include "misc.h"
 #include "player.h"
 #include "var.h"

src/lib/commands/load.c

@@ -33,9 +33,7 @@
  *     Steve McClure, 1998-2000
  */
 
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include "misc.h"
 #include "player.h"
 #include "xy.h"

src/lib/commands/orde.c

@@ -32,9 +32,7 @@
  *     Steve McClure, 2000
  */
 
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include <ctype.h>
 #include "misc.h"
 #include "player.h"

src/lib/commands/powe.c

@@ -33,9 +33,7 @@
  *     Steve McClure, 1998-2000
  */
 
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include "misc.h"
 #include "player.h"
 #include "var.h"

src/lib/commands/tend.c

@@ -33,9 +33,7 @@
  *     Steve McClure, 2000
  */
 
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include "misc.h"
 #include "player.h"
 #include "var.h"

src/lib/commands/tran.c

@@ -32,9 +32,7 @@
  *  
  */
 
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include "misc.h"
 #include "player.h"
 #include "var.h"

src/lib/common/file.c

@@ -32,9 +32,7 @@
  *     Steve McClure, 2000
  */
 
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include <fcntl.h>
 #include <signal.h>
 #include <stdlib.h>
@@ -50,9 +48,6 @@
 #include "common.h"
 #include "gen.h"
 
-#ifdef Rel4
-#include <unistd.h>
-#endif
 
 static void fillcache(struct empfile *ep, int start);
 

src/lib/common/log.c

@@ -40,9 +40,7 @@
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdio.h>
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include <time.h>
 #include "deity.h"
 #include "player.h"

src/lib/common/type.c

@@ -32,9 +32,7 @@
  *     Steve McClure, 2000
  */
 
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include "misc.h"
 #include "ship.h"
 #include "land.h"

src/lib/gen/emp_config.c

@@ -45,9 +45,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>		/* atoi free atol */
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 
 #include "misc.h"
 #include "com.h"

src/lib/gen/numstr.c

@@ -31,9 +31,7 @@
  *     Steve McClure, 2000
  */
 
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include "misc.h"
 #include "gen.h"
 

src/lib/player/login.c

@@ -32,9 +32,7 @@
  *     Steve McClure, 2000
  */
 
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include "prototypes.h"
 #include "misc.h"
 #include "proto.h"

src/lib/subs/pr.c

@@ -40,9 +40,7 @@
  * more input data, etc.
  */
 
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include <fcntl.h>
 #include <ctype.h>
 #include <stdarg.h>