diff --git a/source3/include/registry.h b/source3/include/registry.h
index 6b43b522bc6..762928f3783 100644
--- a/source3/include/registry.h
+++ b/source3/include/registry.h
@@ -1,8 +1,6 @@
 #ifndef _REGISTRY_H
 #define _REGISTRY_H
 
-#include "reg_objects.h"
-
 /*
  * A REG_SZ string is not necessarily NULL terminated. When retrieving it from
  * the net, we guarantee this however. A server might want to push it without
diff --git a/source3/libads/ldap_printer.c b/source3/libads/ldap_printer.c
index b5321abbf0e..48db5ca7d2f 100644
--- a/source3/libads/ldap_printer.c
+++ b/source3/libads/ldap_printer.c
@@ -21,6 +21,7 @@
 #include "../librpc/gen_ndr/cli_spoolss.h"
 #include "rpc_client/cli_spoolss.h"
 #include "registry.h"
+#include "registry/reg_objects.h"
 
 #ifdef HAVE_ADS
 
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 1823b16a862..42ea5fb7c4e 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -23,6 +23,7 @@
 #include "librpc/gen_ndr/messaging.h"
 #include "printing/pcap.h"
 #include "registry.h"
+#include "registry/reg_objects.h"
 
 static TDB_CONTEXT *tdb_forms; /* used for forms files */
 static TDB_CONTEXT *tdb_drivers; /* used for driver files */
diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c
index 32759ed6e1e..4f3b7a2f86a 100644
--- a/source3/registry/reg_api.c
+++ b/source3/registry/reg_api.c
@@ -70,6 +70,7 @@
 #include "reg_backend_db.h"
 #include "reg_dispatcher.h"
 #include "reg_util_marshalling.h"
+#include "reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/registry/reg_backend_current_version.c b/source3/registry/reg_backend_current_version.c
index d5d1a496c06..ee4131ae679 100644
--- a/source3/registry/reg_backend_current_version.c
+++ b/source3/registry/reg_backend_current_version.c
@@ -27,6 +27,7 @@
 #include "includes.h"
 #include "registry.h"
 #include "reg_util_internal.h"
+#include "reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c
index db2dccf4b3a..0c906189bc0 100644
--- a/source3/registry/reg_backend_db.c
+++ b/source3/registry/reg_backend_db.c
@@ -25,6 +25,7 @@
 #include "reg_db.h"
 #include "reg_util_internal.h"
 #include "reg_backend_db.h"
+#include "reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/registry/reg_backend_hkpt_params.c b/source3/registry/reg_backend_hkpt_params.c
index a303e72517e..d34d1acf3ca 100644
--- a/source3/registry/reg_backend_hkpt_params.c
+++ b/source3/registry/reg_backend_hkpt_params.c
@@ -27,6 +27,7 @@
 #include "includes.h"
 #include "registry.h"
 #include "reg_perfcount.h"
+#include "reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/registry/reg_backend_netlogon_params.c b/source3/registry/reg_backend_netlogon_params.c
index 5a5bcce5772..b036e75f7e2 100644
--- a/source3/registry/reg_backend_netlogon_params.c
+++ b/source3/registry/reg_backend_netlogon_params.c
@@ -26,6 +26,7 @@
 
 #include "includes.h"
 #include "registry.h"
+#include "reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/registry/reg_backend_perflib.c b/source3/registry/reg_backend_perflib.c
index da9e8521a7e..396ea07e5d3 100644
--- a/source3/registry/reg_backend_perflib.c
+++ b/source3/registry/reg_backend_perflib.c
@@ -28,6 +28,7 @@
 #include "registry.h"
 #include "reg_util_internal.h"
 #include "reg_perfcount.h"
+#include "reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/registry/reg_backend_printing.c b/source3/registry/reg_backend_printing.c
index 92d7846bc99..a874a62f9db 100644
--- a/source3/registry/reg_backend_printing.c
+++ b/source3/registry/reg_backend_printing.c
@@ -23,6 +23,7 @@
 #include "registry.h"
 #include "reg_util_internal.h"
 #include "reg_backend_db.h"
+#include "reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/registry/reg_backend_prod_options.c b/source3/registry/reg_backend_prod_options.c
index 764d98f6d63..655c587ac40 100644
--- a/source3/registry/reg_backend_prod_options.c
+++ b/source3/registry/reg_backend_prod_options.c
@@ -26,6 +26,7 @@
 
 #include "includes.h"
 #include "registry.h"
+#include "reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/registry/reg_backend_shares.c b/source3/registry/reg_backend_shares.c
index e211e439fd5..3113f0f84ca 100644
--- a/source3/registry/reg_backend_shares.c
+++ b/source3/registry/reg_backend_shares.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "registry.h"
+#include "reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/registry/reg_backend_tcpip_params.c b/source3/registry/reg_backend_tcpip_params.c
index 02bf59c23c6..dd132df093b 100644
--- a/source3/registry/reg_backend_tcpip_params.c
+++ b/source3/registry/reg_backend_tcpip_params.c
@@ -26,6 +26,7 @@
 
 #include "includes.h"
 #include "registry.h"
+#include "reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/registry/reg_eventlog.c b/source3/registry/reg_eventlog.c
index 3fe35542a1b..6bedf4635eb 100644
--- a/source3/registry/reg_eventlog.c
+++ b/source3/registry/reg_eventlog.c
@@ -24,6 +24,7 @@
 #include "registry.h"
 #include "reg_backend_db.h"
 #include "reg_eventlog.h"
+#include "reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/registry/reg_objects.c b/source3/registry/reg_objects.c
index 55559461280..895435d44a5 100644
--- a/source3/registry/reg_objects.c
+++ b/source3/registry/reg_objects.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "registry.h"
+#include "reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/include/reg_objects.h b/source3/registry/reg_objects.h
similarity index 100%
rename from source3/include/reg_objects.h
rename to source3/registry/reg_objects.h
diff --git a/source3/rpc_server/srv_ntsvcs_nt.c b/source3/rpc_server/srv_ntsvcs_nt.c
index ebe117db42f..f864dc175dd 100644
--- a/source3/rpc_server/srv_ntsvcs_nt.c
+++ b/source3/rpc_server/srv_ntsvcs_nt.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "../librpc/gen_ndr/srv_ntsvcs.h"
 #include "registry.h"
+#include "registry/reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 37d1044ef63..81c72c20ae0 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -32,6 +32,7 @@
 #include "rpc_client/init_spoolss.h"
 #include "librpc/gen_ndr/messaging.h"
 #include "registry.h"
+#include "registry/reg_objects.h"
 
 /* macros stolen from s4 spoolss server */
 #define SPOOLSS_BUFFER_UNION(fn,info,level) \
diff --git a/source3/rpc_server/srv_svcctl_nt.c b/source3/rpc_server/srv_svcctl_nt.c
index 86e329e2739..24c67d3baf5 100644
--- a/source3/rpc_server/srv_svcctl_nt.c
+++ b/source3/rpc_server/srv_svcctl_nt.c
@@ -26,6 +26,7 @@
 #include "../librpc/gen_ndr/srv_svcctl.h"
 #include "services/services.h"
 #include "registry.h"
+#include "registry/reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index e2d59be5e0e..f4646c43c3c 100644
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -28,6 +28,7 @@
 #include "rpc_client/cli_spoolss.h"
 #include "rpc_client/init_spoolss.h"
 #include "registry.h"
+#include "registry/reg_objects.h"
 
 #define RPCCLIENT_PRINTERNAME(_printername, _cli, _arg) \
 { \
diff --git a/source3/services/services_db.c b/source3/services/services_db.c
index aa99ac9fef6..2672b95bcab 100644
--- a/source3/services/services_db.c
+++ b/source3/services/services_db.c
@@ -25,6 +25,7 @@
 #include "registry.h"
 #include "registry/reg_util_legacy.h"
 #include "registry/reg_dispatcher.h"
+#include "registry/reg_objects.h"
 
 struct rcinit_file_information {
 	char *description;
diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c
index 88229133960..7d8c67fb4da 100644
--- a/source3/utils/net_rpc_printer.c
+++ b/source3/utils/net_rpc_printer.c
@@ -21,6 +21,7 @@
 #include "../librpc/gen_ndr/cli_spoolss.h"
 #include "rpc_client/cli_spoolss.h"
 #include "registry.h"
+#include "registry/reg_objects.h"
 
 /* support itanium as well */
 static const struct print_architecture_table_node archi_table[]= {
diff --git a/source3/utils/net_rpc_registry.c b/source3/utils/net_rpc_registry.c
index db2e8d62057..7f8f5bb6ffa 100644
--- a/source3/utils/net_rpc_registry.c
+++ b/source3/utils/net_rpc_registry.c
@@ -24,6 +24,7 @@
 #include "regfio.h"
 #include "../librpc/gen_ndr/cli_winreg.h"
 #include "registry/reg_util_marshalling.h"
+#include "registry/reg_objects.h"
 
 /*******************************************************************
  connect to a registry hive root (open a registry policy)
diff --git a/source3/utils/profiles.c b/source3/utils/profiles.c
index f793704be5c..ce330a8b169 100644
--- a/source3/utils/profiles.c
+++ b/source3/utils/profiles.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "reg_objects.h"
+#include "registry/reg_objects.h"
 #include "regfio.h"
 
 /* GLOBAL VARIABLES */