Cleanup headers in irr/include/ (#15181)

irr/src/CB3DMeshFileLoader.cpp

@@ -10,6 +10,7 @@
 
 #include "IVideoDriver.h"
 #include "IFileSystem.h"
+#include "coreutil.h"
 #include "os.h"
 
 #include <algorithm>

irr/src/CFileSystem.cpp

@@ -7,12 +7,11 @@
 #include "IWriteFile.h"
 #include "CZipReader.h"
 #include "CFileList.h"
-#include "stdio.h"
-#include "os.h"
 #include "CReadFile.h"
 #include "CMemoryFile.h"
 #include "CLimitReadFile.h"
 #include "CWriteFile.h"
+#include "coreutil.h"
 #include <list>
 
 #if defined(__STRICT_ANSI__)

irr/src/CImageLoaderBMP.cpp

@@ -8,8 +8,8 @@
 #include "SColor.h"
 #include "CColorConverter.h"
 #include "CImage.h"
+#include "coreutil.h"
 #include "os.h"
-#include "irrString.h"
 
 namespace irr
 {

irr/src/CImageLoaderJPG.cpp

@@ -6,8 +6,10 @@
 
 #include "IReadFile.h"
 #include "CImage.h"
+#include "coreutil.h"
 #include "os.h"
 #include "irrString.h"
+#include <csetjmp>
 
 namespace irr
 {

irr/src/CImageLoaderJPG.h

@@ -6,9 +6,8 @@
 
 #include "IImageLoader.h"
 
-#include <cstdio>    // required for jpeglib.h
+#include <cstdio>    // IWYU pragma: keep (required for jpeglib.h)
 #include <jpeglib.h> // use system lib
-#include <setjmp.h>
 
 namespace irr
 {

irr/src/CImageLoaderPNG.cpp

@@ -7,7 +7,8 @@
 #include <png.h> // use system lib png
 
 #include "CImage.h"
-#include "CReadFile.h"
+#include "IReadFile.h"
+#include "coreutil.h"
 #include "os.h"
 
 namespace irr

irr/src/CImageLoaderTGA.cpp

@@ -5,10 +5,10 @@
 #include "CImageLoaderTGA.h"
 
 #include "IReadFile.h"
+#include "coreutil.h"
 #include "os.h"
 #include "CColorConverter.h"
 #include "CImage.h"
-#include "irrString.h"
 
 #define MAX(x, y) (((x) > (y)) ? (x) : (y))
 

irr/src/CImageWriterJPG.cpp

@@ -6,15 +6,12 @@
 
 #include "CColorConverter.h"
 #include "IWriteFile.h"
-#include "CImage.h"
-#include "irrString.h"
+#include "coreutil.h"
 #include "os.h"
 
-#include <cstdio> // required for jpeglib.h
-extern "C" {
+#include <cstdio> // IWYU pragma: keep (required for jpeglib.h)
 #include <jpeglib.h>
 #include <jerror.h>
-}
 
 namespace irr
 {

irr/src/CImageWriterPNG.cpp

@@ -4,10 +4,9 @@
 
 #include "CImageWriterPNG.h"
 
-#include "CImageLoaderPNG.h"
 #include "CColorConverter.h"
 #include "IWriteFile.h"
-#include "irrString.h"
+#include "coreutil.h"
 #include "os.h" // for logging
 
 #include <png.h> // use system lib png

irr/src/CIrrDeviceOSX.mm

@@ -12,6 +12,7 @@
 #include "CIrrDeviceOSX.h"
 
 #include "IEventReceiver.h"
+#include "IVideoDriver.h"
 #include "os.h"
 #include "CTimer.h"
 #include "irrString.h"

irr/src/CSkinnedMesh.h

@@ -6,6 +6,7 @@
 
 #pragma once
 
+#include "ISceneManager.h"
 #include "ISkinnedMesh.h"
 #include "SMeshBuffer.h"
 #include "quaternion.h"
@@ -17,6 +18,7 @@ namespace scene
 
 class IAnimatedMeshSceneNode;
 class IBoneSceneNode;
+class ISceneManager;
 
 class CSkinnedMesh : public ISkinnedMesh
 {

irr/src/Irrlicht.cpp

@@ -5,6 +5,9 @@
 static const char *const copyright = "Irrlicht Engine (c) 2002-2017 Nikolaus Gebhardt"; // put string in binary
 
 #include "irrlicht.h"
+#include "matrix4.h"
+#include "SMaterial.h"
+
 #ifdef _IRR_COMPILE_WITH_WINDOWS_DEVICE_
 #include "CIrrDeviceWin32.h"
 #endif