5 files changed, 2 insertions, 3 deletions
diff --git a/source4/lib/charset/SConscript b/source4/lib/charset/SConscript
index 9bc474ff48..15ee49909c 100644
--- a/source4/lib/charset/SConscript
+++ b/source4/lib/charset/SConscript
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 # tastes like -*- python -*-
 
-Import('hostenv')
 
 def _CheckIconvPath(context,path):
 	# Some systems have iconv in libc, some have it in libiconv (OSF/1 and
diff --git a/source4/lib/popt/SConscript b/source4/lib/popt/SConscript
index d9a576a031..64faff772c 100644
--- a/source4/lib/popt/SConscript
+++ b/source4/lib/popt/SConscript
@@ -1,3 +1,4 @@
+Import('hostenv')
 #            tastes like -*- python -*-
 Import('hostenv')
 
diff --git a/source4/lib/replace/SConscript b/source4/lib/replace/SConscript
index cf28102175..948c33bdc0 100644
--- a/source4/lib/replace/SConscript
+++ b/source4/lib/replace/SConscript
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 Import('hostenv defines')
+conf = Configure(hostenv)
 
 rep_files = ['replace.c', 'snprintf.c','dlfcn.c']
 
diff --git a/source4/lib/socket/SConscript b/source4/lib/socket/SConscript
index 73c7eeeeac..14080fa1b0 100644
--- a/source4/lib/socket/SConscript
+++ b/source4/lib/socket/SConscript
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 Import('hostenv defines')
-
 if hostenv['configure']:
 	conf = hostenv.Configure()
 	for h in ['sys/socket.h','sys/sockio.h','sys/un.h']:
diff --git a/source4/lib/socket_wrapper/SConscript b/source4/lib/socket_wrapper/SConscript
index 248922bcd7..ab08e3af73 100644
--- a/source4/lib/socket_wrapper/SConscript
+++ b/source4/lib/socket_wrapper/SConscript
@@ -1,5 +1,4 @@
 Import('hostenv')
-
 opts = Options(None, ARGUMENTS)
 opts.AddOptions(
 	BoolOption('socket_wrapper','enable socket wrapper',0)