Remove double includes part 2 (#3890)

Tools/GrownBiomeGenVisualiser/Globals.h

@@ -210,7 +210,10 @@ typedef unsigned char Byte;
 #include <map>
 #include <algorithm>
 #include <memory>
-
+#include <atomic>
+#include <mutex>
+#include <thread>
+#include <condition_variable>
 
 
 
@@ -258,5 +261,6 @@ public:
 } ;
 
 
+#include "BiomeDef.h"
 
 

Tools/MCADefrag/Globals.h

@@ -187,7 +187,10 @@ typedef unsigned char Byte;
 #include <map>
 #include <algorithm>
 #include <memory>
-
+#include <atomic>
+#include <mutex>
+#include <thread>
+#include <condition_variable>
 
 
 
@@ -239,5 +242,8 @@ public:
 } ;
 
 
+#include "BiomeDef.h"
+
+
 
 

Tools/NoiseSpeedTest/Globals.h

@@ -187,6 +187,10 @@ typedef unsigned char Byte;
 #include <map>
 #include <algorithm>
 #include <memory>
+#include <atomic>
+#include <mutex>
+#include <thread>
+#include <condition_variable>
 
 
 

Tools/ProtoProxy/Globals.h

@@ -168,6 +168,7 @@ typedef unsigned char Byte;
 
 
 // STL stuff:
+#include <chrono>
 #include <vector>
 #include <list>
 #include <deque>
@@ -175,6 +176,10 @@ typedef unsigned char Byte;
 #include <map>
 #include <algorithm>
 #include <memory>
+#include <atomic>
+#include <mutex>
+#include <thread>
+#include <condition_variable>
 
 
 

src/AllocationPool.h

@@ -1,8 +1,6 @@
 
 #pragma once
 
-#include <memory>
-
 
 
 

src/Bindings/DeprecatedBindings.cpp

@@ -6,7 +6,6 @@
 #include "tolua++/include/tolua++.h"
 
 
-#include "../BlockInfo.h"
 #include "../World.h"
 #include "../Entities/Player.h"
 #include "LuaState.h"

src/Bindings/LuaFunctions.h

@@ -2,7 +2,6 @@
 
 #include "Logger.h"
 #include <time.h>
-#include <chrono>
 // tolua_begin
 
 inline unsigned int GetTime()

src/Bindings/LuaState.h

@@ -35,8 +35,6 @@ extern "C"
 	#include "lua/src/lauxlib.h"
 }
 
-#include <atomic>
-#include "../Vector3.h"
 #include "../Defines.h"
 #include "PluginManager.h"
 #include "LuaState_Typedefs.inc"

src/Bindings/LuaWindow.h

@@ -9,7 +9,6 @@
 
 #pragma once
 
-#include <atomic>
 #include "LuaState.h"
 #include "../UI/Window.h"
 #include "../ItemGrid.h"

src/Bindings/ManualBindings.cpp

@@ -5,7 +5,6 @@
 #undef TOLUA_TEMPLATE_BIND
 #include <sstream>
 #include <iomanip>
-#include <array>
 #include "tolua++/include/tolua++.h"
 #include "polarssl/md5.h"
 #include "polarssl/sha1.h"

src/BiomeDef.cpp

@@ -4,7 +4,6 @@
 // Implements biome helper functions
 
 #include "Globals.h"
-#include "BiomeDef.h"
 
 
 

src/BiomeDef.h

@@ -10,7 +10,7 @@
 #pragma once
 
 
-#include "StringUtils.h"
+
 
 
 // tolua_begin

src/BlockArea.h

@@ -15,7 +15,6 @@
 #pragma once
 
 #include "ForEachChunkProvider.h"
-#include "Vector3.h"
 #include "ChunkDataCallback.h"
 #include "Cuboid.h"
 

src/BlockID.cpp

@@ -3,7 +3,6 @@
 // Implements the helper functions for converting Block ID string to int etc.
 
 #include "Globals.h"
-#include "BlockID.h"
 #include "IniFile.h"
 #include "Item.h"
 #include "Mobs/Monster.h"

src/BlockInfo.cpp

@@ -1,7 +1,6 @@
 
 #include "Globals.h"
 
-#include "BlockInfo.h"
 #include "Blocks/BlockHandler.h"
 
 

src/Blocks/BlockDirt.h

@@ -3,7 +3,6 @@
 
 #include "BlockHandler.h"
 #include "../FastRandom.h"
-#include "../BlockInfo.h"
 #include "Root.h"
 #include "Bindings/PluginManager.h"
 

src/Blocks/BlockFence.h

@@ -2,7 +2,6 @@
 #pragma once
 
 #include "BlockHandler.h"
-#include "BlockID.h"
 #include "../BoundingBox.h"
 
 

src/Blocks/BlockPiston.cpp

@@ -7,9 +7,6 @@
 #include "BlockInServerPluginInterface.h"
 #include "ChunkInterface.h"
 
-#include <vector>
-#include <array>
-
 
 
 

src/Blocks/BlockStone.h

@@ -2,7 +2,6 @@
 #pragma once
 
 #include "BlockHandler.h"
-#include "BlockID.h"
 
 
 

src/BoundingBox.h

@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include "Vector3.h"
 #include "Defines.h"
 
 

src/Broadcaster.h

@@ -1,8 +1,6 @@
 
 class cWorld;
 
-#include <array>
-
 class cBroadcaster
 {
 

src/Chunk.h

@@ -2,7 +2,6 @@
 #pragma once
 
 #include "Entities/Entity.h"
-#include "ChunkDef.h"
 #include "ChunkData.h"
 
 #include "Simulator/FireSimulator.h"

src/ChunkData.h

@@ -12,9 +12,6 @@
 
 #include <cstring>
 
-
-#include "ChunkDef.h"
-
 #include "AllocationPool.h"
 
 

src/ChunkDef.h

@@ -9,9 +9,6 @@
 
 #pragma once
 
-#include "Vector3.h"
-#include "BiomeDef.h"
-
 
 
 

src/ChunkSender.h

@@ -26,7 +26,6 @@ Note that it may be called by world's BroadcastToChunk() if the client is still
 #pragma once
 
 #include "OSSupport/IsThread.h"
-#include "ChunkDef.h"
 #include "ChunkDataCallback.h"
 
 #include <unordered_set>

src/ClientHandle.h

@@ -11,8 +11,6 @@
 
 #include "OSSupport/Network.h"
 #include "Defines.h"
-#include "Vector3.h"
-#include "ChunkDef.h"
 #include "ByteBuffer.h"
 #include "Scoreboard.h"
 #include "Map.h"
@@ -23,8 +21,7 @@
 #include "EffectID.h"
 
 
-#include <array>
-#include <atomic>
+
 
 
 // fwd:

src/Cuboid.h

@@ -1,8 +1,6 @@
 
 #pragma once
 
-#include "Vector3.h"
-
 
 
 

src/Defines.h

@@ -1,9 +1,6 @@
 
 #pragma once
 
-#include <limits>
-#include <cmath>
-
 
 
 

src/Entities/Entity.h

@@ -2,7 +2,6 @@
 #pragma once
 
 #include "../Item.h"
-#include "../Vector3.h"
 
 
 

src/Entities/Player.cpp

@@ -1,7 +1,6 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include <cmath>
 #include <unordered_map>
 
 #include "Player.h"
@@ -17,7 +16,6 @@
 #include "../Root.h"
 #include "../Chunk.h"
 #include "../Items/ItemHandler.h"
-#include "../Vector3.h"
 #include "../FastRandom.h"
 #include "../ClientHandle.h"
 

src/FastRandom.cpp

@@ -5,9 +5,6 @@
 #include "Globals.h"
 #include "FastRandom.h"
 
-#include <mutex>
-#include <random>
-
 #if defined (__GNUC__)
 	#define ATTRIBUTE_TLS static __thread
 #elif defined (_MSC_VER)

src/Generating/BioGen.cpp

@@ -5,7 +5,6 @@
 
 #include "Globals.h"
 #include "BioGen.h"
-#include <chrono>
 #include <iostream>
 #include "IntGen.h"
 #include "ProtIntGen.h"

src/Generating/ChunkDesc.h

@@ -10,7 +10,6 @@
 #pragma once
 
 #include "../BlockArea.h"
-#include "../ChunkDef.h"
 #include "../Cuboid.h"
 
 

src/Generating/ChunkGenerator.h

@@ -19,7 +19,6 @@ If the generator queue is overloaded, the generator skips chunks with no clients
 #pragma once
 
 #include "../OSSupport/IsThread.h"
-#include "../ChunkDef.h"
 
 
 

src/Generating/CompoGen.cpp

@@ -9,7 +9,6 @@
 
 #include "Globals.h"
 #include "CompoGen.h"
-#include "../BlockID.h"
 #include "../Item.h"
 #include "../LinearUpscale.h"
 #include "../IniFile.h"

src/Generating/DistortedHeightmap.cpp

@@ -6,7 +6,6 @@
 #include "Globals.h"
 
 #include "DistortedHeightmap.h"
-#include "../OSSupport/File.h"
 #include "../IniFile.h"
 #include "../LinearUpscale.h"
 

src/Generating/FinishGen.cpp

@@ -10,7 +10,6 @@
 #include "Globals.h"
 
 #include "FinishGen.h"
-#include "../BlockID.h"
 #include "../Simulator/FluidSimulator.h"  // for cFluidSimulator::CanWashAway()
 #include "../Simulator/FireSimulator.h"
 #include "../World.h"

src/Generating/IntGen.h

@@ -30,7 +30,6 @@ by using templates.
 #pragma once
 
 #include <tuple>
-#include "../BiomeDef.h"
 #include "../Noise/Noise.h"
 
 

src/Generating/Noise3DGenerator.cpp

@@ -5,7 +5,6 @@
 
 #include "Globals.h"
 #include "Noise3DGenerator.h"
-#include "../OSSupport/File.h"
 #include "../IniFile.h"
 #include "../LinearInterpolation.h"
 #include "../LinearUpscale.h"

src/Generating/StructGen.cpp

@@ -3,7 +3,6 @@
 
 #include "Globals.h"
 #include "StructGen.h"
-#include "../BlockID.h"
 #include "Trees.h"
 #include "../BlockArea.h"
 #include "../LinearUpscale.h"

src/Generating/Trees.cpp

@@ -5,7 +5,6 @@
 
 #include "Globals.h"
 #include "Trees.h"
-#include "../BlockID.h"
 #include "../World.h"
 
 

src/Generating/Trees.h

@@ -17,7 +17,6 @@ logs can overwrite others(leaves), but others shouldn't overwrite logs. This is
 
 #pragma once
 
-#include "../ChunkDef.h"
 #include "../Noise/Noise.h"
 
 class cWorld;

src/Globals.h

@@ -211,7 +211,6 @@ template class SizeChecker<UInt8,  1>;
 	#include <dirent.h>
 	#include <errno.h>
 	#include <iostream>
-	#include <cstdio>
 	#include <cstring>
 	#include <pthread.h>
 	#include <semaphore.h>
@@ -256,6 +255,9 @@ template class SizeChecker<UInt8,  1>;
 #include <random>
 #include <type_traits>
 #include <atomic>
+#include <mutex>
+#include <thread>
+#include <condition_variable>
 
 
 
@@ -479,8 +481,9 @@ using cTickTimeLong = std::chrono::duration<Int64,  cTickTime::period>;
 
 
 // Common headers (part 2, with macros):
-#include "ChunkDef.h"
+#include "Vector3.h"
 #include "BiomeDef.h"
+#include "ChunkDef.h"
 #include "BlockID.h"
 #include "BlockInfo.h"
 

src/Items/ItemLilypad.h

@@ -2,9 +2,7 @@
 
 #include "ItemHandler.h"
 #include "../Entities/Player.h"
-#include "Vector3.h"
 #include "../LineBlockTracer.h"
-#include "BlockInfo.h"
 
 
 

src/LightingThread.h

@@ -32,7 +32,6 @@ Chunks from m_PostponedQueue are moved back into m_Queue when their neighbors ge
 #pragma once
 
 #include "OSSupport/IsThread.h"
-#include "ChunkDef.h"
 #include "ChunkStay.h"
 
 

src/LineBlockTracer.cpp

@@ -5,7 +5,6 @@
 
 #include "Globals.h"
 #include "LineBlockTracer.h"
-#include "Vector3.h"
 #include "World.h"
 #include "Chunk.h"
 #include "BoundingBox.h"

src/LoggerListeners.cpp

@@ -3,13 +3,9 @@
 
 #include "LoggerListeners.h"
 
-#include <chrono>
-
 #if defined(_WIN32)
 	#include <io.h>  // Needed for _isatty(), not available on Linux
 	#include <time.h>
-#elif defined(__linux)
-	#include <unistd.h>  // Needed for isatty() on Linux
 #endif
 
 

src/LoggerListeners.h

@@ -1,6 +1,5 @@
 
 #include "Logger.h"
-#include "OSSupport/File.h"
 
 std::unique_ptr<cLogger::cListener> MakeConsoleListener(bool a_IsService);
 std::pair<bool, std::unique_ptr<cLogger::cListener>> MakeFileListener();

src/Map.h

@@ -13,12 +13,6 @@
 
 
 
-#include "BlockID.h"
-
-
-
-
-
 class cClientHandle;
 class cWorld;
 class cPlayer;

src/MobFamilyCollecter.h

@@ -1,9 +1,6 @@
 
 #pragma once
 
-#include <map>
-#include <set>
-#include "BlockID.h"
 #include "Mobs/Monster.h"  // This is a side-effect of keeping Mobfamily inside Monster class. I'd prefer to keep both (Mobfamily and Monster) inside a "Monster" namespace MG TODO : do it
 
 

src/MobProximityCounter.h

@@ -1,8 +1,6 @@
 
 #pragma once
 
-#include <set>
-
 class cChunk;
 class cEntity;
 

src/MobSpawner.h

@@ -1,9 +1,6 @@
 
 #pragma once
 
-#include <set>
-#include "BlockID.h"
-#include "ChunkDef.h"
 #include "Chunk.h"
 #include "Mobs/Monster.h"  // This is a side-effect of keeping Mobfamily inside Monster class. I'd prefer to keep both (Mobfamily and Monster) inside a "Monster" namespace MG TODO : do it
 

src/Mobs/Bat.cpp

@@ -2,7 +2,6 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Bat.h"
-#include "../Vector3.h"
 #include "../Chunk.h"
 
 

src/Mobs/Guardian.cpp

@@ -2,7 +2,6 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Guardian.h"
-#include "../Vector3.h"
 #include "../Chunk.h"
 
 

src/Mobs/Monster.h

@@ -3,7 +3,6 @@
 
 #include "../Entities/Pawn.h"
 #include "../Defines.h"
-#include "../BlockID.h"
 #include "../Item.h"
 #include "../Enchantments.h"
 #include "MonsterTypes.h"

src/Mobs/Path.cpp

@@ -1,8 +1,6 @@
 
 #include "Globals.h"
 
-#include <cmath>
-
 #include "Path.h"
 #include "../Chunk.h"
 

src/Mobs/Sheep.cpp

@@ -2,7 +2,6 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Sheep.h"
-#include "../BlockID.h"
 #include "../Entities/Player.h"
 #include "../World.h"
 #include "../EffectID.h"

src/Mobs/Squid.cpp

@@ -2,7 +2,6 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Squid.h"
-#include "../Vector3.h"
 #include "../Chunk.h"
 
 

src/NetherPortalScanner.h

@@ -1,7 +1,6 @@
 
 #pragma once
 
-#include "Vector3.h"
 #include "ChunkStay.h"
 
 

src/Noise/Noise.h

@@ -5,8 +5,6 @@
 
 #pragma once
 
-#include <cmath>
-
 /** The datatype used by all the noise generators. */
 typedef float NOISE_DATATYPE;
 

src/OSSupport/CriticalSection.h

@@ -1,7 +1,5 @@
 
 #pragma once
-#include <mutex>
-#include <thread>
 
 
 

src/OSSupport/Event.h

@@ -10,9 +10,6 @@
 
 #pragma once
 
-#include <mutex>
-#include <condition_variable>
-
 
 
 

src/OSSupport/IsThread.h

@@ -16,8 +16,6 @@ In the descending class' constructor call the Start() method to start the thread
 
 
 #pragma once
-#include <thread>
-#include <atomic>
 
 
 

src/OSSupport/NetworkSingleton.h

@@ -13,7 +13,6 @@
 
 #pragma once
 
-#include <atomic>
 #include <event2/event.h>
 #include "Network.h"
 #include "NetworkLookup.h"

src/PolarSSL++/BlockingSslClientSocket.h

@@ -9,7 +9,6 @@
 
 #pragma once
 
-#include <atomic>
 #include "OSSupport/Network.h"
 #include "CallbackSslContext.h"
 

src/Protocol/Protocol.h

@@ -17,7 +17,6 @@
 #include "../ByteBuffer.h"
 #include "../EffectID.h"
 
-#include <array>
 
 
 

src/Root.h

@@ -6,8 +6,6 @@
 #include "HTTP/HTTPServer.h"
 #include "Defines.h"
 #include "RankManager.h"
-#include <thread>
-#include <atomic>
 
 
 

src/Server.cpp

@@ -7,7 +7,6 @@
 #include "Mobs/Monster.h"
 #include "Root.h"
 #include "World.h"
-#include "ChunkDef.h"
 #include "Bindings/PluginManager.h"
 #include "ChatColor.h"
 #include "Entities/Player.h"
@@ -20,7 +19,6 @@
 #include "FastRandom.h"
 
 #include "IniFile.h"
-#include "Vector3.h"
 
 #include <fstream>
 #include <sstream>

src/Simulator/FireSimulator.cpp

@@ -3,7 +3,6 @@
 
 #include "FireSimulator.h"
 #include "../World.h"
-#include "../BlockID.h"
 #include "../Defines.h"
 #include "../Chunk.h"
 #include "Root.h"

src/Simulator/IncrementalRedstoneSimulator/RedstoneHandler.h

@@ -2,7 +2,6 @@
 #pragma once
 
 #include "World.h"
-#include "Vector3.h"
 
 
 

src/Simulator/IncrementalRedstoneSimulator/RedstoneSimulatorChunkData.h

@@ -1,7 +1,6 @@
 
 #pragma once
 
-#include "Vector3.h"
 #include "RedstoneHandler.h"
 #include "../RedstoneSimulator.h"
 #include <unordered_map>

src/Simulator/RedstoneSimulator.h

@@ -1,7 +1,6 @@
 
 #pragma once
 
-#include "ChunkDef.h"
 #include "Simulator/Simulator.h"
 
 

src/Simulator/SandSimulator.cpp

@@ -3,7 +3,6 @@
 
 #include "SandSimulator.h"
 #include "../World.h"
-#include "../BlockID.h"
 #include "../Defines.h"
 #include "../Entities/FallingBlock.h"
 #include "../Chunk.h"

src/Simulator/Simulator.cpp

@@ -2,7 +2,6 @@
 #include "Globals.h"
 
 #include "../World.h"
-#include "../BlockID.h"
 #include "../Defines.h"
 #include "../Chunk.h"
 #include "../Cuboid.h"

src/SpawnPrepare.h

@@ -1,8 +1,6 @@
 
 #pragma once
 
-#include <atomic>
-
 class cWorld;
 
 

src/Stopwatch.h

@@ -10,8 +10,6 @@
 
 #pragma once
 
-#include <chrono>
-
 
 
 

src/StringUtils.h

@@ -8,9 +8,6 @@
 
 #pragma once
 
-#include <string>
-#include <limits>
-
 
 
 typedef std::string AString;

src/Tracer.h

@@ -1,10 +1,6 @@
 
 #pragma once
 
-#include "Vector3.h"
-
-#include <array>
-
 
 
 

src/Vector3.h

@@ -3,11 +3,6 @@
 
 
 
-#include <list>
-#include <vector>
-
-
-
 
 
 template <typename T>

src/World.cpp

@@ -2,7 +2,6 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "World.h"
-#include "ChunkDef.h"
 #include "ClientHandle.h"
 #include "Server.h"
 #include "Root.h"

src/World.h

@@ -1,12 +1,6 @@
 
 #pragma once
 
-#ifndef _WIN32
-	#include "BlockID.h"
-#else
-	enum ENUM_ITEM_ID : short;
-#endif
-
 #define MAX_PLAYERS 65535
 
 #include <functional>
@@ -15,7 +9,6 @@
 #include "ChunkMap.h"
 #include "WorldStorage/WorldStorage.h"
 #include "Generating/ChunkGenerator.h"
-#include "Vector3.h"
 #include "ChunkSender.h"
 #include "Defines.h"
 #include "LightingThread.h"

src/WorldStorage/NBTChunkSerializer.cpp

@@ -5,7 +5,6 @@
 #include "Globals.h"
 #include "NBTChunkSerializer.h"
 #include "EnchantmentSerializer.h"
-#include "../BlockID.h"
 #include "../ItemGrid.h"
 #include "../StringCompression.h"
 #include "FastNBT.h"

src/WorldStorage/WSSAnvil.cpp

@@ -10,7 +10,6 @@
 #include "zlib/zlib.h"
 #include "json/json.h"
 #include "../World.h"
-#include "../BlockID.h"
 #include "../Item.h"
 #include "../ItemGrid.h"
 #include "../StringCompression.h"

src/WorldStorage/WorldStorage.h

@@ -11,10 +11,7 @@
 
 
 #pragma once
-#ifndef WORLDSTORAGE_H_INCLUDED
-#define WORLDSTORAGE_H_INCLUDED
 
-#include "../ChunkDef.h"
 #include "../OSSupport/IsThread.h"
 #include "../OSSupport/Queue.h"
 
@@ -116,9 +113,3 @@ protected:
 
 
 
-
-#endif  // WORLDSTORAGE_H_INCLUDED
-
-
-
-