Separate protocol versioning from clientversion

src/test/alert_tests.cpp

@@ -7,13 +7,13 @@
 //
 
 #include "alert.h"
+#include "clientversion.h"
 #include "data/alertTests.raw.h"
 
 #include "serialize.h"
 #include "streams.h"
 #include "util.h"
 #include "utilstrencodings.h"
-#include "version.h"
 
 #include <fstream>
 

src/test/bloom_tests.cpp

@@ -5,6 +5,7 @@
 #include "bloom.h"
 
 #include "base58.h"
+#include "clientversion.h"
 #include "key.h"
 #include "main.h"
 #include "serialize.h"

src/test/checkblock_tests.cpp

@@ -8,6 +8,7 @@
 
 
 
+#include "clientversion.h"
 #include "main.h"
 #include "utiltime.h"
 

src/test/transaction_tests.cpp

@@ -5,6 +5,7 @@
 #include "data/tx_invalid.json.h"
 #include "data/tx_valid.json.h"
 
+#include "clientversion.h"
 #include "key.h"
 #include "keystore.h"
 #include "main.h"

src/test/util_tests.cpp

@@ -4,12 +4,12 @@
 
 #include "util.h"
 
+#include "clientversion.h"
 #include "core/transaction.h"
 #include "random.h"
 #include "sync.h"
 #include "utilstrencodings.h"
 #include "utilmoneystr.h"
-#include "version.h"
 
 #include <stdint.h>
 #include <vector>