Apply iwyu recommendations to utility/

ai/default/aiplayer.cpp

@@ -16,6 +16,8 @@
 #include "city.h"
 #include "game.h"
 #include "multipliers.h"
+#include "registry_ini.h"
+
 // server
 #include "citytools.h"
 

ai/default/aiunit.cpp

@@ -15,18 +15,15 @@
 #include "bitvector.h"
 #include "rand.h"
 #include "registry.h"
-#include "shared.h"
-#include "timing.h"
+#include "registry_ini.h"
 
 // common
 #include "city.h"
 #include "combat.h"
 #include "game.h"
-#include "government.h"
 #include "map.h"
 #include "movement.h"
 #include "nation.h"
-#include "packets.h"
 #include "specialist.h"
 #include "traderoutes.h"
 #include "unit.h"

ai/default/daicity.cpp

@@ -16,6 +16,7 @@
 // utility
 #include "rand.h"
 #include "registry.h"
+#include "registry_ini.h"
 
 // common
 #include "actions.h"

client/audio/audio.cpp

@@ -20,6 +20,7 @@ received a copy of the GNU General Public License along with Freeciv21.
 #include "log.h"
 #include "rand.h"
 #include "registry.h"
+#include "registry_ini.h"
 #include "shared.h"
 
 // client

client/connectdlg_common.cpp

@@ -13,6 +13,7 @@
 // Qt
 #include <QCoreApplication>
 #include <QDebug>
+#include <QDir>
 #include <QProcess>
 #include <QStandardPaths>
 #include <QTcpServer>
@@ -30,17 +31,16 @@
 #include "log.h"
 #include "rand.h"
 #include "registry.h"
+#include "registry_ini.h"
 #include "shared.h"
 #include "support.h"
 
 // client
 #include "chatline_common.h"
 #include "client_main.h"
-#include "climisc.h"
 #include "clinet.h" // connect_to_server()
 #include "connectdlg_common.h"
 #include "packhand_gen.h"
-#include "tileset/tilespec.h"
 
 // gui-qt
 #include "qtg_cxxside.h"

client/global_worklist.cpp

@@ -16,6 +16,7 @@
 #include "fcintl.h"
 #include "log.h"
 #include "registry.h"
+#include "registry_ini.h"
 #include "shared.h"
 #include "support.h"
 

client/luascript/script_client.cpp

@@ -14,13 +14,13 @@
 extern "C" {
 /* dependencies/lua */
 #include "lua.h"
-#include "lualib.h"
 
 /* dependencies/tolua */
 #include "tolua.h"
 }
 // utility
 #include "log.h"
+#include "section_file.h"
 
 // common
 #include "featured_text.h"

client/options.cpp

@@ -15,7 +15,9 @@
 
 #include <cstring>
 #include <sys/stat.h>
+
 // Qt
+#include <QDir>
 #include <QHash>
 #include <QUrl>
 
@@ -24,6 +26,7 @@
 #include "fcintl.h"
 #include "log.h"
 #include "registry.h"
+#include "registry_ini.h"
 #include "shared.h"
 #include "support.h"
 
@@ -35,7 +38,6 @@
 #include "version.h"
 
 /* client/include */
-#include "dialogs_g.h"
 #include "gui_main_g.h"
 #include "menu_g.h"
 #include "optiondlg_g.h"

client/page_load.cpp

@@ -20,15 +20,14 @@
 
 // utility
 #include "fcintl.h"
+#include "section_file.h"
+
 // common
-#include "chatline_common.h"
-#include "connectdlg_common.h"
 #include "rgbcolor.h"
+
 // client
-#include "client_main.h"
-#include "options.h"
-// gui-qt
 #include "fc_client.h"
+#include "options.h"
 
 static struct terrain *char2terrain(char ch);
 

client/page_scenario.cpp

@@ -15,17 +15,12 @@
 
 // utility
 #include "fcintl.h"
-
-// common
-#include "chatline_common.h"
-#include "connectdlg_common.h"
+#include "section_file.h"
 
 // generated
 #include "fc_version.h"
 
 // client
-#include "client_main.h"
-#include "dialogs.h"
 #include "fc_client.h"
 
 // Qt

client/servers.cpp

@@ -27,13 +27,14 @@
 
 // utility
 #include "net_types.h"
+#include "registry_ini.h"
 
 // generated
 #include "fc_version.h"
 
 // common
 #include "capstr.h"
-#include "dataio.h"
+#include "dataio_raw.h"
 #include "version.h"
 
 // client

common/helpdata.cpp

@@ -30,6 +30,7 @@
 #include "fcintl.h"
 #include "log.h"
 #include "registry.h"
+#include "registry_ini.h"
 #include "requirements.h"
 #include "support.h"
 

common/path_finder.h

@@ -11,6 +11,7 @@
 #include <optional>
 #include <queue>
 #include <set>
+#include <utility>
 
 struct tile;
 

common/rgbcolor.cpp

@@ -12,9 +12,9 @@ _   ._       Copyright (c) 1996-2021 Freeciv21 and Freeciv contributors.
 #include <cstdarg>
 
 // utility
-#include "fcintl.h"
 #include "log.h"
 #include "registry.h"
+#include "registry_ini.h"
 
 // common
 #include "rgbcolor.h"

common/scriptcore/luascript.cpp

@@ -26,9 +26,9 @@ extern "C" {
 #include "sol/sol.hpp"
 
 // utility
-#include "fcintl.h"
 #include "log.h"
 #include "registry.h"
+#include "registry_ini.h"
 
 // common
 #include "map.h"

server/connecthand.cpp

@@ -19,6 +19,7 @@
 #include "capability.h"
 #include "fcintl.h"
 #include "log.h"
+#include "registry_ini.h"
 #include "support.h"
 
 // generated

server/fcdb.cpp

@@ -16,11 +16,10 @@ _   ._       Copyright (c) 1996-2021 Freeciv21 and Freeciv contributors.
 // utility
 #include "fcintl.h"
 #include "log.h"
+#include "registry.h"
+#include "section_file.h"
 #include "support.h"
 
-// common
-#include "packets.h"
-
 /* server/scripting */
 #include "script_fcdb.h"
 

server/gamehand.cpp

@@ -18,6 +18,7 @@
 #include "fcintl.h"
 #include "log.h"
 #include "rand.h"
+#include "section_file.h"
 #include "shared.h"
 #include "support.h"
 
@@ -28,7 +29,6 @@
 #include "game.h"
 #include "movement.h"
 #include "nation.h"
-#include "packets.h"
 
 // server
 #include "citytools.h"

server/notify.cpp

@@ -18,6 +18,7 @@
 #include "fcintl.h"
 #include "log.h"
 #include "registry.h"
+#include "registry_ini.h"
 
 // common
 #include "connection.h"

server/rscompat.cpp

@@ -17,11 +17,11 @@
 #include "capability.h"
 #include "fcintl.h"
 #include "registry.h"
+#include "section_file.h"
 
 // common
 #include "actions.h"
 #include "effects.h"
-#include "game.h"
 #include "movement.h"
 #include "requirements.h"
 #include "unittype.h"

server/rssanity.cpp

@@ -13,7 +13,7 @@
 
 // utility
 #include "deprecations.h"
-#include "fcintl.h"
+#include "registry_ini.h"
 
 // common
 #include "achievements.h"
@@ -22,10 +22,9 @@
 #include "game.h"
 #include "government.h"
 #include "movement.h"
-#include "multipliers.h"
 #include "nation.h"
-#include "player.h"
 #include "road.h"
+#include "server_settings.h"
 #include "specialist.h"
 #include "style.h"
 #include "tech.h"

server/savegame/savecompat.cpp

@@ -15,6 +15,7 @@
 #include "capability.h"
 #include "fcintl.h"
 #include "log.h"
+#include "registry_ini.h"
 
 // common
 #include "map.h"

server/savegame/savemain.cpp

@@ -18,8 +18,10 @@
 #include <QString>
 
 // utility
+#include "fcthread.h"
 #include "log.h"
 #include "registry.h"
+#include "registry_ini.h"
 
 // common
 #include "ai.h"

server/scripting/script_server.cpp

@@ -15,14 +15,14 @@
 /* dependencies/lua */
 extern "C" {
 #include "lua.h"
-#include "lualib.h"
 
 /* dependencies/tolua */
 #include "tolua.h"
 }
 // utility
 #include "log.h"
 #include "registry.h"
+#include "registry_ini.h"
 
 /* common/scriptcore */
 #include "api_game_specenum.h"

server/settings.h

@@ -11,12 +11,11 @@
 
 #pragma once
 
-// utility
-#include "shared.h"
-
 // common
-#include "game.h"
-#include "server_settings.h"
+#include "connection.h"
+
+// utility
+#include "registry_ini.h"
 
 struct sset_val_name {
   const char *support; /* Untranslated long support name, used

server/srv_main.cpp

@@ -37,7 +37,7 @@
 #include "calendar.h"
 #include "city.h"
 #include "culture.h"
-#include "dataio.h"
+#include "dataio_raw.h"
 #include "effects.h"
 #include "events.h"
 #include "fc_interface.h"
@@ -53,7 +53,6 @@
 #include "tech.h"
 #include "unit.h"
 #include "unitlist.h"
-#include "version.h"
 #include "victory.h"
 
 // server
@@ -79,6 +78,7 @@
 #include "sanitycheck.h"
 #include "score.h"
 #include "sernet.h"
+#include "server_settings.h"
 #include "settings.h"
 #include "spacerace.h"
 #include "srv_log.h"

tools/fcmp/download.cpp

@@ -16,6 +16,7 @@
 #include <cerrno>
 
 // Qt
+#include <QDir>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
@@ -29,7 +30,6 @@
 #include "capability.h"
 #include "fcintl.h"
 #include "netfile.h"
-#include "registry.h"
 
 // tools
 #include "mpdb.h"

tools/fcmp/mpdb.cpp

@@ -17,9 +17,7 @@
 #include "capability.h"
 #include "fcintl.h"
 #include "registry.h"
-
-// modinst
-#include "download.h"
+#include "registry_ini.h"
 
 #include "mpdb.h"