From 66e6fb6d2a157063616b0278510d0ef5fde5f7fd Mon Sep 17 00:00:00 2001
From: Gav Wood <i@gavwood.com>
Date: Thu, 5 Mar 2015 11:09:34 +0100
Subject: [PATCH] Bunch of repotting/curating. [10:59:28] Vitalik Buterin:
 block.parent.gas_limit * 1023 / 1024 <= block.gas_limit <=
 block.parent.gas_limit * 1025/1024

---
 MemTrie.cpp  | 2 +-
 TrieHash.cpp | 2 +-
 commonjs.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/MemTrie.cpp b/MemTrie.cpp
index c3a44e1e5..ab5a13b60 100644
--- a/MemTrie.cpp
+++ b/MemTrie.cpp
@@ -23,7 +23,7 @@
 
 #include <libdevcrypto/TrieCommon.h>
 #include <libdevcrypto/SHA3.h>
-#include <libethcore/CommonEth.h>
+#include <libethcore/Common.h>
 using namespace std;
 using namespace dev;
 using namespace dev::eth;
diff --git a/TrieHash.cpp b/TrieHash.cpp
index ee4f2e87d..ccf12c162 100644
--- a/TrieHash.cpp
+++ b/TrieHash.cpp
@@ -23,7 +23,7 @@
 
 #include <libdevcrypto/TrieCommon.h>
 #include <libdevcrypto/SHA3.h>
-#include <libethcore/CommonEth.h>
+#include <libethcore/Common.h>
 using namespace std;
 using namespace dev;
 using namespace dev::eth;
diff --git a/commonjs.cpp b/commonjs.cpp
index 041a14f68..72582c540 100644
--- a/commonjs.cpp
+++ b/commonjs.cpp
@@ -42,7 +42,7 @@ BOOST_AUTO_TEST_CASE(jsToAddress)
 	cnote << "Testing jsToPublic...";
 	KeyPair kp = KeyPair::create();
 	string string = toJS(kp.address());
-	Address address = dev::eth::jsToAddress(string);
+	Address address = dev::jsToAddress(string);
 	BOOST_CHECK_EQUAL(kp.address(), address);
 }