5 files changed, 3 insertions, 2 deletions
diff --git a/source4/lib/charset/SConscript b/source4/lib/charset/SConscript
index 15ee49909c..9bc474ff48 100644
--- a/source4/lib/charset/SConscript
+++ b/source4/lib/charset/SConscript
@@ -1,6 +1,7 @@
 #!/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 64faff772c..d9a576a031 100644
--- a/source4/lib/popt/SConscript
+++ b/source4/lib/popt/SConscript
@@ -1,4 +1,3 @@
-Import('hostenv')
 #            tastes like -*- python -*-
 Import('hostenv')
 
diff --git a/source4/lib/replace/SConscript b/source4/lib/replace/SConscript
index 948c33bdc0..cf28102175 100644
--- a/source4/lib/replace/SConscript
+++ b/source4/lib/replace/SConscript
@@ -1,6 +1,5 @@
 #!/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 14080fa1b0..73c7eeeeac 100644
--- a/source4/lib/socket/SConscript
+++ b/source4/lib/socket/SConscript
@@ -1,5 +1,6 @@
 #!/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 ab08e3af73..248922bcd7 100644
--- a/source4/lib/socket_wrapper/SConscript
+++ b/source4/lib/socket_wrapper/SConscript
@@ -1,4 +1,5 @@
 Import('hostenv')
+
 opts = Options(None, ARGUMENTS)
 opts.AddOptions(
 	BoolOption('socket_wrapper','enable socket wrapper',0)