refactor: Remove superfluous include guards (#1741)

Skyaero42 · web-flow · commit 54b8765e0e78 · 2025-10-25T22:39:52.000+02:00
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/framgrab.h b/Core/Libraries/Source/WWVegas/WW3D2/framgrab.h
@@ -36,25 +36,15 @@
 
 #pragma once
 
-#ifndef ALWAYS_H
 #include "always.h"
-#endif
 
 #if defined (_MSC_VER)
 #pragma warning (push, 3)	// (gth) system headers complain at warning level 4...
 #endif
 
-#ifndef _WINDOWS_
 #include "windows.h"
-#endif
-
-#ifndef _INC_WINDOWSX
 #include "windowsx.h"
-#endif
-
-#ifndef _INC_VFW
 #include "vfw.h"
-#endif
 
 #if defined (_MSC_VER)
 #pragma warning (pop)
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/robjlist.h b/Core/Libraries/Source/WWVegas/WW3D2/robjlist.h
@@ -36,17 +36,9 @@
 
 #pragma once
 
-#ifndef ALWAYS_H
 #include "always.h"
-#endif
-
-#ifndef MULTILIST_H
 #include "multilist.h"
-#endif
-
-#ifndef WWDEBUG_H
 #include "wwdebug.h"
-#endif
 
 class RenderObjClass;
 
diff --git a/Core/Libraries/Source/WWVegas/WWLib/SLNODE.H b/Core/Libraries/Source/WWVegas/WWLib/SLNODE.H
@@ -34,10 +34,7 @@
 
 #pragma once
 
-#ifndef ALWAYS_H
 #include "always.h"
-#endif
-
 #include "mempool.h"
 
 #ifndef NULL
diff --git a/Core/Libraries/Source/WWVegas/WWLib/argv.h b/Core/Libraries/Source/WWVegas/WWLib/argv.h
@@ -37,9 +37,7 @@
 
 #pragma once
 
-#ifndef ALWAYS_H
 #include "always.h"
-#endif
 
 // Used to parse command line that is passed into WinMain.
 // It also has the ability to load a file with values to append to the command line.
diff --git a/Core/Libraries/Source/WWVegas/WWLib/chunkio.h b/Core/Libraries/Source/WWVegas/WWLib/chunkio.h
@@ -37,22 +37,10 @@
 
 #pragma once
 
-#ifndef ALWAYS_H
 #include "always.h"
-#endif
-
-#ifndef BITTYPE_H
 #include "bittype.h"
-#endif
-
-#ifndef WWFILE_H
 #include "WWFILE.H"
-#endif
-
-#ifndef IOSTRUCT_H
 #include "iostruct.h"
-#endif
-
 
 /************************************************************************************
 
diff --git a/Core/Libraries/Source/WWVegas/WWLib/ffactory.h b/Core/Libraries/Source/WWVegas/WWLib/ffactory.h
@@ -36,10 +36,7 @@
 
 #pragma once
 
-#ifndef ALWAYS_H
 #include "always.h"
-#endif
-
 #include "mutex.h"
 #include "Vector.H"
 #include "wwstring.h"
diff --git a/Core/Libraries/Source/WWVegas/WWLib/iostruct.h b/Core/Libraries/Source/WWVegas/WWLib/iostruct.h
@@ -36,9 +36,7 @@
 
 #pragma once
 
-#ifndef BITTYPE_H
 #include "bittype.h"
-#endif
 
 /*
 ** Some useful structures for writing/writing (safe from changes).
diff --git a/Core/Libraries/Source/WWVegas/WWLib/ref_ptr.h b/Core/Libraries/Source/WWVegas/WWLib/ref_ptr.h
@@ -36,10 +36,7 @@
 
 #pragma once
 
-#ifndef ALWAYS_H
 #include "always.h"
-#endif
-
 #include "wwdebug.h"
 
 /*
diff --git a/Core/Libraries/Source/WWVegas/WWLib/refcount.h b/Core/Libraries/Source/WWVegas/WWLib/refcount.h
@@ -36,14 +36,8 @@
 
 #pragma once
 
-#ifndef ALWAYS_H
 #include "always.h"
-#endif
-
-#ifndef LISTNODE_H
 #include "LISTNODE.H"
-#endif
-
 #include "wwdebug.h"
 
 class RefCountClass;
diff --git a/Core/Libraries/Source/WWVegas/WWLib/registry.h b/Core/Libraries/Source/WWVegas/WWLib/registry.h
@@ -35,10 +35,7 @@
 
 #pragma once
 
-#ifndef ALWAYS_H
 #include "always.h"
-#endif
-
 #include "Vector.H"
 #include "wwstring.h"
 #include "widestring.h"
diff --git a/Core/Libraries/Source/WWVegas/WWLib/uarray.h b/Core/Libraries/Source/WWVegas/WWLib/uarray.h
@@ -39,14 +39,8 @@
 
 #pragma once
 
-#ifndef HASHCALC_H
 #include "hashcalc.h"
-#endif
-
-#ifndef VECTOR_H
 #include "Vector.H"
-#endif
-
 
 /*
 ** UniqueArrayClass
diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmath.h b/Core/Libraries/Source/WWVegas/WWMath/colmath.h
@@ -36,17 +36,9 @@
 
 #pragma once
 
-#ifndef ALWAYS_H
 #include "always.h"
-#endif
-
-#ifndef VECTOR3_H
 #include "vector3.h"
-#endif
-
-#ifndef CASTRES_H
 #include "castres.h"
-#endif
 
 class AAPlaneClass;
 class PlaneClass;
diff --git a/Core/Libraries/Source/WWVegas/WWMath/curve.h b/Core/Libraries/Source/WWVegas/WWMath/curve.h
@@ -36,21 +36,10 @@
 
 #pragma once
 
-#ifndef ALWAYS_H
 #include "always.h"
-#endif
-
-#ifndef VECTOR_H
 #include "Vector.H"
-#endif
-
-#ifndef VECTOR3_H
 #include "vector3.h"
-#endif
-
-#ifndef PERSIST_H
 #include "persist.h"
-#endif
 
 class ChunkLoadClass;
 class ChunkSaveClass;
diff --git a/Generals/Code/GameEngine/Include/Common/List.h b/Generals/Code/GameEngine/Include/Common/List.h
@@ -47,9 +47,7 @@
 //           Includes
 //----------------------------------------------------------------------------
 
-#ifndef _BASE_TYPE_H_
 #include <Lib/BaseType.h>
-#endif
 
 //----------------------------------------------------------------------------
 //           Forward References
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h
@@ -36,30 +36,12 @@
 
 #pragma once
 
-#ifndef ANIMOBJ_H
 #include "animobj.h"
-#endif
-
-#ifndef VECTOR_H
 #include "Vector.H"
-#endif
-
-#ifndef SNAPPTS_H
 #include "snapPts.h"
-#endif
-
-#ifndef PROTO_H
 #include "proto.h"
-#endif
-
-#ifndef W3DERR_H
 #include "w3derr.h"
-#endif
-
-#ifndef __PROXY_H
 #include "proxy.h"
-#endif
-
 
 class DistLODClass;
 class HModelClass;
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/matpass.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/matpass.h
@@ -38,17 +38,9 @@
 
 #pragma once
 
-#ifndef REFCOUNT_H
 #include "refcount.h"
-#endif
-
-#ifndef SHADER_H
 #include "shader.h"
-#endif
-
-#ifndef WWDEBUG_H
 #include "wwdebug.h"
-#endif
 
 
 class TextureClass;
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h
@@ -36,10 +36,7 @@
 
 #pragma once
 
-#ifndef RENDOBJ_H
 #include "rendobj.h"
-#endif
-
 #include "proto.h"
 
 class Null3DObjClass : public RenderObjClass
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp
@@ -117,11 +117,7 @@
 #include "formconv.h"
 #include "animatedsoundmgr.h"
 #include "static_sort_list.h"
-
-
-#ifndef _UNIX
 #include "framgrab.h"
-#endif
 
 
 const char* DAZZLE_INI_FILENAME="DAZZLE.INI";
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/List.h b/GeneralsMD/Code/GameEngine/Include/Common/List.h
@@ -47,9 +47,7 @@
 //           Includes
 //----------------------------------------------------------------------------
 
-#ifndef _BASE_TYPE_H_
 #include <Lib/BaseType.h>
-#endif
 
 //----------------------------------------------------------------------------
 //           Forward References
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h
@@ -36,29 +36,12 @@
 
 #pragma once
 
-#ifndef ANIMOBJ_H
 #include "animobj.h"
-#endif
-
-#ifndef VECTOR_H
 #include "Vector.H"
-#endif
-
-#ifndef SNAPPTS_H
 #include "snapPts.h"
-#endif
-
-#ifndef PROTO_H
 #include "proto.h"
-#endif
-
-#ifndef W3DERR_H
 #include "w3derr.h"
-#endif
-
-#ifndef __PROXY_H
 #include "proxy.h"
-#endif
 
 
 class DistLODClass;
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matpass.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matpass.h
@@ -39,18 +39,9 @@
 
 #pragma once
 
-#ifndef REFCOUNT_H
 #include "refcount.h"
-#endif
-
-#ifndef SHADER_H
 #include "shader.h"
-#endif
-
-#ifndef WWDEBUG_H
 #include "wwdebug.h"
-#endif
-
 
 class TextureClass;
 class VertexMaterialClass;
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h
@@ -36,10 +36,7 @@
 
 #pragma once
 
-#ifndef RENDOBJ_H
 #include "rendobj.h"
-#endif
-
 #include "proto.h"
 
 class Null3DObjClass : public RenderObjClass
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp
@@ -117,12 +117,8 @@
 #include "formconv.h"
 #include "animatedsoundmgr.h"
 #include "static_sort_list.h"
-
 #include "shdlib.h"
-
-#ifndef _UNIX
 #include "framgrab.h"
-#endif
 
 
 const char* DAZZLE_INI_FILENAME="DAZZLE.INI";
