diff --git a/src/common/system.cpp b/src/common/system.cpp
index 1d1c5fa56ad..ba42c6df502 100644
--- a/src/common/system.cpp
+++ b/src/common/system.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2022 The Bitcoin Core developers
+// Copyright (c) 2009-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -12,6 +12,7 @@
 #ifndef WIN32
 #include <sys/stat.h>
 #else
+#include <compat/compat.h>
 #include <codecvt>
 #endif
 
diff --git a/src/common/system.h b/src/common/system.h
index 4b6aa42150a..e8018f9b100 100644
--- a/src/common/system.h
+++ b/src/common/system.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2022 The Bitcoin Core developers
+// Copyright (c) 2009-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -10,10 +10,7 @@
 #include <config/bitcoin-config.h>
 #endif
 
-#include <compat/compat.h>
-
-#include <set>
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 
 // Application startup time (used for uptime calculation)