diff --git a/addons/ofxAssimpModelLoader/src/ofxAssimpTexture.cpp b/addons/ofxAssimpModelLoader/src/ofxAssimpTexture.cpp
index a733444bec7..1b7bf336e08 100644
--- a/addons/ofxAssimpModelLoader/src/ofxAssimpTexture.cpp
+++ b/addons/ofxAssimpModelLoader/src/ofxAssimpTexture.cpp
@@ -7,6 +7,7 @@
 
 #include "ofxAssimpTexture.h"
 #include "ofLog.h"
+#include "ofUtils.h"
 
 void ofxAssimpTexture::setup(const ofTexture & texture, const of::filesystem::path & texturePath, bool bTexRepeat) {
 	this->texture = texture;
diff --git a/libs/openFrameworks/gl/ofCubeMap.cpp b/libs/openFrameworks/gl/ofCubeMap.cpp
index 0fc69190c83..7dc2f72af88 100644
--- a/libs/openFrameworks/gl/ofCubeMap.cpp
+++ b/libs/openFrameworks/gl/ofCubeMap.cpp
@@ -12,6 +12,7 @@
 #include "ofGLUtils.h"
 #include "ofGLProgrammableRenderer.h"
 #include "ofCubeMapShaders.h"
+#include "ofFbo.h"
 #include "ofConstants.h"
 
 #define GLM_FORCE_CTOR_INIT
@@ -31,6 +32,9 @@ ofVboMesh ofCubeMap::sCubeMesh;
 ofShader ofCubeMap::shaderBrdfLUT;
 ofTexture ofCubeMap::sBrdfLutTex;
 
+void ofCubeMap::setExposure(float aExposure) {
+	data->exposure=ofClamp(aExposure, 0.0f, 1.0f);
+}
 
 // texture management copied from ofTexture
 static std::map<GLuint,int> & getTexturesIndex(){
diff --git a/libs/openFrameworks/gl/ofCubeMap.h b/libs/openFrameworks/gl/ofCubeMap.h
index 4ce0314f4bd..181c960b502 100644
--- a/libs/openFrameworks/gl/ofCubeMap.h
+++ b/libs/openFrameworks/gl/ofCubeMap.h
@@ -6,8 +6,9 @@
 
 #pragma once
 
-#include "ofFbo.h"
-#include "ofVboMesh.h"
+#include "glm/mat4x4.hpp"
+
+class ofVboMesh;
 
 class ofShader;
 class ofGLProgrammableRenderer;
@@ -16,8 +17,8 @@ class ofCubeMap {
 public:
 	
 	struct ofCubeMapSettings {
-		of::filesystem::path filePath = "";
-		of::filesystem::path cacheDirectory = "";
+		of::filesystem::path filePath { "" };
+		of::filesystem::path cacheDirectory { "" };
 		
 		bool overwriteCache = false;
 		bool useCache = false;
@@ -105,7 +106,7 @@ class ofCubeMap {
 	GLuint getTextureId();
 	bool isHdr();
 	
-	void setExposure(float aExposure) {data->exposure=ofClamp(aExposure, 0.0f, 1.0f);}
+	void setExposure(float aExposure);
 	float getExposure() { return data->exposure; }
 	
 	void setUseBrdfLutTexture( bool ab );
diff --git a/libs/openFrameworks/gl/ofFbo.h b/libs/openFrameworks/gl/ofFbo.h
index 2ec3ad43781..43aa1169efc 100644
--- a/libs/openFrameworks/gl/ofFbo.h
+++ b/libs/openFrameworks/gl/ofFbo.h
@@ -1,5 +1,6 @@
 #pragma once
 
+// depthBufferTex only
 #include "ofTexture.h"
 #include "ofGLBaseTypes.h"
 
diff --git a/libs/openFrameworks/gl/ofShader.h b/libs/openFrameworks/gl/ofShader.h
index 2f6e2b67a27..85c134a1ed8 100644
--- a/libs/openFrameworks/gl/ofShader.h
+++ b/libs/openFrameworks/gl/ofShader.h
@@ -7,7 +7,6 @@
  make sure to catch and report that error.
  */
 
-#include "ofFileUtils.h"
 #include "ofConstants.h"
 #include "glm/fwd.hpp"
 #include <unordered_map>
diff --git a/libs/openFrameworks/utils/ofFileUtils.cpp b/libs/openFrameworks/utils/ofFileUtils.cpp
index f9a64a8250b..3259c5c5c1a 100644
--- a/libs/openFrameworks/utils/ofFileUtils.cpp
+++ b/libs/openFrameworks/utils/ofFileUtils.cpp
@@ -1,5 +1,6 @@
 #include "ofFileUtils.h"
 #include "ofLog.h"
+#include "ofUtils.h"
 
 #ifndef TARGET_WIN32
 	#include <pwd.h>
diff --git a/libs/openFrameworks/utils/ofFpsCounter.h b/libs/openFrameworks/utils/ofFpsCounter.h
index a1dea1580c0..207eee264e0 100644
--- a/libs/openFrameworks/utils/ofFpsCounter.h
+++ b/libs/openFrameworks/utils/ofFpsCounter.h
@@ -1,5 +1,6 @@
 #pragma once
 
+// ofTime only
 #include "ofUtils.h"
 #include "ofConstants.h"
 #include <queue>
diff --git a/libs/openFrameworks/utils/ofLog.h b/libs/openFrameworks/utils/ofLog.h
index e75aac221e4..c8986d6cd73 100644
--- a/libs/openFrameworks/utils/ofLog.h
+++ b/libs/openFrameworks/utils/ofLog.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "ofFileUtils.h"
-#include "ofUtils.h"
 #include "ofConstants.h"
+#include "ofUtils.h" // ofVAArgsToString
 #include <sstream>
 
 /// \file
diff --git a/libs/openFrameworks/utils/ofSystemUtils.h b/libs/openFrameworks/utils/ofSystemUtils.h
index b3843a00f90..634dc5d3c9c 100644
--- a/libs/openFrameworks/utils/ofSystemUtils.h
+++ b/libs/openFrameworks/utils/ofSystemUtils.h
@@ -5,19 +5,19 @@
 /// \class ofFileDialogResult
 /// \brief file dialog box selection or save result
 class ofFileDialogResult{
-	public:
-		ofFileDialogResult();
-		
-		/// \return the name of the selected file or directory, if set
-		/// currently returns only 1 file, this may change in the future
-		std::string getName();
-	
-		/// \return the full path of the selected file or directory, if set
-		std::string getPath();
-	
-		std::string filePath; ///< full path to selected file or directory
-		std::string fileName; ///< selected file or directory name
-		bool bSuccess; ///< true if the dialog action was successful, aka file select not cancel
+public:
+	ofFileDialogResult();
+
+	/// \return the name of the selected file or directory, if set
+	/// currently returns only 1 file, this may change in the future
+	std::string getName();
+
+	/// \return the full path of the selected file or directory, if set
+	std::string getPath();
+
+	std::string filePath; ///< full path to selected file or directory
+	std::string fileName; ///< selected file or directory name
+	bool bSuccess; ///< true if the dialog action was successful, aka file select not cancel
 };
 
 /// \brief show an error message in an alert dialog box
diff --git a/libs/openFrameworks/utils/ofURLFileLoader.h b/libs/openFrameworks/utils/ofURLFileLoader.h
index 69cc9f10a11..826f27fb8fe 100644
--- a/libs/openFrameworks/utils/ofURLFileLoader.h
+++ b/libs/openFrameworks/utils/ofURLFileLoader.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ofEvents.h"
+// ofBuffer only
 #include "ofFileUtils.h"
 #include "ofConstants.h"
 #include <map>
diff --git a/libs/openFrameworks/utils/ofXml.h b/libs/openFrameworks/utils/ofXml.h
index 593ea0dc7a1..c372fdf072e 100644
--- a/libs/openFrameworks/utils/ofXml.h
+++ b/libs/openFrameworks/utils/ofXml.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "ofParameter.h"
-#include "ofConstants.h"
 #include "pugixml.hpp"
 
 template<typename It>