Clean up header includes (#16674)

src/util/areastore.h

@@ -5,9 +5,7 @@
 #pragma once
 
 #include "irr_v3d.h"
-#include "noise.h" // for PcgRandom
 #include <map>
-#include <list>
 #include <vector>
 #include <istream>
 #include "util/container.h"
@@ -17,7 +15,6 @@
 #endif
 #if USE_SPATIAL
 	#include <spatialindex/SpatialIndex.h>
-	#include "util/serialize.h"
 #endif
 
 

src/util/auth.cpp

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 // Copyright (C) 2015, 2016 est31 <MTest31@outlook.com>
 
-#include <algorithm>
 #include <string>
 #include "auth.h"
 #include "base64.h"

src/util/base64.cpp

@@ -27,7 +27,6 @@ René Nyffenegger rene.nyffenegger@adp-gmbh.ch
 */
 
 #include "base64.h"
-#include <iostream>
 
 static const std::string base64_chars =
 		"ABCDEFGHIJKLMNOPQRSTUVWXYZ"

src/util/colorize.cpp

@@ -20,7 +20,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifdef HAVE_COLORIZE_URL
 
 #include <curl/urlapi.h>
-#include "log.h"
 #include "string.h"
 #include <sstream>
 #include <memory>

src/util/enriched_string.cpp

@@ -20,7 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "enriched_string.h"
 #include "util/string.h"
 #include "debug.h"
-#include "log.h"
 
 using namespace video;
 

src/util/guid.cpp

@@ -4,12 +4,10 @@
 
 #include "guid.h"
 #include <cstring>
-#include <sstream>
 #include <string_view>
 
 #include "exceptions.h"
 #include "util/base64.h"
-#include "log.h"
 #include "porting.h"
 #include "util/numeric.h"
 

src/util/numeric.cpp

@@ -4,7 +4,6 @@
 
 #include "numeric.h"
 
-#include "log.h"
 #include "constants.h" // BS, MAP_BLOCKSIZE
 #include "noise.h" // PcgRandom
 #include <cstring>

src/util/numeric.h

@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include "basic_macros.h"
 #include "constants.h"
 #include "irrlichttypes.h"
 #include "irr_v2d.h"

src/util/pointabilities.cpp

@@ -6,7 +6,6 @@
 
 #include "serialize.h"
 #include "exceptions.h"
-#include <sstream>
 
 PointabilityType Pointabilities::deSerializePointabilityType(std::istream &is)
 {

src/util/quicktune.cpp

@@ -3,6 +3,8 @@
 // Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 #include "quicktune.h"
+
+#include <map>
 #include "threading/mutex_auto_lock.h"
 #include "util/string.h"
 

src/util/quicktune.h

@@ -34,7 +34,6 @@
 #pragma once
 
 #include <string>
-#include <map>
 #include <vector>
 
 enum QuicktuneValueType {

src/util/sha1.cpp

@@ -24,9 +24,7 @@ SOFTWARE.
 
 */
 
-#include <cstdio>
 #include <cstring>
-#include <cstdlib>
 #include <cassert>
 
 #define IN_SHA1_CPP

src/util/srp.cpp

@@ -40,7 +40,6 @@
 #include <cstdlib>
 #include <cstring>
 #include <cstdio>
-#include <cstdint>
 
 #include <config.h>
 

src/util/string.cpp

@@ -8,7 +8,7 @@
 #include "log.h"
 
 #include "hex.h"
-#include "porting.h"
+#include "porting.h" // strtok_r, strtoull and strncasecmp
 #include "translation.h"
 #include "strfnd.h"
 

src/util/thread.h

@@ -8,8 +8,6 @@
 #include "irrlichttypes.h"
 #include "threading/thread.h"
 #include "threading/mutex_auto_lock.h"
-#include "porting.h"
-#include "log.h"
 #include "container.h"
 
 template<typename T>