21 files changed, 23 insertions, 23 deletions
diff --git a/include/cru/osx/graphics/quartz/Brush.h b/include/cru/platform/graphics/quartz/Brush.h
index 677a0b6c..f3579771 100644
--- a/include/cru/osx/graphics/quartz/Brush.h
+++ b/include/cru/platform/graphics/quartz/Brush.h
@@ -8,7 +8,7 @@
 
 #include <functional>
 
-namespace cru::platform::graphics::osx::quartz {
+namespace cru::platform::graphics::quartz {
 class QuartzBrush : public OsxQuartzResource, public virtual IBrush {
  public:
   QuartzBrush(IGraphicsFactory* graphics_factory)
@@ -44,4 +44,4 @@ class QuartzSolidColorBrush : public QuartzBrush,
   Color color_;
   CGColorRef cg_color_;
 };
-}  // namespace cru::platform::graphics::osx::quartz
+}  // namespace cru::platform::graphics::quartz
diff --git a/include/cru/osx/graphics/quartz/Convert.h b/include/cru/platform/graphics/quartz/Convert.h
index be56b959..c7dab7c9 100644
--- a/include/cru/osx/graphics/quartz/Convert.h
+++ b/include/cru/platform/graphics/quartz/Convert.h
@@ -6,7 +6,7 @@
 
 #include <CoreGraphics/CoreGraphics.h>
 
-namespace cru::platform::graphics::osx::quartz {
+namespace cru::platform::graphics::quartz {
 CGAffineTransform Convert(const Matrix& matrix);
 Matrix Convert(const CGAffineTransform& matrix);
 
@@ -21,4 +21,4 @@ Rect Convert(const CGRect& rect);
 
 CGDataProviderRef ConvertStreamToCGDataProvider(io::Stream* stream);
 CGDataConsumerRef ConvertStreamToCGDataConsumer(io::Stream* stream);
-}  // namespace cru::platform::graphics::osx::quartz
+}  // namespace cru::platform::graphics::quartz
diff --git a/include/cru/osx/graphics/quartz/Factory.h b/include/cru/platform/graphics/quartz/Factory.h
index 1a5abdc1..57992d87 100644
--- a/include/cru/osx/graphics/quartz/Factory.h
+++ b/include/cru/platform/graphics/quartz/Factory.h
@@ -1,11 +1,11 @@
 #pragma once
 #include "Resource.h"
 #include "cru/common/Base.h"
-#include "cru/osx/graphics/quartz/ImageFactory.h"
+#include "cru/platform/graphics/quartz/ImageFactory.h"
 #include "cru/platform/graphics/Factory.h"
 #include "cru/platform/graphics/ImageFactory.h"
 
-namespace cru::platform::graphics::osx::quartz {
+namespace cru::platform::graphics::quartz {
 class QuartzGraphicsFactory : public OsxQuartzResource,
                               public virtual IGraphicsFactory {
  public:
@@ -32,4 +32,4 @@ class QuartzGraphicsFactory : public OsxQuartzResource,
  private:
   std::unique_ptr<QuartzImageFactory> image_factory_;
 };
-}  // namespace cru::platform::graphics::osx::quartz
+}  // namespace cru::platform::graphics::quartz
diff --git a/include/cru/osx/graphics/quartz/Font.h b/include/cru/platform/graphics/quartz/Font.h
index 50703dfe..36dba31a 100644
--- a/include/cru/osx/graphics/quartz/Font.h
+++ b/include/cru/platform/graphics/quartz/Font.h
@@ -5,7 +5,7 @@
 
 #include <CoreText/CoreText.h>
 
-namespace cru::platform::graphics::osx::quartz {
+namespace cru::platform::graphics::quartz {
 class OsxCTFont : public OsxQuartzResource, public virtual IFont {
  public:
   OsxCTFont(IGraphicsFactory* graphics_factory, const String& name, float size);
@@ -24,4 +24,4 @@ class OsxCTFont : public OsxQuartzResource, public virtual IFont {
   String name_;
   CTFontRef ct_font_;
 };
-}  // namespace cru::platform::graphics::osx::quartz
+}  // namespace cru::platform::graphics::quartz
diff --git a/include/cru/osx/graphics/quartz/Geometry.h b/include/cru/platform/graphics/quartz/Geometry.h
index e0bdd5b6..18e2e25e 100644
--- a/include/cru/osx/graphics/quartz/Geometry.h
+++ b/include/cru/platform/graphics/quartz/Geometry.h
@@ -6,7 +6,7 @@
 
 #include <CoreGraphics/CoreGraphics.h>
 
-namespace cru::platform::graphics::osx::quartz {
+namespace cru::platform::graphics::quartz {
 class QuartzGeometry : public OsxQuartzResource, public virtual IGeometry {
  public:
   QuartzGeometry(IGraphicsFactory *graphics_factory, CGPathRef cg_path);
@@ -54,4 +54,4 @@ class QuartzGeometryBuilder : public OsxQuartzResource,
  private:
   CGMutablePathRef cg_mutable_path_;
 };
-}  // namespace cru::platform::graphics::osx::quartz
+}  // namespace cru::platform::graphics::quartz
diff --git a/include/cru/osx/graphics/quartz/Image.h b/include/cru/platform/graphics/quartz/Image.h
index 5b3aead9..1dd8f0a6 100644
--- a/include/cru/osx/graphics/quartz/Image.h
+++ b/include/cru/platform/graphics/quartz/Image.h
@@ -5,7 +5,7 @@
 
 #include <CoreGraphics/CoreGraphics.h>
 
-namespace cru::platform::graphics::osx::quartz {
+namespace cru::platform::graphics::quartz {
 class QuartzImage : public OsxQuartzResource, public virtual IImage {
  public:
   QuartzImage(IGraphicsFactory* graphics_factory, IImageFactory* image_factory,
@@ -34,4 +34,4 @@ class QuartzImage : public OsxQuartzResource, public virtual IImage {
 
   unsigned char* buffer_;
 };
-}  // namespace cru::platform::graphics::osx::quartz
+}  // namespace cru::platform::graphics::quartz
diff --git a/include/cru/osx/graphics/quartz/ImageFactory.h b/include/cru/platform/graphics/quartz/ImageFactory.h
index 23d14332..bd2a929f 100644
--- a/include/cru/osx/graphics/quartz/ImageFactory.h
+++ b/include/cru/platform/graphics/quartz/ImageFactory.h
@@ -2,7 +2,7 @@
 #include "Resource.h"
 #include "cru/platform/graphics/ImageFactory.h"
 
-namespace cru::platform::graphics::osx::quartz {
+namespace cru::platform::graphics::quartz {
 class QuartzImageFactory : public OsxQuartzResource,
                            public virtual IImageFactory {
  public:
@@ -19,4 +19,4 @@ class QuartzImageFactory : public OsxQuartzResource,
                       float quality) override;
   std::unique_ptr<IImage> CreateBitmap(int width, int height) override;
 };
-}  // namespace cru::platform::graphics::osx::quartz
+}  // namespace cru::platform::graphics::quartz
diff --git a/include/cru/osx/graphics/quartz/Painter.h b/include/cru/platform/graphics/quartz/Painter.h
index 87389437..eba66a56 100644
--- a/include/cru/osx/graphics/quartz/Painter.h
+++ b/include/cru/platform/graphics/quartz/Painter.h
@@ -8,7 +8,7 @@
 
 #include <functional>
 
-namespace cru::platform::graphics::osx::quartz {
+namespace cru::platform::graphics::quartz {
 class QuartzCGContextPainter : public OsxQuartzResource,
                                public virtual IPainter {
   CRU_DEFINE_CLASS_LOG_TAG(u"QuartzCGContextPainter")
@@ -79,4 +79,4 @@ class QuartzCGContextPainter : public OsxQuartzResource,
 
   std::vector<Rect> clip_stack_;
 };
-}  // namespace cru::platform::graphics::osx::quartz
+}  // namespace cru::platform::graphics::quartz
diff --git a/include/cru/osx/graphics/quartz/Resource.h b/include/cru/platform/graphics/quartz/Resource.h
index 916a376f..d28e4055 100644
--- a/include/cru/osx/graphics/quartz/Resource.h
+++ b/include/cru/platform/graphics/quartz/Resource.h
@@ -1,9 +1,9 @@
 #pragma once
-#include "cru/osx/Resource.h"
+#include "cru/platform/osx/Resource.h"
 #include "cru/platform/graphics/Base.h"
 #include "cru/platform/graphics/Resource.h"
 
-namespace cru::platform::graphics::osx::quartz {
+namespace cru::platform::graphics::quartz {
 class OsxQuartzResource : public platform::osx::OsxResource,
                           public virtual IGraphicsResource {
  public:
@@ -22,4 +22,4 @@ class OsxQuartzResource : public platform::osx::OsxResource,
  private:
   IGraphicsFactory* graphics_factory_;
 };
-}  // namespace cru::platform::graphics::osx::quartz
+}  // namespace cru::platform::graphics::quartz
diff --git a/include/cru/osx/graphics/quartz/TextLayout.h b/include/cru/platform/graphics/quartz/TextLayout.h
index c0abc7f9..0d23360d 100644
--- a/include/cru/osx/graphics/quartz/TextLayout.h
+++ b/include/cru/platform/graphics/quartz/TextLayout.h
@@ -7,7 +7,7 @@
 
 #include <memory>
 
-namespace cru::platform::graphics::osx::quartz {
+namespace cru::platform::graphics::quartz {
 class OsxCTTextLayout : public OsxQuartzResource, public virtual ITextLayout {
  public:
   OsxCTTextLayout(IGraphicsFactory* graphics_factory,
@@ -92,4 +92,4 @@ class OsxCTTextLayout : public OsxQuartzResource, public virtual ITextLayout {
 
   Matrix transform_;
 };
-}  // namespace cru::platform::graphics::osx::quartz
+}  // namespace cru::platform::graphics::quartz
diff --git a/include/cru/osx/gui/Clipboard.h b/include/cru/platform/gui/osx/Clipboard.h
index b4dcce4c..b4dcce4c 100644
--- a/include/cru/osx/gui/Clipboard.h
+++ b/include/cru/platform/gui/osx/Clipboard.h
diff --git a/include/cru/osx/gui/Cursor.h b/include/cru/platform/gui/osx/Cursor.h
index 6cfd400a..6cfd400a 100644
--- a/include/cru/osx/gui/Cursor.h
+++ b/include/cru/platform/gui/osx/Cursor.h
diff --git a/include/cru/osx/gui/InputMethod.h b/include/cru/platform/gui/osx/InputMethod.h
index cbfdae6c..cbfdae6c 100644
--- a/include/cru/osx/gui/InputMethod.h
+++ b/include/cru/platform/gui/osx/InputMethod.h
diff --git a/include/cru/osx/gui/Keyboard.h b/include/cru/platform/gui/osx/Keyboard.h
index 89e0fa05..89e0fa05 100644
--- a/include/cru/osx/gui/Keyboard.h
+++ b/include/cru/platform/gui/osx/Keyboard.h
diff --git a/include/cru/osx/gui/Menu.h b/include/cru/platform/gui/osx/Menu.h
index c5cc756a..c5cc756a 100644
--- a/include/cru/osx/gui/Menu.h
+++ b/include/cru/platform/gui/osx/Menu.h
diff --git a/include/cru/osx/gui/Resource.h b/include/cru/platform/gui/osx/Resource.h
index bc3f9cd6..1eec7d09 100644
--- a/include/cru/osx/gui/Resource.h
+++ b/include/cru/platform/gui/osx/Resource.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "../Resource.h"
+#include "cru/platform/osx/Resource.h"
 
 #include "cru/platform/gui/Base.h"
 
diff --git a/include/cru/osx/gui/UiApplication.h b/include/cru/platform/gui/osx/UiApplication.h
index 2d2c119c..2d2c119c 100644
--- a/include/cru/osx/gui/UiApplication.h
+++ b/include/cru/platform/gui/osx/UiApplication.h
diff --git a/include/cru/osx/gui/Window.h b/include/cru/platform/gui/osx/Window.h
index 6cefbe8e..6cefbe8e 100644
--- a/include/cru/osx/gui/Window.h
+++ b/include/cru/platform/gui/osx/Window.h
diff --git a/include/cru/osx/Convert.h b/include/cru/platform/osx/Convert.h
index bf32174a..bf32174a 100644
--- a/include/cru/osx/Convert.h
+++ b/include/cru/platform/osx/Convert.h
diff --git a/include/cru/osx/Exception.h b/include/cru/platform/osx/Exception.h
index c346b970..c346b970 100644
--- a/include/cru/osx/Exception.h
+++ b/include/cru/platform/osx/Exception.h
diff --git a/include/cru/osx/Resource.h b/include/cru/platform/osx/Resource.h
index d30ee31b..d30ee31b 100644
--- a/include/cru/osx/Resource.h
+++ b/include/cru/platform/osx/Resource.h