diff --git a/backend_xmmsclient++/wscript b/backend_xmmsclient++/wscript
index 2929f79..dcad64c 100644
--- a/backend_xmmsclient++/wscript
+++ b/backend_xmmsclient++/wscript
@@ -53,10 +53,9 @@ def build(bld):
     obj                 = bld.new_task_gen(features='qt4 cstaticlib cxx')
     obj.target          = 'backend_lib'
     obj.install_path    = 0 # Don't install
-    obj.includes        = ['.', '/usr/include/QtGui', '/usr/include/QtCore', '/usr/include/xmms2']
+    obj.includes        = '.'
     obj.source          = lib_source
-    obj.uselib          = 'libQtCore libQtGui XMMS2-CLIENT-CPP'
+    obj.uselib          = 'QTCORE QTGUI XMMS2-CLIENT-CPP'
     obj.export_incdirs  = '.'
-    print dir(obj)
     pass
 
diff --git a/dir_iterator/wscript b/dir_iterator/wscript
index f9b6775..88d03ee 100644
--- a/dir_iterator/wscript
+++ b/dir_iterator/wscript
@@ -57,7 +57,7 @@ def build(bld):
     obj                 = bld.new_task_gen(features='qt4 cstaticlib cxx')
     obj.target          = 'dir_iterator'
     obj.install_path    = 0 # Don't install
-    obj.includes        = ['.', '/usr/include/QtCore', '/usr/include/QtGui']
+    obj.includes        = '.'
     obj.source          = sources
     obj.uselib          = 'QTCORE QTGUI LIBARCHIVE'
     obj.export_incdirs  = '.'
diff --git a/src/wscript b/src/wscript
index 748ab59..a0b3329 100644
--- a/src/wscript
+++ b/src/wscript
@@ -60,8 +60,8 @@ def files_subdirs(subdirs, filters = ['.cpp', '.ui'], basedir='.'):
     for dir in subdirs:
         d = os.path.join(basedir, dir)
         for file in os.listdir(d):
-            for filt in filters:
-                if file.endswith(filt):
+            for filter in filters:
+                if file.endswith(filter):
                     ret.append(os.path.join(dir, file))
 
     return ret
@@ -92,10 +92,6 @@ def build(bld):
 
     incdirs = bld_subdirs
     incdirs.append('.')
-    incdirs.append('/usr/include/QtCore')
-    incdirs.append('/usr/include/QtGui')
-    incdirs.append('/usr/include/QtNetwork')
-    incdirs.append('/usr/include/xmms2')
 
     obj              = bld.new_task_gen(features='qt4 cprogram cxx')
     obj.target       = 'promoe'
@@ -103,6 +99,6 @@ def build(bld):
     obj.source       = sources
     obj.uselib_local = 'backend_lib dir_iterator'
     obj.add_objects  = 'promoe_data'
-    obj.uselib       = 'QtCore QtGui AVAHI-CLIENT AVAHI-QT4'
+    obj.uselib       = 'QTCORE QTGUI AVAHI-CLIENT AVAHI-QT4'
     pass