Index: source/services/dht/Dht.cpp
===================================================================
--- source/services/dht/Dht.cpp	(revision 10673)
+++ source/services/dht/Dht.cpp	(revision 10688)
@@ -7,4 +7,5 @@
 
 #include "Dht.h"
+#include "messages/DhtMessage.h"
 #include <boost/date_time/time_clock.hpp>
 
Index: source/services/dht/Dht.h
===================================================================
--- source/services/dht/Dht.h	(revision 10673)
+++ source/services/dht/Dht.h	(revision 10688)
@@ -12,5 +12,4 @@
 #include "ariba/utility/system/SystemQueue.h"
 #include "ariba/utility/logging/Logging.h"
-#include "messages/DhtMessage.h"
 #include "DhtAnswerInterface.h"
 #include <boost/date_time/posix_time/posix_time.hpp>
@@ -25,4 +24,7 @@
 using ariba::utility::SystemEventType;
 using ariba::utility::SystemEventListener;
+
+// Forward declarations to avoid adding messages/*.h to the public interface
+class DhtMessage;
 
 #define MEET_REPUBLISH_INTERVAL 10
@@ -135,6 +137,4 @@
     
     
-    virtual void handle_dht_message(const DhtMessage& message, const NodeID& source);
-
     /*** SystemEventListener interface ***/
     virtual void handleSystemEvent( const SystemEvent& event );
@@ -173,4 +173,6 @@
 
 private:
+    void handle_dht_message(const DhtMessage& message, const NodeID& source);
+    
     void answer_dht_request(const std::string& key, const NodeID& source);
     void send_meet_message(const std::string& key, const std::string& value);