Clean up header includes (#16674)

src/network/address.cpp

@@ -4,20 +4,11 @@
 
 #include "address.h"
 
-#include <cstdio>
 #include <iostream>
-#include <cstdlib>
 #include <cstring>
 #include <cerrno>
-#include <sstream>
-#include <iomanip>
 #include "network/networkexceptions.h"
-#include "util/string.h"
-#include "util/numeric.h"
-#include "constants.h"
-#include "debug.h"
 #include "settings.h"
-#include "log.h"
 
 #ifdef _WIN32
 #include <windows.h>

src/network/address.h

@@ -16,7 +16,6 @@
 #include <ostream>
 #include <cstring>
 #include "irrlichttypes.h"
-#include "networkexceptions.h"
 
 struct IPv6AddressBytes
 {

src/network/mtp/impl.cpp

@@ -2,21 +2,18 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 // Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
-#include <iomanip>
-#include <cerrno>
 #include <algorithm>
 #include <cmath>
 #include "network/mtp/internal.h"
-#include "serialization.h"
 #include "log.h"
 #include "porting.h"
 #include "network/mtp/threads.h"
 #include "network/peerhandler.h"
+#include "network/networkexceptions.h"
 #include "network/networkpacket.h"
 #include "util/serialize.h"
 #include "util/numeric.h"
 #include "util/string.h"
-#include "settings.h"
 #include "profiler.h"
 
 namespace con

src/network/mtp/impl.h

@@ -9,11 +9,11 @@
 #include "constants.h"
 #include "util/pointer.h"
 #include "util/container.h"
-#include "util/numeric.h"
 #include "porting.h"
+#include "network/address.h"
 #include "network/networkprotocol.h"
 #include <atomic>
-#include <iostream>
+#include <cfloat>
 #include <vector>
 #include <memory>
 #include <map>

src/network/mtp/internal.h

@@ -6,6 +6,8 @@
 
 #include "network/mtp/impl.h"
 
+#include "util/numeric.h"
+
 // Constant that differentiates the protocol from random data and other protocols
 #define PROTOCOL_ID 0x4f457403
 

src/network/mtp/threads.cpp

@@ -7,6 +7,7 @@
 #include "log.h"
 #include "profiler.h"
 #include "settings.h"
+#include "network/networkexceptions.h"
 #include "network/networkpacket.h"
 #include "util/serialize.h"
 

src/network/networkpacket.cpp

@@ -4,7 +4,6 @@
 
 #include "networkpacket.h"
 #include <sstream>
-#include "networkexceptions.h"
 #include "util/serialize.h"
 #include "networkprotocol.h"
 

src/network/serverpackethandler.cpp

@@ -11,15 +11,15 @@
 #include "mapblock.h"
 #include "modchannels.h"
 #include "nodedef.h"
+#include "porting.h" // strcasecmp
 #include "remoteplayer.h"
 #include "rollback_interface.h"
 #include "scripting_server.h"
 #include "serialization.h"
 #include "settings.h"
 #include "tool.h"
-#include "version.h"
-#include "irrlicht_changes/printing.h"
 #include "network/connection.h"
+#include "network/networkexceptions.h"
 #include "network/networkpacket.h"
 #include "network/networkprotocol.h"
 #include "network/serveropcodes.h"
@@ -28,7 +28,6 @@
 #include "util/auth.h"
 #include "util/base64.h"
 #include "util/pointedthing.h"
-#include "util/serialize.h"
 #include "util/srp.h"
 #include "clientdynamicinfo.h"
 

src/network/socket.cpp

@@ -4,21 +4,19 @@
 
 #include "socket.h"
 
-#include <cstdio>
 #include <iostream>
-#include <cstdlib>
 #include <cstring>
-#include <iomanip>
-#include "util/string.h"
 #include "util/numeric.h"
+#include "address.h"
 #include "constants.h"
-#include "debug.h"
 #include "log.h"
+#include "networkexceptions.h"
 
 #ifdef _WIN32
 #include <windows.h>
 #include <winsock2.h>
 #include <ws2tcpip.h>
+#include "util/string.h"
 #define LAST_SOCKET_ERR() WSAGetLastError()
 #define SOCKET_ERR_STR(e) itos(e)
 typedef int socklen_t;

src/network/socket.h

@@ -4,11 +4,9 @@
 
 #pragma once
 
-#include <ostream>
-#include <cstring>
-#include "address.h"
 #include "irrlichttypes.h"
-#include "networkexceptions.h"
+
+class Address;
 
 void sockets_init();
 void sockets_cleanup();