15 files changed, 19 insertions, 19 deletions
diff --git a/src/platform/gui/osx/Clipboard.mm b/src/platform/gui/osx/Clipboard.mm
index 068771c8..5d498d0e 100644
--- a/src/platform/gui/osx/Clipboard.mm
+++ b/src/platform/gui/osx/Clipboard.mm
@@ -1,7 +1,7 @@
 #include "cru/platform/gui/osx/Clipboard.h"
 #include "ClipboardPrivate.h"
 
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
 #include "cru/platform/osx/Convert.h"
 
 #include <memory>
diff --git a/src/platform/gui/osx/ClipboardPrivate.h b/src/platform/gui/osx/ClipboardPrivate.h
index e00c59dc..766026b6 100644
--- a/src/platform/gui/osx/ClipboardPrivate.h
+++ b/src/platform/gui/osx/ClipboardPrivate.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
 #include "cru/platform/gui/osx/Clipboard.h"
 
 #include <AppKit/AppKit.h>
diff --git a/src/platform/gui/osx/InputMethod.mm b/src/platform/gui/osx/InputMethod.mm
index 50ff80de..af2d1ec2 100644
--- a/src/platform/gui/osx/InputMethod.mm
+++ b/src/platform/gui/osx/InputMethod.mm
@@ -3,7 +3,7 @@
 #import <AppKit/AppKit.h>
 #include "InputMethodPrivate.h"
 #include "WindowPrivate.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
 #include "cru/platform/osx/Convert.h"
 #include "cru/platform/gui/osx/Window.h"
 
diff --git a/src/platform/gui/osx/Menu.mm b/src/platform/gui/osx/Menu.mm
index 568a5208..e74ec23b 100644
--- a/src/platform/gui/osx/Menu.mm
+++ b/src/platform/gui/osx/Menu.mm
@@ -2,7 +2,7 @@
 #import "MenuPrivate.h"
 
 #include "KeyboardPrivate.h"
-#include "cru/common/platform/osx/Convert.h"
+#include "cru/base/platform/osx/Convert.h"
 
 #import <AppKit/NSApplication.h>
 
diff --git a/src/platform/gui/osx/UiApplication.mm b/src/platform/gui/osx/UiApplication.mm
index ef62af58..fd6e8ef0 100644
--- a/src/platform/gui/osx/UiApplication.mm
+++ b/src/platform/gui/osx/UiApplication.mm
@@ -1,8 +1,8 @@
 #include "cru/platform/gui/osx/UiApplication.h"
 
 #include "ClipboardPrivate.h"
-#include "cru/common/log/Logger.h"
-#include "cru/common/platform/osx/Convert.h"
+#include "cru/base/log/Logger.h"
+#include "cru/base/platform/osx/Convert.h"
 #include "cru/platform/graphics/quartz/Factory.h"
 #include "cru/platform/gui/osx/Clipboard.h"
 #include "cru/platform/gui/osx/Cursor.h"
diff --git a/src/platform/gui/osx/Window.mm b/src/platform/gui/osx/Window.mm
index d6bee564..8c059a12 100644
--- a/src/platform/gui/osx/Window.mm
+++ b/src/platform/gui/osx/Window.mm
@@ -3,8 +3,8 @@
 
 #include "CursorPrivate.h"
 #include "InputMethodPrivate.h"
-#include "cru/common/Range.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/Range.h"
+#include "cru/base/log/Logger.h"
 #include "cru/platform/Check.h"
 #include "cru/platform/graphics/NullPainter.h"
 #include "cru/platform/graphics/quartz/Convert.h"
diff --git a/src/platform/gui/osx/WindowPrivate.h b/src/platform/gui/osx/WindowPrivate.h
index 00e15084..478ce4e5 100644
--- a/src/platform/gui/osx/WindowPrivate.h
+++ b/src/platform/gui/osx/WindowPrivate.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "cru/platform/gui/osx/Window.h"
 
-#include "cru/common/Event.h"
+#include "cru/base/Event.h"
 #include "cru/platform/gui/TimerHelper.h"
 #include "cru/platform/gui/Window.h"
 #include "cru/platform/gui/osx/Cursor.h"
diff --git a/src/platform/gui/win/Clipboard.cpp b/src/platform/gui/win/Clipboard.cpp
index 26850d3d..a0914a0b 100644
--- a/src/platform/gui/win/Clipboard.cpp
+++ b/src/platform/gui/win/Clipboard.cpp
@@ -1,5 +1,5 @@
 #include "cru/platform/gui/win/Clipboard.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
 #include "cru/platform/gui/win/GodWindow.h"
 #include "cru/platform/gui/win/UiApplication.h"
 
diff --git a/src/platform/gui/win/Cursor.cpp b/src/platform/gui/win/Cursor.cpp
index c2efff1b..d7692c2d 100644
--- a/src/platform/gui/win/Cursor.cpp
+++ b/src/platform/gui/win/Cursor.cpp
@@ -1,6 +1,6 @@
 #include "cru/platform/gui/win/Cursor.h"
 
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
 #include "cru/platform/gui/win/Exception.h"
 
 #include <stdexcept>
diff --git a/src/platform/gui/win/GodWindow.cpp b/src/platform/gui/win/GodWindow.cpp
index 4a062369..364688e5 100644
--- a/src/platform/gui/win/GodWindow.cpp
+++ b/src/platform/gui/win/GodWindow.cpp
@@ -1,6 +1,6 @@
 #include "cru/platform/gui/win/GodWindow.h"
 
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
 #include "cru/platform/gui/win/Exception.h"
 #include "cru/platform/gui/win/UiApplication.h"
 #include "cru/platform/gui/win/WindowClass.h"
diff --git a/src/platform/gui/win/InputMethod.cpp b/src/platform/gui/win/InputMethod.cpp
index 4c5b3b8c..44b5681d 100644
--- a/src/platform/gui/win/InputMethod.cpp
+++ b/src/platform/gui/win/InputMethod.cpp
@@ -1,7 +1,7 @@
 #include "cru/platform/gui/win/InputMethod.h"
 
-#include "cru/common/StringUtil.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/StringUtil.h"
+#include "cru/base/log/Logger.h"
 #include "cru/platform/Check.h"
 #include "cru/platform/gui/DebugFlags.h"
 #include "cru/platform/gui/win/Exception.h"
diff --git a/src/platform/gui/win/TimerManager.h b/src/platform/gui/win/TimerManager.h
index 21c00690..b3f4aa38 100644
--- a/src/platform/gui/win/TimerManager.h
+++ b/src/platform/gui/win/TimerManager.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "cru/common/Event.h"
+#include "cru/base/Event.h"
 #include "cru/platform/win/WinPreConfig.h"
 
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
 #include "cru/platform/gui/win/GodWindow.h"
 #include "cru/platform/gui/win/WindowNativeMessageEventArgs.h"
 
diff --git a/src/platform/gui/win/UiApplication.cpp b/src/platform/gui/win/UiApplication.cpp
index 94d6b9c5..5be1a5d2 100644
--- a/src/platform/gui/win/UiApplication.cpp
+++ b/src/platform/gui/win/UiApplication.cpp
@@ -2,7 +2,7 @@
 
 #include "TimerManager.h"
 #include "WindowManager.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
 #include "cru/platform/Check.h"
 #include "cru/platform/graphics/direct2d/Factory.h"
 #include "cru/platform/gui/win/Base.h"
diff --git a/src/platform/gui/win/Window.cpp b/src/platform/gui/win/Window.cpp
index 79ae02e2..47ca93f8 100644
--- a/src/platform/gui/win/Window.cpp
+++ b/src/platform/gui/win/Window.cpp
@@ -1,7 +1,7 @@
 #include "cru/platform/gui/win/Window.h"
 
 #include "WindowManager.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
 #include "cru/platform/Check.h"
 #include "cru/platform/graphics/NullPainter.h"
 #include "cru/platform/gui/Base.h"
diff --git a/src/platform/gui/win/WindowManager.h b/src/platform/gui/win/WindowManager.h
index afc4a5f5..062f2002 100644
--- a/src/platform/gui/win/WindowManager.h
+++ b/src/platform/gui/win/WindowManager.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "cru/platform/win/WinPreConfig.h"
 
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
 
 #include <map>
 #include <memory>