Clean up superfluous include of nsc.h in prototypes.h

diff --git a/include/commands.h b/include/commands.h
index 67083d676c44cd8cd4e3a41ff290598574fa8f7a..20529c45c7384abe8fd0f2c066a7d170fbe827ad 100644 (file)
--- 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 5ea60bfcb083df3acb5a58e8f5c5b99844741106..1dc4a16019afccca7889ad616ae759712d70dd3e 100644 (file)
--- 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 ab5ef5021b08314922673709b50fa1970997c292..8f12c9ce8d0dd4992269e1765a8b864537b2d953 100644 (file)
--- 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 6fab3ba0ecbaddb00eec3f5a102ef138617d8d21..4fe77d8b5d0ea503f6ab47ef778439b4b7c2c565 100644 (file)
--- 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 19cf108193b676712852f8e2f4522d758bccba39..1f8c01c86716a83495817674e554a4f1e008c8ab 100644 (file)
--- 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 30ee0f3bf7c179c6e55542d59b336417eb340091..dba934e04563bb35ea12674a9785e9cb58e20b60 100644 (file)
--- 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 7f5889f120fb106772caeb80bc55c92e685d0fb3..27f2fbab2573c9f743fbffa8784ff78c1ba0715b 100644 (file)
--- 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 12c2ed80eac3e311f4fad60baaf95be900680cfe..d3122aeb90043d320afd2074a61d991fc9610607 100644 (file)
--- 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 bf014e48182aae19ead6cc0fe3e718421e2092b0..15c24556d00112a7993910fd1d2a1d868738a556 100644 (file)
--- 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);