diff --git a/src/support/allocators/secure.h b/src/support/allocators/secure.h
index 1ec40fe83..c97d6e7d5 100644
--- a/src/support/allocators/secure.h
+++ b/src/support/allocators/secure.h
@@ -6,7 +6,7 @@
 #ifndef BITCOIN_SUPPORT_ALLOCATORS_SECURE_H
 #define BITCOIN_SUPPORT_ALLOCATORS_SECURE_H
 
-#include "support/pagelocker.h"
+#include <support/pagelocker.h>
 
 #include <string>
 
diff --git a/src/support/allocators/zeroafterfree.h b/src/support/allocators/zeroafterfree.h
index 28a940ad1..cecae369a 100644
--- a/src/support/allocators/zeroafterfree.h
+++ b/src/support/allocators/zeroafterfree.h
@@ -6,7 +6,7 @@
 #ifndef BITCOIN_SUPPORT_ALLOCATORS_ZEROAFTERFREE_H
 #define BITCOIN_SUPPORT_ALLOCATORS_ZEROAFTERFREE_H
 
-#include "support/cleanse.h"
+#include <support/cleanse.h>
 
 #include <memory>
 #include <vector>
diff --git a/src/support/cleanse.cpp b/src/support/cleanse.cpp
index 95899c9f0..82cdfe707 100644
--- a/src/support/cleanse.cpp
+++ b/src/support/cleanse.cpp
@@ -3,7 +3,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "cleanse.h"
+#include <support/cleanse.h>
 
 #include <cstring>
 
diff --git a/src/support/pagelocker.cpp b/src/support/pagelocker.cpp
index 7cea2d88c..daaf58d7b 100644
--- a/src/support/pagelocker.cpp
+++ b/src/support/pagelocker.cpp
@@ -2,10 +2,10 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "support/pagelocker.h"
+#include <support/pagelocker.h>
 
 #if defined(HAVE_CONFIG_H)
-#include "config/bitcoin-config.h"
+#include <config/bitcoin-config.h>
 #endif
 
 #ifdef WIN32
@@ -17,7 +17,7 @@
 #ifndef NOMINMAX
 #define NOMINMAX
 #endif
-#include <windows.h>
+#include <compat.h>
 // This is used to attempt to keep keying material out of swap
 // Note that VirtualLock does not provide this as a guarantee on Windows,
 // but, in practice, memory that has been VirtualLock'd almost never gets written to
@@ -28,7 +28,7 @@
 #include <unistd.h> // for sysconf
 #endif
 
-LockedPageManager* LockedPageManager::_instance = NULL;
+LockedPageManager* LockedPageManager::_instance = nullptr;
 boost::once_flag LockedPageManager::init_flag = BOOST_ONCE_INIT;
 
 /** Determine system page size in bytes */
diff --git a/src/support/pagelocker.h b/src/support/pagelocker.h
index 6b3979e55..84fcb70ef 100644
--- a/src/support/pagelocker.h
+++ b/src/support/pagelocker.h
@@ -6,7 +6,7 @@
 #ifndef BITCOIN_SUPPORT_PAGELOCKER_H
 #define BITCOIN_SUPPORT_PAGELOCKER_H
 
-#include "support/cleanse.h"
+#include <support/cleanse.h>
 
 #include <map>