diff --git a/include/commands.h b/include/commands.h
index 67083d67..20529c45 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 5ea60bfc..1dc4a160 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 ab5ef502..8f12c9ce 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 6fab3ba0..4fe77d8b 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 19cf1081..1f8c01c8 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 30ee0f3b..dba934e0 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 7f5889f1..27f2fbab 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 12c2ed80..d3122aeb 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 bf014e48..15c24556 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);