diff --git a/src/Val.cc b/src/Val.cc
index 4da4a35d48..acf0b6f915 100644
--- a/src/Val.cc
+++ b/src/Val.cc
@@ -27,6 +27,8 @@
 #include "Reporter.h"
 #include "IPAddr.h"
 
+#include "broker/Data.h"
+
 Val::Val(Func* f)
 	{
 	val.func_val = f;
diff --git a/src/logging/WriterBackend.cc b/src/logging/WriterBackend.cc
index 1a70b808a4..69327e815d 100644
--- a/src/logging/WriterBackend.cc
+++ b/src/logging/WriterBackend.cc
@@ -1,5 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
+#include <broker/data.hh>
+
 #include "util.h"
 #include "threading/SerialTypes.h"
 
diff --git a/src/logging/WriterBackend.h b/src/logging/WriterBackend.h
index bb806b31e6..74541d8586 100644
--- a/src/logging/WriterBackend.h
+++ b/src/logging/WriterBackend.h
@@ -6,12 +6,13 @@
 #define LOGGING_WRITERBACKEND_H
 
 #include "threading/MsgThread.h"
-#include "broker/Data.h"
 
 #include "Component.h"
 
 class RemoteSerializer;
 
+namespace broker { class data; }
+
 namespace logging  {
 
 class WriterFrontend;