diff --git a/modules/ripple_data/ripple_data.cpp b/modules/ripple_data/ripple_data.cpp
index a5efc4bc7b..947d8ad298 100644
--- a/modules/ripple_data/ripple_data.cpp
+++ b/modules/ripple_data/ripple_data.cpp
@@ -58,6 +58,7 @@
 
 
 #include "crypto/ripple_Base58.h" // for RippleAddress
+#include "crypto/ripple_CKey.h" // needs RippleAddress VFALCO: TODO, remove this dependency cycle
 #include "crypto/ripple_RFC1751.h"
 
 // VFALCO: TODO, fix these warnings!
diff --git a/modules/ripple_data/ripple_data.h b/modules/ripple_data/ripple_data.h
index 1ae674e594..bf6faed103 100644
--- a/modules/ripple_data/ripple_data.h
+++ b/modules/ripple_data/ripple_data.h
@@ -61,13 +61,11 @@
 #include "../ripple_basics/ripple_basics.h"
 
 #include "crypto/ripple_CBigNum.h"
-//#include "crypto/ripple_CKey.h"
 #include "crypto/ripple_Base58.h" // VFALCO: TODO, Can be moved to .cpp if we clean up setAlphabet stuff
 #include "crypto/ripple_Base58Data.h"
 
 #include "types/ripple_FieldNames.h"
 #include "types/ripple_RippleAddress.h"
-#include "crypto/ripple_CKey.h" // needs RippleAddress VFALCO: TODO, remove this dependency cycle
 #include "types/ripple_Serializer.h" // needs CKey
 
 #endif
diff --git a/modules/ripple_data/types/ripple_Serializer.h b/modules/ripple_data/types/ripple_Serializer.h
index af9f750562..c2a2f07c0e 100644
--- a/modules/ripple_data/types/ripple_Serializer.h
+++ b/modules/ripple_data/types/ripple_Serializer.h
@@ -1,6 +1,8 @@
 #ifndef RIPPLE_SERIALIZER_H
 #define RIPPLE_SERIALIZER_H
 
+class CKey; // forward declaration
+
 class Serializer
 {
 public: