diff --git a/source/Display/GLContext.cpp b/source/Display/GLContext.cpp
index 912c9ff..2c812dc 100644
--- a/source/Display/GLContext.cpp
+++ b/source/Display/GLContext.cpp
@@ -1,10 +1,10 @@
 
 #include <Spectre/Display/GLContext.h>
 
-#ifdef _WIN32
+#ifdef SPECTRE_PLATFORM_WIN
 #include <Platform/Win32/Win32GLContext.h>
 typedef sp::Win32GLContext ContextType;
-#elif defined(__linux__) || defined(unix) || defined(__unix) || defined(__unix__)
+#elif SPECTRE_PLATFORM_UNIX
 #include <Platform/Unix/GLXContext.h>
 typedef sp::GLXContext ContextType;
 #else
diff --git a/source/Platform/PlatformApplication.cpp b/source/Platform/PlatformApplication.cpp
index 02076a0..9bd32b3 100644
--- a/source/Platform/PlatformApplication.cpp
+++ b/source/Platform/PlatformApplication.cpp
@@ -1,10 +1,10 @@
 
 #include "PlatformApplication.h"
 
-#ifdef _WIN32
+#ifdef SPECTRE_PLATFORM_WIN
 #include <Platform/Win32/Win32Application.h>
 typedef sp::Win32Application ApplicationType;
-#elif defined(__linux__) || defined(unix) || defined(__unix) || defined(__unix__)
+#elif SPECTRE_PLATFORM_UNIX
 #include <Platform/Unix/UnixApplication.h>
 typedef sp::UnixApplication ApplicationType;
 #else
diff --git a/source/Platform/PlatformDisplay.cpp b/source/Platform/PlatformDisplay.cpp
index 3298b98..4cfb3c7 100644
--- a/source/Platform/PlatformDisplay.cpp
+++ b/source/Platform/PlatformDisplay.cpp
@@ -2,10 +2,10 @@
 #include <Spectre/Display/Display.h>
 #include "PlatformDisplay.h"
 
-#ifdef _WIN32
+#ifdef SPECTRE_PLATFORM_WIN
 #include <Platform/Win32/Win32Display.h>
 typedef sp::Win32Display DisplayType;
-#elif defined(__linux__) || defined(unix) || defined(__unix) || defined(__unix__)
+#elif SPECTRE_PLATFORM_UNIX
 #include <Platform/Unix/X11Display.h>
 typedef sp::X11Display DisplayType;
 #else
diff --git a/source/System/MessageQueue.cpp b/source/System/MessageQueue.cpp
index 3550e36..57f4fa4 100644
--- a/source/System/MessageQueue.cpp
+++ b/source/System/MessageQueue.cpp
@@ -1,10 +1,10 @@
 
 #include <Spectre/System/MessageQueue.h>
 
-#ifdef _WIN32
+#ifdef SPECTRE_PLATFORM_WIN
 #include <Platform/Win32/Win32EventQueue.h>
 typedef sp::Win32EventQueue ImplType;
-#elif defined(__linux__) || defined(unix) || defined(__unix) || defined(__unix__)
+#elif SPECTRE_PLATFORM_UNIX
 #include <Platform/Unix/X11EventQueue.h>
 typedef sp::X11EventQueue ImplType;
 #else