5 files changed, 6 insertions, 4 deletions
diff --git a/source4/ntvfs/common/brlock.c b/source4/ntvfs/common/brlock.c
index e06cb0602e..3fc3c09316 100644
--- a/source4/ntvfs/common/brlock.c
+++ b/source4/ntvfs/common/brlock.c
@@ -28,7 +28,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "lib/tdb/include/tdb.h"
-#include "messages.h"
+#include "messaging/messaging.h"
 #include "db_wrap.h"
 #include "lib/messaging/irpc.h"
 
diff --git a/source4/ntvfs/common/opendb.c b/source4/ntvfs/common/opendb.c
index 72e9fff1c6..7d45f38840 100644
--- a/source4/ntvfs/common/opendb.c
+++ b/source4/ntvfs/common/opendb.c
@@ -41,9 +41,10 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "lib/tdb/include/tdb.h"
-#include "messages.h"
+#include "messaging/messaging.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "db_wrap.h"
+#include "smb_server/smb_server.h"
 #include "lib/messaging/irpc.h"
 
 struct odb_context {
diff --git a/source4/ntvfs/posix/pvfs_lock.c b/source4/ntvfs/posix/pvfs_lock.c
index a0832723b6..5031e4cef7 100644
--- a/source4/ntvfs/posix/pvfs_lock.c
+++ b/source4/ntvfs/posix/pvfs_lock.c
@@ -24,7 +24,7 @@
 #include "vfs_posix.h"
 #include "system/time.h"
 #include "dlinklist.h"
-#include "messages.h"
+#include "messaging/messaging.h"
 
 
 /*
diff --git a/source4/ntvfs/posix/pvfs_open.c b/source4/ntvfs/posix/pvfs_open.c
index 0e2a85bab1..5aeb5eb7e8 100644
--- a/source4/ntvfs/posix/pvfs_open.c
+++ b/source4/ntvfs/posix/pvfs_open.c
@@ -25,7 +25,7 @@
 #include "system/dir.h"
 #include "system/time.h"
 #include "dlinklist.h"
-#include "messages.h"
+#include "messaging/messaging.h"
 #include "librpc/gen_ndr/ndr_xattr.h"
 
 /*
diff --git a/source4/ntvfs/simple/svfs_util.c b/source4/ntvfs/simple/svfs_util.c
index d332abb091..ab1eccc551 100644
--- a/source4/ntvfs/simple/svfs_util.c
+++ b/source4/ntvfs/simple/svfs_util.c
@@ -28,6 +28,7 @@
 #include "svfs.h"
 #include "system/time.h"
 #include "system/dir.h"
+#include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
 
 /*