diff --git a/src/win32/HResult.cxx b/src/win32/HResult.cxx
index e81eb7c4a..4b6e32e7c 100644
--- a/src/win32/HResult.cxx
+++ b/src/win32/HResult.cxx
@@ -23,7 +23,6 @@
 #endif
 
 #include "HResult.hxx"
-#include "system/Error.hxx"
 
 #include <cassert>
 #include <cstdio>
diff --git a/src/win32/HResult.hxx b/src/win32/HResult.hxx
index 7ddec5138..9fadbccc6 100644
--- a/src/win32/HResult.hxx
+++ b/src/win32/HResult.hxx
@@ -20,14 +20,12 @@
 #ifndef MPD_WIN32_HRESULT_HXX
 #define MPD_WIN32_HRESULT_HXX
 
-#include "util/Compiler.h"
-
 #include <string_view>
 #include <system_error>
 
 #include <windef.h>
 
-gcc_const
+[[gnu::const]]
 std::string_view
 HRESULTToString(HRESULT result) noexcept;