30 files changed, 30 insertions, 8614 deletions
diff --git a/noncore/settings/appearance2/appearance2.pro b/noncore/settings/appearance2/appearance2.pro
index bf18e43..c821e94 100644
--- a/noncore/settings/appearance2/appearance2.pro
+++ b/noncore/settings/appearance2/appearance2.pro
@@ -1,287 +1,10 @@
 CONFIG    = qt warn_on  quick-app
 HEADERS   = appearance.h editScheme.h sample.h
 SOURCES   = appearance.cpp editScheme.cpp main.cpp sample.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2 -lopieui2 -lqtaux2
 TARGET         = appearance
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/aqpkg/aqpkg.pro b/noncore/settings/aqpkg/aqpkg.pro
index 8d4b3dc..41540cb 100644
--- a/noncore/settings/aqpkg/aqpkg.pro
+++ b/noncore/settings/aqpkg/aqpkg.pro
@@ -27,293 +27,14 @@ SOURCES        = mainwin.cpp \
          destination.cpp \
          utils.cpp \
          server.cpp \
          letterpushbutton.cpp \
          inputdlg.cpp \
          version.cpp \
          categoryfilterimpl.cpp
 TARGET        = aqpkg
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2 -lopieui2 
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/backup/backup.pro b/noncore/settings/backup/backup.pro
index df30ab1..de2a977 100644
--- a/noncore/settings/backup/backup.pro
+++ b/noncore/settings/backup/backup.pro
@@ -1,296 +1,10 @@
        CONFIG  = qt warn_on  quick-app
        HEADERS         = backuprestore.h
        SOURCES         = main.cpp backuprestore.cpp
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2 -lopieui2
        INTERFACES= backuprestorebase.ui errordialog.ui
        TARGET  = backup
 VERSION     = 0.8.1
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/doctab/doctab.pro b/noncore/settings/doctab/doctab.pro
index 9f82fad..34e6829 100644
--- a/noncore/settings/doctab/doctab.pro
+++ b/noncore/settings/doctab/doctab.pro
@@ -1,297 +1,10 @@
 CONFIG        += qt warn_on  quick-app
 HEADERS        = doctab.h
 SOURCES        = doctab.cpp main.cpp
 INTERFACES    = doctabsettingsbase.ui
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH    += 
 LIBS            += -lqpe -lopiecore2
 TARGET        = doctab
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/language/language.pro b/noncore/settings/language/language.pro
index fe33a05..a34ed7f 100644
--- a/noncore/settings/language/language.pro
+++ b/noncore/settings/language/language.pro
@@ -1,311 +1,10 @@
 CONFIG        += qt warn_on  quick-app
 HEADERS        = settings.h
 SOURCES        = language.cpp main.cpp
 INTERFACES    = languagesettingsbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH    += 
 LIBS            += -lqpe -lopiecore2
 TARGET        = language
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/mediummount/mediummount.pro b/noncore/settings/mediummount/mediummount.pro
index 73245f9..6eb54c4 100644
--- a/noncore/settings/mediummount/mediummount.pro
+++ b/noncore/settings/mediummount/mediummount.pro
@@ -1,301 +1,12 @@
 TEMPLATE    = app
 DESTDIR         = $(OPIEDIR)/bin/
 #CONFIG        = qt warn_on 
 CONFIG        = qt warn_on  quick-app
 HEADERS        = mediumwidget.h mediumglobal.h mainwindow.h
 SOURCES        = main.cpp mediumwidget.cc mediumglobal.cc mainwindow.cc
 INCLUDEPATH    += $(OPIEDIR)/include
 DEPENDPATH    += $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2
 TARGET          = mediummount
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/netsystemtime/netsystemtime.pro b/noncore/settings/netsystemtime/netsystemtime.pro
index 7cb56b5..109684e 100644
--- a/noncore/settings/netsystemtime/netsystemtime.pro
+++ b/noncore/settings/netsystemtime/netsystemtime.pro
@@ -9,313 +9,13 @@ SOURCES        = main.cpp                \
                mainwindow.cpp        \
                timetabwidget.cpp     \
                formattabwidget.cpp   \
                settingstabwidget.cpp \
                predicttabwidget.cpp  \
                ntptabwidget.cpp
 INCLUDEPATH    += $(OPIEDIR)/include
 DEPENDPATH    += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2 -lopieui2
 TARGET        = systemtime
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings/interfaces/interfaces.pro b/noncore/settings/networksettings/interfaces/interfaces.pro
index b2a55c4..0135cb4 100644
--- a/noncore/settings/networksettings/interfaces/interfaces.pro
+++ b/noncore/settings/networksettings/interfaces/interfaces.pro
@@ -2,310 +2,13 @@ TEMPLATE        = lib
 CONFIG          += qt warn_on 
        #CONFIG         += qt warn_on 
        DESTDIR         = $(OPIEDIR)/lib$(PROJMAK)
        HEADERS         = interface.h  interfaceinformationimp.h  interfaces.h  interfacesetupimp.h
        SOURCES         = interface.cpp interfaces.cpp interfaceinformationimp.cpp  interfacesetupimp.cpp
        INCLUDEPATH+= $(OPIEDIR)/include ../
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2
        INTERFACES= interfaceadvanced.ui  interfaceinformation.ui  interfacesetup.ui
        TARGET  = interfaces
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings/mainwindow/mainwindow.pro b/noncore/settings/networksettings/mainwindow/mainwindow.pro
index de9760a..57d23a3 100644
--- a/noncore/settings/networksettings/mainwindow/mainwindow.pro
+++ b/noncore/settings/networksettings/mainwindow/mainwindow.pro
@@ -1,309 +1,11 @@
 CONFIG   = qt warn_on quick-app
 HEADERS   = mainwindowimp.h addconnectionimp.h defaultmodule.h  module.h
 SOURCES   = main.cpp mainwindowimp.cpp addconnectionimp.cpp
 INCLUDEPATH += $(OPIEDIR)/include ../interfaces/ .
 DEPENDPATH  += $(OPIEDIR)/include ../interfaces/ ../wlan/ ../ppp/
 LIBS        += -lqpe -L$(OPIEDIR)/plugins/networksettings -L../interfaces -linterfaces -lopiecore2 -lopieui2
 INTERFACES = mainwindow.ui addconnection.ui
 TARGET    = networksettings
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings/ppp/ppp.pro b/noncore/settings/networksettings/ppp/ppp.pro
index fc3e950..297dda8 100644
--- a/noncore/settings/networksettings/ppp/ppp.pro
+++ b/noncore/settings/networksettings/ppp/ppp.pro
@@ -2,309 +2,13 @@ TEMPLATE        = lib
        CONFIG  += qt plugin warn_on 
 DESTDIR         = $(OPIEDIR)/plugins/networksettings
        HEADERS         = pppmodule.h  modem.h modeminfo.h pppdata.h kpppconfig.h pppdata.h runtests.h general.h modemcmds.h conwindow.h accounts.h connect.h edit.h scriptedit.h pppdargs.h  iplined.h pwentry.h pppconfig.h interfaceinformationppp.h interfaceppp.h authwidget.h chooserwidget.h devices.h
        SOURCES         = pppmodule.cpp modem.cpp modeminfo.cpp pppdata.cpp runtests.cpp general.cpp modemcmds.cpp  conwindow.cpp  accounts.cpp connect.cpp edit.cpp scriptedit.cpp pppdargs.cpp  iplined.cpp pwentry.cpp pppconfig.cpp interfaceinformationppp.cpp interfaceppp.cpp authwidget.cpp chooserwidget.cpp devices.cpp
        INCLUDEPATH+= $(OPIEDIR)/include ../ ../interfaces/
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -L../interfaces/ -linterfaces
        TARGET  = kppp
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings/wlan/wlan.pro b/noncore/settings/networksettings/wlan/wlan.pro
index 19856b2..e975dde 100644
--- a/noncore/settings/networksettings/wlan/wlan.pro
+++ b/noncore/settings/networksettings/wlan/wlan.pro
@@ -13,318 +13,20 @@ VERSION		= 1.0.0
 #CONFIG += wirelessopts
 wirelessopts {
                HEADERS+= wlanimp.h
                SOURCES+= wlanimp.cpp
 }
 ! wirelessopts {
                HEADERS+= wlanimp2.h
        SOURCES += wlanimp2.cpp
 }
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 !isEmpty( LIBPCAP_INC_DIR ) {
    INCLUDEPATH = $$LIBPCAP_INC_DIR $$INCLUDEPATH
 }
 !isEmpty( LIBPCAP_LIB_DIR ) {
    LIBS = -L$$LIBPCAP_LIB_DIR $$LIBS
 }
diff --git a/noncore/settings/networksettings2/bluetooth/bluetooth.pro b/noncore/settings/networksettings2/bluetooth/bluetooth.pro
index 602ace2..8170d46 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetooth.pro
+++ b/noncore/settings/networksettings2/bluetooth/bluetooth.pro
@@ -10,295 +10,13 @@ SOURCES		= bluetooth_NN.cpp \
                  bluetoothBNEP_NNI.cpp \
                  bluetoothRFCOMM_NNI.cpp \
                  bluetoothBNEPedit.cpp \
                  bluetoothBNEPrun.cpp \
                  bluetoothRFCOMMedit.cpp
        INCLUDEPATH+= $(OPIEDIR)/include ../ ../networksettings2
        DEPENDPATH+= $(OPIEDIR)/include ../ ../networksettings2
 LIBS            += -lqpe
        INTERFACES= bluetoothBNEPGUI.ui bluetoothRFCOMMGUI.ui
        TARGET  = bluetooth
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings2/cable/cable.pro b/noncore/settings/networksettings2/cable/cable.pro
index dac96c6..8a046b7 100644
--- a/noncore/settings/networksettings2/cable/cable.pro
+++ b/noncore/settings/networksettings2/cable/cable.pro
@@ -6,294 +6,13 @@ HEADERS		= cable_NN.h \
                  cableedit.h
        SOURCES         = cable_NN.cpp \
                  cable_NNI.cpp \
                  cableedit.cpp \
                  cablerun.cpp
        INCLUDEPATH+= $(OPIEDIR)/include ../ ../networksettings2
        DEPENDPATH+= $(OPIEDIR)/include ../ ../networksettings2
 LIBS            += -lqpe
        INTERFACES= cableGUI.ui
        TARGET  = cable
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings2/irda/irda.pro b/noncore/settings/networksettings2/irda/irda.pro
index e8f605c..4613abe 100644
--- a/noncore/settings/networksettings2/irda/irda.pro
+++ b/noncore/settings/networksettings2/irda/irda.pro
@@ -5,294 +5,13 @@ HEADERS		= irda_NN.h \
                  irda_NNI.h \
                  irdaedit.h
        SOURCES         = irda_NN.cpp \
                  irda_NNI.cpp \
                  irdaedit.cpp
        INCLUDEPATH+= $(OPIEDIR)/include ../ ../networksettings2
        DEPENDPATH+= $(OPIEDIR)/include ../ ../networksettings2
 LIBS            += -lqpe 
        INTERFACES= irdaGUI.ui
        TARGET  = irda
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings2/lancard/lancard.pro b/noncore/settings/networksettings2/lancard/lancard.pro
index 80bcb84..6f04e01 100644
--- a/noncore/settings/networksettings2/lancard/lancard.pro
+++ b/noncore/settings/networksettings2/lancard/lancard.pro
@@ -6,294 +6,13 @@ HEADERS		= lancard_NN.h \
                  lancardedit.h
        SOURCES         = lancard_NN.cpp \
                  lancard_NNI.cpp \
                  lancardedit.cpp \
                  lancardrun.cpp
        INCLUDEPATH+= $(OPIEDIR)/include ../ ../networksettings2
        DEPENDPATH+= $(OPIEDIR)/include ../ ../networksettings2
 LIBS            += -lqpe
        INTERFACES= lancardGUI.ui
        TARGET  = lancard
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings2/modem/modem.pro b/noncore/settings/networksettings2/modem/modem.pro
index fcca183..25e29d4 100644
--- a/noncore/settings/networksettings2/modem/modem.pro
+++ b/noncore/settings/networksettings2/modem/modem.pro
@@ -5,294 +5,13 @@ HEADERS		= modem_NN.h \
                  modem_NNI.h \
                  modemedit.h
        SOURCES         = modem_NN.cpp \
                  modem_NNI.cpp \
                  modemedit.cpp
        INCLUDEPATH+= $(OPIEDIR)/include ../ ../networksettings2
        DEPENDPATH+= $(OPIEDIR)/include ../ ../networksettings2
 LIBS            += -lqpe
        INTERFACES= modemGUI.ui
        TARGET  = modem
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings2/network/network.pro b/noncore/settings/networksettings2/network/network.pro
index 69f9235..05df007 100644
--- a/noncore/settings/networksettings2/network/network.pro
+++ b/noncore/settings/networksettings2/network/network.pro
@@ -6,295 +6,13 @@ HEADERS		= network_NN.h \
                  networkedit.h
        SOURCES         = network_NN.cpp \
                  network_NNI.cpp \
                  networkedit.cpp \
                  networkrun.cpp
        INCLUDEPATH+= $(OPIEDIR)/include ../ ../networksettings2
        DEPENDPATH+= $(OPIEDIR)/include ../ ../networksettings2
 LIBS            += -lqpe
        INTERFACES= networkGUI.ui
        TARGET  = network
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings2/networksettings.pro b/noncore/settings/networksettings2/networksettings.pro
index d2c54da..5d9efbb 100644
--- a/noncore/settings/networksettings2/networksettings.pro
+++ b/noncore/settings/networksettings2/networksettings.pro
@@ -12,294 +12,13 @@ SOURCES   = main.cpp \
            activatevpn.cpp \
            editconnection.cpp
 INCLUDEPATH += $(OPIEDIR)/include networksettings2/
 DEPENDPATH  += $(OPIEDIR)/include networksettings2/
 LIBS        += -lqpe -L$(OPIEDIR)/plugins/networksettings2 -lnetworksettings2 -lopiecore2
 INTERFACES = networksettingsGUI.ui \
             editconnectionGUI.ui \
             activatevpnGUI.ui \
             activateprofileGUI.ui
 TARGET    = $(OPIEDIR)/bin/networksettings2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings2/networksettings2/networksettings2.pro b/noncore/settings/networksettings2/networksettings2/networksettings2.pro
index e4480e9..d1e42b7 100644
--- a/noncore/settings/networksettings2/networksettings2/networksettings2.pro
+++ b/noncore/settings/networksettings2/networksettings2/networksettings2.pro
@@ -16,295 +16,13 @@ SOURCES		= netnode.cpp \
                  GUIUtils.cpp \
                  system.cpp \
                  systemfile.cpp \
                  wextensions.cpp \
                  resources.cpp
        INCLUDEPATH+= $(OPIEDIR)/include ../networksettings2
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2 -lopieui2
        INTERFACES= 
        TARGET  = networksettings2
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings2/ppp/ppp.pro b/noncore/settings/networksettings2/ppp/ppp.pro
index ad5aa7a..f866bee 100644
--- a/noncore/settings/networksettings2/ppp/ppp.pro
+++ b/noncore/settings/networksettings2/ppp/ppp.pro
@@ -12,294 +12,13 @@ SOURCES		= ppp_NN.cpp \
                  PPPedit.cpp \
                  PPPDNSedit.cpp \
                  PPPAuthedit.cpp \
                  ppprun.cpp \
                  PPPIPedit.cpp
        INCLUDEPATH+= $(OPIEDIR)/include ../ ../networksettings2
        DEPENDPATH+= $(OPIEDIR)/include ../ ../networksettings2
 LIBS            += -lqpe
        INTERFACES= PPPGUI.ui PPPAuthGUI.ui PPPIPGUI.ui PPPDNSGUI.ui
        TARGET  = ppp
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings2/profile/profile.pro b/noncore/settings/networksettings2/profile/profile.pro
index 218a100..f980034 100644
--- a/noncore/settings/networksettings2/profile/profile.pro
+++ b/noncore/settings/networksettings2/profile/profile.pro
@@ -6,295 +6,13 @@ HEADERS		= profile_NN.h \
                  profileedit.h
        SOURCES         = profile_NN.cpp \
                  profile_NNI.cpp \
                  profileedit.cpp \
                  profilerun.cpp
        INCLUDEPATH+= $(OPIEDIR)/include ../ ../networksettings2
        DEPENDPATH+= $(OPIEDIR)/include ../ ../networksettings2
 LIBS            += -lqpe
        INTERFACES= profileGUI.ui
        TARGET  = profile
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings2/usb/usb.pro b/noncore/settings/networksettings2/usb/usb.pro
index e7f8f42..37c1bde 100644
--- a/noncore/settings/networksettings2/usb/usb.pro
+++ b/noncore/settings/networksettings2/usb/usb.pro
@@ -6,294 +6,13 @@ HEADERS		= usb_NN.h \
                  usbedit.h
        SOURCES         = usb_NN.cpp \
                  usb_NNI.cpp \
                  usbedit.cpp \
                  usbrun.cpp
        INCLUDEPATH+= $(OPIEDIR)/include ../ ../networksettings2
        DEPENDPATH+= $(OPIEDIR)/include ../ ../networksettings2
 LIBS            += -lqpe
        INTERFACES= usbGUI.ui
        TARGET  = usb
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings2/vpn/vpn.pro b/noncore/settings/networksettings2/vpn/vpn.pro
index 8c7d634..a131a1f 100644
--- a/noncore/settings/networksettings2/vpn/vpn.pro
+++ b/noncore/settings/networksettings2/vpn/vpn.pro
@@ -6,294 +6,13 @@ HEADERS		= vpn_NN.h \
                  vpnedit.h
        SOURCES         = vpn_NN.cpp \
                  vpn_NNI.cpp \
                  vpnedit.cpp \
                  vpnrun.cpp
        INCLUDEPATH+= $(OPIEDIR)/include ../ ../networksettings2
        DEPENDPATH+= $(OPIEDIR)/include ../ ../networksettings2
 LIBS            += -lqpe
        INTERFACES= vpnGUI.ui
        TARGET  = vpn
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings2/wlan/wlan.pro b/noncore/settings/networksettings2/wlan/wlan.pro
index 0a47263..f4c55df 100644
--- a/noncore/settings/networksettings2/wlan/wlan.pro
+++ b/noncore/settings/networksettings2/wlan/wlan.pro
@@ -6,294 +6,13 @@ HEADERS		= wlan_NN.h \
                  wlanedit.h
        SOURCES         = wlan_NN.cpp \
                  wlan_NNI.cpp \
                  wlanedit.cpp \
                  wlanrun.cpp
        INCLUDEPATH+= $(OPIEDIR)/include ../ ../networksettings2
        DEPENDPATH+= $(OPIEDIR)/include ../ ../networksettings2
 LIBS            += -lqpe
        INTERFACES= wlanGUI.ui
        TARGET  = wlan
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/packagemanager/packagemanager.pro b/noncore/settings/packagemanager/packagemanager.pro
index fef32f3..c7b2273 100644
--- a/noncore/settings/packagemanager/packagemanager.pro
+++ b/noncore/settings/packagemanager/packagemanager.pro
@@ -22,295 +22,20 @@ HEADERS      = opackage.h        \
               packageinfodlg.h  \
               filterdlg.h       \
               promptdlg.h       \
               entrydlg.h
 DEFINES     += IPKG_LIB
 DEFINES     += HAVE_MKDTEMP
 TARGET       = packagemanager
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2 -lopieui2 -lipkg
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 !isEmpty( LIBIPK_INC_DIR ) {
    INCLUDEPATH = $$LIBIPK_INC_DIR $$INCLUDEPATH
 }
 !isEmpty( LIBIPK_LIB_DIR ) {
    LIBS = -L$$LIBIPK_LIB_DIR $$LIBS
 }
diff --git a/noncore/settings/sound/sound.pro b/noncore/settings/sound/sound.pro
index dde608d..4a66be5 100644
--- a/noncore/settings/sound/sound.pro
+++ b/noncore/settings/sound/sound.pro
@@ -1,290 +1,9 @@
 CONFIG      += qt warn_on quick-app
 HEADERS     = soundsettings.h soundsettingsbase.h
 SOURCES     = soundsettings.cpp soundsettingsbase.cpp main.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2
 TARGET      = sound
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/sshkeys/sshkeys.pro b/noncore/settings/sshkeys/sshkeys.pro
index 5b9a298..7968637 100644
--- a/noncore/settings/sshkeys/sshkeys.pro
+++ b/noncore/settings/sshkeys/sshkeys.pro
@@ -1,294 +1,10 @@
 CONFIG += qt quick-app
 HEADERS = sshkeys.h
 SOURCES = main.cpp sshkeys.cpp
 TARGET = sshkeys
 INTERFACES = sshkeysbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH += $(OPIEDIR)/include
 LIBS += -lqpe -lopiecore2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/sysinfo/sysinfo.pro b/noncore/settings/sysinfo/sysinfo.pro
index 8143714..46d6117 100644
--- a/noncore/settings/sysinfo/sysinfo.pro
+++ b/noncore/settings/sysinfo/sysinfo.pro
@@ -24,304 +24,13 @@ SOURCES   = main.cpp \
      benchmarkinfo.cpp \
      sysloginfo.cpp \
      versioninfo.cpp \
      sysinfo.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2 -lopieui2
 DEFINES     += UNIX
 TARGET    = sysinfo
 VERSION   = 1.2.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/tabmanager/tabmanager.pro b/noncore/settings/tabmanager/tabmanager.pro
index 09dc0bf..fa91d99 100644
--- a/noncore/settings/tabmanager/tabmanager.pro
+++ b/noncore/settings/tabmanager/tabmanager.pro
@@ -1,305 +1,10 @@
        CONFIG  = qt quick-app
        HEADERS         = tabmanager.h tabmainwindow.h tablistview.h tabmanagerbase.h tabapplnk.h
        SOURCES         = main.cpp tabmanager.cpp tabmanagerbase.cpp
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
        LIBS    += -lqpe -lopiecore2
        INTERFACES= app.ui wait.ui
        TARGET  = tabmanager
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/usermanager/usermanager.pro b/noncore/settings/usermanager/usermanager.pro
index 991307d..efdf963 100644
--- a/noncore/settings/usermanager/usermanager.pro
+++ b/noncore/settings/usermanager/usermanager.pro
@@ -1,302 +1,9 @@
 CONFIG         = qt warn_on quick-app
 HEADERS        = usermanager.h userdialog.h groupdialog.h passwd.h
 SOURCES        = usermanager.cpp userdialog.cpp groupdialog.cpp passwd.cpp main.cpp
 INCLUDEPATH    += $(OPIEDIR)/include
 DEPENDPATH     += $(OPIEDIR)/include
 LIBS           += -lqpe -lopiecore2 -lopieui2 -lcrypt
 TARGET         = usermanager
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )