Merge remote-tracking branch 'upstream/develop' into addTests

1 files changed, 1 insertions, 2 deletions

diff --git a/state.cpp b/state.cpp
index 6da18e70..fb54a62a 100644
--- a/state.cpp
+++ b/state.cpp
@@ -24,7 +24,7 @@
 #include <boost/test/unit_test.hpp>
 #include "JsonSpiritHeaders.h"
 #include <libdevcore/CommonIO.h>
-#include <libethereum/BlockChain.h>
+#include <libethereum/CanonBlockChain.h>
 #include <libethereum/State.h>
 #include <libethereum/ExtVM.h>
 #include <libethereum/Defaults.h>
@@ -35,7 +35,6 @@ using namespace std;
 using namespace json_spirit;
 using namespace dev;
 using namespace dev::eth;
-using namespace dev::eth;
 
 namespace dev {  namespace test {