diff -urN samba-python-modules-4.9999.orig/source4/dsdb/samdb/ldb_modules/wscript_build samba-python-modules-4.9999/source4/dsdb/samdb/ldb_modules/wscript_build
--- samba-python-modules-4.9999.orig/source4/dsdb/samdb/ldb_modules/wscript_build	2012-02-20 13:36:48.229826866 +0100
+++ samba-python-modules-4.9999/source4/dsdb/samdb/ldb_modules/wscript_build	2012-02-20 13:37:53.287747367 +0100
@@ -150,7 +150,7 @@
 	init_function='ldb_local_password_module_init',
 	module_init_name='ldb_init_module',
 	internal_module=False,
-	deps='talloc ndr samdb'
+	deps='talloc ndr samdb samdb-common'
 	)
 
 bld.SAMBA_MODULE('ldb_extended_dn_in',
@@ -239,7 +239,7 @@
 	subsystem='ldb',
 	init_function='ldb_objectclass_attrs_module_init',
 	module_init_name='ldb_init_module',
-	deps='talloc samdb samba-util',
+	deps='talloc samdb samba-util ldbsamba',
 	internal_module=False,
 	)
 
@@ -290,7 +290,7 @@
 	init_function='ldb_anr_module_init',
 	module_init_name='ldb_init_module',
 	internal_module=False,
-	deps='talloc samba-util samdb'
+	deps='talloc samba-util samdb ldbsamba'
 	)
 
 
@@ -330,7 +330,7 @@
 	init_function='ldb_resolve_oids_module_init',
 	module_init_name='ldb_init_module',
 	internal_module=False,
-	deps='samdb talloc ndr'
+	deps='samdb talloc ndr ldbsamba'
 	)
 
 
diff -urN samba-python-modules-4.9999.orig/source4/param/wscript_build samba-python-modules-4.9999/source4/param/wscript_build
--- samba-python-modules-4.9999.orig/source4/param/wscript_build	2012-02-20 13:36:52.460125143 +0100
+++ samba-python-modules-4.9999/source4/param/wscript_build	2012-02-20 13:37:55.554573865 +0100
@@ -38,7 +38,7 @@
 
 bld.SAMBA_PYTHON('pyparam',
 	source='pyparam.c',
-	deps='samba-hostconfig pytalloc-util',
+	deps='samba-hostconfig server-role pytalloc-util errors events',
 	realname='samba/param.so'
 	)
 
@@ -49,7 +49,7 @@
 
 bld.SAMBA_SUBSYSTEM('pyparam_util',
 	source='pyparam_util.c',
-	deps='LIBPYTHON samba-hostconfig',
+	deps='LIBPYTHON samba-hostconfig server-role',
 	pyext=True,
 	)
 
diff -urN samba-python-modules-4.9999.orig/source4/scripting/python/wscript_build samba-python-modules-4.9999/source4/scripting/python/wscript_build
--- samba-python-modules-4.9999.orig/source4/scripting/python/wscript_build	2012-02-20 13:36:54.043570124 +0100
+++ samba-python-modules-4.9999/source4/scripting/python/wscript_build	2012-02-20 13:37:56.084611237 +0100
@@ -2,7 +2,7 @@
 
 bld.SAMBA_LIBRARY('samba_python',
 	source=[],
-	deps='LIBPYTHON pytalloc-util pyrpc_util',
+	deps='LIBPYTHON pytalloc-util pyrpc_util errors events',
 	grouping_library=True,
 	private_library=True,
 	pyembed=True)