diff --git a/src/keystore.cpp b/src/keystore.cpp
index 22cd08f30c..7531737e04 100644
--- a/src/keystore.cpp
+++ b/src/keystore.cpp
@@ -7,8 +7,6 @@
 
 #include "crypter.h"
 #include "key.h"
-#include "script/script.h"
-#include "script/standard.h"
 #include "util.h"
 
 #include <boost/foreach.hpp>
diff --git a/src/keystore.h b/src/keystore.h
index 6655264d72..4a4b6d20af 100644
--- a/src/keystore.h
+++ b/src/keystore.h
@@ -8,14 +8,13 @@
 
 #include "key.h"
 #include "pubkey.h"
+#include "script/script.h"
+#include "script/standard.h"
 #include "sync.h"
 
 #include <boost/signals2/signal.hpp>
 #include <boost/variant.hpp>
 
-class CScript;
-class CScriptID;
-
 /** A virtual base class for key stores */
 class CKeyStore
 {