13 files changed, 15 insertions, 15 deletions
diff --git a/source4/nbt_server/dgram/netlogon.c b/source4/nbt_server/dgram/netlogon.c
index e2ee1000d7b..e9d89e52dea 100644
--- a/source4/nbt_server/dgram/netlogon.c
+++ b/source4/nbt_server/dgram/netlogon.c
@@ -27,7 +27,7 @@
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
 #include "param/param.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "dsdb/samdb/ldb_modules/util.h"
 #include "libcli/security/security.h"
 #include "nbt_server/dgram/proto.h"
diff --git a/source4/nbt_server/dgram/ntlogon.c b/source4/nbt_server/dgram/ntlogon.c
index 978d354abc5..8c6a6e9264b 100644
--- a/source4/nbt_server/dgram/ntlogon.c
+++ b/source4/nbt_server/dgram/ntlogon.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "nbt_server/nbt_server.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "lib/socket/socket.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 #include "param/param.h"
diff --git a/source4/nbt_server/dgram/request.c b/source4/nbt_server/dgram/request.c
index 908e8d0f35d..ea2b6e8b98a 100644
--- a/source4/nbt_server/dgram/request.c
+++ b/source4/nbt_server/dgram/request.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "nbt_server/nbt_server.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "lib/socket/socket.h"
 #include "libcli/resolve/resolve.h"
 #include "nbt_server/dgram/proto.h"
diff --git a/source4/nbt_server/interfaces.c b/source4/nbt_server/interfaces.c
index beafec6e6af..93e1497c2ae 100644
--- a/source4/nbt_server/interfaces.c
+++ b/source4/nbt_server/interfaces.c
@@ -22,7 +22,7 @@
 #include "includes.h"
 #include "../lib/util/dlinklist.h"
 #include "nbt_server/nbt_server.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "lib/socket/socket.h"
 #include "nbt_server/wins/winsserver.h"
 #include "nbt_server/dgram/proto.h"
diff --git a/source4/nbt_server/irpc.c b/source4/nbt_server/irpc.c
index cfe617b53b0..e835ffd25ab 100644
--- a/source4/nbt_server/irpc.c
+++ b/source4/nbt_server/irpc.c
@@ -21,8 +21,8 @@
 */
 
 #include "includes.h"
-#include "smbd/service_task.h"
-#include "smbd/service.h"
+#include "samba/service_task.h"
+#include "samba/service.h"
 #include "nbt_server/nbt_server.h"
 #include "nbt_server/wins/winsserver.h"
 #include "librpc/gen_ndr/ndr_irpc.h"
diff --git a/source4/nbt_server/nbt_server.c b/source4/nbt_server/nbt_server.c
index 00c255cf0d3..6d28bbdbdad 100644
--- a/source4/nbt_server/nbt_server.c
+++ b/source4/nbt_server/nbt_server.c
@@ -20,8 +20,8 @@
 */
 
 #include "includes.h"
-#include "smbd/service_task.h"
-#include "smbd/service.h"
+#include "samba/service_task.h"
+#include "samba/service.h"
 #include "nbt_server/nbt_server.h"
 #include "nbt_server/wins/winsserver.h"
 #include "system/network.h"
diff --git a/source4/nbt_server/packet.c b/source4/nbt_server/packet.c
index 13954962375..b9aea56d3d2 100644
--- a/source4/nbt_server/packet.c
+++ b/source4/nbt_server/packet.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "nbt_server/nbt_server.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "lib/socket/socket.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 #include "param/param.h"
diff --git a/source4/nbt_server/query.c b/source4/nbt_server/query.c
index 8cf387c2dcd..7e1a7600907 100644
--- a/source4/nbt_server/query.c
+++ b/source4/nbt_server/query.c
@@ -24,7 +24,7 @@
 #include "system/network.h"
 #include "nbt_server/nbt_server.h"
 #include "nbt_server/wins/winsserver.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 #include "lib/socket/socket.h"
 #include "param/param.h"
diff --git a/source4/nbt_server/register.c b/source4/nbt_server/register.c
index 08caa11f8a8..4d10e9b16a2 100644
--- a/source4/nbt_server/register.c
+++ b/source4/nbt_server/register.c
@@ -23,7 +23,7 @@
 #include "lib/events/events.h"
 #include "../lib/util/dlinklist.h"
 #include "nbt_server/nbt_server.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "libcli/composite/composite.h"
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "nbt_server/wins/winsserver.h"
diff --git a/source4/nbt_server/wins/wins_dns_proxy.c b/source4/nbt_server/wins/wins_dns_proxy.c
index 7b85f8d9fea..95ceb214f3c 100644
--- a/source4/nbt_server/wins/wins_dns_proxy.c
+++ b/source4/nbt_server/wins/wins_dns_proxy.c
@@ -25,7 +25,7 @@
 #include "nbt_server/wins/winsserver.h"
 #include "system/time.h"
 #include "libcli/composite/composite.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "libcli/resolve/resolve.h"
 #include "lib/socket/socket.h"
 
diff --git a/source4/nbt_server/wins/winsclient.c b/source4/nbt_server/wins/winsclient.c
index 0636594dddb..c1e7f9a6559 100644
--- a/source4/nbt_server/wins/winsclient.c
+++ b/source4/nbt_server/wins/winsclient.c
@@ -25,7 +25,7 @@
 #include "libcli/composite/composite.h"
 #include "lib/events/events.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "param/param.h"
 
 /* we send WINS client requests using our primary network interface 
diff --git a/source4/nbt_server/wins/winsserver.c b/source4/nbt_server/wins/winsserver.c
index 98789c04965..a9f3ecd7d29 100644
--- a/source4/nbt_server/wins/winsserver.c
+++ b/source4/nbt_server/wins/winsserver.c
@@ -28,7 +28,7 @@
 #include "librpc/gen_ndr/ndr_nbt.h"
 #include "system/time.h"
 #include "libcli/composite/composite.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "system/network.h"
 #include "lib/socket/socket.h"
 #include "lib/socket/netif.h"
diff --git a/source4/nbt_server/wins/winswack.c b/source4/nbt_server/wins/winswack.c
index 35875aa8806..735a4e6653d 100644
--- a/source4/nbt_server/wins/winswack.c
+++ b/source4/nbt_server/wins/winswack.c
@@ -27,7 +27,7 @@
 #include "system/time.h"
 #include "libcli/composite/composite.h"
 #include "param/param.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 
 struct wins_challenge_state {
 	struct wins_challenge_io *io;