56 files changed, 56 insertions, 2131 deletions
diff --git a/core/applets/aboutapplet/aboutapplet.pro b/core/applets/aboutapplet/aboutapplet.pro
index df59316..f12f7fd 100644
--- a/core/applets/aboutapplet/aboutapplet.pro
+++ b/core/applets/aboutapplet/aboutapplet.pro
@@ -1,51 +1,14 @@
 TEMPLATE      = lib
 CONFIG       += qt plugin warn_on 
 HEADERS       = about.h
 SOURCES       = about.cpp
 INTERFACES    = widget.ui
 TARGET        = aboutapplet
 DESTDIR       = $(OPIEDIR)/plugins/applets
 INCLUDEPATH  += $(OPIEDIR)/include
 DEPENDPATH   += $(OPIEDIR)/include
 LIBS         += -lqpe
 VERSION       = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/batteryapplet/batteryapplet.pro b/core/applets/batteryapplet/batteryapplet.pro
index 4bd8e91..ccab947 100644
--- a/core/applets/batteryapplet/batteryapplet.pro
+++ b/core/applets/batteryapplet/batteryapplet.pro
@@ -1,55 +1,13 @@
        TEMPLATE= lib
        CONFIG  += qt plugin warn_on 
        HEADERS=   battery.h batterystatus.h
        SOURCES=   battery.cpp batterystatus.cpp
        TARGET  = batteryapplet
        DESTDIR         = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      +=  ..
 LIBS            += -lqpe -lopiecore2
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/cardmon/cardmon.pro b/core/applets/cardmon/cardmon.pro
index b68ffd2..1ca30f2 100644
--- a/core/applets/cardmon/cardmon.pro
+++ b/core/applets/cardmon/cardmon.pro
@@ -1,71 +1,13 @@
        TEMPLATE= lib
        CONFIG  += qt plugin warn_on 
        HEADERS         =cardmon.h
        SOURCES         =cardmon.cpp
        TARGET  = cardmonapplet
        DESTDIR         = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include ../launcher
 LIBS            += -lqpe -lopiecore2
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/clipboardapplet/clipboardapplet.pro b/core/applets/clipboardapplet/clipboardapplet.pro
index df4643a..647598d 100644
--- a/core/applets/clipboardapplet/clipboardapplet.pro
+++ b/core/applets/clipboardapplet/clipboardapplet.pro
@@ -1,61 +1,13 @@
        TEMPLATE= lib
        CONFIG  += qt plugin warn_on 
        HEADERS         =   clipboard.h
        SOURCES         =   clipboard.cpp
        TARGET  = clipboardapplet
        DESTDIR         = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += 
 LIBS            += -lqpe
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/clockapplet/clockapplet.pro b/core/applets/clockapplet/clockapplet.pro
index 28b2332..910f44b 100644
--- a/core/applets/clockapplet/clockapplet.pro
+++ b/core/applets/clockapplet/clockapplet.pro
@@ -1,74 +1,13 @@
        TEMPLATE= lib
        CONFIG  += qt plugin warn_on 
        HEADERS         = clock.h
        SOURCES         = clock.cpp
        TARGET  = clockapplet
        DESTDIR         = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      +=  ..
 LIBS            += -lqpe
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/homeapplet/homeapplet.pro b/core/applets/homeapplet/homeapplet.pro
index 5deb9ae..a8db61f 100644
--- a/core/applets/homeapplet/homeapplet.pro
+++ b/core/applets/homeapplet/homeapplet.pro
@@ -1,69 +1,13 @@
 TEMPLATE      = lib
 CONFIG       += qt plugin warn_on 
 HEADERS       = home.h
 SOURCES       = home.cpp
 TARGET        = homeapplet
 DESTDIR       = $(OPIEDIR)/plugins/applets
 INCLUDEPATH  += $(OPIEDIR)/include
 DEPENDPATH   += $(OPIEDIR)/include
 LIBS         += -lqpe
 VERSION       = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/irdaapplet/irdaapplet.pro b/core/applets/irdaapplet/irdaapplet.pro
index 920ff4b..095c13c 100644
--- a/core/applets/irdaapplet/irdaapplet.pro
+++ b/core/applets/irdaapplet/irdaapplet.pro
@@ -1,75 +1,13 @@
        TEMPLATE  = lib
        CONFIG    += qt plugin warn_on 
        HEADERS = irda.h
        SOURCES = irda.cpp
        TARGET    = irdaapplet
        DESTDIR   = $(OPIEDIR)/plugins/applets
        INCLUDEPATH+= $(OPIEDIR)/include
 DEPENDPATH      += 
 LIBS            += -lqpe
 VERSION   = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/lockapplet/lockapplet.pro b/core/applets/lockapplet/lockapplet.pro
index 2be6066..ce4761c 100644
--- a/core/applets/lockapplet/lockapplet.pro
+++ b/core/applets/lockapplet/lockapplet.pro
@@ -1,64 +1,12 @@
 TEMPLATE      = lib
 CONFIG       += qt plugn warn_on 
 HEADERS       = lock.h
 SOURCES       = lock.cpp
 TARGET        = lockapplet
 DESTDIR       = $(OPIEDIR)/plugins/applets
 INCLUDEPATH  += $(OPIEDIR)/include
 DEPENDPATH   += $(OPIEDIR)/include
 LIBS         += -lqpe -lopiesecurity2
 VERSION       = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/applets/logoutapplet/logoutapplet.pro b/core/applets/logoutapplet/logoutapplet.pro
index e93dc0b..23cab02 100644
--- a/core/applets/logoutapplet/logoutapplet.pro
+++ b/core/applets/logoutapplet/logoutapplet.pro
@@ -1,63 +1,13 @@
 TEMPLATE      = lib
 CONFIG       += qt plugin warn_on 
 HEADERS       = logout.h
 SOURCES       = logout.cpp
 TARGET        = logoutapplet
 DESTDIR       = $(OPIEDIR)/plugins/applets
 INCLUDEPATH  += $(OPIEDIR)/include
 DEPENDPATH   += $(OPIEDIR)/include
 LIBS         += -lqpe
 VERSION       = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/multikeyapplet/multikeyapplet.pro b/core/applets/multikeyapplet/multikeyapplet.pro
index 571f4ab..de0f34e 100644
--- a/core/applets/multikeyapplet/multikeyapplet.pro
+++ b/core/applets/multikeyapplet/multikeyapplet.pro
@@ -1,58 +1,13 @@
        TEMPLATE= lib
        CONFIG  += qt plugin warn_on 
        HEADERS=   multikey.h
        SOURCES=   multikey.cpp
        TARGET  = multikeyapplet
        DESTDIR         = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      +=  ..
 LIBS            += -lqpe
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/restartapplet/restartapplet.pro b/core/applets/restartapplet/restartapplet.pro
index e616112..5589040 100644
--- a/core/applets/restartapplet/restartapplet.pro
+++ b/core/applets/restartapplet/restartapplet.pro
@@ -4,71 +4,14 @@ HEADERS =   restart.h restartappletimpl.h
 SOURCES =   restart.cpp restartappletimpl.cpp
 TARGET    = restartapplet
 DESTDIR   = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += 
 LIBS            += -lqpe
 VERSION   = 1.0.0
 MOC_DIR=opieobj
 OBJECTS_DIR=opieobj
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/restartapplet2/restartapplet.pro b/core/applets/restartapplet2/restartapplet.pro
index 8e13235..60d34f2 100644
--- a/core/applets/restartapplet2/restartapplet.pro
+++ b/core/applets/restartapplet2/restartapplet.pro
@@ -4,55 +4,14 @@ HEADERS =   restart.h
 SOURCES =   restart.cpp
 TARGET    = restartapplet2
 DESTDIR   = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
 VERSION   = 1.0.0
 MOC_DIR=opieobj
 OBJECTS_DIR=opieobj
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/rotateapplet/rotateapplet.pro b/core/applets/rotateapplet/rotateapplet.pro
index ce95406..67a0173 100644
--- a/core/applets/rotateapplet/rotateapplet.pro
+++ b/core/applets/rotateapplet/rotateapplet.pro
@@ -1,57 +1,13 @@
 TEMPLATE      = lib
 CONFIG       += qt plugn warn_on 
 HEADERS       = rotate.h
 SOURCES       = rotate.cpp
 TARGET        = rotateapplet
 DESTDIR       = $(OPIEDIR)/plugins/applets
 INCLUDEPATH  += $(OPIEDIR)/include
 DEPENDPATH   += $(OPIEDIR)/include
 LIBS         += -lqpe -lopiecore2
 VERSION       = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/screenshotapplet/screenshotapplet.pro b/core/applets/screenshotapplet/screenshotapplet.pro
index 5da3cf3..fe8299e 100644
--- a/core/applets/screenshotapplet/screenshotapplet.pro
+++ b/core/applets/screenshotapplet/screenshotapplet.pro
@@ -1,73 +1,13 @@
 TEMPLATE  = lib
 CONFIG    += qt plugin warn_on 
 HEADERS   = screenshot.h inputDialog.h
 SOURCES   = screenshot.cpp inputDialog.cpp
 TARGET    = screenshotapplet
 DESTDIR   = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += 
 LIBS            += -lqpe
 VERSION   = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/suspendapplet/suspendapplet.pro b/core/applets/suspendapplet/suspendapplet.pro
index df2c882..6607383 100644
--- a/core/applets/suspendapplet/suspendapplet.pro
+++ b/core/applets/suspendapplet/suspendapplet.pro
@@ -1,67 +1,13 @@
 TEMPLATE      = lib
 CONFIG       += qt plugin warn_on 
 HEADERS       = suspend.h
 SOURCES       = suspend.cpp
 TARGET        = suspendapplet
 DESTDIR       = $(OPIEDIR)/plugins/applets
 INCLUDEPATH  += $(OPIEDIR)/include
 DEPENDPATH   += $(OPIEDIR)/include
 LIBS         += -lqpe
 VERSION       = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/vmemo/vmemo.pro b/core/applets/vmemo/vmemo.pro
index 44d6656..abec478 100644
--- a/core/applets/vmemo/vmemo.pro
+++ b/core/applets/vmemo/vmemo.pro
@@ -1,52 +1,13 @@
 TEMPLATE  = lib
 CONFIG    += qt plugin warn_on 
 HEADERS =   vmemo.h adpcm.h
 SOURCES =   vmemo.cpp adpcm.c
 TARGET    = vmemoapplet
 DESTDIR   =$(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
 VERSION   = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/volumeapplet/volumeapplet.pro b/core/applets/volumeapplet/volumeapplet.pro
index eb75e9c..a76bafb 100644
--- a/core/applets/volumeapplet/volumeapplet.pro
+++ b/core/applets/volumeapplet/volumeapplet.pro
@@ -1,72 +1,13 @@
        TEMPLATE= lib
        CONFIG  += qt plugin warn_on 
        HEADERS         = volume.h oledbox.h
        SOURCES         = volume.cpp oledbox.cpp
        TARGET  = volumeapplet
        DESTDIR         = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += 
 LIBS            += -lqpe -lopiecore2
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/vtapplet/vtapplet.pro b/core/applets/vtapplet/vtapplet.pro
index 90fc82a..6c4873c 100644
--- a/core/applets/vtapplet/vtapplet.pro
+++ b/core/applets/vtapplet/vtapplet.pro
@@ -1,60 +1,13 @@
 TEMPLATE      = lib
 CONFIG       += qt warn_on 
 HEADERS       = vt.h
 SOURCES       = vt.cpp
 TARGET        = vtapplet
 DESTDIR       = $(OPIEDIR)/plugins/applets
 INCLUDEPATH  += $(OPIEDIR)/include
 DEPENDPATH   += $(OPIEDIR)/include
 LIBS         += -lqpe
 VERSION       = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/apps/calibrate/calibrate.pro b/core/apps/calibrate/calibrate.pro
index fcc0ba3..28c7f4a 100644
--- a/core/apps/calibrate/calibrate.pro
+++ b/core/apps/calibrate/calibrate.pro
@@ -1,34 +1,11 @@
        TEMPLATE= app
        CONFIG  = qt warn_on 
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = calibrate.h
        SOURCES         = calibrate.cpp main.cpp
        INCLUDEPATH+= $(QTDIR)/include $(OPIEDIR)/include
        DEPENDPATH+= $(QTDIR)/include $(OPIEDIR)/include
        TARGET  = calibrate
        LIBS    += -lqpe 
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/apps/embeddedkonsole/embeddedkonsole.pro b/core/apps/embeddedkonsole/embeddedkonsole.pro
index 018576f..449d609 100755
--- a/core/apps/embeddedkonsole/embeddedkonsole.pro
+++ b/core/apps/embeddedkonsole/embeddedkonsole.pro
@@ -27,40 +27,13 @@ SOURCES   = TEScreen.cpp \
      main.cpp
 INTERFACES =  commandeditdialogbase.ui smallcommandeditdialogbase.ui
 TARGET    = embeddedkonsole
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 DEFINES     += QT_QWS_OPIE HAVE_OPENPTY
 LIBS        += -lqpe -lopiecore2 -lqtaux2 -lutil
 #DEFINES     += HAVE_OPENPTY
 #LIBS        += -lqpe -lutil
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/apps/helpbrowser/helpbrowser.pro b/core/apps/helpbrowser/helpbrowser.pro
index 9627819..2a275b4 100644
--- a/core/apps/helpbrowser/helpbrowser.pro
+++ b/core/apps/helpbrowser/helpbrowser.pro
@@ -1,36 +1,11 @@
 CONFIG    += qt warn_on  quick-app
        HEADERS         = helpbrowser.h magictextbrowser.h
        SOURCES         = helpbrowser.cpp magictextbrowser.cpp \
                  main.cpp
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2
        INTERFACES=
 TARGET          = helpbrowser
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/apps/oapp/oapp.pro b/core/apps/oapp/oapp.pro
index db52c13..9a09ee1 100644
--- a/core/apps/oapp/oapp.pro
+++ b/core/apps/oapp/oapp.pro
@@ -6,29 +6,13 @@ VERSION		= 1.0.0
        LIBS    += -lqpe
        HEADERS         = \
                  oappplugin.h \
                  oappinterface.h
        SOURCES         = \
                  oappplugin.cpp
        DESTDIR         = $(OPIEDIR)/lib$(PROJMAK)
        INCLUDEPATH+= $(OPIEDIR)/include 
        DEPENDPATH+= $(OPIEDIR)/include .
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/apps/qcop/qcop.pro b/core/apps/qcop/qcop.pro
index 5e9c735..8cb1b55 100644
--- a/core/apps/qcop/qcop.pro
+++ b/core/apps/qcop/qcop.pro
@@ -1,30 +1,12 @@
        TEMPLATE= app
        CONFIG  = qt warn_on 
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = 
        SOURCES         = main.cpp
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
        INTERFACES= 
        TARGET  = qcop
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/apps/taboapp/taboapp.pro b/core/apps/taboapp/taboapp.pro
index 645cc04..473007e 100644
--- a/core/apps/taboapp/taboapp.pro
+++ b/core/apps/taboapp/taboapp.pro
@@ -5,32 +5,13 @@ DESTDIR		= $(OPIEDIR)/bin
        SOURCES         = main.cpp
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include .
        TARGET  = taboapp
        LIBS    += -lqpe -lopiecore2 -lopieui2 -loapp
        INCLUDEPATH+= $(OPIEDIR)/core/apps/oapp
        DEPENDPATH+= $(OPIEDIR)/core/apps/oapp
        MOC_DIR         = .build
        OBJECTS_DIR= .build
        UI_DIR  = .build
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/apps/textedit/textedit.pro b/core/apps/textedit/textedit.pro
index 7ec124f..f5786f1 100644
--- a/core/apps/textedit/textedit.pro
+++ b/core/apps/textedit/textedit.pro
@@ -1,30 +1,9 @@
 CONFIG    += qt warn_on  quick-app
 HEADERS = textedit.h filePermissions.h
 SOURCES = main.cpp textedit.cpp filePermissions.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2 -lopieui2
 TARGET    = textedit
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/launcher/server.pro b/core/launcher/server.pro
index 901a80f..e7c5bfd 100644
--- a/core/launcher/server.pro
+++ b/core/launcher/server.pro
@@ -77,84 +77,13 @@ INCLUDEPATH += $(OPIEDIR)/noncore/settings/mediummount
 DEPENDPATH  += $(OPIEDIR)/noncore/settings/mediummount
 LIBS        += -lqpe -lopiecore2 -lopieui2 -lopiesecurity2 -lqrsync
 TARGET       = qpe
 ## not ready for use yet
 # DEFINES += QPE_HAVE_DIRECT_ACCESS
 contains( $(CONFIG_TARGET_MACOSX), y ) {
  LIBS += -lcrypt
 }
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/multimedia/opieplayer/libflash/libflash.pro b/core/multimedia/opieplayer/libflash/libflash.pro
index ac3cd8c..1acd41e 100644
--- a/core/multimedia/opieplayer/libflash/libflash.pro
+++ b/core/multimedia/opieplayer/libflash/libflash.pro
@@ -4,47 +4,13 @@ HEADERS		=   libflashplugin.h   libflashpluginimpl.h
        SOURCES         =   libflashplugin.cpp libflashpluginimpl.cpp \
                    adpcm.cc character.cc flash.cc graphic16.cc matrix.cc script.cc \
                    sprite.cc bitmap.cc cxform.cc font.cc graphic24.cc movie.cc \
                    shape.cc sqrt.cc button.cc displaylist.cc graphic.cc graphic32.cc \
                    program.cc sound.cc text.cc
        TARGET  =   flashplugin
        DESTDIR         =   ../../plugins/codecs
 INCLUDEPATH += $(OPIEDIR)/include ..
 DEPENDPATH      +=   ..
 LIBS            +=  -lqpe
        VERSION         =   1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/multimedia/opieplayer/libmad/libmad.pro b/core/multimedia/opieplayer/libmad/libmad.pro
index 21d3ffd..46af87f 100644
--- a/core/multimedia/opieplayer/libmad/libmad.pro
+++ b/core/multimedia/opieplayer/libmad/libmad.pro
@@ -2,59 +2,25 @@ TEMPLATE 	= lib
        CONFIG   +=  qt warn_on 
        HEADERS   = libmad_version.h fixed.h bit.h timer.h stream.h frame.h synth.h decoder.h \
                layer12.h layer3.h huffman.h libmad_global.h mad.h libmadplugin.h libmadpluginimpl.h
        SOURCES   = version.c fixed.c bit.c timer.c stream.c frame.c synth.c decoder.c \
                layer12.c layer3.c huffman.c libmadplugin.cpp libmadpluginimpl.cpp
        TARGET   = madplugin
        DESTDIR   = $(OPIEDIR)/plugins/codecs
 INCLUDEPATH += $(OPIEDIR)/include ..
 DEPENDPATH      +=  ..
 LIBS            += -lqpe -lm
 VERSION   =   1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
        
 DEFINES += FPM_INTEL
 system(echo $QMAKESPEC | grep -s sharp) {
        DEFINES -= FPM_INTEL
        DEFINES += FPM_ARM
 }
 system(echo $QMAKESPEC | grep -s ipaq) {
        DEFINES -= FPM_INTEL
        DEFINES += FPM_ARM
 }
diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
index 8211182..12ea25e 100644
--- a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
+++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
@@ -37,47 +37,13 @@ SOURCES   =   libmpeg3plugin.cpp libmpeg3pluginimpl.cpp \
        video/reconstruct.c \
        video/seek.c \
        video/slice.c \
        video/vlc.c
 TARGET    =   mpeg3plugin
 TMAKE_CC=$(CXX)
 DESTDIR   =   $(OPIEDIR)/plugins/codecs
 INCLUDEPATH += $(OPIEDIR)/include ..
 DEPENDPATH      +=   ..
 LIBS            +=  -lqpe -lpthread -lm
 VERSION   =   1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/multimedia/opieplayer/modplug/modplug.pro b/core/multimedia/opieplayer/modplug/modplug.pro
index d6c4522..7cd309e 100644
--- a/core/multimedia/opieplayer/modplug/modplug.pro
+++ b/core/multimedia/opieplayer/modplug/modplug.pro
@@ -11,43 +11,13 @@ SOURCES	        =   fastmix.cpp load_669.cpp load_amf.cpp load_ams.cpp \
                    snd_flt.cpp snd_fx.cpp sndfile.cpp sndmix.cpp tables.cpp \
                    memfile.cpp
        TARGET  =   modplugin
        DESTDIR         =   $(OPIEDIR)/plugins/codecs
        INCLUDEPATH +=  $(OPIEDIR)/include
 DEPENDPATH      +=  $(OPIEDIR)/include
 LIBS            +=  -lqpe -lm 
        VERSION         =   1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/multimedia/opieplayer/opieplayer.pro b/core/multimedia/opieplayer/opieplayer.pro
index a13ba38..fa845bc 100644
--- a/core/multimedia/opieplayer/opieplayer.pro
+++ b/core/multimedia/opieplayer/opieplayer.pro
@@ -9,47 +9,13 @@ HEADERS   = loopcontrol.h mediaplayerplugininterface.h \
 SOURCES   = main.cpp \
      loopcontrol.cpp playlistselection.cpp mediaplayerstate.cpp \
      videowidget.cpp audiowidget.cpp playlistwidget.cpp \
      mediaplayer.cpp audiodevice.cpp inputDialog.cpp om3u.cpp
 TARGET    = opieplayer
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lpthread -lopiecore2 -lopieui2 -lqtaux2
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/multimedia/opieplayer/vorbis/libtremor.pro b/core/multimedia/opieplayer/vorbis/libtremor.pro
index 4a9f08b..5b96400 100644
--- a/core/multimedia/opieplayer/vorbis/libtremor.pro
+++ b/core/multimedia/opieplayer/vorbis/libtremor.pro
@@ -1,46 +1,12 @@
 TEMPLATE  =   lib
 CONFIG    +=  qt warn_on 
 HEADERS   =   libtremorplugin.h libtremorinimpl.h
 SOURCES         =   libtremorplugin.cpp libtremorpluginimpl.cpp
 TARGET    =   tremorplugin
 DESTDIR   =   $(OPIEDIR)/plugins/codecs
 INCLUDEPATH += $(OPIEDIR)/include .. tremor
 DEPENDPATH      +=  $(OPIEDIR)/include .. tremor 
 LIBS            +=  -lqpe -lm -ltremor
 #-lvorbisidec
 VERSION   =   1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/multimedia/opieplayer/vorbis/tremor/tremor.pro b/core/multimedia/opieplayer/vorbis/tremor/tremor.pro
index 4a3d017..7163c28 100644
--- a/core/multimedia/opieplayer/vorbis/tremor/tremor.pro
+++ b/core/multimedia/opieplayer/vorbis/tremor/tremor.pro
@@ -31,47 +31,13 @@ SOURCES   = bitwise.c \
      sharedbook.c \
      synthesis.c \
      vorbisfile.c \
      window.c
 INTERFACES  = 
 DESTDIR      = $(OPIEDIR)/lib$(PROJMAK)
 #DESTDIR   =   $(OPIEDIR)/root/usr/lib
 INCLUDEPATH += $(OPIEDIR)/include ..
 DEPENDPATH      +=  $(OPIEDIR)/include ..
 #LIBS            +=  -lqpe
 VERSION   =   1.0.0
 QMAKE_LINK=$$QMAKE_CC
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/multimedia/opieplayer/vorbis/vorbis.pro b/core/multimedia/opieplayer/vorbis/vorbis.pro
index 3b577bd..f7995d0 100644
--- a/core/multimedia/opieplayer/vorbis/vorbis.pro
+++ b/core/multimedia/opieplayer/vorbis/vorbis.pro
@@ -1,45 +1,11 @@
 TEMPLATE  =   lib
 CONFIG    +=  qt warn_on 
 HEADERS   =   libtremorplugin.h libtremorpluginimpl.h
 SOURCES         =   libtremorplugin.cpp libtremorpluginimpl.cpp
 TARGET    =   tremorplugin
 DESTDIR   =   $(OPIEDIR)/plugins/codecs
 INCLUDEPATH += $(OPIEDIR)/include .. tremor
 DEPENDPATH      +=  $(OPIEDIR)/include .. tremor 
 LIBS            +=  -lqpe -lm -ltremor
 VERSION   =   1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/multimedia/opieplayer/wavplugin/wavplugin.pro b/core/multimedia/opieplayer/wavplugin/wavplugin.pro
index 0ab1a39..da89490 100644
--- a/core/multimedia/opieplayer/wavplugin/wavplugin.pro
+++ b/core/multimedia/opieplayer/wavplugin/wavplugin.pro
@@ -1,46 +1,12 @@
        TEMPLATE=   lib
        CONFIG  +=  qt plugin warn_on 
        HEADERS         =   wavplugin.h wavpluginimpl.h
        SOURCES        =   wavplugin.cpp wavpluginimpl.cpp
        TARGET  =   wavplugin
        DESTDIR         =   $(OPIEDIR)/plugins/codecs
 INCLUDEPATH += $(OPIEDIR)/include ..
 DEPENDPATH      +=   ..
 LIBS            +=  -lqpe
        VERSION         =   1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/obex/obex.pro b/core/obex/obex.pro
index 8291d53..4e72bc4 100644
--- a/core/obex/obex.pro
+++ b/core/obex/obex.pro
@@ -1,40 +1,13 @@
        TEMPLATE= lib
        CONFIG  += qt warn_on 
        HEADERS=   obex.h obexhandler.h obexsend.h receiver.h obeximpl.h
        SOURCES=   obex.cc obexsend.cpp obexhandler.cpp receiver.cpp obeximpl.cpp
        TARGET  = opieobex
        DESTDIR         = $(OPIEDIR)/plugins/obex
 INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/core/launcher
 DEPENDPATH      += 
 LIBS            += -lqpe -lopiecore2
        VERSION         = 0.0.2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/opie-login/opie-login.pro b/core/opie-login/opie-login.pro
index 1a75196..ae3fb50 100644
--- a/core/opie-login/opie-login.pro
+++ b/core/opie-login/opie-login.pro
@@ -15,44 +15,16 @@ SOURCES     = loginwindowimpl.cpp  \
              main.cpp
 INTERFACES  = loginwindow.ui passworddialog.ui
 INCLUDEPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate
 DEPENDPATH  += $(OPIEDIR)/include ../launcher ../apps/calibrate
 LIBS        += -lqpe -lopiecore2
 DESTDIR     = $(OPIEDIR)/bin
 TARGET      = opie-login
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 OPIELOGIN_USEPAM:LIBS += -lpam
 OPIELOGIN_USEPAM:DEFINES += USEPAM
diff --git a/core/pim/addressbook/addressbook.pro b/core/pim/addressbook/addressbook.pro
index 2c50bb4..ca9636a 100644
--- a/core/pim/addressbook/addressbook.pro
+++ b/core/pim/addressbook/addressbook.pro
@@ -18,27 +18,13 @@ SOURCES	= main.cpp \
                  picker.cpp \
                  configdlg.cpp \
                  abconfig.cpp \
                  abview.cpp \
                  namelineedit.cpp
        INTERFACES= configdlg_base.ui
        TARGET  = addressbook
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2 -lopieui2 -lopiepim2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/pim/datebook/datebook.pro b/core/pim/datebook/datebook.pro
index 00f0374..9e381ce 100644
--- a/core/pim/datebook/datebook.pro
+++ b/core/pim/datebook/datebook.pro
@@ -29,21 +29,13 @@ INTERFACES	= dateentry.ui \
                  datebookdayheader.ui \
                  datebookweekheader.ui \
                  datebookweeklstheader.ui \
                  datebookweeklstdayhdr.ui \
                  repeatentrybase.ui \
                  datebooksettingsbase.ui \
                  noteentry.ui
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopieui2 -lopiecore2 -lopiepim2
        TARGET  = datebook
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/pim/datebook2/datebook2.pro b/core/pim/datebook2/datebook2.pro
index 6a209bb..d09e104 100644
--- a/core/pim/datebook2/datebook2.pro
+++ b/core/pim/datebook2/datebook2.pro
@@ -17,25 +17,13 @@ SOURCES	= main.cpp \
          bookmanager.cpp \
          stringmanager.cpp \
          templatemanager.cpp \
          show.cpp \
          view.cpp \
          editor.cpp
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
        TARGET  = datebook2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/pim/osearch/osearch.pro b/core/pim/osearch/osearch.pro
index 0e4d926..20ce7d6 100644
--- a/core/pim/osearch/osearch.pro
+++ b/core/pim/osearch/osearch.pro
@@ -27,29 +27,13 @@ HEADERS += mainwindow.h \
           contactitem.h \
           eventitem.h \
           applnksearch.h \
           applnkitem.h \
           doclnkitem.h \
           doclnksearch.h 
        TARGET= osearch
 INCLUDEPATH = $(OPIEDIR)/include
 DEPENDPATH += $(OPIEDIR)/include
 LIBS += -lqpe -lopiecore2 -lopiepim2 -lopieui2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/pim/today/plugins/addressbook/addressbook.pro b/core/pim/today/plugins/addressbook/addressbook.pro
index b884350..8dc2b09 100644
--- a/core/pim/today/plugins/addressbook/addressbook.pro
+++ b/core/pim/today/plugins/addressbook/addressbook.pro
@@ -9,23 +9,13 @@ SOURCES = addressplugin.cpp addresspluginimpl.cpp addresspluginconfig.cpp \
    addresspluginwidget.cpp
 INCLUDEPATH     += $(OPIEDIR)/include \
        ../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
        ../ ../library
 LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lqtaux2
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todayaddressbookplugin
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/pim/today/plugins/datebook/datebook.pro b/core/pim/today/plugins/datebook/datebook.pro
index 383c0bd..7cf038c 100644
--- a/core/pim/today/plugins/datebook/datebook.pro
+++ b/core/pim/today/plugins/datebook/datebook.pro
@@ -9,23 +9,13 @@ SOURCES = datebookplugin.cpp datebookpluginimpl.cpp datebookpluginconfig.cpp \
 INTERFACES = datebookpluginconfigbase.ui
 INCLUDEPATH     += $(OPIEDIR)/include \
                ../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
                ../ ../library
 LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todaydatebookplugin
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/pim/today/plugins/mail/mail.pro b/core/pim/today/plugins/mail/mail.pro
index 15f9990..93bf969 100644
--- a/core/pim/today/plugins/mail/mail.pro
+++ b/core/pim/today/plugins/mail/mail.pro
@@ -7,23 +7,13 @@ HEADERS = mailplugin.h mailpluginimpl.h mailpluginwidget.h
 SOURCES = mailplugin.cpp mailpluginimpl.cpp mailpluginwidget.cpp
 INCLUDEPATH     += $(OPIEDIR)/include \
                ../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
                ../ ../library
 LIBS+= -lqpe -lopiecore2 -lopiepim2
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todaymailplugin
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/pim/today/plugins/todolist/todolist.pro b/core/pim/today/plugins/todolist/todolist.pro
index 82d4018..8d41222 100644
--- a/core/pim/today/plugins/todolist/todolist.pro
+++ b/core/pim/today/plugins/todolist/todolist.pro
@@ -10,23 +10,13 @@ SOURCES = todoplugin.cpp todopluginimpl.cpp todopluginconfig.cpp \
 INTERFACES= todopluginconfigbase.ui
 INCLUDEPATH     += $(OPIEDIR)/include \
                ../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
                ../ ../library
 LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todaytodolistplugin
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/pim/today/today.pro b/core/pim/today/today.pro
index 453eef9..4ee3514 100644
--- a/core/pim/today/today.pro
+++ b/core/pim/today/today.pro
@@ -2,24 +2,14 @@ TEMPLATE	= app
        CONFIG  += qt warn on  quick-app
        HEADERS         = today.h todaybase.h todayconfig.h
        SOURCES         = today.cpp todaybase.cpp todayconfig.cpp main.cpp
 INTERFACES = todayconfigmiscbase.ui
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2 -lopiepim2 -lopieui2 
        TARGET  = today
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/pim/todo/todo.pro b/core/pim/todo/todo.pro
index aae0a95..6c082cf 100644
--- a/core/pim/todo/todo.pro
+++ b/core/pim/todo/todo.pro
@@ -37,19 +37,13 @@ SOURCES	= smalltodo.cpp \
          quickeditimpl.cpp \
          quickedit.cpp \
          otaskeditor.cpp \
          taskeditoroverview.cpp \
          taskeditorstatus.cpp \
          taskeditoralarms.cpp
        TARGET  = todolist
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2 -lopieui2 -lopiepim2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/qws/qws.pro b/core/qws/qws.pro
index 594ceb2..730fc3a 100644
--- a/core/qws/qws.pro
+++ b/core/qws/qws.pro
@@ -8,29 +8,13 @@ HEADERS		= \
                  oqwsserver.h
        SOURCES         = \
                  main.cpp \
                  transferserver.cpp \
                  qcopbridge.cpp \
                  oqwsserver.cpp
        INCLUDEPATH+= $(OPIEDIR)/include 
        DEPENDPATH+= $(OPIEDIR)/include .
        TARGET  = qws
        LIBS    += -lqpe -lopiecore2 -lopieui2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/settings/button/button.pro b/core/settings/button/button.pro
index d9566c9..d7f2a5d 100644
--- a/core/settings/button/button.pro
+++ b/core/settings/button/button.pro
@@ -7,78 +7,13 @@ HEADERS      = buttonsettings.h \
 SOURCES      = main.cpp \
               buttonsettings.cpp \
               buttonutils.cpp \
               remapdlg.cpp
 INTERFACES   = remapdlgbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2
        TARGET     = buttonsettings
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/settings/citytime/citytime.pro b/core/settings/citytime/citytime.pro
index 7f4e823..26b76eb 100644
--- a/core/settings/citytime/citytime.pro
+++ b/core/settings/citytime/citytime.pro
@@ -1,79 +1,10 @@
 CONFIG += qt warn_on  quick-app
 HEADERS = citytime.h citytimebase.h zonemap.h sun.h stylusnormalizer.h
 SOURCES = citytime.cpp citytimebase.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2
        TARGET= citytime
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/settings/launcher/launcher.pro b/core/settings/launcher/launcher.pro
index 17da998..24ae675 100644
--- a/core/settings/launcher/launcher.pro
+++ b/core/settings/launcher/launcher.pro
@@ -16,84 +16,13 @@ SOURCES      = main.cpp \
               inputmethodsettings.cpp \
               doctabsettings.cpp \
               tabdialog.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2 -lopieui2 -lqtaux2
 TARGET       = launchersettings
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/settings/light-and-power/light-and-power.pro b/core/settings/light-and-power/light-and-power.pro
index 81bd1f5..e1f3cb1 100644
--- a/core/settings/light-and-power/light-and-power.pro
+++ b/core/settings/light-and-power/light-and-power.pro
@@ -1,74 +1,11 @@
        CONFIG  += qt warn_on  quick-app
        HEADERS         = light.h sensor.h calibration.h
        SOURCES         = light.cpp main.cpp sensor.cpp calibration.cpp
        INTERFACES= lightsettingsbase.ui sensorbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= 
 LIBS            += -lqpe -lopiecore2
        TARGET  = light-and-power
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/settings/security/demo/multiauth.pro b/core/settings/security/demo/multiauth.pro
index 8e71f66..ecf5803 100644
--- a/core/settings/security/demo/multiauth.pro
+++ b/core/settings/security/demo/multiauth.pro
@@ -3,81 +3,15 @@ CONFIG += qt warn_on
 HEADERS         =
 SOURCES         = main.cpp
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      +=
 LIBS            += -lqpe -lopiecore2 -lopieui2 -lopiesecurity2
 DESTDIR = $(OPIEDIR)/bin
 TARGET = multiauth
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/settings/security/security.pro b/core/settings/security/security.pro
index 2526c45..7fb0f5e 100644
--- a/core/settings/security/security.pro
+++ b/core/settings/security/security.pro
@@ -1,77 +1,10 @@
 CONFIG += qt warn_on quick-app
 HEADERS         = multiauthconfig.h
 SOURCES         = multiauthconfig.cpp main.cpp
        INTERFACES= loginbase.ui syncbase.ui
 INCLUDEPATH     += $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2 -lopieui2 -lopiesecurity2
 TARGET = security
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/symlinker/symlinker.pro b/core/symlinker/symlinker.pro
index a2349dc..5de86d2 100644
--- a/core/symlinker/symlinker.pro
+++ b/core/symlinker/symlinker.pro
@@ -2,49 +2,14 @@ TEMPLATE    = app
 CONFIG      += qt warn_on
 DESTDIR     = $(OPIEDIR)/bin
 HEADERS     =
 SOURCES     = main.cpp
 INTERFACES  =
 TARGET      = opie-update-symlinks
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include .
 LIBS            += -lqpe -lopiecore2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/tools/quicklauncher/quicklauncher.pro b/core/tools/quicklauncher/quicklauncher.pro
index 5171f38..3a7660c 100644
--- a/core/tools/quicklauncher/quicklauncher.pro
+++ b/core/tools/quicklauncher/quicklauncher.pro
@@ -3,41 +3,13 @@ CONFIG		+= qt warn_on
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = dropins.h
        SOURCES         = main.cpp
        INTERFACES= 
        INCLUDEPATH+= $(OPIEDIR)/include
        LIBS       += -lqpe -lopiecore2 -lopieui2
        TARGET  = quicklauncher
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )