diff --git a/library/ColorText.cpp b/library/ColorText.cpp
index bdd3e98f44..a101d795a9 100644
--- a/library/ColorText.cpp
+++ b/library/ColorText.cpp
@@ -35,24 +35,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 */
 
-
-#include <stdarg.h>
-#include <errno.h>
-#include <stdio.h>
-#include <iostream>
-#include <fstream>
-#include <istream>
 #include <string>
+#include <ostream>
+#include <algorithm>
 
 #include "ColorText.h"
-#include "MiscUtils.h"
-
-#include <algorithm>
-#include <cstdio>
-#include <cstdlib>
-#include <sstream>
 
-using namespace std;
 using namespace DFHack;
 
 bool color_ostream::log_errors_to_stderr = false;
@@ -81,7 +69,7 @@ void color_ostream::end_batch()
     flush_proxy();
 }
 
-color_ostream::color_ostream() : ostream(new buffer(this)), cur_color(COLOR_RESET)
+color_ostream::color_ostream() : std::ostream(new buffer(this)), cur_color(COLOR_RESET)
 {
     //
 }
diff --git a/library/Core.cpp b/library/Core.cpp
index 2deba390ff..793824ac8e 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -26,40 +26,43 @@ distribution.
 
 #include "Internal.h"
 
-#include "Error.h"
-#include "MemAccess.h"
+#include "ColorText.h"
+#include "Commands.h"
+#include "Console.h"
+#include "CoreDefs.h"
 #include "DataDefs.h"
 #include "Debug.h"
-#include "Console.h"
+#include "DFHackVersion.h"
+#include "Error.h"
+#include "Format.h"
+#include "LuaTools.h"
+#include "MemAccess.h"
 #include "MemoryPatcher.h"
 #include "MiscUtils.h"
+#include "MiscUtils.h"
 #include "Module.h"
-#include "VersionInfoFactory.h"
-#include "VersionInfo.h"
-#include "PluginManager.h"
 #include "ModuleFactory.h"
+#include "PluginManager.h"
 #include "RemoteServer.h"
 #include "RemoteTools.h"
-#include "LuaTools.h"
-#include "DFHackVersion.h"
-#include "md5wrapper.h"
-#include "Format.h"
-
-#include "Commands.h"
+#include "VersionInfo.h"
+#include "VersionInfoFactory.h"
 
 #include "modules/DFSDL.h"
 #include "modules/DFSteam.h"
 #include "modules/EventManager.h"
 #include "modules/Filesystem.h"
+#include "modules/Graphic.h"
 #include "modules/Gui.h"
 #include "modules/Hotkey.h"
+#include "modules/Persistence.h"
 #include "modules/Textures.h"
 #include "modules/World.h"
-#include "modules/Persistence.h"
 
-#include "df/init.h"
 #include "df/gamest.h"
+#include "df/global_objects.h"
 #include "df/graphic.h"
+#include "df/init.h"
 #include "df/interfacest.h"
 #include "df/plotinfost.h"
 #include "df/viewscreen_dwarfmodest.h"
@@ -68,35 +71,54 @@ distribution.
 #include "df/viewscreen_loadgamest.h"
 #include "df/viewscreen_new_regionst.h"
 #include "df/viewscreen_savegamest.h"
-#include "df/world.h"
 #include "df/world_data.h"
+#include "df/world.h"
 
-#include <stdio.h>
-#include <iomanip>
-#include <stdlib.h>
+#include <algorithm>
+#include <cassert>
+#include <condition_variable>
+#include <cstdarg>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <filesystem>
+#include <forward_list>
 #include <fstream>
-#include <thread>
+#include <iomanip>
+#include <iostream>
+#include <istream>
+#include <map>
+#include <memory>
 #include <mutex>
-#include <condition_variable>
-#include <string>
-#include <vector>
+#include <ostream>
 #include <ranges>
-#include <span>
-#include <map>
 #include <set>
-#include <cstdio>
-#include <cstring>
+#include <span>
 #include <sstream>
-#include <forward_list>
+#include <string_view>
+#include <string>
+#include <system_error>
+#include <thread>
 #include <type_traits>
-#include <cstdarg>
-#include <filesystem>
+#include <utility>
+#include <vector>
+
+#include "md5wrapper.h"
+
+#include <fmt/base.h>
+
 #include <SDL_events.h>
+#include <SDL_keycode.h>
+#include <SDL_video.h>
 
+#include <lua.h>
 
-#ifdef _WIN32
+#ifdef WIN32
 #define NOMINMAX
+#define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
+#include <processthreadsapi.h>
 #endif
 
 #ifdef LINUX_BUILD
@@ -105,6 +127,7 @@ distribution.
 
 using namespace DFHack;
 using namespace df::enums;
+
 using df::global::init;
 using df::global::world;
 using std::string;
diff --git a/library/DataIdentity.cpp b/library/DataIdentity.cpp
index 346565c62f..0a797c2069 100644
--- a/library/DataIdentity.cpp
+++ b/library/DataIdentity.cpp
@@ -1,14 +1,21 @@
-#include <stddef.h>
+#include "DataIdentity.h"
+
+#include "BitArray.h"
+#include "DataDefs.h"
 
 #include <condition_variable>
+#include <cstdint>
+#include <filesystem>
 #include <fstream>
+#include <functional>
+#include <future>
+#include <memory>
 #include <mutex>
+#include <optional>
 #include <string>
-#include <vector>
 #include <variant>
+#include <vector>
 
-#include "DataFuncs.h"
-#include "DataIdentity.h"
 
 // the space after the uses of "type" in OPAQUE_IDENTITY_TRAITS_NAME is _required_
 // without it the macro generates a syntax error when type is a template specification
diff --git a/library/MiscUtils.cpp b/library/MiscUtils.cpp
index dc1d4950ac..44f93524ee 100644
--- a/library/MiscUtils.cpp
+++ b/library/MiscUtils.cpp
@@ -22,39 +22,49 @@ must not be misrepresented as being the original software.
 distribution.
 */
 
-#include "Internal.h"
 #include "Export.h"
 #include "MiscUtils.h"
 #include "ColorText.h"
 
-#include "modules/DFSDL.h"
+#include <array>
+#include <algorithm>
+#include <cctype>
+#include <cstdarg>
+#include <cstdlib>
+#include <cmath>
+#include <cstdint>
+#include <cstdio>
+#include <cstring>
+#include <exception>
+#include <iomanip>
+#include <ios>
+#include <iostream>
+#include <locale>
+#include <map>
+#include <ostream>
+#include <sstream>
+#include <string>
+#include <utility>
+#include <vector>
 
-#ifndef LINUX_BUILD
-// We don't want min and max macros
+#ifdef WIN32
+// Suppress warning which occurs in header on some WinSDK versions
+// See dfhack/dfhack#5147 for more information
 #define NOMINMAX
-    #include <Windows.h>
-    // Suppress warning which occurs in header on some WinSDK versions
-    // See dfhack/dfhack#5147 for more information
-    #pragma warning(push)
-    #pragma warning(disable:4091)
-    #include <DbgHelp.h>
-    #pragma warning(pop)
-#else
-    #include <sys/time.h>
-    #include <ctime>
-    #include <cxxabi.h>
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+#include <sysinfoapi.h>
+#pragma warning(push)
+#pragma warning(disable:4091)
+#include <DbgHelp.h>
+#pragma warning(pop)
 #endif
 
-#include <ctype.h>
-#include <stdarg.h>
-#include <string.h>
-#include <cstdlib>
-#include <cmath>
-
-#include <sstream>
-#include <map>
-#include <array>
-#include <unordered_map>
+#ifdef LINUX_BUILD
+#include <sys/time.h>
+#include <ctime>
+#include <cxxabi.h>
+#endif
 
 NumberFormatType preferred_number_format_type = NumberFormatType::DEFAULT;
 
@@ -499,8 +509,8 @@ uint64_t GetTimeMs64()
 /* Character decoding */
 
 // See http://bjoern.hoehrmann.de/utf-8/decoder/dfa/ for details.
-#define UTF8_ACCEPT 0
-#define UTF8_REJECT 12
+constexpr auto UTF8_ACCEPT = 0;
+constexpr auto UTF8_REJECT = 12;
 
 static const uint8_t utf8d[] = {
   // The first part of the table maps bytes to character classes that
diff --git a/library/PlugLoad.cpp b/library/PlugLoad.cpp
index fa58d39514..d3b7560773 100644
--- a/library/PlugLoad.cpp
+++ b/library/PlugLoad.cpp
@@ -1,19 +1,12 @@
-#include "Core.h"
 #include "Debug.h"
-#include "Export.h"
 #include "PluginManager.h"
-#include "Hooks.h"
 
 #include <iostream>
-#include <map>
 #include <string>
-#include <vector>
-
-#include <stdio.h>
-#include <stdint.h>
 
 #ifdef WIN32
 #define NOMINMAX
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <libloaderapi.h>
 #define global_search_handle() GetModuleHandle(nullptr)
diff --git a/library/PluginManager.cpp b/library/PluginManager.cpp
index b7e0b2c3c4..05486e885d 100644
--- a/library/PluginManager.cpp
+++ b/library/PluginManager.cpp
@@ -22,36 +22,48 @@ must not be misrepresented as being the original software.
 distribution.
 */
 
-#include "modules/EventManager.h"
-#include "modules/Filesystem.h"
-#include "modules/Screen.h"
-#include "modules/World.h"
-#include "Internal.h"
+#include "PluginManager.h"
+
+#include "ColorText.h"
 #include "Core.h"
+#include "CoreDefs.h"
+#include "LuaWrapper.h"
+#include "LuaTools.h"
 #include "MemAccess.h"
-#include "PluginManager.h"
+#include "MiscUtils.h"
 #include "RemoteServer.h"
-#include "Console.h"
 #include "Types.h"
 #include "VersionInfo.h"
 
-#include "DataDefs.h"
-#include "MiscUtils.h"
-#include "DFHackVersion.h"
-
-#include "LuaWrapper.h"
-#include "LuaTools.h"
-
-using namespace DFHack;
+#include "modules/EventManager.h"
+#include "modules/Filesystem.h"
+#include "modules/Screen.h"
+#include "modules/World.h"
 
+#include <algorithm>
 #include <condition_variable>
+#include <cassert>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <filesystem>
+#include <iostream>
+#include <map>
+#include <mutex>
 #include <string>
 #include <vector>
-#include <map>
 
-using std::string;
+#include <fmt/base.h>
+#include <fmt/format.h>
+
+#include "df/viewscreen.h"
 
-#include <assert.h>
+#include <lauxlib.h>
+#include <lua.h>
+
+using namespace DFHack;
+using std::string;
 
 #if defined(_LINUX)
     static const string plugin_suffix = ".plug.so";
@@ -871,7 +883,7 @@ void PluginManager::init()
     loadAll();
 
     bool any_loaded = false;
-    for (auto p : all_plugins)
+    for (auto& p : all_plugins)
     {
         if (p.second->getState() == Plugin::PS_LOADED)
         {
diff --git a/library/Process.cpp b/library/Process.cpp
index c45e5aea45..1ff63622f0 100644
--- a/library/Process.cpp
+++ b/library/Process.cpp
@@ -22,22 +22,30 @@ must not be misrepresented as being the original software.
 distribution.
 */
 
-#ifndef WIN32
-#ifndef _DARWIN
-#include <cstdlib>
-#endif /* ! _DARWIN */
-#endif /* ! WIN32 */
+#include "Format.h"
+#include "MemAccess.h"
+#include "Memory.h"
+#include "MemoryPatcher.h"
+#include "MiscUtils.h"
+#include "VersionInfo.h"
+#include "VersionInfoFactory.h"
+
+#include "modules/Filesystem.h"
+
+#include <algorithm>
+#include <cstdarg>
+#include <cstdint>
 #include <cstring>
-#include <cstdio>
+#include <exception>
+#include <filesystem>
+#include <iostream>
 #include <map>
-#include <set>
+#include <memory>
+#include <stdexcept>
 #include <string>
 #include <vector>
-#include <filesystem>
-
-#include "Format.h"
 
-#ifndef WIN32
+#ifdef LINUX_BUILD
 #include <dirent.h>
 #include <errno.h>
 #include <sys/mman.h>
@@ -53,28 +61,24 @@ distribution.
 #include <mach/vm_statistics.h>
 #include <dlfcn.h>
 #endif /* _DARWIN */
-#endif /* ! WIN32 */
 
-#include "Error.h"
-#include "Internal.h"
-#include "MemAccess.h"
-#include "Memory.h"
-#include "MemoryPatcher.h"
-#include "MiscUtils.h"
-#include "VersionInfo.h"
-#include "VersionInfoFactory.h"
-#include "modules/Filesystem.h"
-
-#ifndef WIN32
 #include "md5wrapper.h"
-#else /* WIN32 */
+#endif /* LINUX_BUILD */
+
+#ifdef WIN32
 #define _WIN32_WINNT 0x0600
 #define WINVER 0x0600
+
+#define NOMINMAX
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <psapi.h>
+#include <processthreadsapi.h>
+#include <memoryapi.h>
+#include <sysinfoapi.h>
+
+#include <malloc.h>
 
-#include <format>
 #endif /* WIN32 */
 
 using namespace DFHack;
@@ -151,7 +155,7 @@ Process::Process(const VersionInfoFactory& known_versions) : identified(false)
         uint32_t pe_offset = readDWord(d->base + 0x3C);
         read(d->base + pe_offset, sizeof(d->pe_header), (uint8_t*)&(d->pe_header));
         const size_t sectionsSize = sizeof(IMAGE_SECTION_HEADER) * d->pe_header.FileHeader.NumberOfSections;
-        d->sections = (IMAGE_SECTION_HEADER*)malloc(sectionsSize);
+        d->sections = (IMAGE_SECTION_HEADER*)std::malloc(sectionsSize);
         read(d->base + pe_offset + sizeof(d->pe_header), sectionsSize, (uint8_t*)(d->sections));
     }
     catch (std::exception&)
diff --git a/library/RemoteClient.cpp b/library/RemoteClient.cpp
index b159843761..c917a3232a 100644
--- a/library/RemoteClient.cpp
+++ b/library/RemoteClient.cpp
@@ -36,24 +36,25 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 
-#include <stdarg.h>
-#include <errno.h>
-#include <stdio.h>
+#include <cassert>
+#include <cstdint>
+#include <cstdlib>
+#include <cstring>
+#include <exception>
+#include <ios>
 #include <iostream>
 #include <fstream>
-#include <istream>
 #include <string>
-#include <stdint.h>
+#include <vector>
 
+#include "ColorText.h"
+#include "CoreDefs.h"
 #include "RemoteClient.h"
-#include <ActiveSocket.h>
-#include "MiscUtils.h"
 
-#include <cstdio>
-#include <cstdlib>
-#include <sstream>
+#include "ActiveSocket.h"
+#include "Host.h"
+#include "SimpleSocket.h"
 
-#include <memory>
 
 #include "json/json.h"
 
diff --git a/library/RemoteServer.cpp b/library/RemoteServer.cpp
index 9557a15862..aa3deb201d 100644
--- a/library/RemoteServer.cpp
+++ b/library/RemoteServer.cpp
@@ -35,27 +35,36 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 */
 
-
-#include <stdarg.h>
-#include <errno.h>
-#include <stdio.h>
+#ifdef WIN32
+#define NOMINMAX
+#endif
+#include <cassert>
+#include <cstdint>
+#include <cstring>
+#include <exception>
+#include <future>
+#include <ios>
 #include <iostream>
+#include <mutex>
 #include <fstream>
-#include <istream>
 #include <string>
-#include <stdint.h>
+#include <utility>
+#include <vector>
+
+#include "ColorText.h"
+#include "Core.h"
+#include "CoreDefs.h"
+#include "Debug.h"
+#include "MiscUtils.h"
+#include "PluginManager.h"
 
+#include "ActiveSocket.h"
+#include "Host.h"
+#include "RemoteClient.h"
 #include "RemoteServer.h"
 #include "RemoteTools.h"
-
 #include "PassiveSocket.h"
-#include "PluginManager.h"
-#include "MiscUtils.h"
-#include "Debug.h"
-
-#include <cstdio>
-#include <cstdlib>
-#include <sstream>
+#include "SimpleSocket.h"
 
 #include <memory>
 #include <thread>
diff --git a/library/RemoteTools.cpp b/library/RemoteTools.cpp
index dbef7a9906..5dab76e8cb 100644
--- a/library/RemoteTools.cpp
+++ b/library/RemoteTools.cpp
@@ -35,57 +35,58 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 */
 
-
-#include <stdarg.h>
-#include <errno.h>
-#include <stdio.h>
-#include <iostream>
-#include <fstream>
-#include <istream>
-#include <string>
-#include <stdint.h>
-
 #include "RemoteTools.h"
-#include "PluginManager.h"
+
+#include "ColorText.h"
+#include "Core.h"
+#include "CoreDefs.h"
+#include "DataDefs.h"
+#include "DFHackVersion.h"
+#include "LuaTools.h"
 #include "MiscUtils.h"
+#include "PluginManager.h"
 #include "VersionInfo.h"
-#include "DFHackVersion.h"
 
 #include "modules/Materials.h"
 #include "modules/Translation.h"
 #include "modules/Units.h"
 #include "modules/World.h"
 
-#include "LuaTools.h"
-
-#include "DataDefs.h"
-#include "df/plotinfost.h"
 #include "df/adventurest.h"
-#include "df/world.h"
-#include "df/world_data.h"
-#include "df/unit.h"
-#include "df/unit_misc_trait.h"
-#include "df/unit_soul.h"
-#include "df/unit_skill.h"
+#include "df/creature_raw.h"
+#include "df/global_objects.h"
+#include "df/historical_entity.h"
+#include "df/historical_figure.h"
+#include "df/incident.h"
+#include "df/inorganic_raw.h"
+#include "df/language_name.h"
 #include "df/material.h"
 #include "df/matter_state.h"
-#include "df/inorganic_raw.h"
-#include "df/creature_raw.h"
-#include "df/plant_raw.h"
 #include "df/nemesis_record.h"
-#include "df/historical_figure.h"
-#include "df/historical_entity.h"
-#include "df/squad.h"
+#include "df/plant_raw.h"
+#include "df/plotinfost.h"
+#include "df/profession.h"
 #include "df/squad_position.h"
-#include "df/incident.h"
+#include "df/squad.h"
+#include "df/unit_misc_trait.h"
+#include "df/unit_skill.h"
+#include "df/unit_soul.h"
+#include "df/unit.h"
+#include "df/world_data.h"
+#include "df/world.h"
 
 #include "BasicApi.pb.h"
 
+#include <cassert>
 #include <cstdio>
 #include <cstdlib>
-#include <sstream>
-
+#include <fstream>
+#include <iostream>
+#include <istream>
 #include <memory>
+#include <sstream>
+#include <string>
+#include <vector>
 
 using namespace DFHack;
 using namespace df::enums;
diff --git a/library/Types.cpp b/library/Types.cpp
index 1dab657c1c..21437723f1 100644
--- a/library/Types.cpp
+++ b/library/Types.cpp
@@ -22,24 +22,20 @@ must not be misrepresented as being the original software.
 distribution.
 */
 
-#include "Internal.h"
-#include "Export.h"
 #include "MiscUtils.h"
-#include "Error.h"
 #include "Types.h"
 
 #include "modules/Filesystem.h"
 
 #include "df/general_ref.h"
+#include "df/general_ref_type.h"
+#include "df/global_objects.h"
 #include "df/specific_ref.h"
+#include "df/specific_ref_type.h"
 
-#include <ctype.h>
-#include <stdarg.h>
-
-#include <string>
-#include <sstream>
-#include <map>
 #include <filesystem>
+#include <string>
+#include <vector>
 
 
 int DFHack::getdir(std::filesystem::path dir, std::vector<std::filesystem::path> &files)
diff --git a/library/include/BitArray.h b/library/include/BitArray.h
index 360281c6b1..7658e33102 100644
--- a/library/include/BitArray.h
+++ b/library/include/BitArray.h
@@ -24,14 +24,14 @@ distribution.
 
 #pragma once
 #include "Error.h"
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
 
 #include <algorithm>
+#include <cstdint>
 #include <cstring>
-#include <sstream>
 #include <iterator>
+#include <ostream>
+#include <sstream>
+#include <vector>
 
 namespace DFHack
 {
diff --git a/library/include/LuaWrapper.h b/library/include/LuaWrapper.h
index 7576be7a11..70f36d3f95 100644
--- a/library/include/LuaWrapper.h
+++ b/library/include/LuaWrapper.h
@@ -25,7 +25,8 @@ distribution.
 #pragma once
 
 #include <lua.h>
-#include <lauxlib.h>
+
+#include "DataDefs.h"
 
 /**
  * Internal header file of the lua wrapper.
diff --git a/library/include/modules/DFSDL.h b/library/include/modules/DFSDL.h
index 393877e095..953686deed 100644
--- a/library/include/modules/DFSDL.h
+++ b/library/include/modules/DFSDL.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Export.h"
 #include "ColorText.h"
+#include "Export.h"
 
 #include <cstdint>
 #include <functional>
+#include <string>
 #include <vector>
-#include <cstdint>
 
 struct SDL_Surface;
 struct SDL_Rect;
diff --git a/library/include/modules/Graphic.h b/library/include/modules/Graphic.h
index 9fa498a7cf..5e30d89805 100644
--- a/library/include/modules/Graphic.h
+++ b/library/include/modules/Graphic.h
@@ -30,9 +30,9 @@ distribution.
 #ifndef CL_MOD_GRAPHIC
 #define CL_MOD_GRAPHIC
 
-#include <stdint.h>
 #include "Export.h"
 #include "Module.h"
+
 #include <vector>
 
 namespace DFHack
diff --git a/library/modules/DFSteam.cpp b/library/modules/DFSteam.cpp
index 61e50a61b8..31cacfea63 100644
--- a/library/modules/DFSteam.cpp
+++ b/library/modules/DFSteam.cpp
@@ -1,11 +1,30 @@
-#include "Internal.h"
-
 #include "modules/DFSteam.h"
 
 #include "Debug.h"
 #include "PluginManager.h"
 
+#include "ColorText.h"
+#include "Core.h"
+
+#include <cstdint>
+#include <cstdlib>
+#include <cstring>
+#include <string>
+#include <vector>
+
 #include "df/gamest.h"
+#include <df/global_objects.h>
+
+#ifdef WIN32
+#define NOMINMAX
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <minwinbase.h>
+#include <handleapi.h>
+#include <processthreadsapi.h>
+#include <TlHelp32.h>
+#include <libloaderapi.h>
+#endif
 
 namespace DFHack
 {
@@ -100,9 +119,6 @@ void DFSteam::cleanup(color_ostream& out) {
 
 #ifdef WIN32
 
-#include <process.h>
-#include <windows.h>
-#include <TlHelp32.h>
 
 static bool is_running_on_wine() {
     typedef const char* (CDECL wine_get_version)(void);