From 157ae8ec21ac52892897aacf344a732cee9deb21 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Sun, 3 Apr 2011 10:41:10 +0200
Subject: [PATCH 1/1] Clean up superfluous include of nsc.h in prototypes.h

---
 include/commands.h     | 3 ++-
 include/prototypes.h   | 1 -
 src/lib/common/type.c  | 1 +
 src/lib/subs/check.c   | 1 +
 src/lib/subs/control.c | 1 +
 src/lib/subs/distrea.c | 1 +
 src/lib/subs/move.c    | 1 +
 src/lib/subs/nstr.c    | 1 +
 src/lib/subs/pr.c      | 1 +
 9 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/include/commands.h b/include/commands.h
index 67083d676..20529c45c 100644
--- a/include/commands.h
+++ b/include/commands.h
@@ -35,8 +35,9 @@
 
 #include "file.h"
 #include "nat.h"
+#include "nsc.h"
 #include "player.h"
-#include "sect.h"
 #include "prototypes.h"
+#include "sect.h"
 
 #endif
diff --git a/include/prototypes.h b/include/prototypes.h
index 5ea60bfcb..1dc4a1601 100644
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -39,7 +39,6 @@
 #include <string.h>
 #include <time.h>
 #include "item.h"
-#include "nsc.h"
 #include "misc.h"
 #include "types.h"
 
diff --git a/src/lib/common/type.c b/src/lib/common/type.c
index ab5ef5021..8f12c9ce8 100644
--- a/src/lib/common/type.c
+++ b/src/lib/common/type.c
@@ -38,6 +38,7 @@
 #include "item.h"
 #include "land.h"
 #include "match.h"
+#include "nsc.h"
 #include "nuke.h"
 #include "plane.h"
 #include "product.h"
diff --git a/src/lib/subs/check.c b/src/lib/subs/check.c
index 6fab3ba0e..4fe77d8b5 100644
--- a/src/lib/subs/check.c
+++ b/src/lib/subs/check.c
@@ -38,6 +38,7 @@
 #include "file.h"
 #include "player.h"
 #include "prototypes.h"
+#include "xy.h"
 
 /* Note that timestamps make things tricky.  And, we don't
  * really care about the timestamp, we just care about the rest
diff --git a/src/lib/subs/control.c b/src/lib/subs/control.c
index 19cf10819..1f8c01c86 100644
--- a/src/lib/subs/control.c
+++ b/src/lib/subs/control.c
@@ -34,6 +34,7 @@
 
 #include "file.h"
 #include "land.h"
+#include "nsc.h"
 #include "prototypes.h"
 #include "sect.h"
 
diff --git a/src/lib/subs/distrea.c b/src/lib/subs/distrea.c
index 30ee0f3bf..dba934e04 100644
--- a/src/lib/subs/distrea.c
+++ b/src/lib/subs/distrea.c
@@ -34,6 +34,7 @@
 
 #include "file.h"
 #include "nat.h"
+#include "nsc.h"
 #include "player.h"
 #include "prototypes.h"
 #include "treaty.h"
diff --git a/src/lib/subs/move.c b/src/lib/subs/move.c
index 7f5889f12..27f2fbab2 100644
--- a/src/lib/subs/move.c
+++ b/src/lib/subs/move.c
@@ -36,6 +36,7 @@
 #include "damage.h"
 #include "file.h"
 #include "map.h"
+#include "nsc.h"
 #include "path.h"
 #include "player.h"
 #include "prototypes.h"
diff --git a/src/lib/subs/nstr.c b/src/lib/subs/nstr.c
index 12c2ed80e..d3122aeb9 100644
--- a/src/lib/subs/nstr.c
+++ b/src/lib/subs/nstr.c
@@ -38,6 +38,7 @@
 #include <limits.h>
 #include "file.h"
 #include "match.h"
+#include "nsc.h"
 #include "player.h"
 #include "prototypes.h"
 
diff --git a/src/lib/subs/pr.c b/src/lib/subs/pr.c
index bf014e481..15c24556d 100644
--- a/src/lib/subs/pr.c
+++ b/src/lib/subs/pr.c
@@ -62,6 +62,7 @@
 #include "prototypes.h"
 #include "server.h"
 #include "tel.h"
+#include "xy.h"
 
 static void pr_player(struct player *pl, int id, char *buf);
 static void upr_player(struct player *pl, int id, char *buf);
-- 
2.43.0