diff --git a/contrib/epee/include/net/abstract_tcp_server2.inl b/contrib/epee/include/net/abstract_tcp_server2.inl
index 7c671d0e49..1aa081b23e 100644
--- a/contrib/epee/include/net/abstract_tcp_server2.inl
+++ b/contrib/epee/include/net/abstract_tcp_server2.inl
@@ -30,6 +30,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // 
 
+#pragma once
 
 #include <boost/asio/post.hpp>
 #include <boost/foreach.hpp>
@@ -45,6 +46,7 @@
 #include "warnings.h"
 #include "string_tools_lexical.h"
 #include "misc_language.h"
+#include "net/abstract_tcp_server2.h"
 
 #include <sstream>
 #include <iomanip>
diff --git a/src/blockchain_db/locked_txn.h b/src/blockchain_db/locked_txn.h
index 88f9ecb0fc..9c08aaa8de 100644
--- a/src/blockchain_db/locked_txn.h
+++ b/src/blockchain_db/locked_txn.h
@@ -30,6 +30,8 @@
 
 #pragma once
 
+#include "blockchain_db.h"
+
 namespace cryptonote
 {
     // This class is meant to create a batch when none currently exists.
diff --git a/src/blockchain_db/testdb.h b/src/blockchain_db/testdb.h
index 3a787066e6..c525dda952 100644
--- a/src/blockchain_db/testdb.h
+++ b/src/blockchain_db/testdb.h
@@ -34,6 +34,8 @@
 #include <vector>
 #include <map>
 
+#include <cryptonote_basic/cryptonote_format_utils.h>
+
 #include "blockchain_db.h"
 
 namespace cryptonote
diff --git a/src/common/aligned.h b/src/common/aligned.h
index 703acb2573..b687c58d96 100644
--- a/src/common/aligned.h
+++ b/src/common/aligned.h
@@ -30,8 +30,16 @@
 #pragma once 
 
 #ifdef __cplusplus
+
+#include <cstddef>
+
 extern "C" {
-#endif
+
+#else // C compiler
+
+#include <stddef.h>
+
+#endif // __cplusplus
 
 void *aligned_malloc(size_t bytes, size_t align);
 void *aligned_realloc(void *ptr, size_t bytes, size_t align);
diff --git a/src/common/download.h b/src/common/download.h
index 88f5b40959..d09195c222 100644
--- a/src/common/download.h
+++ b/src/common/download.h
@@ -29,6 +29,8 @@
 #pragma once 
 
 #include <string>
+#include <memory>
+#include <functional>
 
 namespace tools
 {
diff --git a/src/common/i18n.h b/src/common/i18n.h
index bc1287cf3a..fd04d45b4d 100644
--- a/src/common/i18n.h
+++ b/src/common/i18n.h
@@ -28,6 +28,8 @@
 
 #pragma once
 
+#include <string>
+
 #define QT_TRANSLATE_NOOP(context,str) i18n_translate(str,context)
 
 std::string i18n_get_language();
diff --git a/src/common/sfinae_helpers.h b/src/common/sfinae_helpers.h
index 0419121d4c..260c56cb00 100644
--- a/src/common/sfinae_helpers.h
+++ b/src/common/sfinae_helpers.h
@@ -28,6 +28,8 @@
 
 #pragma once
 
+#include <string>
+
 // the loose definitions of types in this file are, well, loose.
 //
 // these helpers aren't here for absolute type certainty at compile-time,
diff --git a/src/common/spawn.h b/src/common/spawn.h
index 9ea957886e..24e06dfdc1 100644
--- a/src/common/spawn.h
+++ b/src/common/spawn.h
@@ -29,6 +29,9 @@
 
 #pragma once 
 
+#include <string>
+#include <vector>
+
 namespace tools
 {
 
diff --git a/src/crypto/CryptonightR_JIT.h b/src/crypto/CryptonightR_JIT.h
index cb32c3a799..7f4d8d23f9 100644
--- a/src/crypto/CryptonightR_JIT.h
+++ b/src/crypto/CryptonightR_JIT.h
@@ -1,6 +1,9 @@
 #ifndef CRYPTONIGHTR_JIT_H
 #define CRYPTONIGHTR_JIT_H
 
+#include <stdint.h>
+#include <stddef.h>
+
 // Minimalistic JIT code generator for random math sequence in CryptonightR
 //
 // Usage:
diff --git a/src/crypto/CryptonightR_template.h b/src/crypto/CryptonightR_template.h
index dab1bd7502..4d3b1941e2 100644
--- a/src/crypto/CryptonightR_template.h
+++ b/src/crypto/CryptonightR_template.h
@@ -519,523 +519,523 @@ void CryptonightR_instruction_mov255(void);
 void CryptonightR_instruction_mov256(void);
 
 const void* instructions[257] = {
-	CryptonightR_instruction0,
-	CryptonightR_instruction1,
-	CryptonightR_instruction2,
-	CryptonightR_instruction3,
-	CryptonightR_instruction4,
-	CryptonightR_instruction5,
-	CryptonightR_instruction6,
-	CryptonightR_instruction7,
-	CryptonightR_instruction8,
-	CryptonightR_instruction9,
-	CryptonightR_instruction10,
-	CryptonightR_instruction11,
-	CryptonightR_instruction12,
-	CryptonightR_instruction13,
-	CryptonightR_instruction14,
-	CryptonightR_instruction15,
-	CryptonightR_instruction16,
-	CryptonightR_instruction17,
-	CryptonightR_instruction18,
-	CryptonightR_instruction19,
-	CryptonightR_instruction20,
-	CryptonightR_instruction21,
-	CryptonightR_instruction22,
-	CryptonightR_instruction23,
-	CryptonightR_instruction24,
-	CryptonightR_instruction25,
-	CryptonightR_instruction26,
-	CryptonightR_instruction27,
-	CryptonightR_instruction28,
-	CryptonightR_instruction29,
-	CryptonightR_instruction30,
-	CryptonightR_instruction31,
-	CryptonightR_instruction32,
-	CryptonightR_instruction33,
-	CryptonightR_instruction34,
-	CryptonightR_instruction35,
-	CryptonightR_instruction36,
-	CryptonightR_instruction37,
-	CryptonightR_instruction38,
-	CryptonightR_instruction39,
-	CryptonightR_instruction40,
-	CryptonightR_instruction41,
-	CryptonightR_instruction42,
-	CryptonightR_instruction43,
-	CryptonightR_instruction44,
-	CryptonightR_instruction45,
-	CryptonightR_instruction46,
-	CryptonightR_instruction47,
-	CryptonightR_instruction48,
-	CryptonightR_instruction49,
-	CryptonightR_instruction50,
-	CryptonightR_instruction51,
-	CryptonightR_instruction52,
-	CryptonightR_instruction53,
-	CryptonightR_instruction54,
-	CryptonightR_instruction55,
-	CryptonightR_instruction56,
-	CryptonightR_instruction57,
-	CryptonightR_instruction58,
-	CryptonightR_instruction59,
-	CryptonightR_instruction60,
-	CryptonightR_instruction61,
-	CryptonightR_instruction62,
-	CryptonightR_instruction63,
-	CryptonightR_instruction64,
-	CryptonightR_instruction65,
-	CryptonightR_instruction66,
-	CryptonightR_instruction67,
-	CryptonightR_instruction68,
-	CryptonightR_instruction69,
-	CryptonightR_instruction70,
-	CryptonightR_instruction71,
-	CryptonightR_instruction72,
-	CryptonightR_instruction73,
-	CryptonightR_instruction74,
-	CryptonightR_instruction75,
-	CryptonightR_instruction76,
-	CryptonightR_instruction77,
-	CryptonightR_instruction78,
-	CryptonightR_instruction79,
-	CryptonightR_instruction80,
-	CryptonightR_instruction81,
-	CryptonightR_instruction82,
-	CryptonightR_instruction83,
-	CryptonightR_instruction84,
-	CryptonightR_instruction85,
-	CryptonightR_instruction86,
-	CryptonightR_instruction87,
-	CryptonightR_instruction88,
-	CryptonightR_instruction89,
-	CryptonightR_instruction90,
-	CryptonightR_instruction91,
-	CryptonightR_instruction92,
-	CryptonightR_instruction93,
-	CryptonightR_instruction94,
-	CryptonightR_instruction95,
-	CryptonightR_instruction96,
-	CryptonightR_instruction97,
-	CryptonightR_instruction98,
-	CryptonightR_instruction99,
-	CryptonightR_instruction100,
-	CryptonightR_instruction101,
-	CryptonightR_instruction102,
-	CryptonightR_instruction103,
-	CryptonightR_instruction104,
-	CryptonightR_instruction105,
-	CryptonightR_instruction106,
-	CryptonightR_instruction107,
-	CryptonightR_instruction108,
-	CryptonightR_instruction109,
-	CryptonightR_instruction110,
-	CryptonightR_instruction111,
-	CryptonightR_instruction112,
-	CryptonightR_instruction113,
-	CryptonightR_instruction114,
-	CryptonightR_instruction115,
-	CryptonightR_instruction116,
-	CryptonightR_instruction117,
-	CryptonightR_instruction118,
-	CryptonightR_instruction119,
-	CryptonightR_instruction120,
-	CryptonightR_instruction121,
-	CryptonightR_instruction122,
-	CryptonightR_instruction123,
-	CryptonightR_instruction124,
-	CryptonightR_instruction125,
-	CryptonightR_instruction126,
-	CryptonightR_instruction127,
-	CryptonightR_instruction128,
-	CryptonightR_instruction129,
-	CryptonightR_instruction130,
-	CryptonightR_instruction131,
-	CryptonightR_instruction132,
-	CryptonightR_instruction133,
-	CryptonightR_instruction134,
-	CryptonightR_instruction135,
-	CryptonightR_instruction136,
-	CryptonightR_instruction137,
-	CryptonightR_instruction138,
-	CryptonightR_instruction139,
-	CryptonightR_instruction140,
-	CryptonightR_instruction141,
-	CryptonightR_instruction142,
-	CryptonightR_instruction143,
-	CryptonightR_instruction144,
-	CryptonightR_instruction145,
-	CryptonightR_instruction146,
-	CryptonightR_instruction147,
-	CryptonightR_instruction148,
-	CryptonightR_instruction149,
-	CryptonightR_instruction150,
-	CryptonightR_instruction151,
-	CryptonightR_instruction152,
-	CryptonightR_instruction153,
-	CryptonightR_instruction154,
-	CryptonightR_instruction155,
-	CryptonightR_instruction156,
-	CryptonightR_instruction157,
-	CryptonightR_instruction158,
-	CryptonightR_instruction159,
-	CryptonightR_instruction160,
-	CryptonightR_instruction161,
-	CryptonightR_instruction162,
-	CryptonightR_instruction163,
-	CryptonightR_instruction164,
-	CryptonightR_instruction165,
-	CryptonightR_instruction166,
-	CryptonightR_instruction167,
-	CryptonightR_instruction168,
-	CryptonightR_instruction169,
-	CryptonightR_instruction170,
-	CryptonightR_instruction171,
-	CryptonightR_instruction172,
-	CryptonightR_instruction173,
-	CryptonightR_instruction174,
-	CryptonightR_instruction175,
-	CryptonightR_instruction176,
-	CryptonightR_instruction177,
-	CryptonightR_instruction178,
-	CryptonightR_instruction179,
-	CryptonightR_instruction180,
-	CryptonightR_instruction181,
-	CryptonightR_instruction182,
-	CryptonightR_instruction183,
-	CryptonightR_instruction184,
-	CryptonightR_instruction185,
-	CryptonightR_instruction186,
-	CryptonightR_instruction187,
-	CryptonightR_instruction188,
-	CryptonightR_instruction189,
-	CryptonightR_instruction190,
-	CryptonightR_instruction191,
-	CryptonightR_instruction192,
-	CryptonightR_instruction193,
-	CryptonightR_instruction194,
-	CryptonightR_instruction195,
-	CryptonightR_instruction196,
-	CryptonightR_instruction197,
-	CryptonightR_instruction198,
-	CryptonightR_instruction199,
-	CryptonightR_instruction200,
-	CryptonightR_instruction201,
-	CryptonightR_instruction202,
-	CryptonightR_instruction203,
-	CryptonightR_instruction204,
-	CryptonightR_instruction205,
-	CryptonightR_instruction206,
-	CryptonightR_instruction207,
-	CryptonightR_instruction208,
-	CryptonightR_instruction209,
-	CryptonightR_instruction210,
-	CryptonightR_instruction211,
-	CryptonightR_instruction212,
-	CryptonightR_instruction213,
-	CryptonightR_instruction214,
-	CryptonightR_instruction215,
-	CryptonightR_instruction216,
-	CryptonightR_instruction217,
-	CryptonightR_instruction218,
-	CryptonightR_instruction219,
-	CryptonightR_instruction220,
-	CryptonightR_instruction221,
-	CryptonightR_instruction222,
-	CryptonightR_instruction223,
-	CryptonightR_instruction224,
-	CryptonightR_instruction225,
-	CryptonightR_instruction226,
-	CryptonightR_instruction227,
-	CryptonightR_instruction228,
-	CryptonightR_instruction229,
-	CryptonightR_instruction230,
-	CryptonightR_instruction231,
-	CryptonightR_instruction232,
-	CryptonightR_instruction233,
-	CryptonightR_instruction234,
-	CryptonightR_instruction235,
-	CryptonightR_instruction236,
-	CryptonightR_instruction237,
-	CryptonightR_instruction238,
-	CryptonightR_instruction239,
-	CryptonightR_instruction240,
-	CryptonightR_instruction241,
-	CryptonightR_instruction242,
-	CryptonightR_instruction243,
-	CryptonightR_instruction244,
-	CryptonightR_instruction245,
-	CryptonightR_instruction246,
-	CryptonightR_instruction247,
-	CryptonightR_instruction248,
-	CryptonightR_instruction249,
-	CryptonightR_instruction250,
-	CryptonightR_instruction251,
-	CryptonightR_instruction252,
-	CryptonightR_instruction253,
-	CryptonightR_instruction254,
-	CryptonightR_instruction255,
-	CryptonightR_instruction256,
+	(const void* ) CryptonightR_instruction0,
+	(const void* ) CryptonightR_instruction1,
+	(const void* ) CryptonightR_instruction2,
+	(const void* ) CryptonightR_instruction3,
+	(const void* ) CryptonightR_instruction4,
+	(const void* ) CryptonightR_instruction5,
+	(const void* ) CryptonightR_instruction6,
+	(const void* ) CryptonightR_instruction7,
+	(const void* ) CryptonightR_instruction8,
+	(const void* ) CryptonightR_instruction9,
+	(const void* ) CryptonightR_instruction10,
+	(const void* ) CryptonightR_instruction11,
+	(const void* ) CryptonightR_instruction12,
+	(const void* ) CryptonightR_instruction13,
+	(const void* ) CryptonightR_instruction14,
+	(const void* ) CryptonightR_instruction15,
+	(const void* ) CryptonightR_instruction16,
+	(const void* ) CryptonightR_instruction17,
+	(const void* ) CryptonightR_instruction18,
+	(const void* ) CryptonightR_instruction19,
+	(const void* ) CryptonightR_instruction20,
+	(const void* ) CryptonightR_instruction21,
+	(const void* ) CryptonightR_instruction22,
+	(const void* ) CryptonightR_instruction23,
+	(const void* ) CryptonightR_instruction24,
+	(const void* ) CryptonightR_instruction25,
+	(const void* ) CryptonightR_instruction26,
+	(const void* ) CryptonightR_instruction27,
+	(const void* ) CryptonightR_instruction28,
+	(const void* ) CryptonightR_instruction29,
+	(const void* ) CryptonightR_instruction30,
+	(const void* ) CryptonightR_instruction31,
+	(const void* ) CryptonightR_instruction32,
+	(const void* ) CryptonightR_instruction33,
+	(const void* ) CryptonightR_instruction34,
+	(const void* ) CryptonightR_instruction35,
+	(const void* ) CryptonightR_instruction36,
+	(const void* ) CryptonightR_instruction37,
+	(const void* ) CryptonightR_instruction38,
+	(const void* ) CryptonightR_instruction39,
+	(const void* ) CryptonightR_instruction40,
+	(const void* ) CryptonightR_instruction41,
+	(const void* ) CryptonightR_instruction42,
+	(const void* ) CryptonightR_instruction43,
+	(const void* ) CryptonightR_instruction44,
+	(const void* ) CryptonightR_instruction45,
+	(const void* ) CryptonightR_instruction46,
+	(const void* ) CryptonightR_instruction47,
+	(const void* ) CryptonightR_instruction48,
+	(const void* ) CryptonightR_instruction49,
+	(const void* ) CryptonightR_instruction50,
+	(const void* ) CryptonightR_instruction51,
+	(const void* ) CryptonightR_instruction52,
+	(const void* ) CryptonightR_instruction53,
+	(const void* ) CryptonightR_instruction54,
+	(const void* ) CryptonightR_instruction55,
+	(const void* ) CryptonightR_instruction56,
+	(const void* ) CryptonightR_instruction57,
+	(const void* ) CryptonightR_instruction58,
+	(const void* ) CryptonightR_instruction59,
+	(const void* ) CryptonightR_instruction60,
+	(const void* ) CryptonightR_instruction61,
+	(const void* ) CryptonightR_instruction62,
+	(const void* ) CryptonightR_instruction63,
+	(const void* ) CryptonightR_instruction64,
+	(const void* ) CryptonightR_instruction65,
+	(const void* ) CryptonightR_instruction66,
+	(const void* ) CryptonightR_instruction67,
+	(const void* ) CryptonightR_instruction68,
+	(const void* ) CryptonightR_instruction69,
+	(const void* ) CryptonightR_instruction70,
+	(const void* ) CryptonightR_instruction71,
+	(const void* ) CryptonightR_instruction72,
+	(const void* ) CryptonightR_instruction73,
+	(const void* ) CryptonightR_instruction74,
+	(const void* ) CryptonightR_instruction75,
+	(const void* ) CryptonightR_instruction76,
+	(const void* ) CryptonightR_instruction77,
+	(const void* ) CryptonightR_instruction78,
+	(const void* ) CryptonightR_instruction79,
+	(const void* ) CryptonightR_instruction80,
+	(const void* ) CryptonightR_instruction81,
+	(const void* ) CryptonightR_instruction82,
+	(const void* ) CryptonightR_instruction83,
+	(const void* ) CryptonightR_instruction84,
+	(const void* ) CryptonightR_instruction85,
+	(const void* ) CryptonightR_instruction86,
+	(const void* ) CryptonightR_instruction87,
+	(const void* ) CryptonightR_instruction88,
+	(const void* ) CryptonightR_instruction89,
+	(const void* ) CryptonightR_instruction90,
+	(const void* ) CryptonightR_instruction91,
+	(const void* ) CryptonightR_instruction92,
+	(const void* ) CryptonightR_instruction93,
+	(const void* ) CryptonightR_instruction94,
+	(const void* ) CryptonightR_instruction95,
+	(const void* ) CryptonightR_instruction96,
+	(const void* ) CryptonightR_instruction97,
+	(const void* ) CryptonightR_instruction98,
+	(const void* ) CryptonightR_instruction99,
+	(const void* ) CryptonightR_instruction100,
+	(const void* ) CryptonightR_instruction101,
+	(const void* ) CryptonightR_instruction102,
+	(const void* ) CryptonightR_instruction103,
+	(const void* ) CryptonightR_instruction104,
+	(const void* ) CryptonightR_instruction105,
+	(const void* ) CryptonightR_instruction106,
+	(const void* ) CryptonightR_instruction107,
+	(const void* ) CryptonightR_instruction108,
+	(const void* ) CryptonightR_instruction109,
+	(const void* ) CryptonightR_instruction110,
+	(const void* ) CryptonightR_instruction111,
+	(const void* ) CryptonightR_instruction112,
+	(const void* ) CryptonightR_instruction113,
+	(const void* ) CryptonightR_instruction114,
+	(const void* ) CryptonightR_instruction115,
+	(const void* ) CryptonightR_instruction116,
+	(const void* ) CryptonightR_instruction117,
+	(const void* ) CryptonightR_instruction118,
+	(const void* ) CryptonightR_instruction119,
+	(const void* ) CryptonightR_instruction120,
+	(const void* ) CryptonightR_instruction121,
+	(const void* ) CryptonightR_instruction122,
+	(const void* ) CryptonightR_instruction123,
+	(const void* ) CryptonightR_instruction124,
+	(const void* ) CryptonightR_instruction125,
+	(const void* ) CryptonightR_instruction126,
+	(const void* ) CryptonightR_instruction127,
+	(const void* ) CryptonightR_instruction128,
+	(const void* ) CryptonightR_instruction129,
+	(const void* ) CryptonightR_instruction130,
+	(const void* ) CryptonightR_instruction131,
+	(const void* ) CryptonightR_instruction132,
+	(const void* ) CryptonightR_instruction133,
+	(const void* ) CryptonightR_instruction134,
+	(const void* ) CryptonightR_instruction135,
+	(const void* ) CryptonightR_instruction136,
+	(const void* ) CryptonightR_instruction137,
+	(const void* ) CryptonightR_instruction138,
+	(const void* ) CryptonightR_instruction139,
+	(const void* ) CryptonightR_instruction140,
+	(const void* ) CryptonightR_instruction141,
+	(const void* ) CryptonightR_instruction142,
+	(const void* ) CryptonightR_instruction143,
+	(const void* ) CryptonightR_instruction144,
+	(const void* ) CryptonightR_instruction145,
+	(const void* ) CryptonightR_instruction146,
+	(const void* ) CryptonightR_instruction147,
+	(const void* ) CryptonightR_instruction148,
+	(const void* ) CryptonightR_instruction149,
+	(const void* ) CryptonightR_instruction150,
+	(const void* ) CryptonightR_instruction151,
+	(const void* ) CryptonightR_instruction152,
+	(const void* ) CryptonightR_instruction153,
+	(const void* ) CryptonightR_instruction154,
+	(const void* ) CryptonightR_instruction155,
+	(const void* ) CryptonightR_instruction156,
+	(const void* ) CryptonightR_instruction157,
+	(const void* ) CryptonightR_instruction158,
+	(const void* ) CryptonightR_instruction159,
+	(const void* ) CryptonightR_instruction160,
+	(const void* ) CryptonightR_instruction161,
+	(const void* ) CryptonightR_instruction162,
+	(const void* ) CryptonightR_instruction163,
+	(const void* ) CryptonightR_instruction164,
+	(const void* ) CryptonightR_instruction165,
+	(const void* ) CryptonightR_instruction166,
+	(const void* ) CryptonightR_instruction167,
+	(const void* ) CryptonightR_instruction168,
+	(const void* ) CryptonightR_instruction169,
+	(const void* ) CryptonightR_instruction170,
+	(const void* ) CryptonightR_instruction171,
+	(const void* ) CryptonightR_instruction172,
+	(const void* ) CryptonightR_instruction173,
+	(const void* ) CryptonightR_instruction174,
+	(const void* ) CryptonightR_instruction175,
+	(const void* ) CryptonightR_instruction176,
+	(const void* ) CryptonightR_instruction177,
+	(const void* ) CryptonightR_instruction178,
+	(const void* ) CryptonightR_instruction179,
+	(const void* ) CryptonightR_instruction180,
+	(const void* ) CryptonightR_instruction181,
+	(const void* ) CryptonightR_instruction182,
+	(const void* ) CryptonightR_instruction183,
+	(const void* ) CryptonightR_instruction184,
+	(const void* ) CryptonightR_instruction185,
+	(const void* ) CryptonightR_instruction186,
+	(const void* ) CryptonightR_instruction187,
+	(const void* ) CryptonightR_instruction188,
+	(const void* ) CryptonightR_instruction189,
+	(const void* ) CryptonightR_instruction190,
+	(const void* ) CryptonightR_instruction191,
+	(const void* ) CryptonightR_instruction192,
+	(const void* ) CryptonightR_instruction193,
+	(const void* ) CryptonightR_instruction194,
+	(const void* ) CryptonightR_instruction195,
+	(const void* ) CryptonightR_instruction196,
+	(const void* ) CryptonightR_instruction197,
+	(const void* ) CryptonightR_instruction198,
+	(const void* ) CryptonightR_instruction199,
+	(const void* ) CryptonightR_instruction200,
+	(const void* ) CryptonightR_instruction201,
+	(const void* ) CryptonightR_instruction202,
+	(const void* ) CryptonightR_instruction203,
+	(const void* ) CryptonightR_instruction204,
+	(const void* ) CryptonightR_instruction205,
+	(const void* ) CryptonightR_instruction206,
+	(const void* ) CryptonightR_instruction207,
+	(const void* ) CryptonightR_instruction208,
+	(const void* ) CryptonightR_instruction209,
+	(const void* ) CryptonightR_instruction210,
+	(const void* ) CryptonightR_instruction211,
+	(const void* ) CryptonightR_instruction212,
+	(const void* ) CryptonightR_instruction213,
+	(const void* ) CryptonightR_instruction214,
+	(const void* ) CryptonightR_instruction215,
+	(const void* ) CryptonightR_instruction216,
+	(const void* ) CryptonightR_instruction217,
+	(const void* ) CryptonightR_instruction218,
+	(const void* ) CryptonightR_instruction219,
+	(const void* ) CryptonightR_instruction220,
+	(const void* ) CryptonightR_instruction221,
+	(const void* ) CryptonightR_instruction222,
+	(const void* ) CryptonightR_instruction223,
+	(const void* ) CryptonightR_instruction224,
+	(const void* ) CryptonightR_instruction225,
+	(const void* ) CryptonightR_instruction226,
+	(const void* ) CryptonightR_instruction227,
+	(const void* ) CryptonightR_instruction228,
+	(const void* ) CryptonightR_instruction229,
+	(const void* ) CryptonightR_instruction230,
+	(const void* ) CryptonightR_instruction231,
+	(const void* ) CryptonightR_instruction232,
+	(const void* ) CryptonightR_instruction233,
+	(const void* ) CryptonightR_instruction234,
+	(const void* ) CryptonightR_instruction235,
+	(const void* ) CryptonightR_instruction236,
+	(const void* ) CryptonightR_instruction237,
+	(const void* ) CryptonightR_instruction238,
+	(const void* ) CryptonightR_instruction239,
+	(const void* ) CryptonightR_instruction240,
+	(const void* ) CryptonightR_instruction241,
+	(const void* ) CryptonightR_instruction242,
+	(const void* ) CryptonightR_instruction243,
+	(const void* ) CryptonightR_instruction244,
+	(const void* ) CryptonightR_instruction245,
+	(const void* ) CryptonightR_instruction246,
+	(const void* ) CryptonightR_instruction247,
+	(const void* ) CryptonightR_instruction248,
+	(const void* ) CryptonightR_instruction249,
+	(const void* ) CryptonightR_instruction250,
+	(const void* ) CryptonightR_instruction251,
+	(const void* ) CryptonightR_instruction252,
+	(const void* ) CryptonightR_instruction253,
+	(const void* ) CryptonightR_instruction254,
+	(const void* ) CryptonightR_instruction255,
+	(const void* ) CryptonightR_instruction256,
 };
 
 const void* instructions_mov[257] = {
-	CryptonightR_instruction_mov0,
-	CryptonightR_instruction_mov1,
-	CryptonightR_instruction_mov2,
-	CryptonightR_instruction_mov3,
-	CryptonightR_instruction_mov4,
-	CryptonightR_instruction_mov5,
-	CryptonightR_instruction_mov6,
-	CryptonightR_instruction_mov7,
-	CryptonightR_instruction_mov8,
-	CryptonightR_instruction_mov9,
-	CryptonightR_instruction_mov10,
-	CryptonightR_instruction_mov11,
-	CryptonightR_instruction_mov12,
-	CryptonightR_instruction_mov13,
-	CryptonightR_instruction_mov14,
-	CryptonightR_instruction_mov15,
-	CryptonightR_instruction_mov16,
-	CryptonightR_instruction_mov17,
-	CryptonightR_instruction_mov18,
-	CryptonightR_instruction_mov19,
-	CryptonightR_instruction_mov20,
-	CryptonightR_instruction_mov21,
-	CryptonightR_instruction_mov22,
-	CryptonightR_instruction_mov23,
-	CryptonightR_instruction_mov24,
-	CryptonightR_instruction_mov25,
-	CryptonightR_instruction_mov26,
-	CryptonightR_instruction_mov27,
-	CryptonightR_instruction_mov28,
-	CryptonightR_instruction_mov29,
-	CryptonightR_instruction_mov30,
-	CryptonightR_instruction_mov31,
-	CryptonightR_instruction_mov32,
-	CryptonightR_instruction_mov33,
-	CryptonightR_instruction_mov34,
-	CryptonightR_instruction_mov35,
-	CryptonightR_instruction_mov36,
-	CryptonightR_instruction_mov37,
-	CryptonightR_instruction_mov38,
-	CryptonightR_instruction_mov39,
-	CryptonightR_instruction_mov40,
-	CryptonightR_instruction_mov41,
-	CryptonightR_instruction_mov42,
-	CryptonightR_instruction_mov43,
-	CryptonightR_instruction_mov44,
-	CryptonightR_instruction_mov45,
-	CryptonightR_instruction_mov46,
-	CryptonightR_instruction_mov47,
-	CryptonightR_instruction_mov48,
-	CryptonightR_instruction_mov49,
-	CryptonightR_instruction_mov50,
-	CryptonightR_instruction_mov51,
-	CryptonightR_instruction_mov52,
-	CryptonightR_instruction_mov53,
-	CryptonightR_instruction_mov54,
-	CryptonightR_instruction_mov55,
-	CryptonightR_instruction_mov56,
-	CryptonightR_instruction_mov57,
-	CryptonightR_instruction_mov58,
-	CryptonightR_instruction_mov59,
-	CryptonightR_instruction_mov60,
-	CryptonightR_instruction_mov61,
-	CryptonightR_instruction_mov62,
-	CryptonightR_instruction_mov63,
-	CryptonightR_instruction_mov64,
-	CryptonightR_instruction_mov65,
-	CryptonightR_instruction_mov66,
-	CryptonightR_instruction_mov67,
-	CryptonightR_instruction_mov68,
-	CryptonightR_instruction_mov69,
-	CryptonightR_instruction_mov70,
-	CryptonightR_instruction_mov71,
-	CryptonightR_instruction_mov72,
-	CryptonightR_instruction_mov73,
-	CryptonightR_instruction_mov74,
-	CryptonightR_instruction_mov75,
-	CryptonightR_instruction_mov76,
-	CryptonightR_instruction_mov77,
-	CryptonightR_instruction_mov78,
-	CryptonightR_instruction_mov79,
-	CryptonightR_instruction_mov80,
-	CryptonightR_instruction_mov81,
-	CryptonightR_instruction_mov82,
-	CryptonightR_instruction_mov83,
-	CryptonightR_instruction_mov84,
-	CryptonightR_instruction_mov85,
-	CryptonightR_instruction_mov86,
-	CryptonightR_instruction_mov87,
-	CryptonightR_instruction_mov88,
-	CryptonightR_instruction_mov89,
-	CryptonightR_instruction_mov90,
-	CryptonightR_instruction_mov91,
-	CryptonightR_instruction_mov92,
-	CryptonightR_instruction_mov93,
-	CryptonightR_instruction_mov94,
-	CryptonightR_instruction_mov95,
-	CryptonightR_instruction_mov96,
-	CryptonightR_instruction_mov97,
-	CryptonightR_instruction_mov98,
-	CryptonightR_instruction_mov99,
-	CryptonightR_instruction_mov100,
-	CryptonightR_instruction_mov101,
-	CryptonightR_instruction_mov102,
-	CryptonightR_instruction_mov103,
-	CryptonightR_instruction_mov104,
-	CryptonightR_instruction_mov105,
-	CryptonightR_instruction_mov106,
-	CryptonightR_instruction_mov107,
-	CryptonightR_instruction_mov108,
-	CryptonightR_instruction_mov109,
-	CryptonightR_instruction_mov110,
-	CryptonightR_instruction_mov111,
-	CryptonightR_instruction_mov112,
-	CryptonightR_instruction_mov113,
-	CryptonightR_instruction_mov114,
-	CryptonightR_instruction_mov115,
-	CryptonightR_instruction_mov116,
-	CryptonightR_instruction_mov117,
-	CryptonightR_instruction_mov118,
-	CryptonightR_instruction_mov119,
-	CryptonightR_instruction_mov120,
-	CryptonightR_instruction_mov121,
-	CryptonightR_instruction_mov122,
-	CryptonightR_instruction_mov123,
-	CryptonightR_instruction_mov124,
-	CryptonightR_instruction_mov125,
-	CryptonightR_instruction_mov126,
-	CryptonightR_instruction_mov127,
-	CryptonightR_instruction_mov128,
-	CryptonightR_instruction_mov129,
-	CryptonightR_instruction_mov130,
-	CryptonightR_instruction_mov131,
-	CryptonightR_instruction_mov132,
-	CryptonightR_instruction_mov133,
-	CryptonightR_instruction_mov134,
-	CryptonightR_instruction_mov135,
-	CryptonightR_instruction_mov136,
-	CryptonightR_instruction_mov137,
-	CryptonightR_instruction_mov138,
-	CryptonightR_instruction_mov139,
-	CryptonightR_instruction_mov140,
-	CryptonightR_instruction_mov141,
-	CryptonightR_instruction_mov142,
-	CryptonightR_instruction_mov143,
-	CryptonightR_instruction_mov144,
-	CryptonightR_instruction_mov145,
-	CryptonightR_instruction_mov146,
-	CryptonightR_instruction_mov147,
-	CryptonightR_instruction_mov148,
-	CryptonightR_instruction_mov149,
-	CryptonightR_instruction_mov150,
-	CryptonightR_instruction_mov151,
-	CryptonightR_instruction_mov152,
-	CryptonightR_instruction_mov153,
-	CryptonightR_instruction_mov154,
-	CryptonightR_instruction_mov155,
-	CryptonightR_instruction_mov156,
-	CryptonightR_instruction_mov157,
-	CryptonightR_instruction_mov158,
-	CryptonightR_instruction_mov159,
-	CryptonightR_instruction_mov160,
-	CryptonightR_instruction_mov161,
-	CryptonightR_instruction_mov162,
-	CryptonightR_instruction_mov163,
-	CryptonightR_instruction_mov164,
-	CryptonightR_instruction_mov165,
-	CryptonightR_instruction_mov166,
-	CryptonightR_instruction_mov167,
-	CryptonightR_instruction_mov168,
-	CryptonightR_instruction_mov169,
-	CryptonightR_instruction_mov170,
-	CryptonightR_instruction_mov171,
-	CryptonightR_instruction_mov172,
-	CryptonightR_instruction_mov173,
-	CryptonightR_instruction_mov174,
-	CryptonightR_instruction_mov175,
-	CryptonightR_instruction_mov176,
-	CryptonightR_instruction_mov177,
-	CryptonightR_instruction_mov178,
-	CryptonightR_instruction_mov179,
-	CryptonightR_instruction_mov180,
-	CryptonightR_instruction_mov181,
-	CryptonightR_instruction_mov182,
-	CryptonightR_instruction_mov183,
-	CryptonightR_instruction_mov184,
-	CryptonightR_instruction_mov185,
-	CryptonightR_instruction_mov186,
-	CryptonightR_instruction_mov187,
-	CryptonightR_instruction_mov188,
-	CryptonightR_instruction_mov189,
-	CryptonightR_instruction_mov190,
-	CryptonightR_instruction_mov191,
-	CryptonightR_instruction_mov192,
-	CryptonightR_instruction_mov193,
-	CryptonightR_instruction_mov194,
-	CryptonightR_instruction_mov195,
-	CryptonightR_instruction_mov196,
-	CryptonightR_instruction_mov197,
-	CryptonightR_instruction_mov198,
-	CryptonightR_instruction_mov199,
-	CryptonightR_instruction_mov200,
-	CryptonightR_instruction_mov201,
-	CryptonightR_instruction_mov202,
-	CryptonightR_instruction_mov203,
-	CryptonightR_instruction_mov204,
-	CryptonightR_instruction_mov205,
-	CryptonightR_instruction_mov206,
-	CryptonightR_instruction_mov207,
-	CryptonightR_instruction_mov208,
-	CryptonightR_instruction_mov209,
-	CryptonightR_instruction_mov210,
-	CryptonightR_instruction_mov211,
-	CryptonightR_instruction_mov212,
-	CryptonightR_instruction_mov213,
-	CryptonightR_instruction_mov214,
-	CryptonightR_instruction_mov215,
-	CryptonightR_instruction_mov216,
-	CryptonightR_instruction_mov217,
-	CryptonightR_instruction_mov218,
-	CryptonightR_instruction_mov219,
-	CryptonightR_instruction_mov220,
-	CryptonightR_instruction_mov221,
-	CryptonightR_instruction_mov222,
-	CryptonightR_instruction_mov223,
-	CryptonightR_instruction_mov224,
-	CryptonightR_instruction_mov225,
-	CryptonightR_instruction_mov226,
-	CryptonightR_instruction_mov227,
-	CryptonightR_instruction_mov228,
-	CryptonightR_instruction_mov229,
-	CryptonightR_instruction_mov230,
-	CryptonightR_instruction_mov231,
-	CryptonightR_instruction_mov232,
-	CryptonightR_instruction_mov233,
-	CryptonightR_instruction_mov234,
-	CryptonightR_instruction_mov235,
-	CryptonightR_instruction_mov236,
-	CryptonightR_instruction_mov237,
-	CryptonightR_instruction_mov238,
-	CryptonightR_instruction_mov239,
-	CryptonightR_instruction_mov240,
-	CryptonightR_instruction_mov241,
-	CryptonightR_instruction_mov242,
-	CryptonightR_instruction_mov243,
-	CryptonightR_instruction_mov244,
-	CryptonightR_instruction_mov245,
-	CryptonightR_instruction_mov246,
-	CryptonightR_instruction_mov247,
-	CryptonightR_instruction_mov248,
-	CryptonightR_instruction_mov249,
-	CryptonightR_instruction_mov250,
-	CryptonightR_instruction_mov251,
-	CryptonightR_instruction_mov252,
-	CryptonightR_instruction_mov253,
-	CryptonightR_instruction_mov254,
-	CryptonightR_instruction_mov255,
-	CryptonightR_instruction_mov256,
+	(const void* ) CryptonightR_instruction_mov0,
+	(const void* ) CryptonightR_instruction_mov1,
+	(const void* ) CryptonightR_instruction_mov2,
+	(const void* ) CryptonightR_instruction_mov3,
+	(const void* ) CryptonightR_instruction_mov4,
+	(const void* ) CryptonightR_instruction_mov5,
+	(const void* ) CryptonightR_instruction_mov6,
+	(const void* ) CryptonightR_instruction_mov7,
+	(const void* ) CryptonightR_instruction_mov8,
+	(const void* ) CryptonightR_instruction_mov9,
+	(const void* ) CryptonightR_instruction_mov10,
+	(const void* ) CryptonightR_instruction_mov11,
+	(const void* ) CryptonightR_instruction_mov12,
+	(const void* ) CryptonightR_instruction_mov13,
+	(const void* ) CryptonightR_instruction_mov14,
+	(const void* ) CryptonightR_instruction_mov15,
+	(const void* ) CryptonightR_instruction_mov16,
+	(const void* ) CryptonightR_instruction_mov17,
+	(const void* ) CryptonightR_instruction_mov18,
+	(const void* ) CryptonightR_instruction_mov19,
+	(const void* ) CryptonightR_instruction_mov20,
+	(const void* ) CryptonightR_instruction_mov21,
+	(const void* ) CryptonightR_instruction_mov22,
+	(const void* ) CryptonightR_instruction_mov23,
+	(const void* ) CryptonightR_instruction_mov24,
+	(const void* ) CryptonightR_instruction_mov25,
+	(const void* ) CryptonightR_instruction_mov26,
+	(const void* ) CryptonightR_instruction_mov27,
+	(const void* ) CryptonightR_instruction_mov28,
+	(const void* ) CryptonightR_instruction_mov29,
+	(const void* ) CryptonightR_instruction_mov30,
+	(const void* ) CryptonightR_instruction_mov31,
+	(const void* ) CryptonightR_instruction_mov32,
+	(const void* ) CryptonightR_instruction_mov33,
+	(const void* ) CryptonightR_instruction_mov34,
+	(const void* ) CryptonightR_instruction_mov35,
+	(const void* ) CryptonightR_instruction_mov36,
+	(const void* ) CryptonightR_instruction_mov37,
+	(const void* ) CryptonightR_instruction_mov38,
+	(const void* ) CryptonightR_instruction_mov39,
+	(const void* ) CryptonightR_instruction_mov40,
+	(const void* ) CryptonightR_instruction_mov41,
+	(const void* ) CryptonightR_instruction_mov42,
+	(const void* ) CryptonightR_instruction_mov43,
+	(const void* ) CryptonightR_instruction_mov44,
+	(const void* ) CryptonightR_instruction_mov45,
+	(const void* ) CryptonightR_instruction_mov46,
+	(const void* ) CryptonightR_instruction_mov47,
+	(const void* ) CryptonightR_instruction_mov48,
+	(const void* ) CryptonightR_instruction_mov49,
+	(const void* ) CryptonightR_instruction_mov50,
+	(const void* ) CryptonightR_instruction_mov51,
+	(const void* ) CryptonightR_instruction_mov52,
+	(const void* ) CryptonightR_instruction_mov53,
+	(const void* ) CryptonightR_instruction_mov54,
+	(const void* ) CryptonightR_instruction_mov55,
+	(const void* ) CryptonightR_instruction_mov56,
+	(const void* ) CryptonightR_instruction_mov57,
+	(const void* ) CryptonightR_instruction_mov58,
+	(const void* ) CryptonightR_instruction_mov59,
+	(const void* ) CryptonightR_instruction_mov60,
+	(const void* ) CryptonightR_instruction_mov61,
+	(const void* ) CryptonightR_instruction_mov62,
+	(const void* ) CryptonightR_instruction_mov63,
+	(const void* ) CryptonightR_instruction_mov64,
+	(const void* ) CryptonightR_instruction_mov65,
+	(const void* ) CryptonightR_instruction_mov66,
+	(const void* ) CryptonightR_instruction_mov67,
+	(const void* ) CryptonightR_instruction_mov68,
+	(const void* ) CryptonightR_instruction_mov69,
+	(const void* ) CryptonightR_instruction_mov70,
+	(const void* ) CryptonightR_instruction_mov71,
+	(const void* ) CryptonightR_instruction_mov72,
+	(const void* ) CryptonightR_instruction_mov73,
+	(const void* ) CryptonightR_instruction_mov74,
+	(const void* ) CryptonightR_instruction_mov75,
+	(const void* ) CryptonightR_instruction_mov76,
+	(const void* ) CryptonightR_instruction_mov77,
+	(const void* ) CryptonightR_instruction_mov78,
+	(const void* ) CryptonightR_instruction_mov79,
+	(const void* ) CryptonightR_instruction_mov80,
+	(const void* ) CryptonightR_instruction_mov81,
+	(const void* ) CryptonightR_instruction_mov82,
+	(const void* ) CryptonightR_instruction_mov83,
+	(const void* ) CryptonightR_instruction_mov84,
+	(const void* ) CryptonightR_instruction_mov85,
+	(const void* ) CryptonightR_instruction_mov86,
+	(const void* ) CryptonightR_instruction_mov87,
+	(const void* ) CryptonightR_instruction_mov88,
+	(const void* ) CryptonightR_instruction_mov89,
+	(const void* ) CryptonightR_instruction_mov90,
+	(const void* ) CryptonightR_instruction_mov91,
+	(const void* ) CryptonightR_instruction_mov92,
+	(const void* ) CryptonightR_instruction_mov93,
+	(const void* ) CryptonightR_instruction_mov94,
+	(const void* ) CryptonightR_instruction_mov95,
+	(const void* ) CryptonightR_instruction_mov96,
+	(const void* ) CryptonightR_instruction_mov97,
+	(const void* ) CryptonightR_instruction_mov98,
+	(const void* ) CryptonightR_instruction_mov99,
+	(const void* ) CryptonightR_instruction_mov100,
+	(const void* ) CryptonightR_instruction_mov101,
+	(const void* ) CryptonightR_instruction_mov102,
+	(const void* ) CryptonightR_instruction_mov103,
+	(const void* ) CryptonightR_instruction_mov104,
+	(const void* ) CryptonightR_instruction_mov105,
+	(const void* ) CryptonightR_instruction_mov106,
+	(const void* ) CryptonightR_instruction_mov107,
+	(const void* ) CryptonightR_instruction_mov108,
+	(const void* ) CryptonightR_instruction_mov109,
+	(const void* ) CryptonightR_instruction_mov110,
+	(const void* ) CryptonightR_instruction_mov111,
+	(const void* ) CryptonightR_instruction_mov112,
+	(const void* ) CryptonightR_instruction_mov113,
+	(const void* ) CryptonightR_instruction_mov114,
+	(const void* ) CryptonightR_instruction_mov115,
+	(const void* ) CryptonightR_instruction_mov116,
+	(const void* ) CryptonightR_instruction_mov117,
+	(const void* ) CryptonightR_instruction_mov118,
+	(const void* ) CryptonightR_instruction_mov119,
+	(const void* ) CryptonightR_instruction_mov120,
+	(const void* ) CryptonightR_instruction_mov121,
+	(const void* ) CryptonightR_instruction_mov122,
+	(const void* ) CryptonightR_instruction_mov123,
+	(const void* ) CryptonightR_instruction_mov124,
+	(const void* ) CryptonightR_instruction_mov125,
+	(const void* ) CryptonightR_instruction_mov126,
+	(const void* ) CryptonightR_instruction_mov127,
+	(const void* ) CryptonightR_instruction_mov128,
+	(const void* ) CryptonightR_instruction_mov129,
+	(const void* ) CryptonightR_instruction_mov130,
+	(const void* ) CryptonightR_instruction_mov131,
+	(const void* ) CryptonightR_instruction_mov132,
+	(const void* ) CryptonightR_instruction_mov133,
+	(const void* ) CryptonightR_instruction_mov134,
+	(const void* ) CryptonightR_instruction_mov135,
+	(const void* ) CryptonightR_instruction_mov136,
+	(const void* ) CryptonightR_instruction_mov137,
+	(const void* ) CryptonightR_instruction_mov138,
+	(const void* ) CryptonightR_instruction_mov139,
+	(const void* ) CryptonightR_instruction_mov140,
+	(const void* ) CryptonightR_instruction_mov141,
+	(const void* ) CryptonightR_instruction_mov142,
+	(const void* ) CryptonightR_instruction_mov143,
+	(const void* ) CryptonightR_instruction_mov144,
+	(const void* ) CryptonightR_instruction_mov145,
+	(const void* ) CryptonightR_instruction_mov146,
+	(const void* ) CryptonightR_instruction_mov147,
+	(const void* ) CryptonightR_instruction_mov148,
+	(const void* ) CryptonightR_instruction_mov149,
+	(const void* ) CryptonightR_instruction_mov150,
+	(const void* ) CryptonightR_instruction_mov151,
+	(const void* ) CryptonightR_instruction_mov152,
+	(const void* ) CryptonightR_instruction_mov153,
+	(const void* ) CryptonightR_instruction_mov154,
+	(const void* ) CryptonightR_instruction_mov155,
+	(const void* ) CryptonightR_instruction_mov156,
+	(const void* ) CryptonightR_instruction_mov157,
+	(const void* ) CryptonightR_instruction_mov158,
+	(const void* ) CryptonightR_instruction_mov159,
+	(const void* ) CryptonightR_instruction_mov160,
+	(const void* ) CryptonightR_instruction_mov161,
+	(const void* ) CryptonightR_instruction_mov162,
+	(const void* ) CryptonightR_instruction_mov163,
+	(const void* ) CryptonightR_instruction_mov164,
+	(const void* ) CryptonightR_instruction_mov165,
+	(const void* ) CryptonightR_instruction_mov166,
+	(const void* ) CryptonightR_instruction_mov167,
+	(const void* ) CryptonightR_instruction_mov168,
+	(const void* ) CryptonightR_instruction_mov169,
+	(const void* ) CryptonightR_instruction_mov170,
+	(const void* ) CryptonightR_instruction_mov171,
+	(const void* ) CryptonightR_instruction_mov172,
+	(const void* ) CryptonightR_instruction_mov173,
+	(const void* ) CryptonightR_instruction_mov174,
+	(const void* ) CryptonightR_instruction_mov175,
+	(const void* ) CryptonightR_instruction_mov176,
+	(const void* ) CryptonightR_instruction_mov177,
+	(const void* ) CryptonightR_instruction_mov178,
+	(const void* ) CryptonightR_instruction_mov179,
+	(const void* ) CryptonightR_instruction_mov180,
+	(const void* ) CryptonightR_instruction_mov181,
+	(const void* ) CryptonightR_instruction_mov182,
+	(const void* ) CryptonightR_instruction_mov183,
+	(const void* ) CryptonightR_instruction_mov184,
+	(const void* ) CryptonightR_instruction_mov185,
+	(const void* ) CryptonightR_instruction_mov186,
+	(const void* ) CryptonightR_instruction_mov187,
+	(const void* ) CryptonightR_instruction_mov188,
+	(const void* ) CryptonightR_instruction_mov189,
+	(const void* ) CryptonightR_instruction_mov190,
+	(const void* ) CryptonightR_instruction_mov191,
+	(const void* ) CryptonightR_instruction_mov192,
+	(const void* ) CryptonightR_instruction_mov193,
+	(const void* ) CryptonightR_instruction_mov194,
+	(const void* ) CryptonightR_instruction_mov195,
+	(const void* ) CryptonightR_instruction_mov196,
+	(const void* ) CryptonightR_instruction_mov197,
+	(const void* ) CryptonightR_instruction_mov198,
+	(const void* ) CryptonightR_instruction_mov199,
+	(const void* ) CryptonightR_instruction_mov200,
+	(const void* ) CryptonightR_instruction_mov201,
+	(const void* ) CryptonightR_instruction_mov202,
+	(const void* ) CryptonightR_instruction_mov203,
+	(const void* ) CryptonightR_instruction_mov204,
+	(const void* ) CryptonightR_instruction_mov205,
+	(const void* ) CryptonightR_instruction_mov206,
+	(const void* ) CryptonightR_instruction_mov207,
+	(const void* ) CryptonightR_instruction_mov208,
+	(const void* ) CryptonightR_instruction_mov209,
+	(const void* ) CryptonightR_instruction_mov210,
+	(const void* ) CryptonightR_instruction_mov211,
+	(const void* ) CryptonightR_instruction_mov212,
+	(const void* ) CryptonightR_instruction_mov213,
+	(const void* ) CryptonightR_instruction_mov214,
+	(const void* ) CryptonightR_instruction_mov215,
+	(const void* ) CryptonightR_instruction_mov216,
+	(const void* ) CryptonightR_instruction_mov217,
+	(const void* ) CryptonightR_instruction_mov218,
+	(const void* ) CryptonightR_instruction_mov219,
+	(const void* ) CryptonightR_instruction_mov220,
+	(const void* ) CryptonightR_instruction_mov221,
+	(const void* ) CryptonightR_instruction_mov222,
+	(const void* ) CryptonightR_instruction_mov223,
+	(const void* ) CryptonightR_instruction_mov224,
+	(const void* ) CryptonightR_instruction_mov225,
+	(const void* ) CryptonightR_instruction_mov226,
+	(const void* ) CryptonightR_instruction_mov227,
+	(const void* ) CryptonightR_instruction_mov228,
+	(const void* ) CryptonightR_instruction_mov229,
+	(const void* ) CryptonightR_instruction_mov230,
+	(const void* ) CryptonightR_instruction_mov231,
+	(const void* ) CryptonightR_instruction_mov232,
+	(const void* ) CryptonightR_instruction_mov233,
+	(const void* ) CryptonightR_instruction_mov234,
+	(const void* ) CryptonightR_instruction_mov235,
+	(const void* ) CryptonightR_instruction_mov236,
+	(const void* ) CryptonightR_instruction_mov237,
+	(const void* ) CryptonightR_instruction_mov238,
+	(const void* ) CryptonightR_instruction_mov239,
+	(const void* ) CryptonightR_instruction_mov240,
+	(const void* ) CryptonightR_instruction_mov241,
+	(const void* ) CryptonightR_instruction_mov242,
+	(const void* ) CryptonightR_instruction_mov243,
+	(const void* ) CryptonightR_instruction_mov244,
+	(const void* ) CryptonightR_instruction_mov245,
+	(const void* ) CryptonightR_instruction_mov246,
+	(const void* ) CryptonightR_instruction_mov247,
+	(const void* ) CryptonightR_instruction_mov248,
+	(const void* ) CryptonightR_instruction_mov249,
+	(const void* ) CryptonightR_instruction_mov250,
+	(const void* ) CryptonightR_instruction_mov251,
+	(const void* ) CryptonightR_instruction_mov252,
+	(const void* ) CryptonightR_instruction_mov253,
+	(const void* ) CryptonightR_instruction_mov254,
+	(const void* ) CryptonightR_instruction_mov255,
+	(const void* ) CryptonightR_instruction_mov256,
 };
 
 #endif
diff --git a/src/crypto/hash-extra-groestl.c b/src/crypto/hash-extra-groestl.c
index 7ef21d3a61..5fc894cff8 100644
--- a/src/crypto/hash-extra-groestl.c
+++ b/src/crypto/hash-extra-groestl.c
@@ -34,5 +34,5 @@
 #include "groestl.h"
 
 void hash_extra_groestl(const void *data, size_t length, char *hash) {
-  groestl(data, length * 8, (uint8_t*)hash);
+  groestl((const BitSequence *)data, length * 8, (uint8_t*)hash);
 }
diff --git a/src/crypto/hash-extra-jh.c b/src/crypto/hash-extra-jh.c
index 4c0478e2e7..8582682291 100644
--- a/src/crypto/hash-extra-jh.c
+++ b/src/crypto/hash-extra-jh.c
@@ -40,5 +40,5 @@
 
 void hash_extra_jh(const void *data, size_t length, char *hash) {
   // No need to check for failure b/c jh_hash only fails for invalid hash size
-  jh_hash(JH_HASH_BITLEN, data, 8 * length, (uint8_t*)hash);
+  jh_hash(JH_HASH_BITLEN, (const BitSequence *)data, 8 * length, (uint8_t*)hash);
 }
diff --git a/src/crypto/hash-extra-skein.c b/src/crypto/hash-extra-skein.c
index 22403b41a4..d95244b1fd 100644
--- a/src/crypto/hash-extra-skein.c
+++ b/src/crypto/hash-extra-skein.c
@@ -38,5 +38,5 @@
 
 void hash_extra_skein(const void *data, size_t length, char *hash) {
   // No need to check for failure b/c skein_hash only fails for invalid hash size
-  skein_hash(SKEIN_HASH_BITLEN, data, 8 * length, (uint8_t*)hash);
+  skein_hash(SKEIN_HASH_BITLEN, (const BitSequence *)data, 8 * length, (uint8_t*)hash);
 }
diff --git a/src/crypto/hash-ops.h b/src/crypto/hash-ops.h
index 782ab1957b..4323fa70c6 100644
--- a/src/crypto/hash-ops.h
+++ b/src/crypto/hash-ops.h
@@ -30,7 +30,12 @@
 
 #pragma once
 
-#if !defined(__cplusplus)
+#if defined(__cplusplus)
+
+#include <cstddef>
+#include <cstdint>
+
+#else
 
 #include <assert.h>
 #include <stdbool.h>
diff --git a/src/crypto/variant2_int_sqrt.h b/src/crypto/variant2_int_sqrt.h
index b405bb798d..193105fbd7 100644
--- a/src/crypto/variant2_int_sqrt.h
+++ b/src/crypto/variant2_int_sqrt.h
@@ -3,6 +3,7 @@
 
 #include <math.h>
 #include <float.h>
+#include <stdint.h>
 
 #define VARIANT2_INTEGER_MATH_SQRT_STEP_SSE2() \
   do { \
diff --git a/src/crypto/variant4_random_math.h b/src/crypto/variant4_random_math.h
index f3e41a0016..ba84e2a8bf 100644
--- a/src/crypto/variant4_random_math.h
+++ b/src/crypto/variant4_random_math.h
@@ -1,6 +1,13 @@
 #ifndef VARIANT4_RANDOM_MATH_H
 #define VARIANT4_RANDOM_MATH_H
 
+#include <stdint.h>
+#include <stddef.h>
+#include <memory.h>
+
+#include "int-util.h"
+#include "hash-ops.h"
+
 // Register size can be configured to either 32 bit (uint32_t) or 64 bit (uint64_t)
 typedef uint32_t v4_reg;
 
diff --git a/src/crypto/wallet/crypto.h b/src/crypto/wallet/crypto.h
index be9aca46a1..6d8ae9a6cb 100644
--- a/src/crypto/wallet/crypto.h
+++ b/src/crypto/wallet/crypto.h
@@ -31,6 +31,7 @@
 
 #include <cstddef>
 #include "crypto/wallet/ops.h"
+#include "crypto/crypto.h"
 
 namespace crypto {
   namespace wallet {
diff --git a/src/cryptonote_basic/miner.h b/src/cryptonote_basic/miner.h
index 0a61606b3b..47d1ce5073 100644
--- a/src/cryptonote_basic/miner.h
+++ b/src/cryptonote_basic/miner.h
@@ -37,6 +37,8 @@
 #include "verification_context.h"
 #include "difficulty.h"
 #include "math_helper.h"
+#include "syncobj.h"
+#include "cryptonote_basic/blobdatatype.h"
 #ifdef _WIN32
 #include <windows.h>
 #endif
diff --git a/src/cryptonote_basic/subaddress_index.h b/src/cryptonote_basic/subaddress_index.h
index fdadf614a4..d8270aa3ea 100644
--- a/src/cryptonote_basic/subaddress_index.h
+++ b/src/cryptonote_basic/subaddress_index.h
@@ -28,6 +28,7 @@
 
 #pragma once
 
+#include "serialization/serialization.h"
 #include "serialization/keyvalue_serialization.h"
 #include <boost/serialization/serialization.hpp>
 #include <boost/serialization/version.hpp>
diff --git a/src/cryptonote_basic/tx_extra.h b/src/cryptonote_basic/tx_extra.h
index 74c319ec3b..74f5105ee6 100644
--- a/src/cryptonote_basic/tx_extra.h
+++ b/src/cryptonote_basic/tx_extra.h
@@ -30,6 +30,15 @@
 
 #pragma once
 
+#include <cstdint>
+#include <cstddef>
+
+#include <boost/variant/variant.hpp>
+
+#include "serialization/serialization.h"
+#include "serialization/binary_archive.h"
+#include "serialization/variant.h"
+#include "crypto/crypto.h"
 
 #define TX_EXTRA_PADDING_MAX_COUNT          255
 #define TX_EXTRA_NONCE_MAX_COUNT            255
diff --git a/src/cryptonote_core/tx_verification_utils.h b/src/cryptonote_core/tx_verification_utils.h
index 29b032f216..5e377dd1ae 100644
--- a/src/cryptonote_core/tx_verification_utils.h
+++ b/src/cryptonote_core/tx_verification_utils.h
@@ -28,6 +28,7 @@
 
 #pragma once
 
+#include "cryptonote_basic/blobdatatype.h"
 #include "common/data_cache.h"
 #include "cryptonote_basic/cryptonote_basic.h"
 #include "cryptonote_basic/verification_context.h"
diff --git a/src/cryptonote_protocol/block_queue.h b/src/cryptonote_protocol/block_queue.h
index 97f18c7a9b..979cd1d92c 100644
--- a/src/cryptonote_protocol/block_queue.h
+++ b/src/cryptonote_protocol/block_queue.h
@@ -37,6 +37,7 @@
 #include <boost/thread/recursive_mutex.hpp>
 #include <boost/uuid/uuid.hpp>
 #include "net/net_utils_base.h"
+#include "crypto/crypto.h"
 
 #undef MONERO_DEFAULT_LOG_CATEGORY
 #define MONERO_DEFAULT_LOG_CATEGORY "cn.block_queue"
diff --git a/src/cryptonote_protocol/cryptonote_protocol_handler.inl b/src/cryptonote_protocol/cryptonote_protocol_handler.inl
index 56527d6dc9..30b9b07783 100644
--- a/src/cryptonote_protocol/cryptonote_protocol_handler.inl
+++ b/src/cryptonote_protocol/cryptonote_protocol_handler.inl
@@ -36,9 +36,13 @@
 // developer rfree: this code is caller of our new network code, and is modded; e.g. for rate limiting
 
 #include <boost/optional/optional.hpp>
+#include <boost/uuid/uuid.hpp>
+#include <boost/uuid/uuid_generators.hpp>
 #include <list>
 #include <ctime>
 
+#include <cryptonote_core/cryptonote_core.h>
+#include "cryptonote_protocol/cryptonote_protocol_handler.h"
 #include "cryptonote_basic/cryptonote_format_utils.h"
 #include "profile_tools.h"
 #include "net/network_throttle-detail.hpp"
diff --git a/src/daemon/command_line_args.h b/src/daemon/command_line_args.h
index 2b8b281860..a80ab41530 100644
--- a/src/daemon/command_line_args.h
+++ b/src/daemon/command_line_args.h
@@ -32,6 +32,7 @@
 #include "common/command_line.h"
 #include "cryptonote_config.h"
 #include "daemonizer/daemonizer.h"
+#include "cryptonote_core/cryptonote_core.h"
 
 namespace daemon_args
 {
diff --git a/src/daemon/protocol.h b/src/daemon/protocol.h
index a1ed174eda..85cc03e4a5 100644
--- a/src/daemon/protocol.h
+++ b/src/daemon/protocol.h
@@ -30,6 +30,10 @@
 
 #pragma once
 
+#include "cryptonote_protocol/cryptonote_protocol_handler.h"
+#include "daemon/core.h"
+#include "p2p/net_node.h"
+
 #undef MONERO_DEFAULT_LOG_CATEGORY
 #define MONERO_DEFAULT_LOG_CATEGORY "daemon"
 
diff --git a/src/daemon/rpc.h b/src/daemon/rpc.h
index bacc10b214..11eb5cfbf2 100644
--- a/src/daemon/rpc.h
+++ b/src/daemon/rpc.h
@@ -31,6 +31,9 @@
 #pragma once
 
 #include "rpc/core_rpc_server.h"
+#include "daemon/command_line_args.h"
+#include "cryptonote_protocol/cryptonote_protocol_handler.h"
+#include "p2p.h"
 
 #undef MONERO_DEFAULT_LOG_CATEGORY
 #define MONERO_DEFAULT_LOG_CATEGORY "daemon"
diff --git a/src/daemonizer/daemonizer.h b/src/daemonizer/daemonizer.h
index 44833eb0fc..a70ba76d3a 100644
--- a/src/daemonizer/daemonizer.h
+++ b/src/daemonizer/daemonizer.h
@@ -32,6 +32,8 @@
 #include <boost/program_options/options_description.hpp>
 #include <boost/program_options/variables_map.hpp>
 
+#include "common/command_line.h"
+
 namespace daemonizer
 {
   void init_options(
diff --git a/src/daemonizer/posix_daemonizer.inl b/src/daemonizer/posix_daemonizer.inl
index d6e132c58f..b84a075d3b 100644
--- a/src/daemonizer/posix_daemonizer.inl
+++ b/src/daemonizer/posix_daemonizer.inl
@@ -28,8 +28,10 @@
 
 #pragma once
 
+#include "daemonizer/daemonizer.h"
 #include "common/scoped_message_writer.h"
 #include "common/util.h"
+#include "common/command_line.h"
 #include "daemonizer/posix_fork.h"
 
 #include <boost/filesystem/operations.hpp>
diff --git a/src/lmdb/util.h b/src/lmdb/util.h
index 89e4948a7b..42d65cb13a 100644
--- a/src/lmdb/util.h
+++ b/src/lmdb/util.h
@@ -31,6 +31,7 @@
 #include <cstring>
 #include <lmdb.h>
 #include <type_traits>
+#include <cassert>
 #include <utility>
 
 #include "span.h"
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
index 5ac4802eb8..8da16ec724 100644
--- a/src/p2p/net_node.inl
+++ b/src/p2p/net_node.inl
@@ -57,6 +57,7 @@
 #include "storages/levin_abstract_invoke2.h"
 #include "cryptonote_core/cryptonote_core.h"
 #include "net/parse.h"
+#include "p2p/net_node.h"
 
 #include <miniupnp/miniupnpc/miniupnpc.h>
 #include <miniupnp/miniupnpc/upnpcommands.h>
diff --git a/src/p2p/net_node_common.h b/src/p2p/net_node_common.h
index fd6ea4a993..625259eb19 100644
--- a/src/p2p/net_node_common.h
+++ b/src/p2p/net_node_common.h
@@ -33,6 +33,7 @@
 #include <boost/uuid/uuid.hpp>
 #include <utility>
 #include <vector>
+#include "net/levin_base.h"
 #include "cryptonote_basic/blobdatatype.h"
 #include "cryptonote_protocol/enums.h"
 #include "cryptonote_protocol/fwd.h"
diff --git a/src/p2p/net_peerlist_boost_serialization.h b/src/p2p/net_peerlist_boost_serialization.h
index da17814203..81ae3e6032 100644
--- a/src/p2p/net_peerlist_boost_serialization.h
+++ b/src/p2p/net_peerlist_boost_serialization.h
@@ -31,6 +31,7 @@
 #pragma once
 
 #include <cstring>
+#include <boost/serialization/split_free.hpp>
 
 #include "common/expect.h"
 #include "net/net_utils_base.h"
diff --git a/src/rpc/core_rpc_server_error_codes.h b/src/rpc/core_rpc_server_error_codes.h
index bccbb1d732..b2049c5ce4 100644
--- a/src/rpc/core_rpc_server_error_codes.h
+++ b/src/rpc/core_rpc_server_error_codes.h
@@ -30,6 +30,8 @@
 
 #pragma  once 
 
+#include "misc_log_ex.h"
+#include <cstddef>
 
 #define CORE_RPC_ERROR_CODE_WRONG_PARAM           -1
 #define CORE_RPC_ERROR_CODE_TOO_BIG_HEIGHT        -2
diff --git a/src/rpc/daemon_rpc_version.h b/src/rpc/daemon_rpc_version.h
index a9e34b9266..88075d160c 100644
--- a/src/rpc/daemon_rpc_version.h
+++ b/src/rpc/daemon_rpc_version.h
@@ -28,6 +28,8 @@
 
 #pragma once
 
+#include <cstdint>
+
 namespace cryptonote
 {
 
diff --git a/src/serialization/binary_utils.h b/src/serialization/binary_utils.h
index 885decf883..c61f845270 100644
--- a/src/serialization/binary_utils.h
+++ b/src/serialization/binary_utils.h
@@ -31,6 +31,7 @@
 #pragma once
 
 #include <sstream>
+#include "serialization/serialization.h"
 #include "binary_archive.h"
 
 namespace serialization {
diff --git a/src/serialization/container.h b/src/serialization/container.h
index 2ed63f1be6..def703efe0 100644
--- a/src/serialization/container.h
+++ b/src/serialization/container.h
@@ -28,6 +28,13 @@
 // 
 // Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
 
+#pragma once
+
+#include <cstdint>
+#include <cstddef>
+#include <string>
+#include <type_traits>
+
 namespace serialization
 {
   namespace detail
diff --git a/src/serialization/tuple.h b/src/serialization/tuple.h
index b1ef94097f..d39c174693 100644
--- a/src/serialization/tuple.h
+++ b/src/serialization/tuple.h
@@ -31,6 +31,7 @@
 #pragma once
 #include <tuple>
 #include "serialization.h"
+#include <cstdint>
 
 namespace serialization
 {