11 files changed, 10 insertions, 22 deletions
diff --git a/src/platform/graphics/quartz/Convert.cpp b/src/platform/graphics/quartz/Base.cpp
index 06699b0c..3d6e664a 100644
--- a/src/platform/graphics/quartz/Convert.cpp
+++ b/src/platform/graphics/quartz/Base.cpp
@@ -1,4 +1,4 @@
-#include "cru/platform/graphics/quartz/Convert.h"
+#include "cru/platform/graphics/quartz/Base.h"
 
 namespace cru::platform::graphics::quartz {
 
diff --git a/src/platform/graphics/quartz/Brush.cpp b/src/platform/graphics/quartz/Brush.cpp
index c5784e51..acdc7170 100644
--- a/src/platform/graphics/quartz/Brush.cpp
+++ b/src/platform/graphics/quartz/Brush.cpp
@@ -1,4 +1,5 @@
 #include "cru/platform/graphics/quartz/Brush.h"
+
 #include <format>
 
 namespace cru::platform::graphics::quartz {
diff --git a/src/platform/graphics/quartz/CMakeLists.txt b/src/platform/graphics/quartz/CMakeLists.txt
index 88050a07..bde8e815 100644
--- a/src/platform/graphics/quartz/CMakeLists.txt
+++ b/src/platform/graphics/quartz/CMakeLists.txt
@@ -1,19 +1,20 @@
 add_library(CruPlatformGraphicsQuartz
+	Base.cpp
 	Brush.cpp
-	Convert.cpp
 	Factory.cpp
 	Font.cpp
 	Geometry.cpp
 	Image.cpp
 	ImageFactory.cpp
 	Painter.cpp
-	Resource.cpp
 	TextLayout.cpp
 )
 
+find_library(FOUNDATION Foundation REQUIRED)
+find_library(CORE_FOUNDATION CoreFoundation REQUIRED)
 find_library(CORE_GRAPHICS CoreGraphics REQUIRED)
 find_library(CORE_TEXT CoreText REQUIRED)
 find_library(IMAGE_IO ImageIO REQUIRED)
 
-target_link_libraries(CruPlatformGraphicsQuartz PUBLIC ${CORE_GRAPHICS} ${CORE_TEXT} ${IMAGE_IO})
-target_link_libraries(CruPlatformGraphicsQuartz PUBLIC CruPlatformBaseOsx CruPlatformGraphics)
+target_link_libraries(CruPlatformGraphicsQuartz PUBLIC ${FOUNDATION} ${CORE_FOUNDATION} ${CORE_GRAPHICS} ${CORE_TEXT} ${IMAGE_IO})
+target_link_libraries(CruPlatformGraphicsQuartz PUBLIC CruPlatformGraphics)
diff --git a/src/platform/graphics/quartz/Factory.cpp b/src/platform/graphics/quartz/Factory.cpp
index 3a489212..bdef7554 100644
--- a/src/platform/graphics/quartz/Factory.cpp
+++ b/src/platform/graphics/quartz/Factory.cpp
@@ -1,6 +1,5 @@
 #include "cru/platform/graphics/quartz/Factory.h"
 
-#include "cru/platform/graphics/ImageFactory.h"
 #include "cru/platform/graphics/quartz/Brush.h"
 #include "cru/platform/graphics/quartz/Font.h"
 #include "cru/platform/graphics/quartz/Geometry.h"
diff --git a/src/platform/graphics/quartz/Font.cpp b/src/platform/graphics/quartz/Font.cpp
index 12a8aa7f..dc60d559 100644
--- a/src/platform/graphics/quartz/Font.cpp
+++ b/src/platform/graphics/quartz/Font.cpp
@@ -1,7 +1,6 @@
 #include "cru/platform/graphics/quartz/Font.h"
 
-#include "cru/base/Osx.h"
-#include "cru/platform/graphics/quartz/Resource.h"
+#include "cru/base/platform/osx/Base.h"
 
 namespace cru::platform::graphics::quartz {
 OsxCTFont::OsxCTFont(IGraphicsFactory* graphics_factory,
diff --git a/src/platform/graphics/quartz/Geometry.cpp b/src/platform/graphics/quartz/Geometry.cpp
index e6558fbb..4c2f90a6 100644
--- a/src/platform/graphics/quartz/Geometry.cpp
+++ b/src/platform/graphics/quartz/Geometry.cpp
@@ -1,5 +1,4 @@
 #include "cru/platform/graphics/quartz/Geometry.h"
-#include "cru/platform/graphics/quartz/Convert.h"
 
 #include <memory>
 
diff --git a/src/platform/graphics/quartz/Image.cpp b/src/platform/graphics/quartz/Image.cpp
index a6c7c65b..be63f5f5 100644
--- a/src/platform/graphics/quartz/Image.cpp
+++ b/src/platform/graphics/quartz/Image.cpp
@@ -1,6 +1,4 @@
 #include "cru/platform/graphics/quartz/Image.h"
-#include "cru/base/Exception.h"
-#include "cru/platform/graphics/quartz/Convert.h"
 #include "cru/platform/graphics/quartz/Painter.h"
 
 namespace cru::platform::graphics::quartz {
diff --git a/src/platform/graphics/quartz/ImageFactory.cpp b/src/platform/graphics/quartz/ImageFactory.cpp
index 87b2ff36..c591d9d7 100644
--- a/src/platform/graphics/quartz/ImageFactory.cpp
+++ b/src/platform/graphics/quartz/ImageFactory.cpp
@@ -1,8 +1,5 @@
 #include "cru/platform/graphics/quartz/ImageFactory.h"
-#include "cru/base/Exception.h"
-#include "cru/base/Osx.h"
-#include "cru/platform/graphics/Image.h"
-#include "cru/platform/graphics/quartz/Convert.h"
+#include "cru/base/platform/osx/Base.h"
 #include "cru/platform/graphics/quartz/Image.h"
 
 #include <ImageIO/ImageIO.h>
diff --git a/src/platform/graphics/quartz/Painter.cpp b/src/platform/graphics/quartz/Painter.cpp
index b825f28c..90450bab 100644
--- a/src/platform/graphics/quartz/Painter.cpp
+++ b/src/platform/graphics/quartz/Painter.cpp
@@ -1,11 +1,9 @@
 #include "cru/platform/graphics/quartz/Painter.h"
 
 #include "cru/platform/graphics/quartz/Brush.h"
-#include "cru/platform/graphics/quartz/Convert.h"
 #include "cru/platform/graphics/quartz/Geometry.h"
 #include "cru/platform/graphics/quartz/Image.h"
 #include "cru/platform/graphics/quartz/TextLayout.h"
-#include "cru/platform/Color.h"
 
 namespace cru::platform::graphics::quartz {
 QuartzCGContextPainter::QuartzCGContextPainter(
diff --git a/src/platform/graphics/quartz/Resource.cpp b/src/platform/graphics/quartz/Resource.cpp
deleted file mode 100644
index a5d43747..00000000
--- a/src/platform/graphics/quartz/Resource.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "cru/platform/graphics/quartz/Resource.h"
diff --git a/src/platform/graphics/quartz/TextLayout.cpp b/src/platform/graphics/quartz/TextLayout.cpp
index b7a015c1..f98cff3a 100644
--- a/src/platform/graphics/quartz/TextLayout.cpp
+++ b/src/platform/graphics/quartz/TextLayout.cpp
@@ -1,10 +1,7 @@
 #include "cru/platform/graphics/quartz/TextLayout.h"
 #include "cru/base/Base.h"
-#include "cru/base/Osx.h"
 #include "cru/base/StringUtil.h"
-#include "cru/platform/graphics/Base.h"
-#include "cru/platform/graphics/quartz/Convert.h"
-#include "cru/platform/graphics/quartz/Resource.h"
+#include "cru/base/platform/osx/Base.h"
 
 #include <format>
 #include <limits>