diff --git a/libs/io/source/file_stream.cpp b/libs/io/source/file_stream.cpp
index 089b9c71..5e0a5b7e 100644
--- a/libs/io/source/file_stream.cpp
+++ b/libs/io/source/file_stream.cpp
@@ -15,7 +15,7 @@ namespace psemek::io
 			throw util::system_error(std::error_code{errno, std::system_category()}, "Failed to open " + path.string());
 		}
 
-#ifdef __WIN32__
+#ifdef _WIN32
 		wchar_t const * fopen_read_mode()
 		{
 			return L"rb";
diff --git a/libs/sdl2/include/psemek/sdl2/discrete_gpu.hpp b/libs/sdl2/include/psemek/sdl2/discrete_gpu.hpp
index a9157612..29ac99eb 100644
--- a/libs/sdl2/include/psemek/sdl2/discrete_gpu.hpp
+++ b/libs/sdl2/include/psemek/sdl2/discrete_gpu.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#ifdef WIN32
+#ifdef _WIN32
 
 #define PSEMEK_SDL2_DISCRETE_GPU \
 extern "C" { __declspec(dllexport) unsigned long NvOptimusEnablement = 1; } \
diff --git a/libs/util/source/executable_path.cpp b/libs/util/source/executable_path.cpp
index b2f3e9f6..ba8a9dc8 100644
--- a/libs/util/source/executable_path.cpp
+++ b/libs/util/source/executable_path.cpp
@@ -2,7 +2,7 @@
 #include <psemek/util/to_string.hpp>
 #include <psemek/util/exception.hpp>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <libloaderapi.h>
 #include <errhandlingapi.h>
 #include <winerror.h>
@@ -13,7 +13,7 @@ namespace psemek::util
 
 	std::filesystem::path executable_path()
 	{
-#if defined WIN32
+#if defined _WIN32
 		std::wstring result(256, '\0');
 		while (true)
 		{
diff --git a/libs/util/source/open_url.cpp b/libs/util/source/open_url.cpp
index 2af6098f..c5d7c114 100644
--- a/libs/util/source/open_url.cpp
+++ b/libs/util/source/open_url.cpp
@@ -1,7 +1,6 @@
 #include <psemek/util/open_url.hpp>
 
 #include <cstdlib>
-#include <thread>
 
 namespace psemek::util
 {
@@ -13,7 +12,7 @@ namespace psemek::util
 		if (!url.starts_with("http"))
 			url = "https://" + url;
 
-#ifdef WIN32
+#ifdef _WIN32
 		url = "start " + url;
 		ignore(std::system(url.data()));
 #endif