diff --git a/SConstruct b/SConstruct
index c908010..2de9176 100644
--- a/SConstruct
+++ b/SConstruct
@@ -177,7 +177,7 @@ else :
         LINKFLAGS = [ '-nostdlib' ] ,
         ASFLAGS = [ '-D__ASSEMBLY__' ] ,
         LIBS = 'gcc' ,
-        CPPPATH = [ '#' + buildDirectory , '#' + buildDirectory + '/l4' , '#' + includeDirectory , '#' + includeDirectory + '/l4' ] )
+        CPPPATH = [ '#' + buildDirectory , '#' + buildDirectory + '/l4' , '#' + includeDirectory ] )
 
     taskLibraryNames = [ f.name for f in Glob ( 'tasks/lib*' ) ]
 
@@ -196,7 +196,8 @@ else :
         ASFLAGS = [ '-D__ASSEMBLY__' ] ,
         LIBS = 'gcc' ,
         CPPDEFINES = [ '__USERSPACE__' ] ,
-        CPPPATH = [ '#' + buildDirectory ,  '#' + buildDirectory + '/l4' , '#' + includeDirectory , '#' + includeDirectory + '/l4' ] )
+        CPPPATH = [ '#' + buildDirectory + '/l4' , '#' + includeDirectory ] )
+        #CPPPATH = [ '#' + buildDirectory ,  '#' + buildDirectory + '/l4' , '#' + includeDirectory , '#' + includeDirectory + '/l4' ] )
 
     tasks = [ ]
     for task in [ f.name for f in Glob ( 'tasks/*' ) if f.name not in taskLibraryNames + [ 'bootdesc' ] ] :
diff --git a/tasks/fs0/SConscript b/tasks/fs0/SConscript
index 2b89b45..5f0d849 100644
--- a/tasks/fs0/SConscript
+++ b/tasks/fs0/SConscript
@@ -20,7 +20,7 @@
 Import ( 'environment' )
 
 e = environment.Clone ( )
-e.Append ( CPPPATH = [ 'include' , '#libs/c/include/' , '#tasks/libl4/include'  , '#tasks/libmem' , '#tasks/libposix/include' ] )
+e.Append ( CPPPATH = [ 'include' , '#libs/c/include/' , '#tasks/libl4/include' , '#tasks/libmem' , '#tasks/libposix/include' ] )
 
 #  TODO:  There are errors in this code that -Werror gives problems with.
 
diff --git a/tasks/mm0/SConscript b/tasks/mm0/SConscript
index 072409f..fa01a83 100644
--- a/tasks/mm0/SConscript
+++ b/tasks/mm0/SConscript
@@ -20,7 +20,7 @@
 Import ( 'environment' )
 
 e = environment.Clone ( )
-e.Append ( CPPPATH = [ 'include' , '#libs/c/include/' , '#tasks/libl4/include'  , '#tasks/libmem' , '#tasks/libposix/include' ] )
+e.Append ( CPPPATH = [ 'include' , '#libs/c/include/' , '#tasks/libl4/include' , '#tasks/libmem' , '#tasks/libposix/include' ] )
 
 #  TODO:  There are errors in this code that -Werror gives problems with.
 
diff --git a/tasks/test0/SConscript b/tasks/test0/SConscript
index e7b58e3..1e1a0ad 100644
--- a/tasks/test0/SConscript
+++ b/tasks/test0/SConscript
@@ -20,7 +20,7 @@
 Import ( 'environment' )
 
 e = environment.Clone ( )
-e.Append ( CPPPATH = [ 'include' , '#libs/c/include/' , '#tasks/libl4/include'  , '#tasks/libmem' , '#tasks/libposix/include' ] )
+e.Append ( CPPPATH = [ 'include' , '#libs/c/include/' , '#tasks/libl4/include' , '#tasks/libmem' , '#tasks/libposix/include' ] )
 
 #  TODO:  There are errors in this code that -Werror gives problems with.