aboutsummaryrefslogtreecommitdiff
path: root/src/script
diff options
context:
space:
mode:
authorCory Fields <cory-nospam-@coryfields.com>2014-09-24 23:32:36 -0400
committerCory Fields <cory-nospam-@coryfields.com>2014-10-17 13:44:57 -0400
commit85c579e3a63cf505d6cedc454755265572e97d3e (patch)
tree116da64bbc269152c7026948b8600cfa1ac8f87a /src/script
parentdb8eb54bd7239ff2b046fe34b1c8d692860c6b5b (diff)
script: add a slew of includes all around and drop includes from script.h
Lots of files ended up with indirect includes from script.h.
Diffstat (limited to 'src/script')
-rw-r--r--src/script/compressor.cpp2
-rw-r--r--src/script/compressor.h3
-rw-r--r--src/script/interpreter.cpp1
-rw-r--r--src/script/script.cpp3
-rw-r--r--src/script/script.h12
-rw-r--r--src/script/standard.cpp1
-rw-r--r--src/script/standard.h3
7 files changed, 18 insertions, 7 deletions
diff --git a/src/script/compressor.cpp b/src/script/compressor.cpp
index dbb4df8b7c..af1acf48db 100644
--- a/src/script/compressor.cpp
+++ b/src/script/compressor.cpp
@@ -4,6 +4,8 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "compressor.h"
+
+#include "key.h"
#include "script/standard.h"
bool CScriptCompressor::IsToKeyID(CKeyID &hash) const
diff --git a/src/script/compressor.h b/src/script/compressor.h
index f48ecf5001..154e0b2662 100644
--- a/src/script/compressor.h
+++ b/src/script/compressor.h
@@ -7,7 +7,10 @@
#define H_BITCOIN_SCRIPT_COMPRESSOR
#include "script/script.h"
+#include "serialize.h"
+class CKeyID;
+class CPubKey;
class CScriptID;
/** Compact serializer for scripts.
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index ae66217b7c..cd73b88210 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -9,6 +9,7 @@
#include "crypto/ripemd160.h"
#include "crypto/sha1.h"
#include "crypto/sha2.h"
+#include "key.h"
#include "script/script.h"
#include "uint256.h"
#include "util.h"
diff --git a/src/script/script.cpp b/src/script/script.cpp
index 1ce8ddb6df..3e19d0c2bf 100644
--- a/src/script/script.cpp
+++ b/src/script/script.cpp
@@ -5,7 +5,8 @@
#include "script.h"
-#include <boost/foreach.hpp>
+#include "tinyformat.h"
+#include "utilstrencodings.h"
namespace {
inline std::string ValueString(const std::vector<unsigned char>& vch)
diff --git a/src/script/script.h b/src/script/script.h
index 4f6ee0c521..a68924c73a 100644
--- a/src/script/script.h
+++ b/src/script/script.h
@@ -6,13 +6,13 @@
#ifndef H_BITCOIN_SCRIPT
#define H_BITCOIN_SCRIPT
-#include "key.h"
-#include "tinyformat.h"
-#include "utilstrencodings.h"
-
+#include <assert.h>
+#include <climits>
+#include <limits>
#include <stdexcept>
-
-#include <boost/variant.hpp>
+#include <stdint.h>
+#include <string.h>
+#include <vector>
static const unsigned int MAX_SCRIPT_ELEMENT_SIZE = 520; // bytes
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index 7e6b136a28..05938961bc 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -7,6 +7,7 @@
#include "script/script.h"
#include "util.h"
+#include "utilstrencodings.h"
#include <boost/foreach.hpp>
diff --git a/src/script/standard.h b/src/script/standard.h
index 38d0b59885..961b214c89 100644
--- a/src/script/standard.h
+++ b/src/script/standard.h
@@ -6,9 +6,12 @@
#ifndef H_BITCOIN_SCRIPT_STANDARD
#define H_BITCOIN_SCRIPT_STANDARD
+#include "key.h"
#include "script/script.h"
#include "script/interpreter.h"
+#include <boost/variant.hpp>
+
#include <stdint.h>
class CScript;