From ad5afdc44e47629894053f35b01fdf68fbcdab3e Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sat, 4 Mar 2023 06:08:16 +0200
Subject: [PATCH 36/36] Rename autosettlers.[ch] as autoworkers.[ch]

Remove unnecessary autoworkers.h includes

See osdn #45609

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 ai/classic/classicai.c                            | 2 +-
 ai/default/aidiplomat.c                           | 1 -
 ai/default/aiferry.c                              | 1 -
 ai/default/aihunt.c                               | 1 -
 ai/default/aitools.c                              | 3 +--
 ai/default/daicity.c                              | 3 ++-
 ai/default/daidomestic.c                          | 3 +--
 ai/default/daimilitary.c                          | 3 +--
 ai/default/daisettler.c                           | 2 +-
 ai/default/daiunit.c                              | 2 +-
 ai/tex/texaicity.c                                | 2 +-
 meson.build                                       | 2 +-
 server/advisors/Makefile.am                       | 4 ++--
 server/advisors/advdata.c                         | 1 -
 server/advisors/advruleset.c                      | 2 +-
 server/advisors/{autosettlers.c => autoworkers.c} | 8 ++++----
 server/advisors/{autosettlers.h => autoworkers.h} | 7 +++----
 server/advisors/infracache.c                      | 2 +-
 server/aiiface.c                                  | 4 +---
 server/citytools.c                                | 1 -
 server/cityturn.c                                 | 1 -
 server/diplhand.c                                 | 3 ---
 server/plrhand.c                                  | 1 -
 server/srv_main.c                                 | 2 +-
 server/unithand.c                                 | 2 +-
 server/unittools.c                                | 2 +-
 26 files changed, 25 insertions(+), 40 deletions(-)
 rename server/advisors/{autosettlers.c => autoworkers.c} (99%)
 rename server/advisors/{autosettlers.h => autoworkers.h} (97%)

diff --git a/ai/classic/classicai.c b/ai/classic/classicai.c
index a90d77658d..7f1e859d6f 100644
--- a/ai/classic/classicai.c
+++ b/ai/classic/classicai.c
@@ -17,11 +17,11 @@
 
 /* common */
 #include "ai.h"
+#include "map.h"
 #include "player.h"
 
 /* server/advisors */
 #include "advdata.h"
-#include "autosettlers.h"
 
 /* ai/default */
 #include "aiferry.h"
diff --git a/ai/default/aidiplomat.c b/ai/default/aidiplomat.c
index f30c9cc988..10ed657619 100644
--- a/ai/default/aidiplomat.c
+++ b/ai/default/aidiplomat.c
@@ -55,7 +55,6 @@
 #include "advbuilding.h"
 #include "advdata.h"
 #include "advgoto.h"
-#include "autosettlers.h"
 
 /* ai */
 #include "handicaps.h"
diff --git a/ai/default/aiferry.c b/ai/default/aiferry.c
index 9228de5662..d73c507926 100644
--- a/ai/default/aiferry.c
+++ b/ai/default/aiferry.c
@@ -31,7 +31,6 @@
 /* server/advisors */
 #include "advgoto.h"
 #include "autoexplorer.h"
-#include "autosettlers.h"
 
 /* server */
 #include "hand_gen.h"
diff --git a/ai/default/aihunt.c b/ai/default/aihunt.c
index 76b55b536d..96809d383b 100644
--- a/ai/default/aihunt.c
+++ b/ai/default/aihunt.c
@@ -43,7 +43,6 @@
 #include "advdata.h"
 #include "advgoto.h"
 #include "advtools.h"
-#include "autosettlers.h"
 
 /* ai */
 #include "handicaps.h"
diff --git a/ai/default/aitools.c b/ai/default/aitools.c
index 15920cddcc..19d061a142 100644
--- a/ai/default/aitools.c
+++ b/ai/default/aitools.c
@@ -53,8 +53,7 @@
 #include "advdata.h"
 #include "advgoto.h"
 #include "advtools.h"
-#include "autosettlers.h"
-#include "infracache.h" /* adv_city */
+#include "infracache.h"
 
 /* ai */
 #include "handicaps.h"
diff --git a/ai/default/daicity.c b/ai/default/daicity.c
index 0f02571104..b69c500b7a 100644
--- a/ai/default/daicity.c
+++ b/ai/default/daicity.c
@@ -26,6 +26,7 @@
 #include "actions.h"
 #include "game.h"
 #include "government.h"
+#include "map.h"
 #include "research.h"
 #include "specialist.h"
 
@@ -42,7 +43,7 @@
 /* server/advisors */
 #include "advdata.h"
 #include "advtools.h"
-#include "autosettlers.h"
+#include "autoworkers.h"
 #include "advbuilding.h"
 #include "infracache.h"
 
diff --git a/ai/default/daidomestic.c b/ai/default/daidomestic.c
index 6d220e22c1..563017917e 100644
--- a/ai/default/daidomestic.c
+++ b/ai/default/daidomestic.c
@@ -45,8 +45,7 @@
 #include "advbuilding.h"
 #include "advchoice.h"
 #include "advdata.h"
-#include "autosettlers.h"
-#include "infracache.h" /* adv_city */
+#include "infracache.h"
 
 /* ai */
 #include "aitraits.h"
diff --git a/ai/default/daimilitary.c b/ai/default/daimilitary.c
index 6e910b999e..0da56eb7e8 100644
--- a/ai/default/daimilitary.c
+++ b/ai/default/daimilitary.c
@@ -45,8 +45,7 @@
 #include "advdata.h"
 #include "advgoto.h"
 #include "advtools.h"
-#include "autosettlers.h"
-#include "infracache.h" /* adv_city */
+#include "infracache.h"
 
 /* ai */
 #include "aitraits.h"
diff --git a/ai/default/daisettler.c b/ai/default/daisettler.c
index 33517a1e7f..39b85cc339 100644
--- a/ai/default/daisettler.c
+++ b/ai/default/daisettler.c
@@ -48,7 +48,7 @@
 #include "advdata.h"
 #include "advgoto.h"
 #include "advtools.h"
-#include "autosettlers.h"
+#include "autoworkers.h"
 #include "infracache.h"
 
 /* ai */
diff --git a/ai/default/daiunit.c b/ai/default/daiunit.c
index 2806b8cc1b..e05fb05fac 100644
--- a/ai/default/daiunit.c
+++ b/ai/default/daiunit.c
@@ -59,7 +59,7 @@
 #include "advgoto.h"
 #include "advtools.h"
 #include "autoexplorer.h"
-#include "autosettlers.h"
+#include "autoworkers.h"
 
 /* ai */
 #include "difficulty.h"
diff --git a/ai/tex/texaicity.c b/ai/tex/texaicity.c
index 48371a872c..e7c4365968 100644
--- a/ai/tex/texaicity.c
+++ b/ai/tex/texaicity.c
@@ -33,7 +33,7 @@
 /* server/advisors */
 #include "advbuilding.h"
 #include "advdata.h"
-#include "autosettlers.h"
+#include "autoworkers.h"
 #include "infracache.h"
 
 /* ai/default */
diff --git a/meson.build b/meson.build
index 6f7af4bed8..d6aa0fd7ed 100644
--- a/meson.build
+++ b/meson.build
@@ -1033,7 +1033,7 @@ server_lib = static_library('fc_server',
   'server/advisors/advspace.c',
   'server/advisors/advtools.c',
   'server/advisors/autoexplorer.c',
-  'server/advisors/autosettlers.c',
+  'server/advisors/autoworkers.c',
   'server/advisors/infracache.c',
   'server/generator/fracture_map.c',
   'server/generator/height_map.c',
diff --git a/server/advisors/Makefile.am b/server/advisors/Makefile.am
index 9d8eb25be7..9634485b0f 100644
--- a/server/advisors/Makefile.am
+++ b/server/advisors/Makefile.am
@@ -29,7 +29,7 @@ libadvisors_la_SOURCES = \
 	advtools.h	\
 	autoexplorer.c	\
 	autoexplorer.h	\
-	autosettlers.c	\
-	autosettlers.h	\
+	autoworkers.c	\
+	autoworkers.h	\
 	infracache.c	\
 	infracache.h
diff --git a/server/advisors/advdata.c b/server/advisors/advdata.c
index c3a7f00f23..581f2173cd 100644
--- a/server/advisors/advdata.c
+++ b/server/advisors/advdata.c
@@ -49,7 +49,6 @@
 #include "advbuilding.h"
 #include "advcity.h"
 #include "advtools.h"
-#include "autosettlers.h"
 
 /* ai */
 #include "handicaps.h"
diff --git a/server/advisors/advruleset.c b/server/advisors/advruleset.c
index 8a3595b73a..e5f808a417 100644
--- a/server/advisors/advruleset.c
+++ b/server/advisors/advruleset.c
@@ -23,7 +23,7 @@
 #include "unittype.h"
 
 /* server/advisors */
-#include "autosettlers.h"
+#include "autoworkers.h"
 
 #include "advruleset.h"
 
diff --git a/server/advisors/autosettlers.c b/server/advisors/autoworkers.c
similarity index 99%
rename from server/advisors/autosettlers.c
rename to server/advisors/autoworkers.c
index 76cd219009..4930b4589b 100644
--- a/server/advisors/autosettlers.c
+++ b/server/advisors/autoworkers.c
@@ -59,12 +59,12 @@
 /* ai */
 #include "handicaps.h"
 
-#include "autosettlers.h"
+#include "autoworkers.h"
 
-/* This factor is multiplied on when calculating the want.  This is done
+/* This factor is multiplied on when calculating the want. This is done
  * to avoid rounding errors in comparisons when looking for the best
- * possible work.  However before returning the final want we have to
- * divide by it again.  This loses accuracy but is needed since the want
+ * possible work. However before returning the final want we have to
+ * divide by it again. This loses accuracy but is needed since the want
  * values are used for comparison by the AI in trying to calculate the
  * goodness of building worker units. */
 #define WORKER_FACTOR 1024
diff --git a/server/advisors/autosettlers.h b/server/advisors/autoworkers.h
similarity index 97%
rename from server/advisors/autosettlers.h
rename to server/advisors/autoworkers.h
index 84ca4fad10..a4a985990f 100644
--- a/server/advisors/autosettlers.h
+++ b/server/advisors/autoworkers.h
@@ -10,12 +10,11 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 ***********************************************************************/
-#ifndef FC__AUTOSETTLERS_H
-#define FC__AUTOSETTLERS_H
+#ifndef FC__AUTOWORKERS_H
+#define FC__AUTOWORKERS_H
 
 /* common */
 #include "fc_types.h"
-#include "map.h"
 
 void auto_settlers_ruleset_init(void);
 
@@ -95,4 +94,4 @@ extern action_id as_actions_rmextra[MAX_NUM_ACTIONS];
   action_array_iterate_end                                                 \
 }
 
-#endif   /* FC__AUTOSETTLERS_H */
+#endif /* FC__AUTOWORKERS_H */
diff --git a/server/advisors/infracache.c b/server/advisors/infracache.c
index 3c0a54016a..ba150ce324 100644
--- a/server/advisors/infracache.c
+++ b/server/advisors/infracache.c
@@ -27,7 +27,7 @@
 
 /* server/advisors */
 #include "advbuilding.h"
-#include "autosettlers.h"
+#include "autoworkers.h"
 
 #include "infracache.h"
 
diff --git a/server/aiiface.c b/server/aiiface.c
index 0d618d4e36..b91e4be5f2 100644
--- a/server/aiiface.c
+++ b/server/aiiface.c
@@ -24,11 +24,9 @@
 
 /* common */
 #include "ai.h"
+#include "game.h"
 #include "player.h"
 
-/* server/advisors */
-#include "autosettlers.h"
-
 /* ai/classic */
 #include "classicai.h"
 
diff --git a/server/citytools.c b/server/citytools.c
index b7391a073d..ccfb536a83 100644
--- a/server/citytools.c
+++ b/server/citytools.c
@@ -80,7 +80,6 @@
 /* server/advisors */
 #include "advbuilding.h"
 #include "advgoto.h"
-#include "autosettlers.h"
 #include "infracache.h"
 
 /* server/scripting */
diff --git a/server/cityturn.c b/server/cityturn.c
index 2c685d96d9..9d4add59f3 100644
--- a/server/cityturn.c
+++ b/server/cityturn.c
@@ -76,7 +76,6 @@
 /* server/advisors */
 #include "advbuilding.h"
 #include "advdata.h"
-#include "autosettlers.h"
 
 /* server/scripting */
 #include "script_server.h"
diff --git a/server/diplhand.c b/server/diplhand.c
index a194678964..77c5ec5d98 100644
--- a/server/diplhand.c
+++ b/server/diplhand.c
@@ -47,9 +47,6 @@
 #include "techtools.h"
 #include "unittools.h"
 
-/* server/advisors */
-#include "autosettlers.h"
-
 /* server/scripting */
 #include "script_server.h"
 
diff --git a/server/plrhand.c b/server/plrhand.c
index 0b410d6e07..7b4c3f8a8a 100644
--- a/server/plrhand.c
+++ b/server/plrhand.c
@@ -69,7 +69,6 @@
 
 /* server/advisors */
 #include "advdata.h"
-#include "autosettlers.h"
 
 /* server/scripting */
 #include "script_server.h"
diff --git a/server/srv_main.c b/server/srv_main.c
index a0993235cf..90ae586978 100644
--- a/server/srv_main.c
+++ b/server/srv_main.c
@@ -123,7 +123,7 @@
 
 /* server/advisors */
 #include "advdata.h"
-#include "autosettlers.h"
+#include "autoworkers.h"
 #include "advbuilding.h"
 #include "advspace.h"
 #include "infracache.h"
diff --git a/server/unithand.c b/server/unithand.c
index d4265188d3..4ae2be9bd9 100644
--- a/server/unithand.c
+++ b/server/unithand.c
@@ -66,7 +66,7 @@
 
 /* server/advisors */
 #include "autoexplorer.h"
-#include "autosettlers.h"
+#include "autoworkers.h"
 
 /* server/scripting */
 #include "script_server.h"
diff --git a/server/unittools.c b/server/unittools.c
index bd63f3280e..6e42243912 100644
--- a/server/unittools.c
+++ b/server/unittools.c
@@ -77,7 +77,7 @@
 /* server/advisors */
 #include "advgoto.h"
 #include "autoexplorer.h"
-#include "autosettlers.h"
+#include "autoworkers.h"
 
 /* ai */
 #include "handicaps.h"
-- 
2.39.2