2 files changed, 5 insertions, 2 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h
index 70e06e2a58..ce24525158 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -139,8 +139,6 @@ extern int errno;
 #include "lib/dcom/common/dcom.h"
 #include "librpc/gen_ndr/ndr_dcom.h"
 #include "smb_interfaces.h"
-#include "smbd/server.h"
-#include "smbd/service.h"
 #include "ntvfs/ntvfs.h"
 #include "cli_context.h"
 #include "nsswitch/winbind_client.h"
diff --git a/source4/include/structs.h b/source4/include/structs.h
index 29a6589a86..cf59296f32 100644
--- a/source4/include/structs.h
+++ b/source4/include/structs.h
@@ -151,3 +151,8 @@ struct nbt_name_socket;
 struct nbt_name_query;
 struct nbt_name_status;
 
+
+struct messaging_context;
+struct stream_connection;
+struct model_ops;
+struct stream_server_ops;