2 files changed, 4 insertions, 7 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h
index 2222b4ff43..a8aecc3610 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -101,7 +101,6 @@ struct ipv4_addr {
 #include "smb_macros.h"
 #include "smb.h"
 #include "byteorder.h"
-#include "lib/tdr/tdr.h"
 #include "librpc/ndr/libndr.h"
 #include "librpc/gen_ndr/misc.h"
 #include "librpc/gen_ndr/dcerpc.h"
@@ -109,13 +108,13 @@ struct ipv4_addr {
 #include "librpc/gen_ndr/orpc.h"
 #include "librpc/rpc/dcerpc.h"
 #include "smb_interfaces.h"
-#include "ntvfs/ntvfs.h"
 #include "cli_context.h"
 #include "auth/credentials/credentials.h"
 
 /***** automatically generated prototypes *****/
 #define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
 #include "include/proto.h"
+#include "basic.h"
 #undef _PRINTF_ATTRIBUTE
 #define _PRINTF_ATTRIBUTE(a1, a2)
 
diff --git a/source4/include/structs.h b/source4/include/structs.h
index 153902d13a..2187fcd8ba 100644
--- a/source4/include/structs.h
+++ b/source4/include/structs.h
@@ -157,7 +157,6 @@ struct request_buffer;
 struct smb2srv_request;
 struct smb2_request_buffer;
 
-struct ntvfs_context;
 struct ntvfs_module_context;
 
 struct pvfs_dir;
@@ -267,14 +266,10 @@ struct task_server;
 struct model_ops;
 struct stream_server_ops;
 
-struct nbtd_server;
-struct nbtd_interface;
-struct nbtd_iface_name;
 struct wins_server;
 struct nbtd_proxy_wins_challenge;
 struct nbtd_proxy_wins_release_demand;
 
-struct nbt_iface_name;
 struct nbt_dc_name;
 struct wb_sid_object;
 struct wb_dom_info;
@@ -373,3 +368,6 @@ struct IUnknown_vtable;
 struct MprVar;
 
 struct registry_context;
+struct nbtd_interface;
+struct nbtd_iface_name;
+struct nbtd_server;