6 files changed, 21 insertions, 30 deletions
diff --git a/include/cru/base/platform/win/Exception.h b/include/cru/base/platform/win/Base.h
index db98e7b6..83420461 100644
--- a/include/cru/base/platform/win/Exception.h
+++ b/include/cru/base/platform/win/Base.h
@@ -1,13 +1,19 @@
 #pragma once
 
 #ifndef _WIN32
-#error "This file can only be used on Windows."
+#error "This file can only be included on Windows."
 #endif
 
-#include "WinPreConfig.h"
-
 #include "../../Base.h"
 
+#define NOMINMAX
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+#undef CreateWindow
+#undef DrawText
+#undef CreateFont
+#undef CreateEvent
+
 namespace cru::platform::win {
 class CRU_BASE_API HResultError : public Exception {
  public:
diff --git a/include/cru/base/platform/win/ComAutoInit.h b/include/cru/base/platform/win/ComAutoInit.h
index cef819a5..524cd026 100644
--- a/include/cru/base/platform/win/ComAutoInit.h
+++ b/include/cru/base/platform/win/ComAutoInit.h
@@ -1,9 +1,10 @@
 #pragma once
 
-#ifdef CRU_PLATFORM_WINDOWS
+#ifndef _WIN32
+#error "This file can only be included on Windows."
+#endif
 
-#include "WinPreConfig.h"
-#include "cru/base/Base.h"
+#include "Base.h"
 
 namespace cru::platform::win {
 class CRU_BASE_API ComAutoInit {
@@ -16,5 +17,3 @@ class CRU_BASE_API ComAutoInit {
   ~ComAutoInit();
 };
 }  // namespace cru::platform::win
-
-#endif
diff --git a/include/cru/base/platform/win/DebugLogTarget.h b/include/cru/base/platform/win/DebugLogTarget.h
index cabfa7e5..333e764f 100644
--- a/include/cru/base/platform/win/DebugLogTarget.h
+++ b/include/cru/base/platform/win/DebugLogTarget.h
@@ -1,15 +1,13 @@
 #pragma once
 
 #ifndef _WIN32
-#error "This file can only be used on Windows."
+#error "This file can only be included on Windows."
 #endif
 
-#include "WinPreConfig.h"
-
+#include "Base.h"
 #include "../../log/Logger.h"
 
 namespace cru::platform::win {
-
 class CRU_BASE_API WinDebugLogTarget : public ::cru::log::ILogTarget {
  public:
   void Write(::cru::log::LogLevel level, std::string s) override;
diff --git a/include/cru/base/platform/win/StreamConvert.h b/include/cru/base/platform/win/StreamConvert.h
index 17552c31..085e94e6 100644
--- a/include/cru/base/platform/win/StreamConvert.h
+++ b/include/cru/base/platform/win/StreamConvert.h
@@ -1,6 +1,8 @@
 #pragma once
 
-#ifdef CRU_PLATFORM_WINDOWS
+#ifndef _WIN32
+#error "This file can only be included on Windows."
+#endif
 
 #include "../../io/Stream.h"
 
@@ -9,5 +11,3 @@
 namespace cru::platform::win {
 CRU_BASE_API IStream* ConvertStreamToComStream(io::Stream* stream);
 }
-
-#endif
diff --git a/include/cru/base/platform/win/Win32FileStream.h b/include/cru/base/platform/win/Win32FileStream.h
index d0339b11..2980d059 100644
--- a/include/cru/base/platform/win/Win32FileStream.h
+++ b/include/cru/base/platform/win/Win32FileStream.h
@@ -1,6 +1,8 @@
 #pragma once
 
-#ifdef CRU_PLATFORM_WINDOWS
+#ifndef _WIN32
+#error "This file can only be included on Windows."
+#endif
 
 #include "../../io/OpenFileFlag.h"
 #include "../../io/Stream.h"
@@ -38,5 +40,3 @@ class CRU_BASE_API Win32FileStream : public io::Stream {
   details::Win32FileStreamPrivate* p_;
 };
 }  // namespace cru::platform::win
-
-#endif
diff --git a/include/cru/base/platform/win/WinPreConfig.h b/include/cru/base/platform/win/WinPreConfig.h
deleted file mode 100644
index 03e0c03c..00000000
--- a/include/cru/base/platform/win/WinPreConfig.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-#ifdef CRU_PLATFORM_WINDOWS
-
-#define NOMINMAX
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
-#undef CreateWindow
-#undef DrawText
-#undef CreateFont
-#undef CreateEvent
-
-#endif