.h simplification (#7442)

#changelog #core

Author: dimitre

libs/openFrameworks/math/ofMath.cpp

@@ -1,5 +1,4 @@
 #include "ofMath.h"
-#include "ofUtils.h"
 #include "ofNoise.h"
 #include "ofPolyline.h"
 #include <float.h>

libs/openFrameworks/types/ofBaseTypes.cpp

@@ -1,4 +1,3 @@
-#include "ofUtils.h"
 #include "ofGLUtils.h"
 #include "ofGLProgrammableRenderer.h"
 #include "of3dGraphics.h"

libs/openFrameworks/utils/ofFileUtils.cpp

@@ -1,14 +1,12 @@
 #include "ofFileUtils.h"
+#include "ofLog.h"
+
 #ifndef TARGET_WIN32
 	#include <pwd.h>
 	#include <sys/stat.h>
 	#include <unistd.h>
 #endif
 
-#include "ofUtils.h"
-#include "ofLog.h"
-
-
 #ifdef TARGET_OSX
 	#include <mach-o/dyld.h>       /* _NSGetExecutablePath */
 	#include <limits.h>        /* PATH_MAX */

libs/openFrameworks/utils/ofSystemUtils.cpp

@@ -3,22 +3,11 @@
 #include "ofFileUtils.h"
 #include "ofLog.h"
 #include "ofUtils.h"
+#include "ofConstants.h"
+
 #include <condition_variable>
 #include <mutex>
 
-#ifdef TARGET_WIN32
-#include <winuser.h>
-#include <commdlg.h>
-#define _WIN32_DCOM
-
-#include <windows.h>
-#include <shlobj.h>
-#include <tchar.h>
-#include <stdio.h>
-
-
-#endif
-
 #ifdef TARGET_OSX
 	// ofSystemUtils.cpp is configured to build as
 	// objective-c++ so as able to use Cocoa dialog panels
@@ -31,6 +20,14 @@
 #endif
 
 #ifdef TARGET_WIN32
+
+#define _WIN32_DCOM
+#include <winuser.h>
+#include <commdlg.h>
+#include <windows.h>
+#include <shlobj.h>
+#include <tchar.h>
+#include <stdio.h>
 #include <locale>
 #include <sstream>
 #include <string>

libs/openFrameworks/utils/ofSystemUtils.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "ofConstants.h"
+#include <string>
 
 /// \class ofFileDialogResult
 /// \brief file dialog box selection or save result

libs/openFrameworks/utils/ofUtils.cpp

@@ -1,4 +1,5 @@
 #include "ofUtils.h"
+// FIXME: split ofUtils in two files, one which uses urlparser / ofImage, other without for smaller apps.
 #include "ofImage.h"
 #include "ofLog.h"
 #include "ofAppBaseWindow.h"
@@ -15,17 +16,17 @@
 
 #ifdef TARGET_WIN32	 // For ofLaunchBrowser.
 	#include <shellapi.h>
-#endif
-
-
-#ifdef TARGET_WIN32
     #ifndef _MSC_VER
         #include <unistd.h> // this if for MINGW / _getcwd
 		#include <sys/param.h> // for MAXPATHLEN
+	// FIXME: else
     #endif
+	#ifdef _MSC_VER
+		#include <direct.h>
+	#endif
+	#include <mmsystem.h>
 #endif
 
-
 #if defined(TARGET_OF_IOS) || defined(TARGET_OSX ) || defined(TARGET_LINUX) || defined(TARGET_EMSCRIPTEN)
 	#include <sys/time.h>
 #endif
@@ -39,14 +40,6 @@
 	#include <mach/mach.h>
 #endif
 
-#ifdef TARGET_WIN32
-    #include <mmsystem.h>
-	#ifdef _MSC_VER
-		#include <direct.h>
-	#endif
-
-#endif
-
 #ifdef TARGET_OF_IOS
 #include "ofxiOSExtras.h"
 #endif