diff --git a/src/addrman.h b/src/addrman.h
index 160f8f8ff..7652df66a 100644
--- a/src/addrman.h
+++ b/src/addrman.h
@@ -6,6 +6,7 @@
 
 #include "netbase.h"
 #include "protocol.h"
+#include "util.h"
 
 
 #include <map>
diff --git a/src/protocol.h b/src/protocol.h
index a820563d0..f7331c192 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -12,7 +12,6 @@
 
 #include "serialize.h"
 #include "netbase.h"
-#include "util.h"
 #include <string>
 #include "uint256.h"
 
diff --git a/src/uint256.h b/src/uint256.h
index 309c1f799..352458053 100644
--- a/src/uint256.h
+++ b/src/uint256.h
@@ -5,12 +5,13 @@
 #ifndef BITCOIN_UINT256_H
 #define BITCOIN_UINT256_H
 
-#include "serialize.h"
-
 #include <limits.h>
+#include <string.h>
 #include <string>
 #include <vector>
 
+#include "version.h"
+
 typedef long long  int64;
 typedef unsigned long long  uint64;