diff --git a/addons/ofxiOS/src/utils/ofxiOSExternalDisplay.mm b/addons/ofxiOS/src/utils/ofxiOSExternalDisplay.mm
index 1e25ba25bfd..9d54d41e89d 100644
--- a/addons/ofxiOS/src/utils/ofxiOSExternalDisplay.mm
+++ b/addons/ofxiOS/src/utils/ofxiOSExternalDisplay.mm
@@ -7,6 +7,7 @@
 
 #include "ofxiOSExternalDisplay.h"
 #include <TargetConditionals.h>
+#include <vector>
 
 using std::vector;
 
diff --git a/libs/openFrameworks/3d/of3dPrimitives.h b/libs/openFrameworks/3d/of3dPrimitives.h
index 1b30e574c55..dd371614bef 100644
--- a/libs/openFrameworks/3d/of3dPrimitives.h
+++ b/libs/openFrameworks/3d/of3dPrimitives.h
@@ -2,6 +2,7 @@
 
 #include "ofMesh.h"
 #include "ofNode.h"
+#include <vector>
 
 class ofTexture;
 class ofVboMesh;
diff --git a/libs/openFrameworks/3d/ofMesh.h b/libs/openFrameworks/3d/ofMesh.h
index c6b28cfa6ab..c42e2d68d61 100644
--- a/libs/openFrameworks/3d/ofMesh.h
+++ b/libs/openFrameworks/3d/ofMesh.h
@@ -4,6 +4,7 @@
 #define OF_MESH_H
 
 #include "ofGLUtils.h"
+#include <vector>
 
 template<class V, class N, class C, class T>
 class ofMeshFace_;
diff --git a/libs/openFrameworks/communication/ofSerial.h b/libs/openFrameworks/communication/ofSerial.h
index 0b0f404fdd5..44429f1493c 100644
--- a/libs/openFrameworks/communication/ofSerial.h
+++ b/libs/openFrameworks/communication/ofSerial.h
@@ -2,6 +2,7 @@
 
 // MARK: ofConstants targets
 #include "ofConstants.h"
+#include <vector>
 
 class ofBuffer;
 
diff --git a/libs/openFrameworks/gl/ofGLUtils.h b/libs/openFrameworks/gl/ofGLUtils.h
index 7600e05880d..403d81a9d1c 100644
--- a/libs/openFrameworks/gl/ofGLUtils.h
+++ b/libs/openFrameworks/gl/ofGLUtils.h
@@ -8,9 +8,11 @@
 #pragma once
 
 #include "ofGraphicsConstants.h"
+#include <vector>
 // MARK: Targets / Defines
 //#include "ofConstants.h"
 
+
 class ofShader;
 class ofGLProgrammableRenderer;
 class ofBaseGLRenderer;
diff --git a/libs/openFrameworks/gl/ofShader.cpp b/libs/openFrameworks/gl/ofShader.cpp
index b4df3358905..a7eec43fef7 100644
--- a/libs/openFrameworks/gl/ofShader.cpp
+++ b/libs/openFrameworks/gl/ofShader.cpp
@@ -8,6 +8,7 @@
     #include "ofxAndroidUtils.h"
 #endif
 #include <regex>
+#include <vector>
 
 using std::endl;
 using std::ostringstream;
@@ -958,7 +959,7 @@ void ofShader::setUniformTexture(const string & name, const ofTexture & tex, int
 		setUniformTexture( name, texData, textureLocation);
 	}
 }
-	
+
 //--------------------------------------------------------------
 void ofShader::setUniformTexture(const string & name, const ofTextureData & texData, int textureLocation) const{
     if (bLoaded) {
diff --git a/libs/openFrameworks/gl/ofShader.h b/libs/openFrameworks/gl/ofShader.h
index e52cdc18d26..2be4933100b 100644
--- a/libs/openFrameworks/gl/ofShader.h
+++ b/libs/openFrameworks/gl/ofShader.h
@@ -9,6 +9,7 @@
 
 // MARK: ofConstants Targets
 #include "ofConstants.h"
+#include <vector>
 
 #include <glm/detail/qualifier.hpp>
 namespace glm {
diff --git a/libs/openFrameworks/graphics/ofPixels.cpp b/libs/openFrameworks/graphics/ofPixels.cpp
index de5d1847b6f..8b2356085a3 100644
--- a/libs/openFrameworks/graphics/ofPixels.cpp
+++ b/libs/openFrameworks/graphics/ofPixels.cpp
@@ -1,6 +1,8 @@
 #include "ofGraphicsConstants.h"
 #include "ofPixels.h"
 #include "ofColor.h"
+#include <string.h> // memcpy
+#include <functional> // std::function
 
 static ofImageType getImageTypeFromChannels(size_t channels){
 	switch(channels){
diff --git a/libs/openFrameworks/graphics/ofTessellator.h b/libs/openFrameworks/graphics/ofTessellator.h
index c54656a3f20..4a37c43c797 100644
--- a/libs/openFrameworks/graphics/ofTessellator.h
+++ b/libs/openFrameworks/graphics/ofTessellator.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ofGraphicsBaseTypes.h"
+#include <vector>
 
 typedef struct TESStesselator TESStesselator;
 typedef struct TESSalloc TESSalloc;
diff --git a/libs/openFrameworks/graphics/ofTrueTypeFont.h b/libs/openFrameworks/graphics/ofTrueTypeFont.h
index 77afeab0d94..74c941a39e7 100644
--- a/libs/openFrameworks/graphics/ofTrueTypeFont.h
+++ b/libs/openFrameworks/graphics/ofTrueTypeFont.h
@@ -6,6 +6,7 @@
 #include "ofRectangle.h"
 #include "ofTexture.h"
 #include <unordered_map>
+#include <vector>
 
 class ofPath;
 
diff --git a/libs/openFrameworks/ofMain.h b/libs/openFrameworks/ofMain.h
index 602116e0589..c370881f208 100644
--- a/libs/openFrameworks/ofMain.h
+++ b/libs/openFrameworks/ofMain.h
@@ -134,3 +134,15 @@ using std::vector;
 using std::weak_ptr;
     #endif
 #endif
+
+
+// core: ---------------------------
+#include <stdint.h>
+#include <cstdio>
+#include <cstdlib>
+#include <string>
+#include <cstring>
+#include <iostream>
+#include <vector>
+#include <memory>
+#include <functional>
diff --git a/libs/openFrameworks/sound/ofSoundBaseTypes.h b/libs/openFrameworks/sound/ofSoundBaseTypes.h
index 9996621a2a5..dcbcc2bae68 100644
--- a/libs/openFrameworks/sound/ofSoundBaseTypes.h
+++ b/libs/openFrameworks/sound/ofSoundBaseTypes.h
@@ -3,6 +3,7 @@
 // MARK: ofConstants FS
 #include "ofConstants.h"
 #include <functional>
+#include <vector>
 
 class ofSoundBuffer;
 
diff --git a/libs/openFrameworks/utils/ofConstants.h b/libs/openFrameworks/utils/ofConstants.h
index f476c7a600d..a881c12b485 100644
--- a/libs/openFrameworks/utils/ofConstants.h
+++ b/libs/openFrameworks/utils/ofConstants.h
@@ -6,16 +6,7 @@
 #define OF_VERSION_PATCH 0
 #define OF_VERSION_PRE_RELEASE "master"
 
-// core: ---------------------------
-#include <stdint.h>
-#include <cstdio>
-#include <cstdlib>
-#include <string>
-#include <cstring>
-#include <iostream>
-#include <vector>
-#include <memory>
-#include <functional>
+
 
 // Set to 1 for compatibility with old projects using ofVec instead of glm
 #ifndef OF_USE_LEGACY_VECTOR_MATH
diff --git a/libs/openFrameworks/utils/ofFileUtils.h b/libs/openFrameworks/utils/ofFileUtils.h
index c2ed03af9f3..e541dae392b 100644
--- a/libs/openFrameworks/utils/ofFileUtils.h
+++ b/libs/openFrameworks/utils/ofFileUtils.h
@@ -3,6 +3,7 @@
 // MARK: ofConstants FS
 #include "ofConstants.h"
 #include <fstream>
+#include <vector>
 
 //----------------------------------------------------------
 // ofBuffer
diff --git a/libs/openFrameworks/utils/ofLog.cpp b/libs/openFrameworks/utils/ofLog.cpp
index 7a75025fe22..121a2197235 100644
--- a/libs/openFrameworks/utils/ofLog.cpp
+++ b/libs/openFrameworks/utils/ofLog.cpp
@@ -1,6 +1,8 @@
 #include "ofLog.h"
 #include <ofUtils.h>
 #include <map>
+#include <functional> // std::function
+
 #ifdef TARGET_ANDROID
 	#include "ofxAndroidLogChannel.h"
 #endif
@@ -82,7 +84,7 @@ ofLog::ofLog(){
 	module = "";
 	bPrinted = false;
 }
-		
+
 //--------------------------------------------------
 ofLog::ofLog(ofLogLevel _level){
 	level = _level;
@@ -231,7 +233,7 @@ string ofGetLogLevelName(ofLogLevel level, bool pad){
 
 //--------------------------------------------------
 void ofConsoleLoggerChannel::log(ofLogLevel level, const string & module, const string & message){
-	// print to cerr for OF_LOG_ERROR and OF_LOG_FATAL_ERROR, everything else to cout 
+	// print to cerr for OF_LOG_ERROR and OF_LOG_FATAL_ERROR, everything else to cout
 	std::ostream& out = level < OF_LOG_ERROR ? std::cout : std::cerr;
 	out << "[" << ofGetLogLevelName(level, true)  << "] ";
 	// only print the module name if it's not ""
@@ -245,7 +247,7 @@ void ofConsoleLoggerChannel::log(ofLogLevel level, const string & module, const
 #ifdef TARGET_WIN32
 #include <array>
 void ofDebugViewLoggerChannel::log(ofLogLevel level, const string & module, const string & message) {
-	// print to cerr for OF_LOG_ERROR and OF_LOG_FATAL_ERROR, everything else to cout 
+	// print to cerr for OF_LOG_ERROR and OF_LOG_FATAL_ERROR, everything else to cout
 	std::stringstream out;
 	out << "[" << ofGetLogLevelName(level, true) << "] ";
 	// only print the module name if it's not ""
@@ -287,4 +289,3 @@ void ofFileLoggerChannel::log(ofLogLevel level, const string & module, const str
 	}
 	file << message << std::endl;
 }
-
diff --git a/libs/openFrameworks/utils/ofLog.h b/libs/openFrameworks/utils/ofLog.h
index 77bf21fc3b4..83cb8c50a81 100644
--- a/libs/openFrameworks/utils/ofLog.h
+++ b/libs/openFrameworks/utils/ofLog.h
@@ -3,6 +3,7 @@
 // Only private ofFile file;
 #include "ofFileUtils.h"
 #include <sstream>
+#include <vector>
 
 
 
diff --git a/libs/openFrameworks/utils/ofThread.cpp b/libs/openFrameworks/utils/ofThread.cpp
index 8977f3a5e23..f04e0796151 100644
--- a/libs/openFrameworks/utils/ofThread.cpp
+++ b/libs/openFrameworks/utils/ofThread.cpp
@@ -1,5 +1,6 @@
 #include "ofThread.h"
 #include "ofLog.h"
+#include <functional>
 
 #ifdef TARGET_ANDROID
 #include <jni.h>
diff --git a/libs/openFrameworks/utils/ofTimerFps.cpp b/libs/openFrameworks/utils/ofTimerFps.cpp
index 03a4d85d697..1dc87989821 100644
--- a/libs/openFrameworks/utils/ofTimerFps.cpp
+++ b/libs/openFrameworks/utils/ofTimerFps.cpp
@@ -1,4 +1,5 @@
 #include "ofTimerFps.h"
+#include <thread>
 
 using namespace std::chrono;
 using namespace std::chrono_literals;
diff --git a/libs/openFrameworksCompiled/project/ios/iOS+OFLib.xcodeproj/project.pbxproj b/libs/openFrameworksCompiled/project/ios/iOS+OFLib.xcodeproj/project.pbxproj
index c347655e373..c6ce3fe0295 100644
--- a/libs/openFrameworksCompiled/project/ios/iOS+OFLib.xcodeproj/project.pbxproj
+++ b/libs/openFrameworksCompiled/project/ios/iOS+OFLib.xcodeproj/project.pbxproj
@@ -131,7 +131,6 @@
 		BFB0B4072C50E019008FB5A3 /* zlib.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF7E591D2BA2057900E5C52E /* zlib.xcframework */; };
 		BFB0B4082C50E019008FB5A3 /* uriparser.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF7E591B2BA2056600E5C52E /* uriparser.xcframework */; };
 		BFB0B4092C50E019008FB5A3 /* tess2.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF7E59192BA2054700E5C52E /* tess2.xcframework */; };
-		BFB0B40A2C50E019008FB5A3 /* pugixml.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF7E59172BA2052D00E5C52E /* pugixml.xcframework */; };
 		BFB0B40B2C50E019008FB5A3 /* libpng.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF7E59132BA2050B00E5C52E /* libpng.xcframework */; };
 		BFB0B40C2C50E019008FB5A3 /* freetype.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF7E590D2BA204D300E5C52E /* freetype.xcframework */; };
 		BFB0B40D2C50E019008FB5A3 /* fmt.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF7E590B2BA204BC00E5C52E /* fmt.xcframework */; };
@@ -376,7 +375,6 @@
 		BF7E590B2BA204BC00E5C52E /* fmt.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = fmt.xcframework; path = ../../../fmt/lib/macos/fmt.xcframework; sourceTree = "<group>"; };
 		BF7E590D2BA204D300E5C52E /* freetype.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = freetype.xcframework; path = ../../../freetype/lib/macos/freetype.xcframework; sourceTree = "<group>"; };
 		BF7E59132BA2050B00E5C52E /* libpng.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = libpng.xcframework; path = ../../../libpng/lib/macos/libpng.xcframework; sourceTree = "<group>"; };
-		BF7E59172BA2052D00E5C52E /* pugixml.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = pugixml.xcframework; path = ../../../pugixml/lib/macos/pugixml.xcframework; sourceTree = "<group>"; };
 		BF7E59192BA2054700E5C52E /* tess2.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = tess2.xcframework; path = ../../../tess2/lib/macos/tess2.xcframework; sourceTree = "<group>"; };
 		BF7E591B2BA2056600E5C52E /* uriparser.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = uriparser.xcframework; path = ../../../uriparser/lib/macos/uriparser.xcframework; sourceTree = "<group>"; };
 		BF7E591D2BA2057900E5C52E /* zlib.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = zlib.xcframework; path = ../../../zlib/lib/macos/zlib.xcframework; sourceTree = "<group>"; };
@@ -524,7 +522,6 @@
 				BFB0B4072C50E019008FB5A3 /* zlib.xcframework in Frameworks */,
 				BFB0B4082C50E019008FB5A3 /* uriparser.xcframework in Frameworks */,
 				BFB0B4092C50E019008FB5A3 /* tess2.xcframework in Frameworks */,
-				BFB0B40A2C50E019008FB5A3 /* pugixml.xcframework in Frameworks */,
 				BFB0B40B2C50E019008FB5A3 /* libpng.xcframework in Frameworks */,
 				BFB0B40C2C50E019008FB5A3 /* freetype.xcframework in Frameworks */,
 				BFB0B40D2C50E019008FB5A3 /* fmt.xcframework in Frameworks */,
@@ -1001,7 +998,6 @@
 				BF7E591D2BA2057900E5C52E /* zlib.xcframework */,
 				BF7E591B2BA2056600E5C52E /* uriparser.xcframework */,
 				BF7E59192BA2054700E5C52E /* tess2.xcframework */,
-				BF7E59172BA2052D00E5C52E /* pugixml.xcframework */,
 				BF7E59132BA2050B00E5C52E /* libpng.xcframework */,
 				BF7E590D2BA204D300E5C52E /* freetype.xcframework */,
 				BF7E590B2BA204BC00E5C52E /* fmt.xcframework */,
diff --git a/scripts/apothecary b/scripts/apothecary
index 313b213ede6..6a2a342ac92 160000
--- a/scripts/apothecary
+++ b/scripts/apothecary
@@ -1 +1 @@
-Subproject commit 313b213ede658eb6ae3fa5c4fb21a7bdcbe2230a
+Subproject commit 6a2a342ac9216aab1d2d9dae18dbdfa5b69df9e1