From a2386edc01df415aa0fac415c83a44f085f5e20f Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Sun, 3 Apr 2011 10:36:46 +0200
Subject: [PATCH] Clean up superfluous include of news.h in empobj.h

Missed in commit 0ba61f17, v4.3.24.
---
 include/empobj.h         | 1 -
 src/lib/commands/mfir.c  | 1 +
 src/lib/commands/scut.c  | 1 +
 src/lib/commands/xdump.c | 1 +
 src/lib/common/nsc.c     | 1 +
 src/lib/subs/attsub.c    | 5 +++--
 src/lib/subs/lndsub.c    | 5 +++--
 src/lib/subs/mission.c   | 1 +
 src/lib/subs/shpsub.c    | 5 +++--
 9 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/include/empobj.h b/include/empobj.h
index 39253ce7..81cdbfc5 100644
--- a/include/empobj.h
+++ b/include/empobj.h
@@ -40,7 +40,6 @@
 #include "loan.h"
 #include "lost.h"
 #include "nat.h"
-#include "news.h"
 #include "nuke.h"
 #include "plane.h"
 #include "sect.h"
diff --git a/src/lib/commands/mfir.c b/src/lib/commands/mfir.c
index 8d32ecf8..90631f6d 100644
--- a/src/lib/commands/mfir.c
+++ b/src/lib/commands/mfir.c
@@ -35,6 +35,7 @@
 
 #include "commands.h"
 #include "empobj.h"
+#include "news.h"
 #include "optlist.h"
 #include "retreat.h"
 
diff --git a/src/lib/commands/scut.c b/src/lib/commands/scut.c
index c54f8e85..16d49f5f 100644
--- a/src/lib/commands/scut.c
+++ b/src/lib/commands/scut.c
@@ -35,6 +35,7 @@
 #include <ctype.h>
 #include "commands.h"
 #include "empobj.h"
+#include "news.h"
 #include "optlist.h"
 #include "unit.h"
 
diff --git a/src/lib/commands/xdump.c b/src/lib/commands/xdump.c
index e37779a0..2001f885 100644
--- a/src/lib/commands/xdump.c
+++ b/src/lib/commands/xdump.c
@@ -35,6 +35,7 @@
 #include <ctype.h>
 #include "commands.h"
 #include "empobj.h"
+#include "news.h"
 #include "optlist.h"
 #include "version.h"
 #include "xdump.h"
diff --git a/src/lib/common/nsc.c b/src/lib/common/nsc.c
index 95aa6da9..d3f57644 100644
--- a/src/lib/common/nsc.c
+++ b/src/lib/common/nsc.c
@@ -41,6 +41,7 @@
 #include "empobj.h"
 #include "file.h"
 #include "optlist.h"
+#include "news.h"
 #include "nsc.h"
 #include "product.h"
 #include "unit.h"
diff --git a/src/lib/subs/attsub.c b/src/lib/subs/attsub.c
index 645c7796..1638008f 100644
--- a/src/lib/subs/attsub.c
+++ b/src/lib/subs/attsub.c
@@ -37,19 +37,20 @@
 #include <ctype.h>
 #include <math.h>
 #include "combat.h"
+#include "empobj.h"
 #include "file.h"
 #include "map.h"
 #include "misc.h"
 #include "mission.h"
+#include "news.h"
 #include "nsc.h"
 #include "optlist.h"
 #include "path.h"
 #include "plague.h"
 #include "player.h"
 #include "prototypes.h"
-#include "xy.h"
-#include "empobj.h"
 #include "unit.h"
+#include "xy.h"
 
 #define CASUALTY_LUMP	1	/* How big casualty chunks should be */
 
diff --git a/src/lib/subs/lndsub.c b/src/lib/subs/lndsub.c
index f0fd5d3b..00278e89 100644
--- a/src/lib/subs/lndsub.c
+++ b/src/lib/subs/lndsub.c
@@ -38,17 +38,18 @@
 #include <stdlib.h>
 #include "combat.h"
 #include "damage.h"
+#include "empobj.h"
 #include "file.h"
 #include "misc.h"
 #include "mission.h"
+#include "news.h"
 #include "nsc.h"
 #include "optlist.h"
 #include "path.h"
 #include "player.h"
 #include "prototypes.h"
-#include "xy.h"
-#include "empobj.h"
 #include "unit.h"
+#include "xy.h"
 
 static void lnd_stays(natid, char *, struct ulist *);
 static int lnd_hit_mine(struct lndstr *);
diff --git a/src/lib/subs/mission.c b/src/lib/subs/mission.c
index 93ff0420..296022a6 100644
--- a/src/lib/subs/mission.c
+++ b/src/lib/subs/mission.c
@@ -40,6 +40,7 @@
 #include "item.h"
 #include "misc.h"
 #include "mission.h"
+#include "news.h"
 #include "nsc.h"
 #include "optlist.h"
 #include "path.h"
diff --git a/src/lib/subs/shpsub.c b/src/lib/subs/shpsub.c
index 924ac8a4..c3002023 100644
--- a/src/lib/subs/shpsub.c
+++ b/src/lib/subs/shpsub.c
@@ -36,10 +36,12 @@
 
 #include <stdlib.h>
 #include "damage.h"
+#include "empobj.h"
 #include "file.h"
 #include "map.h"
 #include "misc.h"
 #include "mission.h"
+#include "news.h"
 #include "nsc.h"
 #include "optlist.h"
 #include "path.h"
@@ -47,9 +49,8 @@
 #include "prototypes.h"
 #include "queue.h"
 #include "server.h"
-#include "xy.h"
-#include "empobj.h"
 #include "unit.h"
+#include "xy.h"
 
 static int shp_check_one_mines(struct ulist *);
 static int shp_hit_mine(struct shpstr *);