s4: rename source4/smbd/ to source4/samba/

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Fri Nov 27 10:07:18 UTC 2020 on sn-devel-184

92 files changed, 117 insertions, 117 deletions

diff --git a/file_server/file_server.c b/file_server/file_server.c
index 4c216695a1f..69aabbe3ca1 100644
--- a/file_server/file_server.c
+++ b/file_server/file_server.c
@@ -24,8 +24,8 @@
 #include "tevent.h"
 #include "system/filesys.h"
 #include "lib/param/param.h"
-#include "source4/smbd/service.h"
-#include "source4/smbd/process_model.h"
+#include "source4/samba/service.h"
+#include "source4/samba/process_model.h"
 #include "dynconfig.h"
 #include "nsswitch/winbind_client.h"
 
diff --git a/source4/cldap_server/cldap_server.c b/source4/cldap_server/cldap_server.c
index 51183260833..3a8b3be7a63 100644
--- a/source4/cldap_server/cldap_server.c
+++ b/source4/cldap_server/cldap_server.c
@@ -22,8 +22,8 @@
 #include "includes.h"
 #include <talloc.h>
 #include "lib/messaging/irpc.h"
-#include "smbd/service_task.h"
-#include "smbd/service.h"
+#include "samba/service_task.h"
+#include "samba/service.h"
 #include "cldap_server/cldap_server.h"
 #include "system/network.h"
 #include "lib/socket/netif.h"
diff --git a/source4/cldap_server/rootdse.c b/source4/cldap_server/rootdse.c
index a5e1c6b5c4e..89f0a66b0ad 100644
--- a/source4/cldap_server/rootdse.c
+++ b/source4/cldap_server/rootdse.c
@@ -23,7 +23,7 @@
 #include <tevent.h>
 #include <ldb.h>
 #include <ldb_errors.h>
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "cldap_server/cldap_server.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "dsdb/samdb/samdb.h"
diff --git a/source4/dns_server/dns_query.c b/source4/dns_server/dns_query.c
index 762bcca6fb6..181beda219b 100644
--- a/source4/dns_server/dns_query.c
+++ b/source4/dns_server/dns_query.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "libcli/util/werror.h"
 #include "librpc/ndr/libndr.h"
 #include "librpc/gen_ndr/ndr_dns.h"
diff --git a/source4/dns_server/dns_server.c b/source4/dns_server/dns_server.c
index 43ea88158ce..f9b14ed49db 100644
--- a/source4/dns_server/dns_server.c
+++ b/source4/dns_server/dns_server.c
@@ -20,10 +20,10 @@
 */
 
 #include "includes.h"
-#include "smbd/service_task.h"
-#include "smbd/service.h"
-#include "smbd/service_stream.h"
-#include "smbd/process_model.h"
+#include "samba/service_task.h"
+#include "samba/service.h"
+#include "samba/service_stream.h"
+#include "samba/process_model.h"
 #include "lib/events/events.h"
 #include "lib/socket/socket.h"
 #include "lib/tsocket/tsocket.h"
diff --git a/source4/dns_server/dns_update.c b/source4/dns_server/dns_update.c
index f9866611119..b6d39e4c034 100644
--- a/source4/dns_server/dns_update.c
+++ b/source4/dns_server/dns_update.c
@@ -29,7 +29,7 @@
 #include "param/loadparm.h"
 #include "dsdb/samdb/samdb.h"
 #include "dsdb/common/util.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "dns_server/dns_server.h"
 #include "auth/auth.h"
 
diff --git a/source4/dsdb/dns/dns_update.c b/source4/dsdb/dns/dns_update.c
index 4a81d06b097..dd94564c996 100644
--- a/source4/dsdb/dns/dns_update.c
+++ b/source4/dsdb/dns/dns_update.c
@@ -31,7 +31,7 @@
 #include "includes.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "lib/messaging/irpc.h"
 #include "param/param.h"
 #include "system/filesys.h"
diff --git a/source4/dsdb/kcc/kcc_connection.c b/source4/dsdb/kcc/kcc_connection.c
index 6a20dea1d14..f387dfcb0fe 100644
--- a/source4/dsdb/kcc/kcc_connection.c
+++ b/source4/dsdb/kcc/kcc_connection.c
@@ -23,7 +23,7 @@
 #include "lib/events/events.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "lib/messaging/irpc.h"
 #include "dsdb/kcc/kcc_service.h"
 #include "dsdb/kcc/kcc_connection.h"
diff --git a/source4/dsdb/kcc/kcc_drs_replica_info.c b/source4/dsdb/kcc/kcc_drs_replica_info.c
index 3f16de8cb6d..edd0710c4a2 100644
--- a/source4/dsdb/kcc/kcc_drs_replica_info.c
+++ b/source4/dsdb/kcc/kcc_drs_replica_info.c
@@ -24,7 +24,7 @@
 #include "dsdb/samdb/samdb.h"
 #include "dsdb/common/proto.h"
 #include "auth/auth.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "lib/events/events.h"
 #include "lib/messaging/irpc.h"
 #include "dsdb/kcc/kcc_service.h"
diff --git a/source4/dsdb/kcc/kcc_periodic.c b/source4/dsdb/kcc/kcc_periodic.c
index c6ee6d89dfd..c37b8587852 100644
--- a/source4/dsdb/kcc/kcc_periodic.c
+++ b/source4/dsdb/kcc/kcc_periodic.c
@@ -24,7 +24,7 @@
 #include "lib/events/events.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "lib/messaging/irpc.h"
 #include "dsdb/kcc/kcc_connection.h"
 #include "dsdb/kcc/kcc_service.h"
diff --git a/source4/dsdb/kcc/kcc_service.c b/source4/dsdb/kcc/kcc_service.c
index 13c78976e3a..066cc070c30 100644
--- a/source4/dsdb/kcc/kcc_service.c
+++ b/source4/dsdb/kcc/kcc_service.c
@@ -24,7 +24,7 @@
 #include "includes.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "lib/events/events.h"
 #include "lib/messaging/irpc.h"
 #include "dsdb/kcc/kcc_service.h"
diff --git a/source4/dsdb/repl/drepl_extended.c b/source4/dsdb/repl/drepl_extended.c
index e2f85893ae8..8b5bb6faf63 100644
--- a/source4/dsdb/repl/drepl_extended.c
+++ b/source4/dsdb/repl/drepl_extended.c
@@ -27,7 +27,7 @@
 #include "includes.h"
 #include "ldb_module.h"
 #include "dsdb/samdb/samdb.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "dsdb/repl/drepl_service.h"
 #include "param/param.h"
 
diff --git a/source4/dsdb/repl/drepl_fsmo.c b/source4/dsdb/repl/drepl_fsmo.c
index be707a9c238..3c3cbad8f21 100644
--- a/source4/dsdb/repl/drepl_fsmo.c
+++ b/source4/dsdb/repl/drepl_fsmo.c
@@ -27,7 +27,7 @@
 
 #include "includes.h"
 #include "dsdb/samdb/samdb.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "dsdb/repl/drepl_service.h"
 #include "param/param.h"
 
diff --git a/source4/dsdb/repl/drepl_notify.c b/source4/dsdb/repl/drepl_notify.c
index a811f97e274..20be3b53dd0 100644
--- a/source4/dsdb/repl/drepl_notify.c
+++ b/source4/dsdb/repl/drepl_notify.c
@@ -25,7 +25,7 @@
 #include "lib/events/events.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "dsdb/repl/drepl_service.h"
 #include <ldb_errors.h>
 #include "../lib/util/dlinklist.h"
diff --git a/source4/dsdb/repl/drepl_out_helpers.c b/source4/dsdb/repl/drepl_out_helpers.c
index afe25d82271..401d2bf2728 100644
--- a/source4/dsdb/repl/drepl_out_helpers.c
+++ b/source4/dsdb/repl/drepl_out_helpers.c
@@ -22,7 +22,7 @@
 #include "includes.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "lib/events/events.h"
 #include "dsdb/repl/drepl_service.h"
 #include <ldb_errors.h>
diff --git a/source4/dsdb/repl/drepl_out_pull.c b/source4/dsdb/repl/drepl_out_pull.c
index ea553b4b6d2..fe9bd60c3ef 100644
--- a/source4/dsdb/repl/drepl_out_pull.c
+++ b/source4/dsdb/repl/drepl_out_pull.c
@@ -22,7 +22,7 @@
 #include "includes.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "lib/events/events.h"
 #include "dsdb/repl/drepl_service.h"
 #include <ldb_errors.h>
diff --git a/source4/dsdb/repl/drepl_partitions.c b/source4/dsdb/repl/drepl_partitions.c
index 57b82131225..cc32d5904da 100644
--- a/source4/dsdb/repl/drepl_partitions.c
+++ b/source4/dsdb/repl/drepl_partitions.c
@@ -22,7 +22,7 @@
 #include "includes.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "lib/events/events.h"
 #include "dsdb/repl/drepl_service.h"
 #include <ldb_errors.h>
diff --git a/source4/dsdb/repl/drepl_periodic.c b/source4/dsdb/repl/drepl_periodic.c
index d4ed1f013d1..4cdc8cba220 100644
--- a/source4/dsdb/repl/drepl_periodic.c
+++ b/source4/dsdb/repl/drepl_periodic.c
@@ -23,7 +23,7 @@
 #include "lib/events/events.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "dsdb/repl/drepl_service.h"
 #include <ldb_errors.h>
 #include "../lib/util/dlinklist.h"
diff --git a/source4/dsdb/repl/drepl_replica.c b/source4/dsdb/repl/drepl_replica.c
index b79b2826eda..05d068306fd 100644
--- a/source4/dsdb/repl/drepl_replica.c
+++ b/source4/dsdb/repl/drepl_replica.c
@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "ldb_module.h"
 #include "dsdb/samdb/samdb.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "dsdb/repl/drepl_service.h"
 #include "param/param.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"
diff --git a/source4/dsdb/repl/drepl_ridalloc.c b/source4/dsdb/repl/drepl_ridalloc.c
index 162df198c20..6794d4beb6c 100644
--- a/source4/dsdb/repl/drepl_ridalloc.c
+++ b/source4/dsdb/repl/drepl_ridalloc.c
@@ -26,7 +26,7 @@
 #include "includes.h"
 #include "ldb_module.h"
 #include "dsdb/samdb/samdb.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "dsdb/repl/drepl_service.h"
 #include "param/param.h"
 
diff --git a/source4/dsdb/repl/drepl_secret.c b/source4/dsdb/repl/drepl_secret.c
index 70492f58983..47a8ca9c65e 100644
--- a/source4/dsdb/repl/drepl_secret.c
+++ b/source4/dsdb/repl/drepl_secret.c
@@ -24,7 +24,7 @@
 #include "includes.h"
 #include "ldb_module.h"
 #include "dsdb/samdb/samdb.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "dsdb/repl/drepl_service.h"
 #include "param/param.h"
 
diff --git a/source4/dsdb/repl/drepl_service.c b/source4/dsdb/repl/drepl_service.c
index ee877f2654e..02ece26842e 100644
--- a/source4/dsdb/repl/drepl_service.c
+++ b/source4/dsdb/repl/drepl_service.c
@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "lib/events/events.h"
 #include "dsdb/repl/drepl_service.h"
 #include <ldb_errors.h>
diff --git a/source4/dsdb/samdb/ldb_modules/netlogon.c b/source4/dsdb/samdb/ldb_modules/netlogon.c
index e5ca65f3b36..66ab70b6f54 100644
--- a/source4/dsdb/samdb/ldb_modules/netlogon.c
+++ b/source4/dsdb/samdb/ldb_modules/netlogon.c
@@ -24,7 +24,7 @@
 #include <ldb.h>
 #include <ldb_errors.h>
 #include "lib/events/events.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "libcli/ldap/ldap_ndr.h"
 #include "libcli/security/security.h"
diff --git a/source4/echo_server/echo_server.c b/source4/echo_server/echo_server.c
index c81fc140a0a..54ab719cfaf 100644
--- a/source4/echo_server/echo_server.c
+++ b/source4/echo_server/echo_server.c
@@ -24,7 +24,7 @@
 /* Get at the config file settings */
 #include "param/param.h"
 /* This defines task_server_terminate */
-#include "smbd/process_model.h"
+#include "samba/process_model.h"
 /* We get load_interface_list from here */
 #include "socket/netif.h"
 /* NTSTATUS-related stuff */
diff --git a/source4/kdc/kdc-heimdal.c b/source4/kdc/kdc-heimdal.c
index ee4e1387def..a3c357ca1a6 100644
--- a/source4/kdc/kdc-heimdal.c
+++ b/source4/kdc/kdc-heimdal.c
@@ -22,7 +22,7 @@
 */
 
 #include "includes.h"
-#include "smbd/process_model.h"
+#include "samba/process_model.h"
 #include "lib/tsocket/tsocket.h"
 #include "lib/messaging/irpc.h"
 #include "librpc/gen_ndr/ndr_irpc.h"
diff --git a/source4/kdc/kdc-proxy.c b/source4/kdc/kdc-proxy.c
index 0f84906338f..64160b3434d 100644
--- a/source4/kdc/kdc-proxy.c
+++ b/source4/kdc/kdc-proxy.c
@@ -22,7 +22,7 @@
 */
 
 #include "includes.h"
-#include "smbd/process_model.h"
+#include "samba/process_model.h"
 #include "lib/tsocket/tsocket.h"
 #include "libcli/util/tstream.h"
 #include "lib/util/tevent_ntstatus.h"
diff --git a/source4/kdc/kdc-server.c b/source4/kdc/kdc-server.c
index 00b5c745fec..de0ae8d1a72 100644
--- a/source4/kdc/kdc-server.c
+++ b/source4/kdc/kdc-server.c
@@ -23,7 +23,7 @@
 
 #include "includes.h"
 #include "param/param.h"
-#include "smbd/process_model.h"
+#include "samba/process_model.h"
 #include "lib/tsocket/tsocket.h"
 #include "libcli/util/tstream.h"
 #include "kdc/kdc-server.h"
diff --git a/source4/kdc/kdc-service-mit.c b/source4/kdc/kdc-service-mit.c
index dd6902f083d..5d4180aa7cc 100644
--- a/source4/kdc/kdc-service-mit.c
+++ b/source4/kdc/kdc-service-mit.c
@@ -25,8 +25,8 @@
 #include "system/filesys.h"
 #include "lib/param/param.h"
 #include "lib/util/samba_util.h"
-#include "source4/smbd/service.h"
-#include "source4/smbd/process_model.h"
+#include "source4/samba/service.h"
+#include "source4/samba/process_model.h"
 #include "kdc/kdc-service-mit.h"
 #include "dynconfig.h"
 #include "libds/common/roles.h"
diff --git a/source4/kdc/kpasswd-service-heimdal.c b/source4/kdc/kpasswd-service-heimdal.c
index 12c7402bf3f..c804852c3a7 100644
--- a/source4/kdc/kpasswd-service-heimdal.c
+++ b/source4/kdc/kpasswd-service-heimdal.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "param/param.h"
 #include "auth/auth.h"
 #include "auth/gensec/gensec.h"
diff --git a/source4/kdc/kpasswd-service-mit.c b/source4/kdc/kpasswd-service-mit.c
index 9a014c058fe..2117c1c1696 100644
--- a/source4/kdc/kpasswd-service-mit.c
+++ b/source4/kdc/kpasswd-service-mit.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "param/param.h"
 #include "auth/auth.h"
 #include "auth/gensec/gensec.h"
diff --git a/source4/kdc/kpasswd-service.c b/source4/kdc/kpasswd-service.c
index b36cf402228..8f1679e4a28 100644
--- a/source4/kdc/kpasswd-service.c
+++ b/source4/kdc/kpasswd-service.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "tsocket/tsocket.h"
 #include "auth/credentials/credentials.h"
 #include "auth/auth.h"
diff --git a/source4/kdc/mit_kdc_irpc.c b/source4/kdc/mit_kdc_irpc.c
index e0021710c9f..33eb74b37f5 100644
--- a/source4/kdc/mit_kdc_irpc.c
+++ b/source4/kdc/mit_kdc_irpc.c
@@ -29,7 +29,7 @@
 
 #include "librpc/gen_ndr/ndr_krb5pac.h"
 
-#include "source4/smbd/process_model.h"
+#include "source4/samba/process_model.h"
 #include "lib/param/param.h"
 
 #include "samba_kdc.h"
diff --git a/source4/ldap_server/ldap_backend.c b/source4/ldap_server/ldap_backend.c
index 915d9b94f9b..e19f82cf5df 100644
--- a/source4/ldap_server/ldap_backend.c
+++ b/source4/ldap_server/ldap_backend.c
@@ -26,7 +26,7 @@
 #include "auth/gensec/gensec_internal.h" /* TODO: remove this */
 #include "auth/common_auth.h"
 #include "param/param.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "dsdb/samdb/samdb.h"
 #include <ldb_errors.h>
 #include <ldb_module.h>
diff --git a/source4/ldap_server/ldap_bind.c b/source4/ldap_server/ldap_bind.c
index 54493d040ff..b60dc71d7e7 100644
--- a/source4/ldap_server/ldap_bind.c
+++ b/source4/ldap_server/ldap_bind.c
@@ -20,7 +20,7 @@
 #include "includes.h"
 #include "ldap_server/ldap_server.h"
 #include "auth/auth.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include <ldb.h>
 #include <ldb_errors.h>
 #include "../lib/util/dlinklist.h"
diff --git a/source4/ldap_server/ldap_extended.c b/source4/ldap_server/ldap_extended.c
index 2d4a5345460..e6bf16384f0 100644
--- a/source4/ldap_server/ldap_extended.c
+++ b/source4/ldap_server/ldap_extended.c
@@ -21,7 +21,7 @@
 #include "ldap_server/ldap_server.h"
 #include "../lib/util/dlinklist.h"
 #include "lib/tls/tls.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "../lib/util/tevent_ntstatus.h"
 
 struct ldapsrv_starttls_postprocess_context {
diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c
index c2d53eacd3f..20442ecd9e5 100644
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -30,10 +30,10 @@
 #include "../lib/util/dlinklist.h"
 #include "../lib/util/asn1.h"
 #include "ldap_server/ldap_server.h"
-#include "smbd/service_task.h"
-#include "smbd/service_stream.h"
-#include "smbd/service.h"
-#include "smbd/process_model.h"
+#include "samba/service_task.h"
+#include "samba/service_stream.h"
+#include "samba/service.h"
+#include "samba/process_model.h"
 #include "lib/tls/tls.h"
 #include "lib/messaging/irpc.h"
 #include <ldb.h>
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;
diff --git a/source4/ntp_signd/ntp_signd.c b/source4/ntp_signd/ntp_signd.c
index 44096f71f49..eab70f1f148 100644
--- a/source4/ntp_signd/ntp_signd.c
+++ b/source4/ntp_signd/ntp_signd.c
@@ -22,10 +22,10 @@
 */
 
 #include "includes.h"
-#include "smbd/service_task.h"
-#include "smbd/service.h"
-#include "smbd/service_stream.h"
-#include "smbd/process_model.h"
+#include "samba/service_task.h"
+#include "samba/service.h"
+#include "samba/service_stream.h"
+#include "samba/process_model.h"
 #include "lib/stream/packet.h"
 #include "lib/tsocket/tsocket.h"
 #include "libcli/util/tstream.h"
diff --git a/source4/ntvfs/posix/pvfs_search.c b/source4/ntvfs/posix/pvfs_search.c
index 8cba72da439..f50319b5fad 100644
--- a/source4/ntvfs/posix/pvfs_search.c
+++ b/source4/ntvfs/posix/pvfs_search.c
@@ -23,7 +23,7 @@
 #include "vfs_posix.h"
 #include "system/time.h"
 #include "librpc/gen_ndr/security.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "lib/events/events.h"
 #include "../lib/util/dlinklist.h"
 
diff --git a/source4/ntvfs/posix/pvfs_wait.c b/source4/ntvfs/posix/pvfs_wait.c
index 460c2f7d9c5..21ff33e28f7 100644
--- a/source4/ntvfs/posix/pvfs_wait.c
+++ b/source4/ntvfs/posix/pvfs_wait.c
@@ -23,7 +23,7 @@
 #include "lib/events/events.h"
 #include "../lib/util/dlinklist.h"
 #include "vfs_posix.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "lib/messaging/irpc.h"
 
 /* the context for a single wait instance */
diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index e64148ef788..ec83f72e91f 100644
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -27,10 +27,10 @@
 #include "rpc_server/dcerpc_server.h"
 #include "rpc_server/dcerpc_server_proto.h"
 #include "param/param.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "lib/tsocket/tsocket.h"
 #include "lib/socket/socket.h"
-#include "smbd/process_model.h"
+#include "samba/process_model.h"
 #include "lib/util/samba_modules.h"
 #include "lib/util/tevent_ntstatus.h"
 
diff --git a/source4/rpc_server/service_rpc.c b/source4/rpc_server/service_rpc.c
index 96ebc2dbe57..ae8d91e68f0 100644
--- a/source4/rpc_server/service_rpc.c
+++ b/source4/rpc_server/service_rpc.c
@@ -38,7 +38,7 @@
 #include "../lib/util/tevent_ntstatus.h"
 #include "libcli/raw/smb.h"
 #include "../libcli/named_pipe_auth/npa_tstream.h"
-#include "smbd/process_model.h"
+#include "samba/process_model.h"
 
 struct dcesrv_context_callbacks srv_callbacks = {
 	.log.successful_authz = log_successful_dcesrv_authz_event,
diff --git a/source4/smbd/process_model.c b/source4/samba/process_model.c
index b75efac9845..754da79ce9f 100644
--- a/source4/smbd/process_model.c
+++ b/source4/samba/process_model.c
@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
-#include "smbd/process_model.h"
+#include "samba/process_model.h"
 #include "param/param.h"
 #include "lib/util/samba_modules.h"
 
diff --git a/source4/smbd/process_model.h b/source4/samba/process_model.h
index 2892dd43c04..446e0f1cf26 100644
--- a/source4/smbd/process_model.h
+++ b/source4/samba/process_model.h
@@ -25,8 +25,8 @@
 #define __PROCESS_MODEL_H__
 
 #include "lib/socket/socket.h"
-#include "smbd/service.h"
-#include "smbd/process_model_proto.h"
+#include "samba/service.h"
+#include "samba/process_model_proto.h"
 
 /* modules can use the following to determine if the interface has changed
  * please increment the version number after each interface change
diff --git a/source4/smbd/process_prefork.c b/source4/samba/process_prefork.c
index 3c93fc0ee2a..f3387d87e61 100644
--- a/source4/smbd/process_prefork.c
+++ b/source4/samba/process_prefork.c
@@ -38,7 +38,7 @@
 #include "lib/events/events.h"
 #include "lib/messaging/messaging.h"
 #include "lib/socket/socket.h"
-#include "smbd/process_model.h"
+#include "samba/process_model.h"
 #include "cluster/cluster.h"
 #include "param/param.h"
 #include "ldb_wrap.h"
diff --git a/source4/smbd/process_single.c b/source4/samba/process_single.c
index 12ed2e30a74..c2ff460f640 100644
--- a/source4/smbd/process_single.c
+++ b/source4/samba/process_single.c
@@ -22,7 +22,7 @@
 */
 
 #include "includes.h"
-#include "smbd/process_model.h"
+#include "samba/process_model.h"
 #include "system/filesys.h"
 #include "cluster/cluster.h"
 
diff --git a/source4/smbd/process_standard.c b/source4/samba/process_standard.c
index 5e804807c93..2820e30eace 100644
--- a/source4/smbd/process_standard.c
+++ b/source4/samba/process_standard.c
@@ -23,7 +23,7 @@
 
 #include "includes.h"
 #include "lib/events/events.h"
-#include "smbd/process_model.h"
+#include "samba/process_model.h"
 #include "system/filesys.h"
 #include "cluster/cluster.h"
 #include "param/param.h"
diff --git a/source4/smbd/server.c b/source4/samba/server.c
index ee2e7508bb3..d3cbd654d76 100644
--- a/source4/smbd/server.c
+++ b/source4/samba/server.c
@@ -30,7 +30,7 @@
 #include "system/filesys.h"
 #include "auth/gensec/gensec.h"
 #include "libcli/auth/schannel.h"
-#include "smbd/process_model.h"
+#include "samba/process_model.h"
 #include "param/secrets.h"
 #include "lib/util/pidfile.h"
 #include "param/param.h"
diff --git a/source4/smbd/service.c b/source4/samba/service.c
index e939c85e689..f801e4c8eab 100644
--- a/source4/smbd/service.c
+++ b/source4/samba/service.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "../lib/util/dlinklist.h"
-#include "smbd/process_model.h"
+#include "samba/process_model.h"
 
 #undef strcasecmp
 
diff --git a/source4/smbd/service.h b/source4/samba/service.h
index 0b6f937b63c..88d2478dfe5 100644
--- a/source4/smbd/service.h
+++ b/source4/samba/service.h
@@ -24,8 +24,8 @@
 #define __SERVICE_H__
 
 
-#include "smbd/service_stream.h"
-#include "smbd/service_task.h"
+#include "samba/service_stream.h"
+#include "samba/service_task.h"
 
 struct process_details {
 	unsigned int instances;
@@ -75,6 +75,6 @@ struct service_details {
 	void (*post_fork) (struct task_server *, struct process_details *);
 };
 
-#include "smbd/service_proto.h"
+#include "samba/service_proto.h"
 
 #endif /* __SERVICE_H__ */
diff --git a/source4/smbd/service_named_pipe.c b/source4/samba/service_named_pipe.c
index d054c6fdce6..7ba57e24fe8 100644
--- a/source4/smbd/service_named_pipe.c
+++ b/source4/samba/service_named_pipe.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include <tevent.h>
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "param/param.h"
 #include "auth/auth.h"
 #include "auth/session.h"
diff --git a/source4/smbd/service_stream.c b/source4/samba/service_stream.c
index d0ad45aca3a..d0ad45aca3a 100644
--- a/source4/smbd/service_stream.c
+++ b/source4/samba/service_stream.c
diff --git a/source4/smbd/service_stream.h b/source4/samba/service_stream.h
index 81bf2754beb..81bf2754beb 100644
--- a/source4/smbd/service_stream.h
+++ b/source4/samba/service_stream.h
diff --git a/source4/smbd/service_task.c b/source4/samba/service_task.c
index d911027db0a..d911027db0a 100644
--- a/source4/smbd/service_task.c
+++ b/source4/samba/service_task.c
diff --git a/source4/smbd/service_task.h b/source4/samba/service_task.h
index 2499dc1ddaf..2499dc1ddaf 100644
--- a/source4/smbd/service_task.h
+++ b/source4/samba/service_task.h
diff --git a/source4/smbd/wscript_build b/source4/samba/wscript_build
index ef0aaf773c1..ef0aaf773c1 100644
--- a/source4/smbd/wscript_build
+++ b/source4/samba/wscript_build
diff --git a/source4/smb_server/management.c b/source4/smb_server/management.c
index af993717ef7..5cdfff0d801 100644
--- a/source4/smb_server/management.c
+++ b/source4/smb_server/management.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "smb_server/smb_server.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "lib/messaging/irpc.h"
 #include "librpc/gen_ndr/ndr_irpc.h"
 #include "auth/auth.h"
diff --git a/source4/smb_server/service_smb.c b/source4/smb_server/service_smb.c
index 37e8a61afb5..2215ba18862 100644
--- a/source4/smb_server/service_smb.c
+++ b/source4/smb_server/service_smb.c
@@ -19,9 +19,9 @@
 */
 
 #include "includes.h"
-#include "smbd/service_task.h"
-#include "smbd/service_stream.h"
-#include "smbd/service.h"
+#include "samba/service_task.h"
+#include "samba/service_stream.h"
+#include "samba/service.h"
 #include "smb_server/smb_server.h"
 #include "smb_server/service_smb_proto.h"
 #include "lib/messaging/irpc.h"
diff --git a/source4/smb_server/smb/negprot.c b/source4/smb_server/smb/negprot.c
index 04b69dd9883..cd2451d2e9c 100644
--- a/source4/smb_server/smb/negprot.c
+++ b/source4/smb_server/smb/negprot.c
@@ -25,7 +25,7 @@
 #include "smb_server/smb_server.h"
 #include "libcli/smb2/smb2.h"
 #include "smb_server/smb2/smb2_server.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "lib/stream/packet.h"
 #include "param/param.h"
 
diff --git a/source4/smb_server/smb/receive.c b/source4/smb_server/smb/receive.c
index 8a05ecee56f..b96cdbd821b 100644
--- a/source4/smb_server/smb/receive.c
+++ b/source4/smb_server/smb/receive.c
@@ -22,7 +22,7 @@
 #include "includes.h"
 #include "system/time.h"
 #include "lib/util/server_id.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "smb_server/smb_server.h"
 #include "system/filesys.h"
 #include "param/param.h"
diff --git a/source4/smb_server/smb/request.c b/source4/smb_server/smb/request.c
index 41854a1f0f1..0f3171fb68e 100644
--- a/source4/smb_server/smb/request.c
+++ b/source4/smb_server/smb/request.c
@@ -23,7 +23,7 @@
 
 #include "includes.h"
 #include "smb_server/smb_server.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "lib/stream/packet.h"
 #include "ntvfs/ntvfs.h"
 
diff --git a/source4/smb_server/smb/service.c b/source4/smb_server/smb/service.c
index c23b470e472..eb1874c4d51 100644
--- a/source4/smb_server/smb/service.c
+++ b/source4/smb_server/smb/service.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "smb_server/smb_server.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "ntvfs/ntvfs.h"
 #include "param/param.h"
 
diff --git a/source4/smb_server/smb/sesssetup.c b/source4/smb_server/smb/sesssetup.c
index 13f13934412..68cdd70feff 100644
--- a/source4/smb_server/smb/sesssetup.c
+++ b/source4/smb_server/smb/sesssetup.c
@@ -28,7 +28,7 @@
 #include "auth/gensec/gensec.h"
 #include "auth/auth.h"
 #include "smb_server/smb_server.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "param/param.h"
 #include "../lib/tsocket/tsocket.h"
 #include "lib/stream/packet.h"
diff --git a/source4/smb_server/smb/trans2.c b/source4/smb_server/smb/trans2.c
index 447095c5008..fc357ed73f9 100644
--- a/source4/smb_server/smb/trans2.c
+++ b/source4/smb_server/smb/trans2.c
@@ -22,7 +22,7 @@
 */
 
 #include "includes.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
 #include "libcli/raw/libcliraw.h"
diff --git a/source4/smb_server/smb2/negprot.c b/source4/smb_server/smb2/negprot.c
index c433eb194bd..048d7b46837 100644
--- a/source4/smb_server/smb2/negprot.c
+++ b/source4/smb_server/smb2/negprot.c
@@ -28,7 +28,7 @@
 #include "libcli/smb2/smb2_calls.h"
 #include "smb_server/smb_server.h"
 #include "smb_server/smb2/smb2_server.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "param/param.h"
 
 static NTSTATUS smb2srv_negprot_secblob(struct smb2srv_request *req, DATA_BLOB *_blob)
diff --git a/source4/smb_server/smb2/receive.c b/source4/smb_server/smb2/receive.c
index 04241abcc39..c4109bfbc2f 100644
--- a/source4/smb_server/smb2/receive.c
+++ b/source4/smb_server/smb2/receive.c
@@ -24,7 +24,7 @@
 #include "libcli/smb2/smb2_calls.h"
 #include "smb_server/smb_server.h"
 #include "smb_server/smb2/smb2_server.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "lib/stream/packet.h"
 #include "ntvfs/ntvfs.h"
 #include "param/param.h"
diff --git a/source4/smb_server/smb2/sesssetup.c b/source4/smb_server/smb2/sesssetup.c
index 501aab671d7..a8c45608cae 100644
--- a/source4/smb_server/smb2/sesssetup.c
+++ b/source4/smb_server/smb2/sesssetup.c
@@ -26,7 +26,7 @@
 #include "libcli/smb2/smb2_calls.h"
 #include "smb_server/smb_server.h"
 #include "smb_server/smb2/smb2_server.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "lib/stream/packet.h"
 
 static void smb2srv_sesssetup_send(struct smb2srv_request *req, union smb_sesssetup *io)
diff --git a/source4/smb_server/smb2/tcon.c b/source4/smb_server/smb2/tcon.c
index b2d104329a1..0c564206a08 100644
--- a/source4/smb_server/smb2/tcon.c
+++ b/source4/smb_server/smb2/tcon.c
@@ -22,7 +22,7 @@
 #include "libcli/smb2/smb2_calls.h"
 #include "smb_server/smb_server.h"
 #include "smb_server/smb2/smb2_server.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "ntvfs/ntvfs.h"
 
 /*
diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c
index 0b80f2fbd20..57810c08a96 100644
--- a/source4/smb_server/smb_server.c
+++ b/source4/smb_server/smb_server.c
@@ -19,9 +19,9 @@
 */
 
 #include "includes.h"
-#include "smbd/service_task.h"
-#include "smbd/service_stream.h"
-#include "smbd/service.h"
+#include "samba/service_task.h"
+#include "samba/service_stream.h"
+#include "samba/service.h"
 #include "smb_server/smb_server.h"
 #include "smb_server/service_smb_proto.h"
 #include "lib/messaging/irpc.h"
diff --git a/source4/smb_server/tcon.c b/source4/smb_server/tcon.c
index 34c303c53b0..39bc0a5ff5f 100644
--- a/source4/smb_server/tcon.c
+++ b/source4/smb_server/tcon.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "smb_server/smb_server.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "lib/tsocket/tsocket.h"
 #include "ntvfs/ntvfs.h"
 
diff --git a/source4/torture/rpc/spoolss_notify.c b/source4/torture/rpc/spoolss_notify.c
index 8c17d76cd3c..32e0d074a06 100644
--- a/source4/torture/rpc/spoolss_notify.c
+++ b/source4/torture/rpc/spoolss_notify.c
@@ -28,7 +28,7 @@
 #include "rpc_server/dcerpc_server.h"
 #include "rpc_server/dcerpc_server_proto.h"
 #include "rpc_server/service_rpc.h"
-#include "smbd/process_model.h"
+#include "samba/process_model.h"
 #include "smb_server/smb_server.h"
 #include "lib/socket/netif.h"
 #include "ntvfs/ntvfs.h"
diff --git a/source4/winbind/winbindd.c b/source4/winbind/winbindd.c
index e68ddfb68e1..a3d536901bd 100644
--- a/source4/winbind/winbindd.c
+++ b/source4/winbind/winbindd.c
@@ -25,8 +25,8 @@
 #include "tevent.h"
 #include "system/filesys.h"
 #include "lib/param/param.h"
-#include "source4/smbd/service.h"
-#include "source4/smbd/process_model.h"
+#include "source4/samba/service.h"
+#include "source4/samba/process_model.h"
 #include "dynconfig.h"
 #include "nsswitch/winbind_client.h"
 
diff --git a/source4/wrepl_server/wrepl_apply_records.c b/source4/wrepl_server/wrepl_apply_records.c
index bc8a8200132..9e7bab395e3 100644
--- a/source4/wrepl_server/wrepl_apply_records.c
+++ b/source4/wrepl_server/wrepl_apply_records.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include <tevent.h>
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "lib/messaging/irpc.h"
 #include "librpc/gen_ndr/ndr_irpc_c.h"
 #include "librpc/gen_ndr/ndr_winsrepl.h"
diff --git a/source4/wrepl_server/wrepl_in_call.c b/source4/wrepl_server/wrepl_in_call.c
index 9fc723fd31e..68fffa137fb 100644
--- a/source4/wrepl_server/wrepl_in_call.c
+++ b/source4/wrepl_server/wrepl_in_call.c
@@ -22,8 +22,8 @@
 #include "includes.h"
 #include "lib/events/events.h"
 #include "lib/tsocket/tsocket.h"
-#include "smbd/service_task.h"
-#include "smbd/service_stream.h"
+#include "samba/service_task.h"
+#include "samba/service_stream.h"
 #include "libcli/wrepl/winsrepl.h"
 #include "wrepl_server/wrepl_server.h"
 #include "libcli/composite/composite.h"
diff --git a/source4/wrepl_server/wrepl_in_connection.c b/source4/wrepl_server/wrepl_in_connection.c
index 5cbb086a8db..c68214dcbd2 100644
--- a/source4/wrepl_server/wrepl_in_connection.c
+++ b/source4/wrepl_server/wrepl_in_connection.c
@@ -22,13 +22,13 @@
 #include "includes.h"
 #include "lib/socket/socket.h"
 #include "lib/stream/packet.h"
-#include "smbd/service_task.h"
-#include "smbd/service_stream.h"
-#include "smbd/service.h"
+#include "samba/service_task.h"
+#include "samba/service_stream.h"
+#include "samba/service.h"
 #include "lib/messaging/irpc.h"
 #include "librpc/gen_ndr/ndr_winsrepl.h"
 #include "wrepl_server/wrepl_server.h"
-#include "smbd/process_model.h"
+#include "samba/process_model.h"
 #include "system/network.h"
 #include "lib/socket/netif.h"
 #include "lib/tsocket/tsocket.h"
diff --git a/source4/wrepl_server/wrepl_out_helpers.c b/source4/wrepl_server/wrepl_out_helpers.c
index 0e3f0a458ba..98e8b638b74 100644
--- a/source4/wrepl_server/wrepl_out_helpers.c
+++ b/source4/wrepl_server/wrepl_out_helpers.c
@@ -22,8 +22,8 @@
 #include "includes.h"
 #include "lib/events/events.h"
 #include "lib/socket/socket.h"
-#include "smbd/service_task.h"
-#include "smbd/service_stream.h"
+#include "samba/service_task.h"
+#include "samba/service_stream.h"
 #include "librpc/gen_ndr/winsrepl.h"
 #include "wrepl_server/wrepl_server.h"
 #include "nbt_server/wins/winsdb.h"
diff --git a/source4/wrepl_server/wrepl_periodic.c b/source4/wrepl_server/wrepl_periodic.c
index aecf47357ea..8cbf6fb97a4 100644
--- a/source4/wrepl_server/wrepl_periodic.c
+++ b/source4/wrepl_server/wrepl_periodic.c
@@ -21,8 +21,8 @@
 
 #include "includes.h"
 #include "lib/events/events.h"
-#include "smbd/service_task.h"
-#include "smbd/service.h"
+#include "samba/service_task.h"
+#include "samba/service.h"
 #include "librpc/gen_ndr/winsrepl.h"
 #include "wrepl_server/wrepl_server.h"
 
diff --git a/source4/wrepl_server/wrepl_scavenging.c b/source4/wrepl_server/wrepl_scavenging.c
index d04064970c9..05a02187b10 100644
--- a/source4/wrepl_server/wrepl_scavenging.c
+++ b/source4/wrepl_server/wrepl_scavenging.c
@@ -26,7 +26,7 @@
 #include <ldb.h>
 #include <ldb_errors.h>
 #include "system/time.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "lib/messaging/irpc.h"
 #include "librpc/gen_ndr/ndr_irpc_c.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
diff --git a/source4/wrepl_server/wrepl_server.c b/source4/wrepl_server/wrepl_server.c
index d1e2869b009..aa408edc799 100644
--- a/source4/wrepl_server/wrepl_server.c
+++ b/source4/wrepl_server/wrepl_server.c
@@ -21,8 +21,8 @@
 
 #include "includes.h"
 #include "../lib/util/dlinklist.h"
-#include "smbd/service_task.h"
-#include "smbd/service.h"
+#include "samba/service_task.h"
+#include "samba/service.h"
 #include "lib/messaging/irpc.h"
 #include "librpc/gen_ndr/winsrepl.h"
 #include "wrepl_server/wrepl_server.h"
diff --git a/wscript_build b/wscript_build
index 850ed71c1c1..7ac64b7af83 100644
--- a/wscript_build
+++ b/wscript_build
@@ -60,7 +60,7 @@ bld.RECURSE('python')
 bld.RECURSE('source4/param')
 bld.RECURSE('source4/librpc')
 bld.RECURSE('source4/dsdb')
-bld.RECURSE('source4/smbd')
+bld.RECURSE('source4/samba')
 bld.RECURSE('source4/cluster')
 bld.RECURSE('source4/libnet')
 bld.RECURSE('source4/auth')