From 1e589bfe94b51df5ec432a83767eb70a8af1892c Mon Sep 17 00:00:00 2001 From: xezon <4720891+xezon@users.noreply.github.com> Date: Tue, 21 Oct 2025 19:20:23 +0200 Subject: [PATCH 1/3] Simplify stdio_adapter.h includes --- Core/Libraries/Source/WWVegas/WW3D2/statistics.cpp | 1 - Core/Libraries/Source/WWVegas/WWLib/WWCommon.h | 1 + Core/Libraries/Source/WWVegas/WWLib/ini.cpp | 1 - Core/Libraries/Source/WWVegas/WWLib/widestring.cpp | 1 - Core/Libraries/Source/WWVegas/WWLib/wwstring.cpp | 1 - Core/Libraries/Source/debug/debug_debug.cpp | 1 - Core/Libraries/Source/profile/profile_highlevel.cpp | 1 - GeneralsMD/Code/GameEngine/Include/Precompiled/PreRTS.h | 1 - GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp | 1 - GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/textureloader.cpp | 1 - GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp | 1 - GeneralsMD/Code/Tools/WorldBuilder/src/DrawObject.cpp | 1 - 12 files changed, 1 insertion(+), 11 deletions(-) diff --git a/Core/Libraries/Source/WWVegas/WW3D2/statistics.cpp b/Core/Libraries/Source/WWVegas/WW3D2/statistics.cpp index ba506020c8..09b0ce0fe0 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/statistics.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/statistics.cpp @@ -24,7 +24,6 @@ #include "dx8caps.h" #include "textureloader.h" #include "texture.h" -#include #include #ifdef _UNIX diff --git a/Core/Libraries/Source/WWVegas/WWLib/WWCommon.h b/Core/Libraries/Source/WWVegas/WWLib/WWCommon.h index 1f59b88449..253c500bb8 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/WWCommon.h +++ b/Core/Libraries/Source/WWVegas/WWLib/WWCommon.h @@ -20,6 +20,7 @@ #include "STLUtils.h" #include "stringex.h" +#include // This macro serves as a general way to determine the number of elements within an array. diff --git a/Core/Libraries/Source/WWVegas/WWLib/ini.cpp b/Core/Libraries/Source/WWVegas/WWLib/ini.cpp index 1cc1a5a279..98f35f74d0 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/ini.cpp +++ b/Core/Libraries/Source/WWVegas/WWLib/ini.cpp @@ -94,7 +94,6 @@ #include "win.h" #include "XPIPE.H" #include "XSTRAW.H" -#include #include #ifdef _UNIX #include diff --git a/Core/Libraries/Source/WWVegas/WWLib/widestring.cpp b/Core/Libraries/Source/WWVegas/WWLib/widestring.cpp index 69b1724e45..41cbb495ea 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/widestring.cpp +++ b/Core/Libraries/Source/WWVegas/WWLib/widestring.cpp @@ -38,7 +38,6 @@ #include "widestring.h" #include "win.h" -#include /////////////////////////////////////////////////////////////////// diff --git a/Core/Libraries/Source/WWVegas/WWLib/wwstring.cpp b/Core/Libraries/Source/WWVegas/WWLib/wwstring.cpp index 54143fd640..f4da1100c4 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/wwstring.cpp +++ b/Core/Libraries/Source/WWVegas/WWLib/wwstring.cpp @@ -37,7 +37,6 @@ #include "wwstring.h" #include "wwmemlog.h" #include "mutex.h" -#include /////////////////////////////////////////////////////////////////// diff --git a/Core/Libraries/Source/debug/debug_debug.cpp b/Core/Libraries/Source/debug/debug_debug.cpp index 314b911e63..0e237526ca 100644 --- a/Core/Libraries/Source/debug/debug_debug.cpp +++ b/Core/Libraries/Source/debug/debug_debug.cpp @@ -29,7 +29,6 @@ #include "_pch.h" #include #include -#include #include #include #include // needed for placement new prototype diff --git a/Core/Libraries/Source/profile/profile_highlevel.cpp b/Core/Libraries/Source/profile/profile_highlevel.cpp index 566cb8cbcf..16f73c6db3 100644 --- a/Core/Libraries/Source/profile/profile_highlevel.cpp +++ b/Core/Libraries/Source/profile/profile_highlevel.cpp @@ -30,7 +30,6 @@ #include "stringex.h" #include #include -#include // our own fast critical section static ProfileFastCS cs; diff --git a/GeneralsMD/Code/GameEngine/Include/Precompiled/PreRTS.h b/GeneralsMD/Code/GameEngine/Include/Precompiled/PreRTS.h index 2d9fd88a3a..abd6b7da80 100644 --- a/GeneralsMD/Code/GameEngine/Include/Precompiled/PreRTS.h +++ b/GeneralsMD/Code/GameEngine/Include/Precompiled/PreRTS.h @@ -68,7 +68,6 @@ class STLSpecialAlloc; #include #include #include -#include #include #include #include diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp index 0a1d64b2bd..93fefbe801 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp @@ -65,7 +65,6 @@ #include "scene.h" #include "wwprofile.h" #include "visrasterizer.h" -#include #include #include diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/textureloader.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/textureloader.cpp index 7d1795a9eb..a9b9cd644f 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/textureloader.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/textureloader.cpp @@ -53,7 +53,6 @@ #include "missingtexture.h" #include "TARGA.H" #include -#include #include "wwmemlog.h" #include "texture.h" #include "formconv.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp index c27bd87134..b4b65ef5de 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp @@ -108,7 +108,6 @@ #include "bound.h" #include "rddesc.h" #include "Vector3i.h" -#include #include "dx8wrapper.h" #include "TARGA.H" #include "sortingrenderer.h" diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/DrawObject.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/DrawObject.cpp index c37deea52a..2dec9af2f1 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/DrawObject.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/DrawObject.cpp @@ -20,7 +20,6 @@ #include "DrawObject.h" -#include #include #include #include From a4aa40a7f88f654ae8bd7250317ef665b874c09e Mon Sep 17 00:00:00 2001 From: xezon <4720891+xezon@users.noreply.github.com> Date: Tue, 21 Oct 2025 20:00:08 +0200 Subject: [PATCH 2/3] Remove many obsolete stdio.h includes --- Core/GameEngine/Include/Common/AsciiString.h | 1 - Core/GameEngine/Include/Common/GameMemory.h | 2 +- Core/GameEngine/Include/Common/UnicodeString.h | 1 - Core/GameEngine/Include/Common/XferLoad.h | 1 - Core/GameEngine/Source/Common/System/File.cpp | 1 - Core/GameEngine/Source/Common/System/RAMFile.cpp | 1 - Core/GameEngine/Source/Common/System/StreamingArchiveFile.cpp | 1 - Core/Libraries/Source/Compression/LZHCompress/NoxCompress.cpp | 1 - Core/Libraries/Source/WWVegas/WW3D2/FramGrab.cpp | 1 - Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.cpp | 1 - Core/Libraries/Source/WWVegas/WW3D2/metalmap.cpp | 1 - Core/Libraries/Source/WWVegas/WWDebug/wwdebug.cpp | 2 +- Core/Libraries/Source/WWVegas/WWDebug/wwprofile.cpp | 1 - Core/Libraries/Source/WWVegas/WWDownload/Download.cpp | 1 - Core/Libraries/Source/WWVegas/WWDownload/FTP.CPP | 1 - Core/Libraries/Source/WWVegas/WWDownload/ftp.h | 2 +- Core/Libraries/Source/WWVegas/WWLib/Except.cpp | 1 - Core/Libraries/Source/WWVegas/WWLib/RAWFILE.H | 1 - Core/Libraries/Source/WWVegas/WWLib/TARGA.CPP | 2 +- Core/Libraries/Source/WWVegas/WWLib/argv.cpp | 1 - Core/Libraries/Source/WWVegas/WWLib/ffactory.cpp | 1 - Core/Libraries/Source/WWVegas/WWLib/rawfile.cpp | 1 - Core/Libraries/Source/WWVegas/WWLib/strtok_r.cpp | 1 - Core/Libraries/Source/WWVegas/WWMath/matrix3d.cpp | 1 - Core/Libraries/Source/WWVegas/WWMath/quat.cpp | 1 - Core/Libraries/Source/WWVegas/WWStub/wwdebugstub.cpp | 2 +- Core/Libraries/Source/debug/debug_except.cpp | 2 -- Core/Libraries/Source/profile/profile_result.cpp | 2 +- Core/Tools/ImagePacker/Source/ImagePacker.cpp | 1 - Core/Tools/ImagePacker/Source/TexturePage.cpp | 2 +- .../ImagePacker/Source/WindowProcedures/DirectorySelect.cpp | 1 - .../ImagePacker/Source/WindowProcedures/ImageErrorProc.cpp | 2 +- .../Tools/ImagePacker/Source/WindowProcedures/PageErrorProc.cpp | 2 +- Core/Tools/ImagePacker/Source/WindowProcedures/PreviewProc.cpp | 2 +- GeneralsMD/Code/GameEngine/Include/GameClient/DebugDisplay.h | 2 +- GeneralsMD/Code/GameEngine/Include/GameClient/Display.h | 1 - GeneralsMD/Code/GameEngine/Include/GameClient/ParticleSys.h | 1 - GeneralsMD/Code/GameEngine/Source/Common/System/Trig.cpp | 1 - GeneralsMD/Code/GameEngine/Source/Common/System/encrypt.cpp | 1 - .../GameClient/GUI/ControlBar/ControlBarPrintPositions.cpp | 1 - .../GameEngineDevice/Include/W3DDevice/GameClient/TileData.h | 2 -- .../Source/W3DDevice/GameClient/BaseHeightMap.cpp | 1 - .../Source/W3DDevice/GameClient/FlatHeightMap.cpp | 1 - .../Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMOTD.cpp | 1 - .../GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp | 1 - .../Source/W3DDevice/GameClient/W3DAssetManager.cpp | 1 - .../Source/W3DDevice/GameClient/W3DBibBuffer.cpp | 1 - .../Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp | 1 - .../Source/W3DDevice/GameClient/W3DCustomEdging.cpp | 1 - .../Source/W3DDevice/GameClient/W3DPropBuffer.cpp | 1 - .../Source/W3DDevice/GameClient/W3DRoadBuffer.cpp | 1 - .../Source/W3DDevice/GameClient/W3DStatusCircle.cpp | 1 - .../Source/W3DDevice/GameClient/W3DTerrainBackground.cpp | 1 - .../Source/W3DDevice/GameClient/W3DTerrainVisual.cpp | 1 - .../Source/W3DDevice/GameClient/W3DTreeBuffer.cpp | 1 - .../Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp | 1 - .../Source/W3DDevice/GameClient/Water/W3DWater.cpp | 1 - .../Source/W3DDevice/GameClient/camerashakesystem.cpp | 1 - GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp | 1 - GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp | 1 - GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp | 1 - GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp | 2 -- GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.cpp | 1 - GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texture.cpp | 1 - GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp | 1 - GeneralsMD/Code/Tools/GUIEdit/Include/GUIEdit.h | 1 - .../GUIEdit/Source/Dialog Procedures/GenericProperties.cpp | 1 - .../GUIEdit/Source/Dialog Procedures/RadioButtonProperties.cpp | 1 - .../GUIEdit/Source/Dialog Procedures/TabControlProperties.cpp | 1 - GeneralsMD/Code/Tools/GUIEdit/Source/EditWindow.cpp | 1 - GeneralsMD/Code/Tools/GUIEdit/Source/GUIEditWindowManager.cpp | 1 - GeneralsMD/Code/Tools/GUIEdit/Source/LayoutScheme.cpp | 1 - GeneralsMD/Code/Tools/GUIEdit/Source/Properties.cpp | 1 - GeneralsMD/Code/Tools/GUIEdit/Source/Save.cpp | 1 - GeneralsMD/Code/Tools/wdump/rawfilem.cpp | 1 - 75 files changed, 11 insertions(+), 78 deletions(-) diff --git a/Core/GameEngine/Include/Common/AsciiString.h b/Core/GameEngine/Include/Common/AsciiString.h index e978575720..13c6a1259a 100644 --- a/Core/GameEngine/Include/Common/AsciiString.h +++ b/Core/GameEngine/Include/Common/AsciiString.h @@ -46,7 +46,6 @@ #pragma once #include -#include #include #include "Lib/BaseType.h" #include "Common/Debug.h" diff --git a/Core/GameEngine/Include/Common/GameMemory.h b/Core/GameEngine/Include/Common/GameMemory.h index b2a3015165..8d173afec4 100644 --- a/Core/GameEngine/Include/Common/GameMemory.h +++ b/Core/GameEngine/Include/Common/GameMemory.h @@ -62,7 +62,7 @@ // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include -#include +#include #ifdef MEMORYPOOL_OVERRIDE_MALLOC #include #endif diff --git a/Core/GameEngine/Include/Common/UnicodeString.h b/Core/GameEngine/Include/Common/UnicodeString.h index 52866c8f1f..0a6111cb6b 100644 --- a/Core/GameEngine/Include/Common/UnicodeString.h +++ b/Core/GameEngine/Include/Common/UnicodeString.h @@ -46,7 +46,6 @@ #pragma once #include -#include #include #include "Lib/BaseType.h" #include "Common/Debug.h" diff --git a/Core/GameEngine/Include/Common/XferLoad.h b/Core/GameEngine/Include/Common/XferLoad.h index 0da4ed1424..4df7a5428d 100644 --- a/Core/GameEngine/Include/Common/XferLoad.h +++ b/Core/GameEngine/Include/Common/XferLoad.h @@ -30,7 +30,6 @@ #pragma once // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// -#include #include "Common/Xfer.h" // FOWARD REFERNCES /////////////////////////////////////////////////////////////////////////////// diff --git a/Core/GameEngine/Source/Common/System/File.cpp b/Core/GameEngine/Source/Common/System/File.cpp index 3efb660b6c..9fcbc09b42 100644 --- a/Core/GameEngine/Source/Common/System/File.cpp +++ b/Core/GameEngine/Source/Common/System/File.cpp @@ -50,7 +50,6 @@ #include #include #include -#include #include "Common/file.h" diff --git a/Core/GameEngine/Source/Common/System/RAMFile.cpp b/Core/GameEngine/Source/Common/System/RAMFile.cpp index 1ffb8fea55..5d8db754a0 100644 --- a/Core/GameEngine/Source/Common/System/RAMFile.cpp +++ b/Core/GameEngine/Source/Common/System/RAMFile.cpp @@ -47,7 +47,6 @@ #include "PreRTS.h" -#include #include #include #include diff --git a/Core/GameEngine/Source/Common/System/StreamingArchiveFile.cpp b/Core/GameEngine/Source/Common/System/StreamingArchiveFile.cpp index cfc3faa87c..151ae00425 100644 --- a/Core/GameEngine/Source/Common/System/StreamingArchiveFile.cpp +++ b/Core/GameEngine/Source/Common/System/StreamingArchiveFile.cpp @@ -47,7 +47,6 @@ #include "PreRTS.h" -#include #include #include #include diff --git a/Core/Libraries/Source/Compression/LZHCompress/NoxCompress.cpp b/Core/Libraries/Source/Compression/LZHCompress/NoxCompress.cpp index 6eb2271ae9..224084152a 100644 --- a/Core/Libraries/Source/Compression/LZHCompress/NoxCompress.cpp +++ b/Core/Libraries/Source/Compression/LZHCompress/NoxCompress.cpp @@ -20,7 +20,6 @@ // Compress interface for packets and files // Author: Jeff Brown, January 1999 -#include #include #include "Lib/BaseTypeCore.h" #include "NoxCompress.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/FramGrab.cpp b/Core/Libraries/Source/WWVegas/WW3D2/FramGrab.cpp index 612d9fb5be..0fb36d93ac 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/FramGrab.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/FramGrab.cpp @@ -21,7 +21,6 @@ ////////////////////////////////////////////////////////////////////// #include "framgrab.h" -#include #include //#include diff --git a/Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.cpp b/Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.cpp index 5a046060e5..3241dbd8a4 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.cpp @@ -43,7 +43,6 @@ #include "inisup.h" #include "ffactory.h" #include "WWFILE.H" -#include #include "definition.h" #include "definitionmgr.h" #include "definitionclassids.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/metalmap.cpp b/Core/Libraries/Source/WWVegas/WW3D2/metalmap.cpp index 458ad970d1..2995df1d7c 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/metalmap.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/metalmap.cpp @@ -53,7 +53,6 @@ #include #include #include -#include #include #include #include diff --git a/Core/Libraries/Source/WWVegas/WWDebug/wwdebug.cpp b/Core/Libraries/Source/WWVegas/WWDebug/wwdebug.cpp index 8991b8fc75..01f454b85f 100644 --- a/Core/Libraries/Source/WWVegas/WWDebug/wwdebug.cpp +++ b/Core/Libraries/Source/WWVegas/WWDebug/wwdebug.cpp @@ -46,7 +46,7 @@ //#include "win.h" can use this if allowed to see wwlib #include #include -#include +#include #include #include #include diff --git a/Core/Libraries/Source/WWVegas/WWDebug/wwprofile.cpp b/Core/Libraries/Source/WWVegas/WWDebug/wwprofile.cpp index bb0f93fab2..9d25511a0e 100644 --- a/Core/Libraries/Source/WWVegas/WWDebug/wwprofile.cpp +++ b/Core/Libraries/Source/WWVegas/WWDebug/wwprofile.cpp @@ -60,7 +60,6 @@ #include "simplevec.h" #include "cpudetect.h" #include "hashtemplate.h" -#include #include static SimpleDynVecClass ProfileCollectVector; diff --git a/Core/Libraries/Source/WWVegas/WWDownload/Download.cpp b/Core/Libraries/Source/WWVegas/WWDownload/Download.cpp index 803bbdc84a..30cf21c44f 100644 --- a/Core/Libraries/Source/WWVegas/WWDownload/Download.cpp +++ b/Core/Libraries/Source/WWVegas/WWDownload/Download.cpp @@ -24,7 +24,6 @@ #include #include #include -#include #include ///////////////////////////////////////////////////////////////////////////// diff --git a/Core/Libraries/Source/WWVegas/WWDownload/FTP.CPP b/Core/Libraries/Source/WWVegas/WWDownload/FTP.CPP index 36296fa335..c65b4cbea9 100644 --- a/Core/Libraries/Source/WWVegas/WWDownload/FTP.CPP +++ b/Core/Libraries/Source/WWVegas/WWDownload/FTP.CPP @@ -23,7 +23,6 @@ /*************************************************************************/ -#include #include #include #include diff --git a/Core/Libraries/Source/WWVegas/WWDownload/ftp.h b/Core/Libraries/Source/WWVegas/WWDownload/ftp.h index 31c767482b..08c5918ab4 100644 --- a/Core/Libraries/Source/WWVegas/WWDownload/ftp.h +++ b/Core/Libraries/Source/WWVegas/WWDownload/ftp.h @@ -23,7 +23,7 @@ //#include "../resource.h" // main symbols #include "winsock.h" -#include "stdio.h" +#include #include "WWDownload/ftpdefs.h" diff --git a/Core/Libraries/Source/WWVegas/WWLib/Except.cpp b/Core/Libraries/Source/WWVegas/WWLib/Except.cpp index 6de15adbb5..dc732ad877 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/Except.cpp +++ b/Core/Libraries/Source/WWVegas/WWLib/Except.cpp @@ -64,7 +64,6 @@ #include #include #include -#include #ifdef WWDEBUG #define DebugString WWDebug_Printf diff --git a/Core/Libraries/Source/WWVegas/WWLib/RAWFILE.H b/Core/Libraries/Source/WWVegas/WWLib/RAWFILE.H index b3ee84191a..99f186088e 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/RAWFILE.H +++ b/Core/Libraries/Source/WWVegas/WWLib/RAWFILE.H @@ -44,7 +44,6 @@ // #include "win.h" -#include #define NULL_HANDLE NULL #define HANDLE_TYPE FILE* #include "WWFILE.H" diff --git a/Core/Libraries/Source/WWVegas/WWLib/TARGA.CPP b/Core/Libraries/Source/WWVegas/WWLib/TARGA.CPP index d05c50ea87..41c3e9f3f4 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/TARGA.CPP +++ b/Core/Libraries/Source/WWVegas/WWLib/TARGA.CPP @@ -62,7 +62,7 @@ #include "TARGA.H" #ifndef TGA_USES_WWLIB_FILE_CLASSES -#include +#include "WWDebug/wwdebug.h" #endif #include #include diff --git a/Core/Libraries/Source/WWVegas/WWLib/argv.cpp b/Core/Libraries/Source/WWVegas/WWLib/argv.cpp index 1b5ae3c669..f332183732 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/argv.cpp +++ b/Core/Libraries/Source/WWVegas/WWLib/argv.cpp @@ -43,7 +43,6 @@ #include #include -#include #include #include #include "ffactory.h" diff --git a/Core/Libraries/Source/WWVegas/WWLib/ffactory.cpp b/Core/Libraries/Source/WWVegas/WWLib/ffactory.cpp index 186d286927..3a104c2ebf 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/ffactory.cpp +++ b/Core/Libraries/Source/WWVegas/WWLib/ffactory.cpp @@ -37,7 +37,6 @@ #include "RAWFILE.H" #include "bufffile.h" #include "realcrc.h" -#include #include #include #include diff --git a/Core/Libraries/Source/WWVegas/WWLib/rawfile.cpp b/Core/Libraries/Source/WWVegas/WWLib/rawfile.cpp index 15412e42ba..b2db3abd3b 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/rawfile.cpp +++ b/Core/Libraries/Source/WWVegas/WWLib/rawfile.cpp @@ -55,7 +55,6 @@ #include "always.h" #include "RAWFILE.H" #include -#include #include #include #include diff --git a/Core/Libraries/Source/WWVegas/WWLib/strtok_r.cpp b/Core/Libraries/Source/WWVegas/WWLib/strtok_r.cpp index db0ba5b4a2..136a8d722f 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/strtok_r.cpp +++ b/Core/Libraries/Source/WWVegas/WWLib/strtok_r.cpp @@ -37,7 +37,6 @@ #include "strtok_r.h" #include -#include // // Replacement for strtok() that doesn't use a static to diff --git a/Core/Libraries/Source/WWVegas/WWMath/matrix3d.cpp b/Core/Libraries/Source/WWVegas/WWMath/matrix3d.cpp index a7f2a105ac..c97e2516a5 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/matrix3d.cpp +++ b/Core/Libraries/Source/WWVegas/WWMath/matrix3d.cpp @@ -60,7 +60,6 @@ #include #include #include -//#include #include "vector3.h" #include "matrix3.h" #include "matrix4.h" diff --git a/Core/Libraries/Source/WWVegas/WWMath/quat.cpp b/Core/Libraries/Source/WWVegas/WWMath/quat.cpp index ae9386120c..261e73b79b 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/quat.cpp +++ b/Core/Libraries/Source/WWVegas/WWMath/quat.cpp @@ -54,7 +54,6 @@ #include "matrix4.h" #include "wwmath.h" -#include #include #include #include diff --git a/Core/Libraries/Source/WWVegas/WWStub/wwdebugstub.cpp b/Core/Libraries/Source/WWVegas/WWStub/wwdebugstub.cpp index 48bd79cd78..3103aff21c 100644 --- a/Core/Libraries/Source/WWVegas/WWStub/wwdebugstub.cpp +++ b/Core/Libraries/Source/WWVegas/WWStub/wwdebugstub.cpp @@ -20,7 +20,7 @@ #include "wwdebug.h" #include #include -#include +#include char* TheCurrentIgnoreCrashPtr = NULL; diff --git a/Core/Libraries/Source/debug/debug_except.cpp b/Core/Libraries/Source/debug/debug_except.cpp index 27b17abc40..1501472b52 100644 --- a/Core/Libraries/Source/debug/debug_except.cpp +++ b/Core/Libraries/Source/debug/debug_except.cpp @@ -342,8 +342,6 @@ static BOOL CALLBACK ExceptionDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA return TRUE; } -#include - LONG __stdcall DebugExceptionhandler::ExceptionFilter(struct _EXCEPTION_POINTERS* pExPtrs) { // we should not be calling ourselves! diff --git a/Core/Libraries/Source/profile/profile_result.cpp b/Core/Libraries/Source/profile/profile_result.cpp index c0eff27de1..e8b35b37f0 100644 --- a/Core/Libraries/Source/profile/profile_result.cpp +++ b/Core/Libraries/Source/profile/profile_result.cpp @@ -28,8 +28,8 @@ ////////////////////////////////////////////////////////////////////////////// #include "_pch.h" #include -#include #include +#include ////////////////////////////////////////////////////////////////////////////// // ProfileResultFileCSV diff --git a/Core/Tools/ImagePacker/Source/ImagePacker.cpp b/Core/Tools/ImagePacker/Source/ImagePacker.cpp index 42c815a4ff..ba0857d5ef 100644 --- a/Core/Tools/ImagePacker/Source/ImagePacker.cpp +++ b/Core/Tools/ImagePacker/Source/ImagePacker.cpp @@ -41,7 +41,6 @@ /////////////////////////////////////////////////////////////////////////////// // SYSTEM INCLUDES //////////////////////////////////////////////////////////// -#include #include #include #include diff --git a/Core/Tools/ImagePacker/Source/TexturePage.cpp b/Core/Tools/ImagePacker/Source/TexturePage.cpp index 71d8775cb1..e463a558f4 100644 --- a/Core/Tools/ImagePacker/Source/TexturePage.cpp +++ b/Core/Tools/ImagePacker/Source/TexturePage.cpp @@ -40,7 +40,7 @@ // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include -#include +#include // USER INCLUDES ////////////////////////////////////////////////////////////// #include "Common/Debug.h" diff --git a/Core/Tools/ImagePacker/Source/WindowProcedures/DirectorySelect.cpp b/Core/Tools/ImagePacker/Source/WindowProcedures/DirectorySelect.cpp index c76e57d98c..190f3fd8a3 100644 --- a/Core/Tools/ImagePacker/Source/WindowProcedures/DirectorySelect.cpp +++ b/Core/Tools/ImagePacker/Source/WindowProcedures/DirectorySelect.cpp @@ -39,7 +39,6 @@ // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include -#include #include // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Core/Tools/ImagePacker/Source/WindowProcedures/ImageErrorProc.cpp b/Core/Tools/ImagePacker/Source/WindowProcedures/ImageErrorProc.cpp index 20b29b3f7c..93b08ff214 100644 --- a/Core/Tools/ImagePacker/Source/WindowProcedures/ImageErrorProc.cpp +++ b/Core/Tools/ImagePacker/Source/WindowProcedures/ImageErrorProc.cpp @@ -41,7 +41,7 @@ // SYSTEM INCLUDES //////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// #include -#include +#include // USER INCLUDES ////////////////////////////////////////////////////////////// #include "ImagePacker.h" diff --git a/Core/Tools/ImagePacker/Source/WindowProcedures/PageErrorProc.cpp b/Core/Tools/ImagePacker/Source/WindowProcedures/PageErrorProc.cpp index bb937c3140..e96cd278ec 100644 --- a/Core/Tools/ImagePacker/Source/WindowProcedures/PageErrorProc.cpp +++ b/Core/Tools/ImagePacker/Source/WindowProcedures/PageErrorProc.cpp @@ -41,7 +41,7 @@ // SYSTEM INCLUDES //////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// #include -#include +#include // USER INCLUDES ////////////////////////////////////////////////////////////// #include "ImagePacker.h" diff --git a/Core/Tools/ImagePacker/Source/WindowProcedures/PreviewProc.cpp b/Core/Tools/ImagePacker/Source/WindowProcedures/PreviewProc.cpp index dceb76b635..24729b0f5e 100644 --- a/Core/Tools/ImagePacker/Source/WindowProcedures/PreviewProc.cpp +++ b/Core/Tools/ImagePacker/Source/WindowProcedures/PreviewProc.cpp @@ -39,7 +39,7 @@ // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include -#include +#include // USER INCLUDES ////////////////////////////////////////////////////////////// #include "ImagePacker.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/DebugDisplay.h b/GeneralsMD/Code/GameEngine/Include/GameClient/DebugDisplay.h index c6e3c8aa0c..98dccebbf2 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/DebugDisplay.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/DebugDisplay.h @@ -48,7 +48,7 @@ //---------------------------------------------------------------------------- #include "Lib/BaseType.h" -#include +#include //---------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h index aba8118685..3f3a783946 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h @@ -28,7 +28,6 @@ #pragma once -#include #include "Common/SubsystemInterface.h" #include "View.h" #include "GameClient/Color.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ParticleSys.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ParticleSys.h index beeb444c17..c1c14cdc73 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ParticleSys.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ParticleSys.h @@ -29,7 +29,6 @@ #pragma once -#include #include "Common/AsciiString.h" #include "Common/GameMemory.h" #include "Common/GameType.h" diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/Trig.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/Trig.cpp index e0718c419b..a742f4f735 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/Trig.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/Trig.cpp @@ -72,7 +72,6 @@ Real ASin(Real x) } #ifdef REGENERATE_TRIG_TABLES -#include void initTrig( void ) { static Byte inited = FALSE; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/encrypt.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/encrypt.cpp index 148371612c..afa81152c9 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/encrypt.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/encrypt.cpp @@ -28,7 +28,6 @@ #include "PreRTS.h" // This must go first in EVERY cpp file int the GameEngine -#include #include #include "Common/encrypt.h" diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarPrintPositions.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarPrintPositions.cpp index c5a7169a2e..a13bebcb0b 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarPrintPositions.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarPrintPositions.cpp @@ -48,7 +48,6 @@ // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- #include "PreRTS.h" // This must go first in EVERY cpp file int the GameEngine -#include //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h index b48b704b13..7905a6def9 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h @@ -28,8 +28,6 @@ #pragma once -#include - #include "Lib/BaseType.h" #include "WWLib/refcount.h" #include "Common/AsciiString.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/BaseHeightMap.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/BaseHeightMap.cpp index f61baf015b..ceb11b6de3 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/BaseHeightMap.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/BaseHeightMap.cpp @@ -46,7 +46,6 @@ // Includes //----------------------------------------------------------------------------- -#include #include #include #include diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/FlatHeightMap.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/FlatHeightMap.cpp index 553e62db20..d9f024afb6 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/FlatHeightMap.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/FlatHeightMap.cpp @@ -47,7 +47,6 @@ //----------------------------------------------------------------------------- #include "W3DDevice/GameClient/FlatHeightMap.h" -#include #include #include #include diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMOTD.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMOTD.cpp index 656b3d6183..771c0af2fa 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMOTD.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMOTD.cpp @@ -45,7 +45,6 @@ // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include -#include // USER INCLUDES ////////////////////////////////////////////////////////////// #include "Common/NameKeyGenerator.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp index 6b7dbd25a8..4ac04141b3 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp @@ -51,7 +51,6 @@ #ifndef USE_FLAT_HEIGHT_MAP // Flat height map uses flattened textures. jba. [3/20/2003] -#include #include #include #include diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp index 51462028c7..b6d4111f7e 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp @@ -65,7 +65,6 @@ #include "ffactory.h" #include "font3d.h" #include "render2dsentence.h" -#include #include "Common/PerfTimer.h" #include "Common/GlobalData.h" #include "Common/GameCommon.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBibBuffer.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBibBuffer.cpp index 0f73ea167b..482f773d71 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBibBuffer.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBibBuffer.cpp @@ -47,7 +47,6 @@ //----------------------------------------------------------------------------- #include "W3DDevice/GameClient/W3DBibBuffer.h" -#include #include #include #include diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp index fbb0111fd2..ebc19615bd 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp @@ -47,7 +47,6 @@ //----------------------------------------------------------------------------- #include "W3DDevice/GameClient/W3DBridgeBuffer.h" -#include #include #include "W3DDevice/GameClient/W3DAssetManager.h" #include diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DCustomEdging.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DCustomEdging.cpp index e2bb7d80c2..52379c7ed7 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DCustomEdging.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DCustomEdging.cpp @@ -47,7 +47,6 @@ //----------------------------------------------------------------------------- #include "W3DDevice/GameClient/W3DCustomEdging.h" -#include #include #include #include diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DPropBuffer.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DPropBuffer.cpp index 3124a16206..4e5ee2ffb0 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DPropBuffer.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DPropBuffer.cpp @@ -47,7 +47,6 @@ //----------------------------------------------------------------------------- #include "W3DDevice/GameClient/W3DPropBuffer.h" -#include #include #include #include "Common/GameUtility.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DRoadBuffer.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DRoadBuffer.cpp index f67d2b95d9..3b7b02a7d2 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DRoadBuffer.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DRoadBuffer.cpp @@ -47,7 +47,6 @@ //----------------------------------------------------------------------------- #include "W3DDevice/GameClient/W3DRoadBuffer.h" -#include #include #include #include diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DStatusCircle.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DStatusCircle.cpp index fc69b8f373..f30e93645b 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DStatusCircle.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DStatusCircle.cpp @@ -24,7 +24,6 @@ #include "W3DDevice/GameClient/W3DStatusCircle.h" -#include #include #include #include diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainBackground.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainBackground.cpp index e4f8492b8e..2c314db859 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainBackground.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainBackground.cpp @@ -47,7 +47,6 @@ //----------------------------------------------------------------------------- #include "W3DDevice/GameClient/W3DTerrainBackground.h" -#include #include #include #include diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp index a61b1d3fe6..d1e770c2f0 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp @@ -27,7 +27,6 @@ // Author: Colin Day, April 2001 /////////////////////////////////////////////////////////////////////////////////////////////////// -#include #include #include diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp index f930569113..032f653f1e 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp @@ -56,7 +56,6 @@ enum //----------------------------------------------------------------------------- #include "W3DDevice/GameClient/W3DTreeBuffer.h" -#include #include #include #include diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp index 773674e713..786e6fcbfd 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp @@ -53,7 +53,6 @@ //----------------------------------------------------------------------------- #include "W3DDevice/GameClient/W3DWaypointBuffer.h" -#include #include #include #include diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp index 9ef4271dcc..f3189e931e 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp @@ -31,7 +31,6 @@ #define SCROLL_UV // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// -#include "stdio.h" #include "W3DDevice/GameClient/W3DWater.h" #include "W3DDevice/GameClient/HeightMap.h" #include "W3DDevice/GameClient/W3DShroud.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/camerashakesystem.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/camerashakesystem.cpp index a71ebaad1b..ab9e91936c 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/camerashakesystem.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/camerashakesystem.cpp @@ -36,7 +36,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#include #include #include #include diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp index a0cbd3dba8..3e62fafdc3 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp @@ -112,7 +112,6 @@ #include "w3dexclusionlist.h" #include #include -#include #include #include "texture.h" #include "wwprofile.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp index 33adbebd63..93d2c8b093 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp @@ -75,7 +75,6 @@ #include "textureloader.h" #include "missingtexture.h" #include "thread.h" -#include #include #include "pot.h" #include "wwprofile.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp index 0243c55963..2eec580ae1 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp @@ -119,7 +119,6 @@ #include "visrasterizer.h" #include "wwmemlog.h" #include "dx8rendererdebugger.h" -#include #include static unsigned MeshDebugIdCount; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp index 7eb0c93909..e4c76ef83e 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp @@ -90,8 +90,6 @@ #include "realcrc.h" #include "dx8wrapper.h" -#include - #ifdef _UNIX #include "osdep/osdep.h" #endif diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.cpp index 9ecc96ee1d..441a44dc42 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.cpp @@ -51,7 +51,6 @@ #include "wwmath.h" #include "quat.h" #include "wwmath.h" -//#include //#include // Static Table, for Adaptive Delta Decompressor #define FILTER_TABLE_SIZE (256) diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texture.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texture.cpp index df53dadbaf..d2b0d27df6 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texture.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texture.cpp @@ -42,7 +42,6 @@ #include "texture.h" #include -#include #include #include "dx8wrapper.h" #include "TARGA.H" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp index 5902fecec0..b0f41ac1eb 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp @@ -47,7 +47,6 @@ #include "XSTRAW.H" #include "dx8wrapper.h" -#include #include static unsigned int unique=1; diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEdit.h b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEdit.h index 86122e9b6f..9ec56ecc7f 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEdit.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEdit.h @@ -31,7 +31,6 @@ // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include -#include #include "GameClient/GameWindow.h" #include "GameClient/WindowLayout.h" diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/GenericProperties.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/GenericProperties.cpp index fdd1812bcc..fbd5fef545 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/GenericProperties.cpp +++ b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/GenericProperties.cpp @@ -48,7 +48,6 @@ #include #include #include -#include // USER INCLUDES ////////////////////////////////////////////////////////////// #include "Common/Debug.h" diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/RadioButtonProperties.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/RadioButtonProperties.cpp index 1c55f06a58..5695ad0781 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/RadioButtonProperties.cpp +++ b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/RadioButtonProperties.cpp @@ -45,7 +45,6 @@ // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include -#include // USER INCLUDES ////////////////////////////////////////////////////////////// #include "Common/NameKeyGenerator.h" diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/TabControlProperties.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/TabControlProperties.cpp index cefcb7b591..d11224b79a 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/TabControlProperties.cpp +++ b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/TabControlProperties.cpp @@ -44,7 +44,6 @@ // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include -#include // USER INCLUDES ////////////////////////////////////////////////////////////// #include "Common/NameKeyGenerator.h" diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/EditWindow.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/EditWindow.cpp index 9c577027cc..9f43480cf3 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Source/EditWindow.cpp +++ b/GeneralsMD/Code/Tools/GUIEdit/Source/EditWindow.cpp @@ -45,7 +45,6 @@ // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include -#include // USER INCLUDES ////////////////////////////////////////////////////////////// #include "Common/Debug.h" diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEditWindowManager.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEditWindowManager.cpp index 43f00b40a0..dbed4df9f2 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEditWindowManager.cpp +++ b/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEditWindowManager.cpp @@ -33,7 +33,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #include -#include #include "Common/Debug.h" #include "GameClient/GadgetSlider.h" diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/LayoutScheme.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/LayoutScheme.cpp index 4d28f1331d..dcd163c461 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Source/LayoutScheme.cpp +++ b/GeneralsMD/Code/Tools/GUIEdit/Source/LayoutScheme.cpp @@ -46,7 +46,6 @@ // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include #include -#include // USER INCLUDES ////////////////////////////////////////////////////////////// #include "Common/Debug.h" diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/Properties.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/Properties.cpp index d0cdc67b30..f5c1815382 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Source/Properties.cpp +++ b/GeneralsMD/Code/Tools/GUIEdit/Source/Properties.cpp @@ -50,7 +50,6 @@ // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include #include -#include // USER INCLUDES ////////////////////////////////////////////////////////////// #include "Common/Debug.h" diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/Save.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/Save.cpp index 56111932eb..02f7e27f3d 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Source/Save.cpp +++ b/GeneralsMD/Code/Tools/GUIEdit/Source/Save.cpp @@ -44,7 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// // SYSTEM INCLUDES //////////////////////////////////////////////////////////// -#include #include // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/Tools/wdump/rawfilem.cpp b/GeneralsMD/Code/Tools/wdump/rawfilem.cpp index 1ba8263104..c4e49f218e 100644 --- a/GeneralsMD/Code/Tools/wdump/rawfilem.cpp +++ b/GeneralsMD/Code/Tools/wdump/rawfilem.cpp @@ -56,7 +56,6 @@ #include #include #include -#include #include #include From 97fd0c9f8fe155fd4a20808155e3df37a764589e Mon Sep 17 00:00:00 2001 From: xezon <4720891+xezon@users.noreply.github.com> Date: Tue, 21 Oct 2025 22:03:47 +0200 Subject: [PATCH 3/3] Replicate in Generals --- Generals/Code/GameEngine/Include/GameClient/DebugDisplay.h | 2 +- Generals/Code/GameEngine/Include/GameClient/Display.h | 1 - Generals/Code/GameEngine/Include/GameClient/ParticleSys.h | 1 - Generals/Code/GameEngine/Include/Precompiled/PreRTS.h | 1 - Generals/Code/GameEngine/Source/Common/System/Trig.cpp | 1 - Generals/Code/GameEngine/Source/Common/System/encrypt.cpp | 1 - .../GameClient/GUI/ControlBar/ControlBarPrintPositions.cpp | 1 - .../GameEngineDevice/Include/W3DDevice/GameClient/TileData.h | 2 -- .../Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMOTD.cpp | 1 - .../GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp | 1 - .../Source/W3DDevice/GameClient/W3DAssetManager.cpp | 1 - .../Source/W3DDevice/GameClient/W3DBibBuffer.cpp | 1 - .../Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp | 1 - .../Source/W3DDevice/GameClient/W3DCustomEdging.cpp | 1 - .../Source/W3DDevice/GameClient/W3DRoadBuffer.cpp | 1 - .../Source/W3DDevice/GameClient/W3DStatusCircle.cpp | 1 - .../Source/W3DDevice/GameClient/W3DTerrainVisual.cpp | 1 - .../Source/W3DDevice/GameClient/W3DTreeBuffer.cpp | 1 - .../Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp | 1 - .../Source/W3DDevice/GameClient/Water/W3DWater.cpp | 1 - Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp | 1 - Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp | 1 - Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp | 1 - Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp | 1 - Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp | 2 -- Generals/Code/Libraries/Source/WWVegas/WW3D2/texture.cpp | 1 - Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.cpp | 1 - Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp | 1 - Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp | 1 - Generals/Code/Tools/GUIEdit/Include/GUIEdit.h | 1 - .../GUIEdit/Source/Dialog Procedures/GenericProperties.cpp | 1 - .../GUIEdit/Source/Dialog Procedures/RadioButtonProperties.cpp | 1 - .../GUIEdit/Source/Dialog Procedures/TabControlProperties.cpp | 1 - Generals/Code/Tools/GUIEdit/Source/EditWindow.cpp | 1 - Generals/Code/Tools/GUIEdit/Source/GUIEditWindowManager.cpp | 1 - Generals/Code/Tools/GUIEdit/Source/LayoutScheme.cpp | 1 - Generals/Code/Tools/GUIEdit/Source/Properties.cpp | 1 - Generals/Code/Tools/GUIEdit/Source/Save.cpp | 1 - Generals/Code/Tools/WorldBuilder/src/DrawObject.cpp | 1 - 39 files changed, 1 insertion(+), 41 deletions(-) diff --git a/Generals/Code/GameEngine/Include/GameClient/DebugDisplay.h b/Generals/Code/GameEngine/Include/GameClient/DebugDisplay.h index 528c06c256..145cff3c5d 100644 --- a/Generals/Code/GameEngine/Include/GameClient/DebugDisplay.h +++ b/Generals/Code/GameEngine/Include/GameClient/DebugDisplay.h @@ -48,7 +48,7 @@ //---------------------------------------------------------------------------- #include "Lib/BaseType.h" -#include +#include //---------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameClient/Display.h b/Generals/Code/GameEngine/Include/GameClient/Display.h index 6036450c29..4d12e246e3 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Display.h +++ b/Generals/Code/GameEngine/Include/GameClient/Display.h @@ -28,7 +28,6 @@ #pragma once -#include #include "Common/SubsystemInterface.h" #include "View.h" #include "GameClient/Color.h" diff --git a/Generals/Code/GameEngine/Include/GameClient/ParticleSys.h b/Generals/Code/GameEngine/Include/GameClient/ParticleSys.h index 0ccc11899b..c9ee6a7355 100644 --- a/Generals/Code/GameEngine/Include/GameClient/ParticleSys.h +++ b/Generals/Code/GameEngine/Include/GameClient/ParticleSys.h @@ -29,7 +29,6 @@ #pragma once -#include #include "Common/AsciiString.h" #include "Common/GameMemory.h" #include "Common/GameType.h" diff --git a/Generals/Code/GameEngine/Include/Precompiled/PreRTS.h b/Generals/Code/GameEngine/Include/Precompiled/PreRTS.h index 4c773345d0..d437fed0ab 100644 --- a/Generals/Code/GameEngine/Include/Precompiled/PreRTS.h +++ b/Generals/Code/GameEngine/Include/Precompiled/PreRTS.h @@ -68,7 +68,6 @@ class STLSpecialAlloc; #include #include #include -#include #include #include #include diff --git a/Generals/Code/GameEngine/Source/Common/System/Trig.cpp b/Generals/Code/GameEngine/Source/Common/System/Trig.cpp index 595d9c1bdb..63be8eb802 100644 --- a/Generals/Code/GameEngine/Source/Common/System/Trig.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/Trig.cpp @@ -72,7 +72,6 @@ Real ASin(Real x) } #ifdef REGENERATE_TRIG_TABLES -#include void initTrig( void ) { static Byte inited = FALSE; diff --git a/Generals/Code/GameEngine/Source/Common/System/encrypt.cpp b/Generals/Code/GameEngine/Source/Common/System/encrypt.cpp index 890d8c79c3..58fd3d51a5 100644 --- a/Generals/Code/GameEngine/Source/Common/System/encrypt.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/encrypt.cpp @@ -28,7 +28,6 @@ #include "PreRTS.h" // This must go first in EVERY cpp file int the GameEngine -#include #include #include "Common/encrypt.h" diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarPrintPositions.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarPrintPositions.cpp index d9036cbac4..22f79a43c6 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarPrintPositions.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarPrintPositions.cpp @@ -48,7 +48,6 @@ // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- #include "PreRTS.h" // This must go first in EVERY cpp file int the GameEngine -#include //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h index 2912c673ca..8eb350f2ae 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h @@ -28,8 +28,6 @@ #pragma once -#include - #include "Lib/BaseType.h" #include "WWLib/refcount.h" #include "Common/AsciiString.h" diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMOTD.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMOTD.cpp index 0d08e965d6..5e194c35a3 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMOTD.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMOTD.cpp @@ -45,7 +45,6 @@ // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include -#include // USER INCLUDES ////////////////////////////////////////////////////////////// #include "Common/NameKeyGenerator.h" diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp index 8e03f06459..2d3aae0e35 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp @@ -47,7 +47,6 @@ //----------------------------------------------------------------------------- #include "W3DDevice/GameClient/HeightMap.h" -#include #include #include #include diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp index fe1de8e7e9..55f7f17e1d 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp @@ -65,7 +65,6 @@ #include "ffactory.h" #include "font3d.h" #include "render2dsentence.h" -#include #include "Common/PerfTimer.h" #include "Common/GlobalData.h" diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBibBuffer.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBibBuffer.cpp index daab2ebc8a..b21b80265f 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBibBuffer.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBibBuffer.cpp @@ -47,7 +47,6 @@ //----------------------------------------------------------------------------- #include "W3DDevice/GameClient/W3DBibBuffer.h" -#include #include #include #include diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp index 693129dd39..689ef9ddc0 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp @@ -47,7 +47,6 @@ //----------------------------------------------------------------------------- #include "W3DDevice/GameClient/W3DBridgeBuffer.h" -#include #include #include "W3DDevice/GameClient/W3DAssetManager.h" #include diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DCustomEdging.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DCustomEdging.cpp index 58f042ecde..b0fe1a6721 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DCustomEdging.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DCustomEdging.cpp @@ -47,7 +47,6 @@ //----------------------------------------------------------------------------- #include "W3DDevice/GameClient/W3DCustomEdging.h" -#include #include #include #include diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DRoadBuffer.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DRoadBuffer.cpp index 7043b7fed9..4f7e16e654 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DRoadBuffer.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DRoadBuffer.cpp @@ -47,7 +47,6 @@ //----------------------------------------------------------------------------- #include "W3DDevice/GameClient/W3DRoadBuffer.h" -#include #include #include #include diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DStatusCircle.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DStatusCircle.cpp index 041ada435a..d2a66ac702 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DStatusCircle.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DStatusCircle.cpp @@ -24,7 +24,6 @@ #include "W3DDevice/GameClient/W3DStatusCircle.h" -#include #include #include #include diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp index b18101069f..1119bea537 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp @@ -27,7 +27,6 @@ // Author: Colin Day, April 2001 /////////////////////////////////////////////////////////////////////////////////////////////////// -#include #include #include diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp index d0867bb2c2..4bd0fcfd37 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp @@ -47,7 +47,6 @@ //----------------------------------------------------------------------------- #include "W3DDevice/GameClient/W3DTreeBuffer.h" -#include #include #include #include diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp index 05710d7efd..a770478c46 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp @@ -53,7 +53,6 @@ //----------------------------------------------------------------------------- #include "W3DDevice/GameClient/W3DWaypointBuffer.h" -#include #include #include #include diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp index 2119e618d7..258bf46c86 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp @@ -31,7 +31,6 @@ #define SCROLL_UV // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// -#include "stdio.h" #include "W3DDevice/GameClient/W3DWater.h" #include "W3DDevice/GameClient/HeightMap.h" #include "W3DDevice/GameClient/W3DShroud.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp index 1d126d3a8b..7153c7cf11 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp @@ -107,7 +107,6 @@ #include "w3dexclusionlist.h" #include #include -#include #include #include "texture.h" #include "wwprofile.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp index d7af5da088..9978ca15d9 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp @@ -64,7 +64,6 @@ #include "texture.h" #include "scene.h" #include "wwprofile.h" -#include #include diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp index a94c8d239c..f94b0e729a 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp @@ -71,7 +71,6 @@ #include "textureloader.h" #include "missingtexture.h" #include "thread.h" -#include #include #include "pot.h" #include "wwprofile.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp index b4e0c19c99..906f59841b 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp @@ -118,7 +118,6 @@ #include "dx8renderer.h" #include "visrasterizer.h" #include "wwmemlog.h" -#include #include diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp index d50b7ebda3..c2bfcf7691 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp @@ -90,8 +90,6 @@ #include "realcrc.h" #include "dx8wrapper.h" -#include - #ifdef _UNIX #include "osdep/osdep.h" #endif diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texture.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texture.cpp index 1345a71a1f..93e15efe24 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texture.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texture.cpp @@ -38,7 +38,6 @@ #include "texture.h" #include -#include #include #include "dx8wrapper.h" #include "TARGA.H" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.cpp index baa495c64d..76f5d902a5 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.cpp @@ -31,7 +31,6 @@ #include "missingtexture.h" #include "TARGA.H" #include -#include #include "wwmemlog.h" #include "texture.h" #include "formconv.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp index 94c4464c02..9e990314a1 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp @@ -47,7 +47,6 @@ #include "XSTRAW.H" #include "dx8wrapper.h" -#include #include static unsigned int unique=1; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp index 0acd23d847..f4941576eb 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp @@ -108,7 +108,6 @@ #include "bound.h" #include "rddesc.h" #include "Vector3i.h" -#include #include "dx8wrapper.h" #include "TARGA.H" #include "sortingrenderer.h" diff --git a/Generals/Code/Tools/GUIEdit/Include/GUIEdit.h b/Generals/Code/Tools/GUIEdit/Include/GUIEdit.h index 5432ab4fcf..1de3db82ca 100644 --- a/Generals/Code/Tools/GUIEdit/Include/GUIEdit.h +++ b/Generals/Code/Tools/GUIEdit/Include/GUIEdit.h @@ -31,7 +31,6 @@ // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include -#include #include "GameClient/GameWindow.h" #include "GameClient/WindowLayout.h" diff --git a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/GenericProperties.cpp b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/GenericProperties.cpp index b8aa5f2fd9..4f2f38a36a 100644 --- a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/GenericProperties.cpp +++ b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/GenericProperties.cpp @@ -48,7 +48,6 @@ #include #include #include -#include // USER INCLUDES ////////////////////////////////////////////////////////////// #include "Common/Debug.h" diff --git a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/RadioButtonProperties.cpp b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/RadioButtonProperties.cpp index b47aaa6f29..c9514c44b2 100644 --- a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/RadioButtonProperties.cpp +++ b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/RadioButtonProperties.cpp @@ -45,7 +45,6 @@ // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include -#include // USER INCLUDES ////////////////////////////////////////////////////////////// #include "Common/NameKeyGenerator.h" diff --git a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/TabControlProperties.cpp b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/TabControlProperties.cpp index c3dc2732b2..07b2c4da46 100644 --- a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/TabControlProperties.cpp +++ b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/TabControlProperties.cpp @@ -44,7 +44,6 @@ // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include -#include // USER INCLUDES ////////////////////////////////////////////////////////////// #include "Common/NameKeyGenerator.h" diff --git a/Generals/Code/Tools/GUIEdit/Source/EditWindow.cpp b/Generals/Code/Tools/GUIEdit/Source/EditWindow.cpp index 08eec4d1a3..7cb45b9e44 100644 --- a/Generals/Code/Tools/GUIEdit/Source/EditWindow.cpp +++ b/Generals/Code/Tools/GUIEdit/Source/EditWindow.cpp @@ -45,7 +45,6 @@ // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include -#include // USER INCLUDES ////////////////////////////////////////////////////////////// #include "Common/Debug.h" diff --git a/Generals/Code/Tools/GUIEdit/Source/GUIEditWindowManager.cpp b/Generals/Code/Tools/GUIEdit/Source/GUIEditWindowManager.cpp index 81f60d75e9..df5e9a0dc1 100644 --- a/Generals/Code/Tools/GUIEdit/Source/GUIEditWindowManager.cpp +++ b/Generals/Code/Tools/GUIEdit/Source/GUIEditWindowManager.cpp @@ -33,7 +33,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #include -#include #include "Common/Debug.h" #include "GameClient/GadgetSlider.h" diff --git a/Generals/Code/Tools/GUIEdit/Source/LayoutScheme.cpp b/Generals/Code/Tools/GUIEdit/Source/LayoutScheme.cpp index 5ea70e9405..a69dbaf887 100644 --- a/Generals/Code/Tools/GUIEdit/Source/LayoutScheme.cpp +++ b/Generals/Code/Tools/GUIEdit/Source/LayoutScheme.cpp @@ -46,7 +46,6 @@ // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include #include -#include // USER INCLUDES ////////////////////////////////////////////////////////////// #include "Common/Debug.h" diff --git a/Generals/Code/Tools/GUIEdit/Source/Properties.cpp b/Generals/Code/Tools/GUIEdit/Source/Properties.cpp index 94e1d068e2..a569f8be50 100644 --- a/Generals/Code/Tools/GUIEdit/Source/Properties.cpp +++ b/Generals/Code/Tools/GUIEdit/Source/Properties.cpp @@ -50,7 +50,6 @@ // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include #include -#include // USER INCLUDES ////////////////////////////////////////////////////////////// #include "Common/Debug.h" diff --git a/Generals/Code/Tools/GUIEdit/Source/Save.cpp b/Generals/Code/Tools/GUIEdit/Source/Save.cpp index 949f4ef1b4..41b68e1805 100644 --- a/Generals/Code/Tools/GUIEdit/Source/Save.cpp +++ b/Generals/Code/Tools/GUIEdit/Source/Save.cpp @@ -44,7 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// // SYSTEM INCLUDES //////////////////////////////////////////////////////////// -#include #include // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/Tools/WorldBuilder/src/DrawObject.cpp b/Generals/Code/Tools/WorldBuilder/src/DrawObject.cpp index 8c60712f75..ae6d76b7f9 100644 --- a/Generals/Code/Tools/WorldBuilder/src/DrawObject.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/DrawObject.cpp @@ -20,7 +20,6 @@ #include "DrawObject.h" -#include #include #include #include