diff --git a/src/random.cpp b/src/random.cpp
--- a/src/random.cpp
+++ b/src/random.cpp
@@ -11,9 +11,9 @@
 #include "compat.h" // for Windows API
 #include <wincrypt.h>
 #endif
-#include "sync.h"             // for WAIT_LOCK
-#include "util.h"             // for LogPrint()
-#include "utilstrencodings.h" // for GetTime()
+#include "logging.h"  // for LogPrint()
+#include "sync.h"     // for WAIT_LOCK
+#include "utiltime.h" // for GetTime()
 
 #include <chrono>
 #include <cstdlib>
@@ -21,6 +21,7 @@
 #include <thread>
 
 #ifndef WIN32
+#include <fcntl.h>
 #include <sys/time.h>
 #endif
 
diff --git a/src/sync.cpp b/src/sync.cpp
--- a/src/sync.cpp
+++ b/src/sync.cpp
@@ -4,10 +4,12 @@
 
 #include "sync.h"
 
-#include "util.h"
+#include "logging.h"
 #include "utilstrencodings.h"
 
 #include <cstdio>
+#include <map>
+#include <memory>
 #include <set>
 
 #ifdef DEBUG_LOCKCONTENTION