5 files changed, 16 insertions, 13 deletions
diff --git a/include/cru/common/io/FileStream.hpp b/include/cru/common/io/FileStream.hpp
index fdde13fa..73c7b61e 100644
--- a/include/cru/common/io/FileStream.hpp
+++ b/include/cru/common/io/FileStream.hpp
@@ -6,8 +6,8 @@ namespace cru::io {
 using FileStream = UnixFileStream;
 }
 #elif CRU_PLATFORM_WINDOWS
-#include "Win32FileStream.hpp"
+#include "../platform/win/Win32FileStream.hpp"
 namespace cru::io {
-using FileStream = Win32FileStream;
+using FileStream = platform::win::Win32FileStream;
 }
 #endif
diff --git a/include/cru/common/platform/win/Exception.hpp b/include/cru/common/platform/win/Exception.hpp
index f90efe0a..0774327f 100644
--- a/include/cru/common/platform/win/Exception.hpp
+++ b/include/cru/common/platform/win/Exception.hpp
@@ -38,8 +38,10 @@ class CRU_BASE_API Win32Error : public platform::PlatformException {
  public:
   // ::GetLastError is automatically called to get the error code.
   // The same as Win32Error(::GetLastError(), message)
-  explicit Win32Error(std::string_view message);
-  Win32Error(DWORD error_code, std::string_view message);
+  [[deprecated]] explicit Win32Error(std::string_view message);
+  explicit Win32Error(String message);
+  [[deprecated]] Win32Error(DWORD error_code, std::string_view message);
+  Win32Error(DWORD error_code, String message);
 
   CRU_DEFAULT_COPY(Win32Error)
   CRU_DEFAULT_MOVE(Win32Error)
diff --git a/include/cru/common/io/Win32FileStream.hpp b/include/cru/common/platform/win/Win32FileStream.hpp
index 08600a8e..231a7ec6 100644
--- a/include/cru/common/io/Win32FileStream.hpp
+++ b/include/cru/common/platform/win/Win32FileStream.hpp
@@ -1,22 +1,21 @@
 #pragma once
 
-#include "../PreConfig.hpp"
+#include "../../PreConfig.hpp"
 
 #ifdef CRU_PLATFORM_WINDOWS
 
-#include "../String.hpp"
-#include "OpenFileFlag.hpp"
-#include "Stream.hpp"
-#include "cru/common/Base.hpp"
+#include "../../String.hpp"
+#include "../../io/OpenFileFlag.hpp"
+#include "../../io/Stream.hpp"
 
-namespace cru::io {
+namespace cru::platform::win {
 namespace details {
 class Win32FileStreamPrivate;
 }
 
-class CRU_BASE_API Win32FileStream : public Stream {
+class CRU_BASE_API Win32FileStream : public io::Stream {
  public:
-  Win32FileStream(String path, OpenFileFlag flags);
+  Win32FileStream(String path, io::OpenFileFlag flags);
 
   CRU_DELETE_COPY(Win32FileStream)
   CRU_DELETE_MOVE(Win32FileStream)
@@ -43,7 +42,7 @@ class CRU_BASE_API Win32FileStream : public Stream {
 
  private:
   String path_;
-  OpenFileFlag flags_;
+  io::OpenFileFlag flags_;
   bool closed_ = false;
 
   details::Win32FileStreamPrivate* p_;
diff --git a/include/cru/osx/Exception.hpp b/include/cru/osx/Exception.hpp
index 4123778b..5776ab72 100644
--- a/include/cru/osx/Exception.hpp
+++ b/include/cru/osx/Exception.hpp
@@ -1,2 +1,3 @@
 #pragma once
 #include "cru/common/platform/osx/Exception.hpp"
+#include "cru/platform/Exception.hpp"
diff --git a/include/cru/win/Exception.hpp b/include/cru/win/Exception.hpp
index d3ac69a7..3c42ff65 100644
--- a/include/cru/win/Exception.hpp
+++ b/include/cru/win/Exception.hpp
@@ -1,2 +1,3 @@
 #pragma once
 #include "cru/common/platform/win/Exception.hpp"
+#include "cru/platform/Exception.hpp"