diff --git a/cmake/use_ld64.cmake b/cmake/use_ld64.cmake
index 4812c16ca..ee5a03dd6 100644
--- a/cmake/use_ld64.cmake
+++ b/cmake/use_ld64.cmake
@@ -67,18 +67,19 @@ ${ld_dylib_paths}")
 ENDFUNCTION(use_ld64)
 
 function(reexport reexporter reexportee)
-	get_property(reexportee_binary_dir TARGET ${reexportee} PROPERTY BINARY_DIR)
-	get_property(reexportee_output_name TARGET ${reexportee} PROPERTY OUTPUT_NAME)
+	add_dependencies(${reexporter} ${reexportee})
+	set(reexportee_binary_dir "$<TARGET_PROPERTY:${reexportee},BINARY_DIR>")
+	set(reexportee_output_name "$<TARGET_PROPERTY:${reexportee},OUTPUT_NAME>")
+	message("binary dir: ${reexportee_binary_dir}, output name: ${reexportee_output_name}")
 	if(NOT DEFINED reexportee_output_name)
-		get_property(reexportee_output_name TARGET ${reexportee} PROPERTY DYLIB_BUILD_NAME)
+		set(reexportee_output_name "$<TARGET_PROPERTY:${reexportee},DYLIB_BUILD_NAME>")
 		if(NOT DEFINED reexportee_output_name)
 			message(FATAL_ERROR "failed to get reexportee path")
 		endif(NOT DEFINED reexportee_output_name)
 	endif(NOT DEFINED reexportee_output_name)
 	set(reexportee_output "${reexportee_binary_dir}/${reexportee_output_name}")
-	get_property(reexportee_install_name TARGET ${reexportee} PROPERTY DYLIB_INSTALL_NAME)
-	set_property(TARGET ${reexporter} APPEND_STRING PROPERTY
-                LINK_FLAGS " -Wl,-reexport_library,${reexportee_output} ")
-	set_property(GLOBAL APPEND_STRING PROPERTY ld_dylib_paths " -Wl,-dylib_file,${reexportee_install_name}:${reexportee_output} ")
-	add_dependencies(${reexporter} ${reexportee})
+	set(reexportee_install_name "$<TARGET_PROPERTY:${reexportee},DYLIB_INSTALL_NAME>")
+	set_property(TARGET ${reexporter} APPEND PROPERTY
+		LINK_OPTIONS " -Wl,-reexport_library,${reexportee_output} ")
+	#set_property(GLOBAL APPEND_STRING PROPERTY ld_dylib_paths " -Wl,-dylib_file,${reexportee_install_name}:${reexportee_output} ")
 endfunction(reexport)
diff --git a/src/ApplicationServices/ApplicationServices.c b/src/ApplicationServices/ApplicationServices.c
index b5edb328e..f69efa149 100644
--- a/src/ApplicationServices/ApplicationServices.c
+++ b/src/ApplicationServices/ApplicationServices.c
@@ -1,4 +1,24 @@
+/*
+ This file is part of Darling.
+
+ Copyright (C) 2019 Lubos Dolezel
+
+ Darling is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Darling is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Darling.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 #include <CoreFoundation/CoreFoundation.h>
+#include <CoreGraphics/CGDirectDisplay.h>
 
 const char* ApplicationServicesVersionString = "Darling ApplicationServices-48";
 const unsigned long long ApplicationServicesVersionNumber = 0x4048000000000000;
@@ -11,9 +31,6 @@ const CFStringRef kAXUIElementCopyHierarchyTruncateStringsKey = CFSTR("AXTRUNC")
 /* Not const for some reason */
 CFStringRef kAXTrustedCheckOptionPrompt = CFSTR("AXTrustedCheckOptionPrompt");
 
-#include <CoreFoundation/CoreFoundation.h>
-#include <CoreGraphics/CGDirectDisplay.h>
-#include <CoreGraphics/CGGeometry.h>
 #include "MacTypes.h"
 
 static int verbose = 0;
@@ -33,9 +50,6 @@ typedef uint32_t ATSUAttributeTag;
 typedef Fixed ATSUTextMeasurement;
 typedef void* ATSUAttributeValuePtr;
 
-typedef float CGGammaValue;
-typedef int32_t CGWindowLevel;
-
 typedef uint32_t UniCharArrayOffset;
 typedef char* ConstUniCharArrayPtr;
 
@@ -45,153 +59,6 @@ typedef void** GDHandle;
 typedef uint32_t FMFont;
 
 
-// CGDirect Stubs - should probably be in cocoatron
-
-CGError CGDisplayShowCursor(CGDirectDisplayID display)
-{
-    if (verbose) puts("STUB: CGDisplayShowCursor called");
-	return (CGError)0;
-}
-
-boolean_t CGCursorIsVisible(void)
-{
-    if (verbose) puts("STUB: CGCursorIsVisible called");
-	return false;
-}
-
-CFArrayRef CGDisplayAvailableModes(CGDirectDisplayID a)
-{
-	// Usual keys: Width, Height, Mode, BitsPerPixel, SamplesPerPixel, RefreshRate, UsableForDesktopGUI, IOFlags, kCGDisplayBytesPerRow, IODisplayModeID
-
-    if (verbose) puts("STUB: CGDisplayAvailableModes called");
-
-    CFTypeRef arrayValues[ 1 ];
-
-    CFTypeRef dummyDisplayKeys[ 3 ];
-    CFTypeRef dummyDisplayValues[ 3 ];
-
-    dummyDisplayKeys[0] = CFSTR("Width");
-    dummyDisplayKeys[1] = CFSTR("Height");
-    dummyDisplayKeys[2] = CFSTR("BitsPerPixel");
-
-    // TODO: put some real values here
-    int val = 640;
-    dummyDisplayValues[0] = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &val);
-    val = 480;
-    dummyDisplayValues[1] = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &val);
-    val = 32;
-    dummyDisplayValues[2] = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &val);
-
-    CFDictionaryRef dictionary = CFDictionaryCreate(
-        kCFAllocatorDefault,
-        (const void **)&dummyDisplayKeys,
-        (const void **)&dummyDisplayValues,
-        3,
-        &kCFTypeDictionaryKeyCallBacks,
-        &kCFTypeDictionaryValueCallBacks
-    );
-
-    arrayValues[0] = dictionary;
-
-    CFArrayRef ret = CFArrayCreate(kCFAllocatorDefault, 
-    	                      &arrayValues, 
-    	                      1, 
-    	                      &kCFTypeArrayCallBacks);
-
-    CFRelease(dummyDisplayValues[0]);
-    CFRelease(dummyDisplayValues[1]);
-    CFRelease(dummyDisplayValues[2]);
-
-    // TODO: autorelease ret?
-	return ret;
-}
-
-CGRect CGDisplayBounds(CGDirectDisplayID a)
-{
-    if (verbose) puts("STUB: CGDisplayBounds called");
-	return CGRectMake(0,0,640,480);
-}
-
-CGError CGDisplayHideCursor(CGDirectDisplayID a)
-{
-    if (verbose) puts("STUB: CGDisplayHideCursor called");
-	return (CGError)0;
-}
-
-CGOpenGLDisplayMask CGDisplayIDToOpenGLDisplayMask(CGDirectDisplayID a)
-{
-    if (verbose) puts("STUB: CGDisplayIDToOpenGLDisplayMask called");
-	return 0;
-}
-
-CGError CGDisplayMoveCursorToPoint(CGDirectDisplayID a, CGPoint b)
-{
-    if (verbose) puts("STUB: CGDisplayMoveCursorToPoint called");
-	return (CGError)0;
-}
-
-void CGDisplayRestoreColorSyncSettings(void)
-{
-    if (verbose) puts("STUB: CGDisplayRestoreColorSyncSettings called");
-	
-}
-
-CGError CGGetActiveDisplayList(uint32_t a, CGDirectDisplayID *b, uint32_t *c)
-{
-    if (verbose) puts("STUB: CGGetActiveDisplayList called");
-	return (CGError)0;
-}
-
-CGError CGGetDisplayTransferByFormula(CGDirectDisplayID a, CGGammaValue *b, CGGammaValue *c, CGGammaValue *d, CGGammaValue *e, CGGammaValue *f, CGGammaValue *g, CGGammaValue *h, CGGammaValue *i, CGGammaValue *j)
-{
-    if (verbose) puts("STUB: CGGetDisplayTransferByFormula called");
-	return (CGError)0;
-}
-
-CGError CGGetDisplayTransferByTable(CGDirectDisplayID a, uint32_t b, CGGammaValue *c, CGGammaValue *d, CGGammaValue *e, uint32_t *f)
-{
-    if (verbose) puts("STUB: CGGetDisplayTransferByTable called");
-	return (CGError)0;
-}
-
-void CGGetLastMouseDelta(int32_t *a, int32_t *b)
-{
-    if (verbose) puts("STUB: CGGetLastMouseDelta called");
-	
-}
-
-CGDirectDisplayID CGMainDisplayID(void)
-{
-    if (verbose) puts("STUB: CGMainDisplayID called");
-	return (CGDirectDisplayID)0;
-}
-
-CGError CGSetDisplayTransferByFormula(CGDirectDisplayID a, CGGammaValue b, CGGammaValue c, CGGammaValue d, CGGammaValue e, CGGammaValue f, CGGammaValue g, CGGammaValue h, CGGammaValue i, CGGammaValue j)
-{
-    if (verbose) puts("STUB: CGSetDisplayTransferByFormula called");
-	return (CGError)0;
-}
-
-CGError CGSetDisplayTransferByTable(CGDirectDisplayID a, uint32_t b, const CGGammaValue *c, const CGGammaValue *d, const CGGammaValue *e)
-{
-    if (verbose) puts("STUB: CGSetDisplayTransferByTable called");
-	return (CGError)0;
-}
-
-CGError CGSetLocalEventsSuppressionInterval(CFTimeInterval a)
-{
-    if (verbose) puts("STUB: CGSetLocalEventsSuppressionInterval called");
-	return (CGError)0;
-}
-
-CGWindowLevel CGShieldingWindowLevel(void)
-{
-    if (verbose) puts("STUB: CGShieldingWindowLevel called");
-	return 0;
-}
-
-// End CGDirect Stubs
-
 
 // ATS Stubs
 
diff --git a/src/ApplicationServices/CMakeLists.txt b/src/ApplicationServices/CMakeLists.txt
index 48070acef..05d98a24f 100644
--- a/src/ApplicationServices/CMakeLists.txt
+++ b/src/ApplicationServices/CMakeLists.txt
@@ -1,5 +1,6 @@
 project(ApplicationServices)
 
+set(DYLIB_COMPAT_VERSION "1.0.0")
 set(DYLIB_CURRENT_VERSION "48.0.0")
 
 add_framework(ApplicationServices
@@ -8,10 +9,18 @@ add_framework(ApplicationServices
 	SOURCES
 		ApplicationServices.c
 	DEPENDENCIES
-		system CoreServices CoreFoundation
-	LINK_FLAGS
-		" -Wl,-reexport_library,${CMAKE_BINARY_DIR}/src/CoreServices/CoreServices \
-		  -Wl,-reexport_library,${CMAKE_BINARY_DIR}/src/external/cocotron/CoreGraphics/CoreGraphics"
+	system CoreServices CoreFoundation
 )
 
-add_dependencies(ApplicationServices CoreServices CoreGraphics)
+reexport(ApplicationServices CoreGraphics)
+reexport(ApplicationServices CoreText)
+reexport(ApplicationServices ImageIO)
+reexport(ApplicationServices ColorSync)
+# reexport ATS
+# reexport ColorSyncLegacy
+reexport(ApplicationServices CoreServices)
+# reexport HIServices
+# reexport LangAnalysis
+# reexport PrintCore
+# reexport QD
+# reexport SpeechSynthesis
diff --git a/src/ApplicationServices/include/ApplicationServices/ApplicationServices.h b/src/ApplicationServices/include/ApplicationServices/ApplicationServices.h
index 602caf72e..c51c92f89 100644
--- a/src/ApplicationServices/include/ApplicationServices/ApplicationServices.h
+++ b/src/ApplicationServices/include/ApplicationServices/ApplicationServices.h
@@ -1,3 +1,22 @@
+/*
+ This file is part of Darling.
+
+ Copyright (C) 2019 Lubos Dolezel
+
+ Darling is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Darling is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Darling.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 #ifndef _ApplicationServices_H_
 #define _ApplicationServices_H_
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6dc9b1b4b..0ca099ed2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -284,7 +284,6 @@ add_subdirectory(external/IOKitUser)
 add_subdirectory(external/python_modules)
 add_subdirectory(SystemConfiguration)
 add_subdirectory(CoreServices)
-add_subdirectory(ApplicationServices)
 #add_subdirectory(VideoDecodeAcceleration)
 add_subdirectory(DiskArbitration)
 add_subdirectory(LocalAuthentication)
@@ -415,6 +414,10 @@ add_subdirectory(DrawSprocket)
 add_subdirectory(AddressBook)
 add_subdirectory(EventKit)
 
+add_subdirectory(ApplicationServices)
+add_subdirectory(external/cocotron/CoreGraphics)
+add_subdirectory(ColorSync)
+
 # /Applications
 #add_subdirectory(external/TextEdit)
 
@@ -449,7 +452,6 @@ add_subdirectory(external/dtrace)
 
 add_subdirectory(lkm)
 
-add_subdirectory(external/cocotron/CoreGraphics)
 add_subdirectory(external/cocotron/Onyx2D)
 add_subdirectory(external/cocotron/AppKit)
 add_subdirectory(external/cocotron/CoreText)
diff --git a/src/ColorSync/CMakeLists.txt b/src/ColorSync/CMakeLists.txt
new file mode 100644
index 000000000..f84979572
--- /dev/null
+++ b/src/ColorSync/CMakeLists.txt
@@ -0,0 +1,18 @@
+project(ColorSync)
+
+set(DYLIB_COMPAT_VERSION "1.0.0")
+set(DYLIB_CURRENT_VERSION "4.7.0")
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+
+add_framework(ColorSync
+    FAT
+    CURRENT_VERSION
+    VERSION "A"
+
+    SOURCES
+        src/ColorSync.c
+
+    DEPENDENCIES
+        system
+)
diff --git a/src/ColorSync/include/ColorSync/ColorSync.h b/src/ColorSync/include/ColorSync/ColorSync.h
new file mode 100644
index 000000000..8006f0446
--- /dev/null
+++ b/src/ColorSync/include/ColorSync/ColorSync.h
@@ -0,0 +1,132 @@
+/*
+ This file is part of Darling.
+
+ Copyright (C) 2019 Lubos Dolezel
+
+ Darling is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Darling is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Darling.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#ifndef _ColorSync_H_
+#define _ColorSync_H_
+
+void* CGDisplayCreateUUIDFromDisplayID(void);
+void* CGDisplayGetDisplayIDFromUUID(void);
+void* CMProfileFromColorSyncProfile(void);
+void* ColorSyncCMMCopyCMMIdentifier(void);
+void* ColorSyncCMMCopyLocalizedName(void);
+void* ColorSyncCMMCreate(void);
+void* ColorSyncCMMGetBundle(void);
+void* ColorSyncCMMGetTypeID(void);
+void* ColorSyncCodeFragmentGetMD5(void);
+void* ColorSyncConvertDoubleXYZToD50(void);
+void* ColorSyncConvertXYZToXYZWithChromaticAdaptationMatrix(void);
+void* ColorSyncCreateCodeFragment(void);
+void* ColorSyncCreateCodeFragmentPriv(void);
+void* ColorSyncCreateGammaTablesFromVCGT(void);
+void* ColorSyncCreateInputPoppyProfile(void);
+void* ColorSyncCreateOutputPoppyProfile(void);
+void* ColorSyncCreateOutputPoppyProfileForRGBData(void);
+void* ColorSyncCreateSignatureFromFourCharCode(void);
+void* ColorSyncCreateUUIDFromUInt32(void);
+void* ColorSyncDataCanBeIgnoredOnSRGBDevice(void);
+void* ColorSyncDeviceCopyDeviceInfo(void);
+void* ColorSyncDeviceCopyDeviceRegistrationInfo(void);
+void* ColorSyncDeviceSetCustomProfiles(void);
+void* ColorSyncDisplayServicesUpdateProfiles(void);
+void* ColorSyncGetAdaptationMtx(void);
+void* ColorSyncGetDisplayTransferFormulaFromVCGT(void);
+void* ColorSyncGetFourCharCodeFromSignature(void);
+void* ColorSyncGetMainDisplayID(void);
+void* ColorSyncGetUInt32FromUUID(void);
+void* ColorSyncIterateDeviceProfiles(void);
+void* ColorSyncIterateInstalledCMMs(void);
+void* ColorSyncIterateInstalledProfiles(void);
+void* ColorSyncIterateInstalledProfilesWithOptions(void);
+void* ColorSyncMakeProfile(void);
+void* ColorSyncMatrixGetFunction(void);
+void* ColorSyncMatrixGetOptions(void);
+void* ColorSyncMatrixGetProperties(void);
+void* ColorSyncMatrixGetRange(void);
+void* ColorSyncMatrixGetTypeID(void);
+void* ColorSyncNxMLUTGetFunction(void);
+void* ColorSyncNxMLUTGetOptions(void);
+void* ColorSyncNxMLUTGetProperties(void);
+void* ColorSyncNxMLUTGetRange(void);
+void* ColorSyncNxMLUTGetTypeID(void);
+void* ColorSyncProfileContainsTag(void);
+void* ColorSyncProfileCopyASCIIDescriptionString(void);
+void* ColorSyncProfileCopyData(void);
+void* ColorSyncProfileCopyDescriptionString(void);
+void* ColorSyncProfileCopyHeader(void);
+void* ColorSyncProfileCopyLocalizedDescriptionString(void);
+void* ColorSyncProfileCopyLocalizedStringDictionary(void);
+void* ColorSyncProfileCopyTag(void);
+void* ColorSyncProfileCopyTagSignatures(void);
+void* ColorSyncProfileCreate(void);
+void* ColorSyncProfileCreateDeviceProfile(void);
+void* ColorSyncProfileCreateDisplayTransferTablesFromVCGT(void);
+void* ColorSyncProfileCreateLink(void);
+void* ColorSyncProfileCreateMutable(void);
+void* ColorSyncProfileCreateMutableCopy(void);
+void* ColorSyncProfileCreateSanitizedCopy(void);
+void* ColorSyncProfileCreateWithDisplayID(void);
+void* ColorSyncProfileCreateWithName(void);
+void* ColorSyncProfileCreateWithURL(void);
+void* ColorSyncProfileEstimateGamma(void);
+void* ColorSyncProfileEstimateGammaWithDisplayID(void);
+void* ColorSyncProfileFromCMProfile(void);
+void* ColorSyncProfileGetData(void);
+void* ColorSyncProfileGetDisplayTransferFormulaFromVCGT(void);
+void* ColorSyncProfileGetMD5(void);
+void* ColorSyncProfileGetTypeID(void);
+void* ColorSyncProfileGetURL(void);
+void* ColorSyncProfileInstall(void);
+void* ColorSyncProfileIsWideGamut(void);
+void* ColorSyncProfileProducesMatrixTransform(void);
+void* ColorSyncProfileRemoveTag(void);
+void* ColorSyncProfileSetDescriptionTag(void);
+void* ColorSyncProfileSetHeader(void);
+void* ColorSyncProfileSetLocalizedStringDictionary(void);
+void* ColorSyncProfileSetParametricTRCTag(void);
+void* ColorSyncProfileSetTag(void);
+void* ColorSyncProfileStreamPS2Definition(void);
+void* ColorSyncProfileUninstall(void);
+void* ColorSyncProfileVerify(void);
+void* ColorSyncProfileWriteToFile(void);
+void* ColorSyncPureGammaOriginalTRC(void);
+void* ColorSyncRegisterDevice(void);
+void* ColorSyncSwapProfileHeader(void);
+void* ColorSyncTRCGetFunction(void);
+void* ColorSyncTRCGetGammaID(void);
+void* ColorSyncTRCGetLuminanceScale(void);
+void* ColorSyncTRCGetOptions(void);
+void* ColorSyncTRCGetProperties(void);
+void* ColorSyncTRCGetRange(void);
+void* ColorSyncTRCGetTypeID(void);
+void* ColorSyncTransformConvert(void);
+void* ColorSyncTransformCopyProperty(void);
+void* ColorSyncTransformCreate(void);
+void* ColorSyncTransformCreateWithName(void);
+void* ColorSyncTransformGetTypeID(void);
+void* ColorSyncTransformIterate(void);
+void* ColorSyncTransformSetProperty(void);
+void* ColorSyncUnregisterDevice(void);
+void* ColorSyncVerifyAdobeRGBData(void);
+void* ColorSyncVerifyDisplayP3Data(void);
+void* ColorSyncVerifyGenericGrayGamma2_2Data(void);
+void* ColorSyncVerifyGenericLabData(void);
+void* ColorSyncVerifySRGBData(void);
+
+#endif
diff --git a/src/ColorSync/src/ColorSync.c b/src/ColorSync/src/ColorSync.c
new file mode 100644
index 000000000..b820c60bb
--- /dev/null
+++ b/src/ColorSync/src/ColorSync.c
@@ -0,0 +1,672 @@
+/*
+ This file is part of Darling.
+
+ Copyright (C) 2019 Lubos Dolezel
+
+ Darling is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Darling is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Darling.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#include <ColorSync/ColorSync.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+static int verbose = 0;
+
+__attribute__((constructor))
+static void initme(void) {
+    verbose = getenv("STUB_VERBOSE") != NULL;
+}
+
+void* CGDisplayCreateUUIDFromDisplayID(void)
+{
+    if (verbose) puts("STUB: CGDisplayCreateUUIDFromDisplayID called");
+    return NULL;
+}
+
+void* CGDisplayGetDisplayIDFromUUID(void)
+{
+    if (verbose) puts("STUB: CGDisplayGetDisplayIDFromUUID called");
+    return NULL;
+}
+
+void* CMProfileFromColorSyncProfile(void)
+{
+    if (verbose) puts("STUB: CMProfileFromColorSyncProfile called");
+    return NULL;
+}
+
+void* ColorSyncCMMCopyCMMIdentifier(void)
+{
+    if (verbose) puts("STUB: ColorSyncCMMCopyCMMIdentifier called");
+    return NULL;
+}
+
+void* ColorSyncCMMCopyLocalizedName(void)
+{
+    if (verbose) puts("STUB: ColorSyncCMMCopyLocalizedName called");
+    return NULL;
+}
+
+void* ColorSyncCMMCreate(void)
+{
+    if (verbose) puts("STUB: ColorSyncCMMCreate called");
+    return NULL;
+}
+
+void* ColorSyncCMMGetBundle(void)
+{
+    if (verbose) puts("STUB: ColorSyncCMMGetBundle called");
+    return NULL;
+}
+
+void* ColorSyncCMMGetTypeID(void)
+{
+    if (verbose) puts("STUB: ColorSyncCMMGetTypeID called");
+    return NULL;
+}
+
+void* ColorSyncCodeFragmentGetMD5(void)
+{
+    if (verbose) puts("STUB: ColorSyncCodeFragmentGetMD5 called");
+    return NULL;
+}
+
+void* ColorSyncConvertDoubleXYZToD50(void)
+{
+    if (verbose) puts("STUB: ColorSyncConvertDoubleXYZToD50 called");
+    return NULL;
+}
+
+void* ColorSyncConvertXYZToXYZWithChromaticAdaptationMatrix(void)
+{
+    if (verbose) puts("STUB: ColorSyncConvertXYZToXYZWithChromaticAdaptationMatrix called");
+    return NULL;
+}
+
+void* ColorSyncCreateCodeFragment(void)
+{
+    if (verbose) puts("STUB: ColorSyncCreateCodeFragment called");
+    return NULL;
+}
+
+void* ColorSyncCreateCodeFragmentPriv(void)
+{
+    if (verbose) puts("STUB: ColorSyncCreateCodeFragmentPriv called");
+    return NULL;
+}
+
+void* ColorSyncCreateGammaTablesFromVCGT(void)
+{
+    if (verbose) puts("STUB: ColorSyncCreateGammaTablesFromVCGT called");
+    return NULL;
+}
+
+void* ColorSyncCreateInputPoppyProfile(void)
+{
+    if (verbose) puts("STUB: ColorSyncCreateInputPoppyProfile called");
+    return NULL;
+}
+
+void* ColorSyncCreateOutputPoppyProfile(void)
+{
+    if (verbose) puts("STUB: ColorSyncCreateOutputPoppyProfile called");
+    return NULL;
+}
+
+void* ColorSyncCreateOutputPoppyProfileForRGBData(void)
+{
+    if (verbose) puts("STUB: ColorSyncCreateOutputPoppyProfileForRGBData called");
+    return NULL;
+}
+
+void* ColorSyncCreateSignatureFromFourCharCode(void)
+{
+    if (verbose) puts("STUB: ColorSyncCreateSignatureFromFourCharCode called");
+    return NULL;
+}
+
+void* ColorSyncCreateUUIDFromUInt32(void)
+{
+    if (verbose) puts("STUB: ColorSyncCreateUUIDFromUInt32 called");
+    return NULL;
+}
+
+void* ColorSyncDataCanBeIgnoredOnSRGBDevice(void)
+{
+    if (verbose) puts("STUB: ColorSyncDataCanBeIgnoredOnSRGBDevice called");
+    return NULL;
+}
+
+void* ColorSyncDeviceCopyDeviceInfo(void)
+{
+    if (verbose) puts("STUB: ColorSyncDeviceCopyDeviceInfo called");
+    return NULL;
+}
+
+void* ColorSyncDeviceCopyDeviceRegistrationInfo(void)
+{
+    if (verbose) puts("STUB: ColorSyncDeviceCopyDeviceRegistrationInfo called");
+    return NULL;
+}
+
+void* ColorSyncDeviceSetCustomProfiles(void)
+{
+    if (verbose) puts("STUB: ColorSyncDeviceSetCustomProfiles called");
+    return NULL;
+}
+
+void* ColorSyncDisplayServicesUpdateProfiles(void)
+{
+    if (verbose) puts("STUB: ColorSyncDisplayServicesUpdateProfiles called");
+    return NULL;
+}
+
+void* ColorSyncGetAdaptationMtx(void)
+{
+    if (verbose) puts("STUB: ColorSyncGetAdaptationMtx called");
+    return NULL;
+}
+
+void* ColorSyncGetDisplayTransferFormulaFromVCGT(void)
+{
+    if (verbose) puts("STUB: ColorSyncGetDisplayTransferFormulaFromVCGT called");
+    return NULL;
+}
+
+void* ColorSyncGetFourCharCodeFromSignature(void)
+{
+    if (verbose) puts("STUB: ColorSyncGetFourCharCodeFromSignature called");
+    return NULL;
+}
+
+void* ColorSyncGetMainDisplayID(void)
+{
+    if (verbose) puts("STUB: ColorSyncGetMainDisplayID called");
+    return NULL;
+}
+
+void* ColorSyncGetUInt32FromUUID(void)
+{
+    if (verbose) puts("STUB: ColorSyncGetUInt32FromUUID called");
+    return NULL;
+}
+
+void* ColorSyncIterateDeviceProfiles(void)
+{
+    if (verbose) puts("STUB: ColorSyncIterateDeviceProfiles called");
+    return NULL;
+}
+
+void* ColorSyncIterateInstalledCMMs(void)
+{
+    if (verbose) puts("STUB: ColorSyncIterateInstalledCMMs called");
+    return NULL;
+}
+
+void* ColorSyncIterateInstalledProfiles(void)
+{
+    if (verbose) puts("STUB: ColorSyncIterateInstalledProfiles called");
+    return NULL;
+}
+
+void* ColorSyncIterateInstalledProfilesWithOptions(void)
+{
+    if (verbose) puts("STUB: ColorSyncIterateInstalledProfilesWithOptions called");
+    return NULL;
+}
+
+void* ColorSyncMakeProfile(void)
+{
+    if (verbose) puts("STUB: ColorSyncMakeProfile called");
+    return NULL;
+}
+
+void* ColorSyncMatrixGetFunction(void)
+{
+    if (verbose) puts("STUB: ColorSyncMatrixGetFunction called");
+    return NULL;
+}
+
+void* ColorSyncMatrixGetOptions(void)
+{
+    if (verbose) puts("STUB: ColorSyncMatrixGetOptions called");
+    return NULL;
+}
+
+void* ColorSyncMatrixGetProperties(void)
+{
+    if (verbose) puts("STUB: ColorSyncMatrixGetProperties called");
+    return NULL;
+}
+
+void* ColorSyncMatrixGetRange(void)
+{
+    if (verbose) puts("STUB: ColorSyncMatrixGetRange called");
+    return NULL;
+}
+
+void* ColorSyncMatrixGetTypeID(void)
+{
+    if (verbose) puts("STUB: ColorSyncMatrixGetTypeID called");
+    return NULL;
+}
+
+void* ColorSyncNxMLUTGetFunction(void)
+{
+    if (verbose) puts("STUB: ColorSyncNxMLUTGetFunction called");
+    return NULL;
+}
+
+void* ColorSyncNxMLUTGetOptions(void)
+{
+    if (verbose) puts("STUB: ColorSyncNxMLUTGetOptions called");
+    return NULL;
+}
+
+void* ColorSyncNxMLUTGetProperties(void)
+{
+    if (verbose) puts("STUB: ColorSyncNxMLUTGetProperties called");
+    return NULL;
+}
+
+void* ColorSyncNxMLUTGetRange(void)
+{
+    if (verbose) puts("STUB: ColorSyncNxMLUTGetRange called");
+    return NULL;
+}
+
+void* ColorSyncNxMLUTGetTypeID(void)
+{
+    if (verbose) puts("STUB: ColorSyncNxMLUTGetTypeID called");
+    return NULL;
+}
+
+void* ColorSyncProfileContainsTag(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileContainsTag called");
+    return NULL;
+}
+
+void* ColorSyncProfileCopyASCIIDescriptionString(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileCopyASCIIDescriptionString called");
+    return NULL;
+}
+
+void* ColorSyncProfileCopyData(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileCopyData called");
+    return NULL;
+}
+
+void* ColorSyncProfileCopyDescriptionString(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileCopyDescriptionString called");
+    return NULL;
+}
+
+void* ColorSyncProfileCopyHeader(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileCopyHeader called");
+    return NULL;
+}
+
+void* ColorSyncProfileCopyLocalizedDescriptionString(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileCopyLocalizedDescriptionString called");
+    return NULL;
+}
+
+void* ColorSyncProfileCopyLocalizedStringDictionary(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileCopyLocalizedStringDictionary called");
+    return NULL;
+}
+
+void* ColorSyncProfileCopyTag(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileCopyTag called");
+    return NULL;
+}
+
+void* ColorSyncProfileCopyTagSignatures(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileCopyTagSignatures called");
+    return NULL;
+}
+
+void* ColorSyncProfileCreate(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileCreate called");
+    return NULL;
+}
+
+void* ColorSyncProfileCreateDeviceProfile(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileCreateDeviceProfile called");
+    return NULL;
+}
+
+void* ColorSyncProfileCreateDisplayTransferTablesFromVCGT(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileCreateDisplayTransferTablesFromVCGT called");
+    return NULL;
+}
+
+void* ColorSyncProfileCreateLink(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileCreateLink called");
+    return NULL;
+}
+
+void* ColorSyncProfileCreateMutable(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileCreateMutable called");
+    return NULL;
+}
+
+void* ColorSyncProfileCreateMutableCopy(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileCreateMutableCopy called");
+    return NULL;
+}
+
+void* ColorSyncProfileCreateSanitizedCopy(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileCreateSanitizedCopy called");
+    return NULL;
+}
+
+void* ColorSyncProfileCreateWithDisplayID(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileCreateWithDisplayID called");
+    return NULL;
+}
+
+void* ColorSyncProfileCreateWithName(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileCreateWithName called");
+    return NULL;
+}
+
+void* ColorSyncProfileCreateWithURL(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileCreateWithURL called");
+    return NULL;
+}
+
+void* ColorSyncProfileEstimateGamma(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileEstimateGamma called");
+    return NULL;
+}
+
+void* ColorSyncProfileEstimateGammaWithDisplayID(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileEstimateGammaWithDisplayID called");
+    return NULL;
+}
+
+void* ColorSyncProfileFromCMProfile(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileFromCMProfile called");
+    return NULL;
+}
+
+void* ColorSyncProfileGetData(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileGetData called");
+    return NULL;
+}
+
+void* ColorSyncProfileGetDisplayTransferFormulaFromVCGT(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileGetDisplayTransferFormulaFromVCGT called");
+    return NULL;
+}
+
+void* ColorSyncProfileGetMD5(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileGetMD5 called");
+    return NULL;
+}
+
+void* ColorSyncProfileGetTypeID(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileGetTypeID called");
+    return NULL;
+}
+
+void* ColorSyncProfileGetURL(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileGetURL called");
+    return NULL;
+}
+
+void* ColorSyncProfileInstall(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileInstall called");
+    return NULL;
+}
+
+void* ColorSyncProfileIsWideGamut(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileIsWideGamut called");
+    return NULL;
+}
+
+void* ColorSyncProfileProducesMatrixTransform(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileProducesMatrixTransform called");
+    return NULL;
+}
+
+void* ColorSyncProfileRemoveTag(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileRemoveTag called");
+    return NULL;
+}
+
+void* ColorSyncProfileSetDescriptionTag(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileSetDescriptionTag called");
+    return NULL;
+}
+
+void* ColorSyncProfileSetHeader(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileSetHeader called");
+    return NULL;
+}
+
+void* ColorSyncProfileSetLocalizedStringDictionary(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileSetLocalizedStringDictionary called");
+    return NULL;
+}
+
+void* ColorSyncProfileSetParametricTRCTag(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileSetParametricTRCTag called");
+    return NULL;
+}
+
+void* ColorSyncProfileSetTag(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileSetTag called");
+    return NULL;
+}
+
+void* ColorSyncProfileStreamPS2Definition(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileStreamPS2Definition called");
+    return NULL;
+}
+
+void* ColorSyncProfileUninstall(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileUninstall called");
+    return NULL;
+}
+
+void* ColorSyncProfileVerify(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileVerify called");
+    return NULL;
+}
+
+void* ColorSyncProfileWriteToFile(void)
+{
+    if (verbose) puts("STUB: ColorSyncProfileWriteToFile called");
+    return NULL;
+}
+
+void* ColorSyncPureGammaOriginalTRC(void)
+{
+    if (verbose) puts("STUB: ColorSyncPureGammaOriginalTRC called");
+    return NULL;
+}
+
+void* ColorSyncRegisterDevice(void)
+{
+    if (verbose) puts("STUB: ColorSyncRegisterDevice called");
+    return NULL;
+}
+
+void* ColorSyncSwapProfileHeader(void)
+{
+    if (verbose) puts("STUB: ColorSyncSwapProfileHeader called");
+    return NULL;
+}
+
+void* ColorSyncTRCGetFunction(void)
+{
+    if (verbose) puts("STUB: ColorSyncTRCGetFunction called");
+    return NULL;
+}
+
+void* ColorSyncTRCGetGammaID(void)
+{
+    if (verbose) puts("STUB: ColorSyncTRCGetGammaID called");
+    return NULL;
+}
+
+void* ColorSyncTRCGetLuminanceScale(void)
+{
+    if (verbose) puts("STUB: ColorSyncTRCGetLuminanceScale called");
+    return NULL;
+}
+
+void* ColorSyncTRCGetOptions(void)
+{
+    if (verbose) puts("STUB: ColorSyncTRCGetOptions called");
+    return NULL;
+}
+
+void* ColorSyncTRCGetProperties(void)
+{
+    if (verbose) puts("STUB: ColorSyncTRCGetProperties called");
+    return NULL;
+}
+
+void* ColorSyncTRCGetRange(void)
+{
+    if (verbose) puts("STUB: ColorSyncTRCGetRange called");
+    return NULL;
+}
+
+void* ColorSyncTRCGetTypeID(void)
+{
+    if (verbose) puts("STUB: ColorSyncTRCGetTypeID called");
+    return NULL;
+}
+
+void* ColorSyncTransformConvert(void)
+{
+    if (verbose) puts("STUB: ColorSyncTransformConvert called");
+    return NULL;
+}
+
+void* ColorSyncTransformCopyProperty(void)
+{
+    if (verbose) puts("STUB: ColorSyncTransformCopyProperty called");
+    return NULL;
+}
+
+void* ColorSyncTransformCreate(void)
+{
+    if (verbose) puts("STUB: ColorSyncTransformCreate called");
+    return NULL;
+}
+
+void* ColorSyncTransformCreateWithName(void)
+{
+    if (verbose) puts("STUB: ColorSyncTransformCreateWithName called");
+    return NULL;
+}
+
+void* ColorSyncTransformGetTypeID(void)
+{
+    if (verbose) puts("STUB: ColorSyncTransformGetTypeID called");
+    return NULL;
+}
+
+void* ColorSyncTransformIterate(void)
+{
+    if (verbose) puts("STUB: ColorSyncTransformIterate called");
+    return NULL;
+}
+
+void* ColorSyncTransformSetProperty(void)
+{
+    if (verbose) puts("STUB: ColorSyncTransformSetProperty called");
+    return NULL;
+}
+
+void* ColorSyncUnregisterDevice(void)
+{
+    if (verbose) puts("STUB: ColorSyncUnregisterDevice called");
+    return NULL;
+}
+
+void* ColorSyncVerifyAdobeRGBData(void)
+{
+    if (verbose) puts("STUB: ColorSyncVerifyAdobeRGBData called");
+    return NULL;
+}
+
+void* ColorSyncVerifyDisplayP3Data(void)
+{
+    if (verbose) puts("STUB: ColorSyncVerifyDisplayP3Data called");
+    return NULL;
+}
+
+void* ColorSyncVerifyGenericGrayGamma2_2Data(void)
+{
+    if (verbose) puts("STUB: ColorSyncVerifyGenericGrayGamma2_2Data called");
+    return NULL;
+}
+
+void* ColorSyncVerifyGenericLabData(void)
+{
+    if (verbose) puts("STUB: ColorSyncVerifyGenericLabData called");
+    return NULL;
+}
+
+void* ColorSyncVerifySRGBData(void)
+{
+    if (verbose) puts("STUB: ColorSyncVerifySRGBData called");
+    return NULL;
+}
diff --git a/src/TODO.md b/src/TODO.md
new file mode 100644
index 000000000..ee28e29ef
--- /dev/null
+++ b/src/TODO.md
@@ -0,0 +1,3 @@
+# TODO
+
+Move includes from Accelerate and ColorSync
diff --git a/src/external/cocotron b/src/external/cocotron
index 06c93de0e..6116cd1df 160000
--- a/src/external/cocotron
+++ b/src/external/cocotron
@@ -1 +1 @@
-Subproject commit 06c93de0ec0e17298bd24cc4321e6d4d00b55c8d
+Subproject commit 6116cd1df6d1c190468e9e0fd4b481276483b5aa
diff --git a/src/external/foundation b/src/external/foundation
index d53727789..adf1ef963 160000
--- a/src/external/foundation
+++ b/src/external/foundation
@@ -1 +1 @@
-Subproject commit d537277897c2ef86c834fa4f765a1e9a68e8a3d3
+Subproject commit adf1ef9636268a68712e358b9467c2517012f2ee