Fix numerous missing dependencies in WAF build scripts

With the recent consolidation of code between s3 and s4, a number of new
dependencies have been implicitly introduced.  For example, previous s3
code gained an implicit dependency on talloc after the charset related
consolidation (lib/util/charset/charset.h now includes talloc.h).  When
building against the embedded version of talloc this isn't a problem
since the paths are automatically added to the search path, but when
building against the external libraries build failures will occur for
all components that don't directly or indirectly include talloc as
a dependency.

Since charset.h is included from util.h, which in turn is included from
includes.h, this means most of the codebase (s3 and s4) has such an
undeclared dependency.

Therefore, samba-util-common and samba-util have been added as
dependencies to the s3 and s4 code respectively, for all cases where
the source would otherwise fail to build.  Additionally, a few other
dependencies are added in specific wscript_build files to address
similar dependency-related problems.

https://bugzilla.samba.org/show_bug.cgi?id=8128

Signed-off-by: Sean Finney <seanius@seanius.net>
Signed-off-by: Matthias Dieter Wallnöfer <mdw@samba.org>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Wed May 25 19:22:13 CEST 2011 on sn-devel-104

10 files changed, 111 insertions, 25 deletions

diff --git a/lib/util/charset/wscript_build b/lib/util/charset/wscript_build
index 3b29ace6d32..1f2c8dfa7a6 100644
--- a/lib/util/charset/wscript_build
+++ b/lib/util/charset/wscript_build
@@ -7,8 +7,8 @@ bld.SAMBA_SUBSYSTEM('ICONV_WRAPPER',
 bld.SAMBA_SUBSYSTEM('CHARSET',
                     public_headers='charset.h',
                     source='codepoints.c convert_string.c util_str.c util_unistr_w.c charcnv.c pull_push.c util_unistr.c',
-                    deps='DYNCONFIG ICONV_WRAPPER'
-                    )
+                    deps='DYNCONFIG ICONV_WRAPPER',
+                    public_deps='talloc')
 
 bld.SAMBA_MODULE('charset_weird',
                  subsystem='CHARSET',
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 740e68b6f02..3092b6ccbba 100755
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -8,10 +8,10 @@ common_util_sources = '''talloc_stack.c smb_threads.c xfile.c data_blob.c
                     util_str.c util_str_common.c substitute.c ms_fnmatch.c'''
 
 common_util_headers = 'debug.h'
-common_util_public_deps = 'talloc pthread LIBCRYPTO'
+common_util_public_deps = 'talloc pthread LIBCRYPTO CHARSET'
 s4_util_sources = '''dprintf.c parmlist.c'''
 s4_util_deps = 'DYNCONFIG'
-s4_util_public_deps = 'talloc CHARSET execinfo uid_wrapper'
+s4_util_public_deps = 'talloc execinfo uid_wrapper'
 s4_util_public_headers = 'attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h string_wrappers.h'
 s4_util_header_path = [ ('dlinklist.h util.h', '.'), ('*', 'util') ]
 
diff --git a/libgpo/wscript_build b/libgpo/wscript_build
index e2422c566b6..f182b44df00 100644
--- a/libgpo/wscript_build
+++ b/libgpo/wscript_build
@@ -2,7 +2,7 @@
 
 bld.SAMBA_SUBSYSTEM('LIBGPO',
 	source='gpo_util.c gpo_sec.c ../libgpo/gpext/gpext.c gpo_fetch.c gpo_ini.c ../source4/libgpo/ads_convenience.c ../source3/libgpo/gpo_filesync.c ../source4/libgpo/gpo_filesync.c',
-	deps='ldb samba-net',
+	deps='ldb samba-net samba-util',
 	enabled=False
 	)
 
diff --git a/source3/auth/wscript_build b/source3/auth/wscript_build
index 58929da526e..4077b8f5e79 100644
--- a/source3/auth/wscript_build
+++ b/source3/auth/wscript_build
@@ -16,6 +16,7 @@ AUTH_SRC = '''auth.c
 
 bld.SAMBA3_SUBSYSTEM('TOKEN_UTIL',
                     source='token_util.c',
+                    deps='samba-util-common',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('AUTH_COMMON',
@@ -37,6 +38,7 @@ bld.SAMBA3_SUBSYSTEM('auth',
 bld.SAMBA3_MODULE('auth_sam',
                  subsystem='auth',
                  source=AUTH_SAM_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_sam'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_sam'))
@@ -44,6 +46,7 @@ bld.SAMBA3_MODULE('auth_sam',
 bld.SAMBA3_MODULE('auth_unix',
                  subsystem='auth',
                  source=AUTH_UNIX_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_unix'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_unix'))
@@ -51,6 +54,7 @@ bld.SAMBA3_MODULE('auth_unix',
 bld.SAMBA3_MODULE('auth_winbind',
                  subsystem='auth',
                  source=AUTH_WINBIND_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_winbind'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_winbind'))
@@ -58,6 +62,7 @@ bld.SAMBA3_MODULE('auth_winbind',
 bld.SAMBA3_MODULE('auth_wbc',
                  subsystem='auth',
                  source=AUTH_WBC_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_wbc'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_wbc'))
@@ -65,6 +70,7 @@ bld.SAMBA3_MODULE('auth_wbc',
 bld.SAMBA3_MODULE('auth_server',
                  subsystem='auth',
                  source=AUTH_SERVER_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_server'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_server'))
@@ -80,6 +86,7 @@ bld.SAMBA3_MODULE('auth_domain',
 bld.SAMBA3_MODULE('auth_builtin',
                  subsystem='auth',
                  source=AUTH_BUILTIN_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_builtin'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_builtin'))
diff --git a/source3/libgpo/gpext/wscript_build b/source3/libgpo/gpext/wscript_build
index bfdb4d0bf6b..67f15188d83 100644
--- a/source3/libgpo/gpext/wscript_build
+++ b/source3/libgpo/gpext/wscript_build
@@ -8,6 +8,7 @@ GPEXT_SRC = '''../../../libgpo/gpext/gpext.c'''
 
 bld.SAMBA3_SUBSYSTEM('gpext',
                     source=GPEXT_SRC,
+                    deps='samba-util-common',
                     vars=locals())
 
 bld.SAMBA3_MODULE('gpext_registry',
diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build
index a16a4f292fb..9a6a6c3c15e 100644
--- a/source3/modules/wscript_build
+++ b/source3/modules/wscript_build
@@ -53,7 +53,8 @@ VFS_TIME_AUDIT_SRC = 'vfs_time_audit.c'
 
 
 bld.SAMBA3_SUBSYSTEM('NFS4_ACLS',
-                    source='nfs4_acls.c')
+                    source='nfs4_acls.c',
+                    deps='samba-util-common')
 
 bld.SAMBA3_SUBSYSTEM('VFS_AIXACL_UTIL',
                     source='vfs_aixacl_util.c',
@@ -67,6 +68,7 @@ bld.SAMBA3_SUBSYSTEM('vfs',
 bld.SAMBA3_MODULE('vfs_default',
                  subsystem='vfs',
                  source=VFS_DEFAULT_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_default'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_default'))
@@ -74,6 +76,7 @@ bld.SAMBA3_MODULE('vfs_default',
 bld.SAMBA3_MODULE('vfs_audit',
                  subsystem='vfs',
                  source=VFS_AUDIT_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_audit'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_audit'))
@@ -81,6 +84,7 @@ bld.SAMBA3_MODULE('vfs_audit',
 bld.SAMBA3_MODULE('vfs_extd_audit',
                  subsystem='vfs',
                  source=VFS_EXTD_AUDIT_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_extd_audit'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_extd_audit'))
@@ -88,6 +92,7 @@ bld.SAMBA3_MODULE('vfs_extd_audit',
 bld.SAMBA3_MODULE('vfs_full_audit',
                  subsystem='vfs',
                  source=VFS_FULL_AUDIT_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_full_audit'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_full_audit'))
@@ -95,7 +100,7 @@ bld.SAMBA3_MODULE('vfs_full_audit',
 bld.SAMBA3_MODULE('vfs_fake_perms',
                  subsystem='vfs',
                  source=VFS_FAKE_PERMS_SRC,
-                 deps='acl attr',
+                 deps='acl attr samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_fake_perms'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_fake_perms'))
@@ -103,6 +108,7 @@ bld.SAMBA3_MODULE('vfs_fake_perms',
 bld.SAMBA3_MODULE('vfs_recycle',
                  subsystem='vfs',
                  source=VFS_RECYCLE_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_recycle'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_recycle'))
@@ -110,6 +116,7 @@ bld.SAMBA3_MODULE('vfs_recycle',
 bld.SAMBA3_MODULE('vfs_netatalk',
                  subsystem='vfs',
                  source=VFS_NETATALK_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_netatalk'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_netatalk'))
@@ -117,6 +124,7 @@ bld.SAMBA3_MODULE('vfs_netatalk',
 bld.SAMBA3_MODULE('vfs_default_quota',
                  subsystem='vfs',
                  source=VFS_DEFAULT_QUOTA_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_default_quota'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_default_quota'))
@@ -124,6 +132,7 @@ bld.SAMBA3_MODULE('vfs_default_quota',
 bld.SAMBA3_MODULE('vfs_readonly',
                  subsystem='vfs',
                  source=VFS_READONLY_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_readonly'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_readonly'))
@@ -131,6 +140,7 @@ bld.SAMBA3_MODULE('vfs_readonly',
 bld.SAMBA3_MODULE('vfs_cap',
                  subsystem='vfs',
                  source=VFS_CAP_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_cap'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_cap'))
@@ -138,6 +148,7 @@ bld.SAMBA3_MODULE('vfs_cap',
 bld.SAMBA3_MODULE('vfs_expand_msdfs',
                  subsystem='vfs',
                  source=VFS_EXPAND_MSDFS_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_expand_msdfs'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_expand_msdfs'))
@@ -145,6 +156,7 @@ bld.SAMBA3_MODULE('vfs_expand_msdfs',
 bld.SAMBA3_MODULE('vfs_shadow_copy',
                  subsystem='vfs',
                  source=VFS_SHADOW_COPY_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_shadow_copy'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_shadow_copy'))
@@ -152,6 +164,7 @@ bld.SAMBA3_MODULE('vfs_shadow_copy',
 bld.SAMBA3_MODULE('vfs_shadow_copy2',
                  subsystem='vfs',
                  source=VFS_SHADOW_COPY2_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_shadow_copy2'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_shadow_copy2'))
@@ -159,6 +172,7 @@ bld.SAMBA3_MODULE('vfs_shadow_copy2',
 bld.SAMBA3_MODULE('vfs_afsacl',
                  subsystem='vfs',
                  source=VFS_AFSACL_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_afsacl'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_afsacl'))
@@ -234,6 +248,7 @@ bld.SAMBA3_MODULE('vfs_tru64acl',
 bld.SAMBA3_MODULE('vfs_catia',
                  subsystem='vfs',
                  source=VFS_CATIA_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_catia'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_catia'))
@@ -241,6 +256,7 @@ bld.SAMBA3_MODULE('vfs_catia',
 bld.SAMBA3_MODULE('vfs_streams_xattr',
                  subsystem='vfs',
                  source=VFS_STREAMS_XATTR_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_streams_xattr'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_streams_xattr'))
@@ -248,6 +264,7 @@ bld.SAMBA3_MODULE('vfs_streams_xattr',
 bld.SAMBA3_MODULE('vfs_streams_depot',
                  subsystem='vfs',
                  source=VFS_STREAMS_DEPOT_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_streams_depot'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_streams_depot'))
@@ -255,6 +272,7 @@ bld.SAMBA3_MODULE('vfs_streams_depot',
 bld.SAMBA3_MODULE('vfs_cacheprime',
                  subsystem='vfs',
                  source=VFS_CACHEPRIME_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_cacheprime'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_cacheprime'))
@@ -262,6 +280,7 @@ bld.SAMBA3_MODULE('vfs_cacheprime',
 bld.SAMBA3_MODULE('vfs_prealloc',
                  subsystem='vfs',
                  source=VFS_PREALLOC_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_prealloc'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_prealloc'))
@@ -269,6 +288,7 @@ bld.SAMBA3_MODULE('vfs_prealloc',
 bld.SAMBA3_MODULE('vfs_commit',
                  subsystem='vfs',
                  source=VFS_COMMIT_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_commit'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_commit'))
@@ -298,6 +318,7 @@ bld.SAMBA3_MODULE('vfs_notify_fam',
 bld.SAMBA3_MODULE('vfs_readahead',
                  subsystem='vfs',
                  source=VFS_READAHEAD_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_readahead'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_readahead'))
@@ -305,6 +326,7 @@ bld.SAMBA3_MODULE('vfs_readahead',
 bld.SAMBA3_MODULE('vfs_tsmsm',
                  subsystem='vfs',
                  source=VFS_TSMSM_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_tsmsm'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_tsmsm'))
@@ -312,6 +334,7 @@ bld.SAMBA3_MODULE('vfs_tsmsm',
 bld.SAMBA3_MODULE('vfs_fileid',
                  subsystem='vfs',
                  source=VFS_FILEID_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_fileid'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_fileid'))
@@ -319,6 +342,7 @@ bld.SAMBA3_MODULE('vfs_fileid',
 bld.SAMBA3_MODULE('vfs_aio_fork',
                  subsystem='vfs',
                  source=VFS_AIO_FORK_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_aio_fork'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_aio_fork'))
@@ -326,6 +350,7 @@ bld.SAMBA3_MODULE('vfs_aio_fork',
 bld.SAMBA3_MODULE('vfs_preopen',
                  subsystem='vfs',
                  source=VFS_PREOPEN_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_preopen'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_preopen'))
@@ -333,6 +358,7 @@ bld.SAMBA3_MODULE('vfs_preopen',
 bld.SAMBA3_MODULE('vfs_syncops',
                  subsystem='vfs',
                  source=VFS_SYNCOPS_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_syncops'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_syncops'))
@@ -340,6 +366,7 @@ bld.SAMBA3_MODULE('vfs_syncops',
 bld.SAMBA3_MODULE('vfs_acl_xattr',
                  subsystem='vfs',
                  source=VFS_ACL_XATTR_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_acl_xattr'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_acl_xattr'))
@@ -355,6 +382,7 @@ bld.SAMBA3_MODULE('vfs_acl_tdb',
 bld.SAMBA3_MODULE('vfs_smb_traffic_analyzer',
                  subsystem='vfs',
                  source=VFS_SMB_TRAFFIC_ANALYZER_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_smb_traffic_analyzer'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_smb_traffic_analyzer'))
@@ -362,6 +390,7 @@ bld.SAMBA3_MODULE('vfs_smb_traffic_analyzer',
 bld.SAMBA3_MODULE('vfs_onefs',
                  subsystem='vfs',
                  source=VFS_ONEFS_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_onefs'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_onefs'))
@@ -369,6 +398,7 @@ bld.SAMBA3_MODULE('vfs_onefs',
 bld.SAMBA3_MODULE('vfs_onefs_shadow_copy',
                  subsystem='vfs',
                  source=VFS_ONEFS_SHADOW_COPY_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_onefs_shadow_copy'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_onefs_shadow_copy'))
@@ -376,6 +406,7 @@ bld.SAMBA3_MODULE('vfs_onefs_shadow_copy',
 bld.SAMBA3_MODULE('vfs_dirsort',
                  subsystem='vfs',
                  source=VFS_DIRSORT_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_dirsort'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_dirsort'))
@@ -383,6 +414,7 @@ bld.SAMBA3_MODULE('vfs_dirsort',
 bld.SAMBA3_MODULE('vfs_scannedonly',
                  subsystem='vfs',
                  source=VFS_SCANNEDONLY_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_scannedonly'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_scannedonly'))
@@ -390,6 +422,7 @@ bld.SAMBA3_MODULE('vfs_scannedonly',
 bld.SAMBA3_MODULE('vfs_crossrename',
                  subsystem='vfs',
                  source=VFS_CROSSRENAME_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_crossrename'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_crossrename'))
@@ -397,6 +430,7 @@ bld.SAMBA3_MODULE('vfs_crossrename',
 bld.SAMBA3_MODULE('vfs_linux_xfs_sgid',
                  subsystem='vfs',
                  source=VFS_LINUX_XFS_SGID_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_linux_xfs_sgid'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_linux_xfs_sgid'))
@@ -404,6 +438,7 @@ bld.SAMBA3_MODULE('vfs_linux_xfs_sgid',
 bld.SAMBA3_MODULE('vfs_time_audit',
                  subsystem='vfs',
                  source=VFS_TIME_AUDIT_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_time_audit'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_time_audit'))
diff --git a/source3/passdb/wscript_build b/source3/passdb/wscript_build
index c741bfad587..ccb6ee7db6b 100644
--- a/source3/passdb/wscript_build
+++ b/source3/passdb/wscript_build
@@ -14,6 +14,7 @@ bld.SAMBA3_SUBSYSTEM('pdb',
 bld.SAMBA3_MODULE('pdb_tdbsam',
                  subsystem='pdb',
                  source=PDB_TDBSAM_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_tdbsam'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_tdbsam'))
@@ -36,6 +37,7 @@ bld.SAMBA3_MODULE('pdb_ads',
 bld.SAMBA3_MODULE('pdb_smbpasswd',
                  subsystem='pdb',
                  source=PDB_SMBPASSWD_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_smbpasswd'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_smbpasswd'))
@@ -43,6 +45,7 @@ bld.SAMBA3_MODULE('pdb_smbpasswd',
 bld.SAMBA3_MODULE('pdb_wbc_sam',
                  subsystem='pdb',
                  source=PDB_WBC_SAM_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_wbc_sam'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_wbc_sam'))
diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build
index dec837842fc..eba52a1b258 100644
--- a/source3/rpc_server/wscript_build
+++ b/source3/rpc_server/wscript_build
@@ -30,23 +30,28 @@ bld.SAMBA3_SUBSYSTEM('RPC_NCACN_NP',
                     deps='auth_sam_reply RPC_PIPE_REGISTER AUTH_COMMON npa_tstream')
 
 bld.SAMBA3_SUBSYSTEM('RPC_SERVICE',
-                    source='rpc_server.c')
+                    source='rpc_server.c',
+                    deps='samba-util-common')
 
 bld.SAMBA3_SUBSYSTEM('RPC_CRYPTO',
                      source='dcesrv_ntlmssp.c dcesrv_gssapi.c dcesrv_spnego.c',
                      deps = 'KRB5_PAC')
 
 bld.SAMBA3_SUBSYSTEM('RPC_PIPE_REGISTER',
-                    source='srv_pipe_register.c')
+                    source='srv_pipe_register.c',
+                    deps='samba-util-common')
 
 bld.SAMBA3_SUBSYSTEM('RPC_SERVER_REGISTER',
-                    source='rpc_ep_setup.c ../librpc/rpc/dcerpc_ep.c')
+                    source='rpc_ep_setup.c ../librpc/rpc/dcerpc_ep.c',
+                    deps='samba-util-common')
 
 bld.SAMBA3_SUBSYSTEM('EPMD',
-		     source='epmd.c')
+                    source='epmd.c',
+                    deps='samba-util-common')
 
 bld.SAMBA3_SUBSYSTEM('SRV_ACCESS_CHECK',
-                    source='srv_access_check.c')
+                    source='srv_access_check.c',
+                    deps='samba-util-common')
 
 bld.SAMBA3_SUBSYSTEM('RPC_SAMR',
                     source=RPC_SAMR_SRC,
@@ -65,10 +70,12 @@ bld.SAMBA3_SUBSYSTEM('RPC_WINREG',
 
 bld.SAMBA3_SUBSYSTEM('RPC_INITSHUTDOWN',
                     source=RPC_INITSHUTDOWN_SRC,
+                    deps='samba-util-common',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('RPC_DSSETUP',
                     source=RPC_DSSETUP_SRC,
+                    deps='samba-util-common',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('RPC_WKSSVC',
@@ -83,6 +90,7 @@ bld.SAMBA3_SUBSYSTEM('RPC_SVCCTL',
 
 bld.SAMBA3_SUBSYSTEM('RPC_NTSVCS',
                     source=RPC_NTSVCS_SRC,
+                    deps='samba-util-common',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('RPC_NETLOGON',
@@ -92,10 +100,12 @@ bld.SAMBA3_SUBSYSTEM('RPC_NETLOGON',
 
 bld.SAMBA3_SUBSYSTEM('RPC_NETDFS',
                     source=RPC_NETDFS_SRC,
+                    deps='samba-util-common',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('RPC_SRVSVC',
                     source=RPC_SRVSVC_SRC,
+                    deps='samba-util-common',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('RPC_SPOOLSS',
@@ -110,10 +120,12 @@ bld.SAMBA3_SUBSYSTEM('RPC_EVENTLOG',
 
 bld.SAMBA3_SUBSYSTEM('RPC_RPCECHO',
                     source=RPC_RPCECHO_SRC,
+                    deps='samba-util-common',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('RPC_EPMAPPER',
                     source=RPC_EPMAPPER_SRC,
+                    deps='samba-util-common',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('RPC_SERVER',
diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build
index dbae11697e5..ebee8eaa7fb 100644
--- a/source3/winbindd/wscript_build
+++ b/source3/winbindd/wscript_build
@@ -24,6 +24,7 @@ IDMAP_SRC = 'idmap.c idmap_util.c ${IDMAP_RW_SRC}'
 
 bld.SAMBA3_SUBSYSTEM('idmap',
                     source=IDMAP_SRC,
+                    deps='samba-util-common',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('IDMAP_ADEX',
@@ -33,6 +34,7 @@ bld.SAMBA3_SUBSYSTEM('IDMAP_ADEX',
 
 bld.SAMBA3_SUBSYSTEM('IDMAP_HASH',
                     source=IDMAP_HASH_SRC,
+                    deps='samba-util-common',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('IDMAP_AD',
@@ -58,6 +60,7 @@ bld.SAMBA3_MODULE('idmap_rid',
 bld.SAMBA3_MODULE('idmap_passdb',
                  subsystem='idmap',
                  source=IDMAP_PASSDB_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_passdb'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_passdb'))
@@ -72,6 +75,7 @@ bld.SAMBA3_MODULE('idmap_ldap',
 bld.SAMBA3_MODULE('idmap_nss',
                  subsystem='idmap',
                  source=IDMAP_NSS_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_nss'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_nss'))
@@ -79,6 +83,7 @@ bld.SAMBA3_MODULE('idmap_nss',
 bld.SAMBA3_MODULE('idmap_tdb',
                  subsystem='idmap',
                  source=IDMAP_TDB_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_tdb'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_tdb'))
@@ -86,6 +91,7 @@ bld.SAMBA3_MODULE('idmap_tdb',
 bld.SAMBA3_MODULE('idmap_tdb2',
                  subsystem='idmap',
                  source=IDMAP_TDB2_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_tdb2'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_tdb2'))
@@ -109,6 +115,7 @@ bld.SAMBA3_MODULE('idmap_adex',
 bld.SAMBA3_MODULE('idmap_autorid',
                  subsystem='idmap',
                  source=IDMAP_AUTORID_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_autorid'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_autorid'))
@@ -119,11 +126,13 @@ NSS_INFO_SRC = 'nss_info.c'
 
 bld.SAMBA3_SUBSYSTEM('nss_info',
                     source=NSS_INFO_SRC,
+                    deps='samba-util-common',
                     vars=locals())
 
 bld.SAMBA3_MODULE('nss_info_template',
                  subsystem='nss_info',
                  source=NSS_INFO_TEMPLATE_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('nss_info_template'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('nss_info_template'))
diff --git a/source3/wscript_build b/source3/wscript_build
index 90a03fe649d..2ee4f62fe02 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -711,7 +711,7 @@ bld.SAMBA3_SUBSYSTEM('LIBMSRPC_GEN',
 
 bld.SAMBA3_SUBSYSTEM('LIBGPO',
                     source='${LIBGPO_SRC}',
-                    deps='gpext',
+                    deps='gpext talloc',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('AVAHI',
@@ -720,7 +720,8 @@ bld.SAMBA3_SUBSYSTEM('AVAHI',
                     enabled=bld.env.with_avahi)
 
 bld.SAMBA3_SUBSYSTEM('GROUPDB',
-                    source=GROUPDB_SRC)
+                    source=GROUPDB_SRC,
+                    deps='tdb')
 
 bld.SAMBA3_SUBSYSTEM('TLDAP',
                     source=TLDAP_SRC,
@@ -733,7 +734,8 @@ bld.SAMBA3_LIBRARY('passdb',
                    vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('PARAM_UTIL',
-                    source=PARAM_UTIL_SRC)
+                    source=PARAM_UTIL_SRC,
+                    deps='samba-util-common')
 
 bld.SAMBA3_SUBSYSTEM('PARAM_WITHOUT_REG',
                     source=PARAM_WITHOUT_REG_SRC,
@@ -748,10 +750,12 @@ bld.SAMBA3_LIBRARY('param',
 
 bld.SAMBA3_SUBSYSTEM('REGFIO',
                     source=REGFIO_SRC,
+                    deps='samba-util-common',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('REG_API_REGF',
                     source=REG_API_REGF_SRC,
+                    deps='samba-util-common',
                     vars=locals())
 
 bld.SAMBA3_LIBRARY('smbregistry',
@@ -774,7 +778,7 @@ bld.SAMBA3_SUBSYSTEM('REG_FULL',
 
 bld.SAMBA3_LIBRARY('POPT_SAMBA3',
                    source=POPT_LIB_SRC,
-                   deps='popt',
+                   deps='popt samba-util-common',
                    vars=locals(),
                    private_library=True)
 
@@ -844,14 +848,17 @@ bld.SAMBA3_SUBSYSTEM('LIBADS_SERVER',
 
 bld.SAMBA3_SUBSYSTEM('LIBADS_PRINTER',
                     source=LIBADS_PRINTER_SRC,
+                    deps='samba-util-common',
 		    vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('LIBAFS',
                     source=AFS_SRC,
+                    deps='samba-util-common',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('LIBAFS_SETTOKEN',
                     source=AFS_SETTOKEN_SRC,
+                    deps='samba-util-common',
                     vars=locals())
 
 bld.SAMBA3_LIBRARY('smbconf',
@@ -884,10 +891,12 @@ bld.SAMBA3_SUBSYSTEM('LOCKING',
 
 bld.SAMBA3_SUBSYSTEM('PROFILE',
                     source='${PROFILE_SRC}',
+                    deps='samba-util-common',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('PRINTBASE',
                     source=PRINTBASE_SRC,
+                    deps='samba-util-common',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('PRINTBACKEND',
@@ -902,10 +911,12 @@ bld.SAMBA3_SUBSYSTEM('PRINTING',
 
 bld.SAMBA3_SUBSYSTEM('PASSWD_UTIL',
                     source=PASSWD_UTIL_SRC,
+                    deps='samba-util-common',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('FNAME_UTIL',
                     source=FNAME_UTIL_SRC,
+                    deps='samba-util-common',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('LIBNET',
@@ -940,6 +951,7 @@ bld.SAMBA3_SUBSYSTEM('LIBNBT',
 
 bld.SAMBA3_SUBSYSTEM('SERVICES',
                     source=SERVICES_SRC,
+                    deps='samba-util-common',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('PLAINTEXT_AUTH',
@@ -954,10 +966,12 @@ bld.SAMBA3_SUBSYSTEM('PASSCHANGE',
 
 bld.SAMBA3_SUBSYSTEM('SAMBA_VERSION',
                     source=VERSION_SRC,
+                    deps='samba-util-common',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('SLCACHE',
                     source=SLCACHE_SRC,
+                    deps='samba-util-common',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('DCUTIL',
@@ -972,11 +986,12 @@ bld.SAMBA3_SUBSYSTEM('tdb-wrap3',
 
 bld.SAMBA3_SUBSYSTEM('CHARSET3',
                     source='''lib/util_str.c lib/charcnv.c lib/fstring.c''',
-                    public_deps='ICONV_WRAPPER CHARSET',
+                    public_deps='ICONV_WRAPPER samba3core CHARSET',
                     deps='samba-util')
 
 bld.SAMBA3_SUBSYSTEM('ldb3',
-                    source='lib/ldb_compat.c')
+                    source='lib/ldb_compat.c',
+                    deps='samba-util-common')
 
 bld.SAMBA3_SUBSYSTEM('errors3',
                      source='libsmb/nterr.c libsmb/errormap.c libsmb/smberr.c lib/errmap_unix.c', 
@@ -1003,17 +1018,21 @@ bld.SAMBA3_SUBSYSTEM('LIBCLI_WINREG',
                     deps='RPC_NDR_WINREG RPC_NCACN_NP')
 
 bld.SAMBA3_SUBSYSTEM('RPC_CLIENT_SCHANNEL',
-	source=RPC_CLIENT_SCHANNEL_SRC,
-	vars=locals())
+                    source=RPC_CLIENT_SCHANNEL_SRC,
+                    deps='samba-util-common',
+                    vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('INIT_LSA',
-                    source='rpc_client/init_lsa.c')
+                    source='rpc_client/init_lsa.c',
+                    deps='samba-util-common')
 
 bld.SAMBA3_SUBSYSTEM('INIT_NETLOGON',
-                    source='rpc_client/init_netlogon.c')
+                    source='rpc_client/init_netlogon.c',
+                    deps='samba-util-common')
 
 bld.SAMBA3_SUBSYSTEM('INIT_SAMR',
-                    source='rpc_client/init_samr.c')
+                    source='rpc_client/init_samr.c',
+                    deps='samba-util-common')
 
 ########################## BINARIES #################################
 
@@ -1257,7 +1276,7 @@ bld.SAMBA3_BINARY('smbfilter',
 
 bld.SAMBA3_BINARY('versiontest',
                  source='lib/version_test.c',
-                 deps='SAMBA_VERSION',
+                 deps='SAMBA_VERSION samba3core param',
                  vars=locals())
 
 bld.SAMBA3_BINARY('wbinfo' + bld.env.suffix3,
@@ -1309,7 +1328,7 @@ bld.SAMBA3_BINARY('split_tokens',
 
 bld.SAMBA3_BINARY('vlp',
                  source=VLP_SRC,
-                 deps='''talloc tdb PARAM_UTIL UTIL_TDB''',
+                 deps='''talloc tdb PARAM_UTIL UTIL_TDB samba3core param''',
                  vars=locals())
 
 swat_dir = os.path.join(bld.curdir, '../swat')