Repair damage done by a broken replace program. Note to self: Never use anything other than sed!

Merry Christmas!
author: mickeyl <mickeyl> 2004-12-24 20:12:34 (UTC)
committer: mickeyl <mickeyl> 2004-12-24 20:12:34 (UTC)
commit: 15dc267bf93fd9d32cfa9a4c642d0b89761eda7d (patch) (unidiff)
tree: fc4014b9eb59dfddc61e55eadd7391f89fce1def
parent: c935fd64ef5892d32d3d55780f26643a47452752 (diff)
download: opie-15dc267bf93fd9d32cfa9a4c642d0b89761eda7d.zip
opie-15dc267bf93fd9d32cfa9a4c642d0b89761eda7d.tar.gz
opie-15dc267bf93fd9d32cfa9a4c642d0b89761eda7d.tar.bz2
274 files changed, 285 insertions, 55251 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
@@ -10,42 +10,5 @@ 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
@@ -9,47 +9,5 @@ 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
@@ -9,63 +9,5 @@ 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
@@ -9,53 +9,5 @@ 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
@@ -9,66 +9,5 @@ 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
@@ -9,61 +9,5 @@ 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
@@ -9,67 +9,5 @@ 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
@@ -9,56 +9,4 @@ 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
@@ -9,55 +9,5 @@ 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
@@ -9,50 +9,5 @@ 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
@@ -13,62 +13,5 @@ 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
@@ -13,46 +13,5 @@ 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
@@ -9,49 +9,5 @@ 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
@@ -9,65 +9,5 @@ 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
@@ -9,59 +9,5 @@ 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
@@ -9,44 +9,5 @@ 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
@@ -9,64 +9,5 @@ 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
@@ -9,52 +9,5 @@ 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
@@ -8,27 +8,4 @@ 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
@@ -36,31 +36,4 @@ 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
@@ -8,29 +8,4 @@ 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
@@ -15,20 +15,4 @@ 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
@@ -9,22 +9,4 @@ 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
@@ -14,23 +14,4 @@ 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
@@ -6,25 +6,4 @@ 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
@@ -86,75 +86,4 @@ 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
@@ -13,38 +13,4 @@ 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
@@ -11,41 +11,7 @@ DEPENDPATH      +=  ..
 LIBS            += -lqpe -lm
 VERSION   =   1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
        
 DEFINES += FPM_INTEL
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
@@ -46,38 +46,4 @@ 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
@@ -20,34 +20,4 @@ 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
@@ -18,38 +18,4 @@ 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
@@ -9,38 +9,4 @@ 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
@@ -40,38 +40,4 @@ 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
@@ -8,38 +8,4 @@ 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
@@ -9,38 +9,4 @@ 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
@@ -9,32 +9,5 @@ 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
@@ -24,35 +24,7 @@ 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
@@ -27,18 +27,4 @@ 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
@@ -38,12 +38,4 @@ 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
@@ -26,16 +26,4 @@ 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
@@ -36,20 +36,4 @@ 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
@@ -18,14 +18,4 @@ 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
@@ -18,14 +18,4 @@ 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
@@ -16,14 +16,4 @@ 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
@@ -19,14 +19,4 @@ 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
@@ -11,15 +11,5 @@ 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
@@ -46,10 +46,4 @@ 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
@@ -17,20 +17,4 @@ 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
@@ -16,69 +16,4 @@ 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
@@ -7,73 +7,4 @@ 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
@@ -25,75 +25,4 @@ 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
@@ -8,67 +8,4 @@ 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
@@ -12,72 +12,6 @@ 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
@@ -7,71 +7,4 @@ 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
@@ -11,40 +11,5 @@ 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
@@ -12,32 +12,4 @@ LIBS       	+= -lqpe -lopiecore2 -lopieui2
        TARGET  = quicklauncher
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/development/keyview/keyview.pro b/development/keyview/keyview.pro
index 02d2d28..e7df8a4 100644
--- a/development/keyview/keyview.pro
+++ b/development/keyview/keyview.pro
@@ -10,78 +10,4 @@ INTERFACES	=
        TARGET  = keyview
 DESTDIR     = $(OPIEDIR)/plugins/inputmethods
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/development/performance/performance.pro b/development/performance/performance.pro
index 1dc9155..6cc4514 100644
--- a/development/performance/performance.pro
+++ b/development/performance/performance.pro
@@ -7,80 +7,4 @@ INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lqte
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/examples/applet/example.pro b/examples/applet/example.pro
index 9312b9a..6890141 100644
--- a/examples/applet/example.pro
+++ b/examples/applet/example.pro
@@ -13,326 +13,4 @@ DEPENDSPATH += $(OPIEDIR)/include
 LIBS += -lqpe -lopieui2
-include(
+include( $(OPIEDIR)/include.pro ) 
- $(OPIEDIR)/include.pro ) 
diff --git a/examples/inputmethod/example.pro b/examples/inputmethod/example.pro
index 030a7c8..ea98dd5 100644
--- a/examples/inputmethod/example.pro
+++ b/examples/inputmethod/example.pro
@@ -9,333 +9,4 @@ DEPENDPATH      +=  ../../launcher
 LIBS            += -lqpe
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/examples/main-tab/example.pro b/examples/main-tab/example.pro
index 4e405b3..a0df875 100644
--- a/examples/main-tab/example.pro
+++ b/examples/main-tab/example.pro
@@ -14,324 +14,4 @@ DEPENDPATH  += $(OPIEDIR)/include
 # we now also include opie
 LIBS += -lqpe -lopieui2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/examples/menuapplet/menuapplet.pro b/examples/menuapplet/menuapplet.pro
index 839302d..1e20e78 100644
--- a/examples/menuapplet/menuapplet.pro
+++ b/examples/menuapplet/menuapplet.pro
@@ -9,322 +9,4 @@ DEPENDPATH   += $(OPIEDIR)/include
 LIBS         += -lqpe
 VERSION       = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/examples/networksettings/example.pro b/examples/networksettings/example.pro
index 70741b7..82e250f 100644
--- a/examples/networksettings/example.pro
+++ b/examples/networksettings/example.pro
@@ -11,332 +11,4 @@ VERSION        = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/examples/simple-icon/example.pro b/examples/simple-icon/example.pro
index 6dd993a..eda2692 100644
--- a/examples/simple-icon/example.pro
+++ b/examples/simple-icon/example.pro
@@ -13,328 +13,4 @@ DEPENDPATH  += $(OPIEDIR)/include
 LIBS += -lqpe 
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/examples/simple-main/example.pro b/examples/simple-main/example.pro
index ce12900..ded8ed2 100644
--- a/examples/simple-main/example.pro
+++ b/examples/simple-main/example.pro
@@ -14,330 +14,4 @@ DEPENDPATH  += $(OPIEDIR)/include
 LIBS += -lqpe 
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/examples/simple-pim/example.pro b/examples/simple-pim/example.pro
index 94ef029..f9c5304 100644
--- a/examples/simple-pim/example.pro
+++ b/examples/simple-pim/example.pro
@@ -14,335 +14,4 @@ DEPENDPATH  += $(OPIEDIR)/include
 # we now also include opie
 LIBS += -lqpe -lopiecore2 -lopiepim2 -lopieui2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/examples/simple/example.pro b/examples/simple/example.pro
index b424674..8f006f6 100644
--- a/examples/simple/example.pro
+++ b/examples/simple/example.pro
@@ -35,332 +35,4 @@ LIBS += -lqpe
 #Important include the global include.pro just like below
 
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/examples/todayplugin/example.pro b/examples/todayplugin/example.pro
index 1df3e38..0cd1103 100644
--- a/examples/todayplugin/example.pro
+++ b/examples/todayplugin/example.pro
@@ -14,333 +14,4 @@ LIBS+= -lqpe -lopieui2
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todayexampleplugin
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/freetype/freetype.pro b/freetype/freetype.pro
index 3cd0143..c409577 100644
--- a/freetype/freetype.pro
+++ b/freetype/freetype.pro
@@ -10,82 +10,4 @@ DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe -lfreetype -lopiecore2
        VERSION         = 1.0.1
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/include.pro b/include.pro
index a7f4439..f32786a 100644
--- a/include.pro
+++ b/include.pro
@@ -1,387 +1,4 @@
-include(
+include( $(OPIEDIR)/gen.pro )
- $(OPIEDIR)/gen.pro )
 # base opie install path
 # prefix = /opt/QtPalmtop ??? Why here (eilers) ???
@@ -401,7 +18,7 @@ contains( CONFIG, quick-app-lib ) {
    }
 }
-contains( CONFIG, quick-app-bin ) {
+contains ( CONFIG, quick-app-bin ) {
    TEMPLATE = app
    DESTDIR  = $(OPIEDIR)/bin
    DEFINES -= OPIE_APP_INTERFACE
@@ -516,387 +133,4 @@ MOC_DIR=.moc/$(PLATFORM)
 OBJECTS_DIR=.obj/$(PLATFORM)
 #was here now at thetop
-#include(
+#include( $(OPIEDIR)/gen.pro )
- $(OPIEDIR)/gen.pro )
diff --git a/inputmethods/dasher/dasher.pro b/inputmethods/dasher/dasher.pro
index f47ccfe..2381103 100644
--- a/inputmethods/dasher/dasher.pro
+++ b/inputmethods/dasher/dasher.pro
@@ -50,317 +50,7 @@ VERSION		= 1.0.0
        SUBDIRS         = DasherCore
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/inputmethods
diff --git a/inputmethods/dvorak/dvorak.pro b/inputmethods/dvorak/dvorak.pro
index 143b929..b659ab5 100644
--- a/inputmethods/dvorak/dvorak.pro
+++ b/inputmethods/dvorak/dvorak.pro
@@ -12,316 +12,5 @@ LIBS            += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard
        QMAKE_LFLAGS+= -Wl,-rpath,/opt/QtPalmtop/plugins/inputmethods
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/inputmethods
diff --git a/inputmethods/handwriting/handwriting.pro b/inputmethods/handwriting/handwriting.pro
index 3b2edec..646574b 100644
--- a/inputmethods/handwriting/handwriting.pro
+++ b/inputmethods/handwriting/handwriting.pro
@@ -30,320 +30,5 @@ DEPENDPATH      +=  ../../launcher
 LIBS            += -lqpe -lopiecore2
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/inputmethods
diff --git a/inputmethods/jumpx/jumpx.pro b/inputmethods/jumpx/jumpx.pro
index 7576dc1..c8b2185 100644
--- a/inputmethods/jumpx/jumpx.pro
+++ b/inputmethods/jumpx/jumpx.pro
@@ -11,312 +11,5 @@ DEPENDPATH      += $(OPIEDIR)/include
 LIBS           += -lqpe
 VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/inputmethods
diff --git a/inputmethods/keyboard/keyboard.pro b/inputmethods/keyboard/keyboard.pro
index b6b6c5a..3a9e075 100644
--- a/inputmethods/keyboard/keyboard.pro
+++ b/inputmethods/keyboard/keyboard.pro
@@ -12,321 +12,5 @@ LIBS            += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard
        QMAKE_LFLAGS+= -Wl,-rpath,/opt/QtPalmtop/plugins/inputmethods
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/inputmethods
diff --git a/inputmethods/kjumpx/kjumpx.pro b/inputmethods/kjumpx/kjumpx.pro
index 3b6dd16..09e9bf1 100644
--- a/inputmethods/kjumpx/kjumpx.pro
+++ b/inputmethods/kjumpx/kjumpx.pro
@@ -11,318 +11,5 @@ DEPENDPATH      += $(OPIEDIR)/include
 LIBS           += -lqpe
 VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/inputmethods
diff --git a/inputmethods/multikey/multikey.pro b/inputmethods/multikey/multikey.pro
index 61b3c39..3fd621f 100644
--- a/inputmethods/multikey/multikey.pro
+++ b/inputmethods/multikey/multikey.pro
@@ -14,313 +14,5 @@ LIBS            += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard -lqtaux2
        QMAKE_LFLAGS+= -Wl,-rpath,/opt/QtPalmtop/plugins/inputmethods
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/inputmethods
diff --git a/inputmethods/pickboard/pickboard.pro b/inputmethods/pickboard/pickboard.pro
index f6487a6..63efd7c 100644
--- a/inputmethods/pickboard/pickboard.pro
+++ b/inputmethods/pickboard/pickboard.pro
@@ -9,319 +9,5 @@ DEPENDPATH      +=  ../../launcher
 LIBS            += -lqpe
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/inputmethods
diff --git a/inputmethods/unikeyboard/unikeyboard.pro b/inputmethods/unikeyboard/unikeyboard.pro
index 3e727d6..fdbbce7 100644
--- a/inputmethods/unikeyboard/unikeyboard.pro
+++ b/inputmethods/unikeyboard/unikeyboard.pro
@@ -9,314 +9,5 @@ DEPENDPATH      +=  ../../launcher
 LIBS            += -lqpe
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/inputmethods
diff --git a/libopie2/examples/examples.pro b/libopie2/examples/examples.pro
index 939b24a..192c1f5 100644
--- a/libopie2/examples/examples.pro
+++ b/libopie2/examples/examples.pro
@@ -3,354 +3,7 @@ unix:SUBDIRS    = opieui opienet opiecore opiemm opiedb
 !contains( platform, x11 ) {
-  include(
+  include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 }
 contains( platform, x11 ) {
diff --git a/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.pro b/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.pro
index c7f7b19..9721e99 100644
--- a/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.pro
+++ b/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.pro
@@ -11,379 +11,7 @@ MOC_DIR     = moc
 OBJECTS_DIR = obj
 !contains( platform, x11 ) {
-  include(
+  include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 }
 contains( platform, x11 ) {
diff --git a/libopie2/examples/opiecore/odebugdemo/odebugdemo.pro b/libopie2/examples/opiecore/odebugdemo/odebugdemo.pro
index f4b95cc..781d678 100644
--- a/libopie2/examples/opiecore/odebugdemo/odebugdemo.pro
+++ b/libopie2/examples/opiecore/odebugdemo/odebugdemo.pro
@@ -10,377 +10,7 @@ TARGET          = odebugdemo
 OBJECTS_DIR = obj
 !contains( platform, x11 ) {
-  include(
+  include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 }
 contains( platform, x11 ) {
diff --git a/libopie2/examples/opiecore/oglobalsettingsdemo/oglobalsettingsdemo.pro b/libopie2/examples/opiecore/oglobalsettingsdemo/oglobalsettingsdemo.pro
index 245c938..d7bed05 100644
--- a/libopie2/examples/opiecore/oglobalsettingsdemo/oglobalsettingsdemo.pro
+++ b/libopie2/examples/opiecore/oglobalsettingsdemo/oglobalsettingsdemo.pro
@@ -9,380 +9,6 @@ TARGET          = oglobalsettingsdemo
 MOC_DIR     = moc
 OBJECTS_DIR = obj
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/libopie2/examples/opiecore/onotifydemo/onotifydemo.pro b/libopie2/examples/opiecore/onotifydemo/onotifydemo.pro
index a8261c7..d2c9138 100644
--- a/libopie2/examples/opiecore/onotifydemo/onotifydemo.pro
+++ b/libopie2/examples/opiecore/onotifydemo/onotifydemo.pro
@@ -8,375 +8,7 @@ LIBS            += -lopiecore2 -lopieui2
 TARGET          = onotifydemo
 !contains( platform, x11 ) {
-  include(
+  include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 }
 contains( platform, x11 ) {
diff --git a/libopie2/examples/opiecore/oplugins/oplugins.pro b/libopie2/examples/opiecore/oplugins/oplugins.pro
index 43558a1..03f8e4d 100644
--- a/libopie2/examples/opiecore/oplugins/oplugins.pro
+++ b/libopie2/examples/opiecore/oplugins/oplugins.pro
@@ -8,382 +8,4 @@ DEPENDSPATH += $(OPIEDIR)/include
 LIBS += -lopiecore2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/libopie2/examples/opiecore/oprocessdemo/oprocessdemo.pro b/libopie2/examples/opiecore/oprocessdemo/oprocessdemo.pro
index f110b41..7efc614 100644
--- a/libopie2/examples/opiecore/oprocessdemo/oprocessdemo.pro
+++ b/libopie2/examples/opiecore/oprocessdemo/oprocessdemo.pro
@@ -7,382 +7,6 @@ DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lopiecore2
 TARGET          = oprocessdemo
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/libopie2/examples/opiedb/sqltest/spaltenweise.pro b/libopie2/examples/opiedb/sqltest/spaltenweise.pro
index 6107cec..0335d16 100644
--- a/libopie2/examples/opiedb/sqltest/spaltenweise.pro
+++ b/libopie2/examples/opiedb/sqltest/spaltenweise.pro
@@ -10,353 +10,4 @@ TARGET		= spaltenweise
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/libopie2/examples/opiedb/sqltest/sqltest.pro b/libopie2/examples/opiedb/sqltest/sqltest.pro
index 1ff3245..a4eee6b 100644
--- a/libopie2/examples/opiedb/sqltest/sqltest.pro
+++ b/libopie2/examples/opiedb/sqltest/sqltest.pro
@@ -7,360 +7,7 @@ DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lopiedb2 -lsqlite3
 TARGET      = sqltest
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 !isEmpty( LIBSQLITE_INC_DIR ) {
    INCLUDEPATH = $$LIBSQLITE_INC_DIR $$INCLUDEPATH
diff --git a/libopie2/examples/opiedb/sqltest/zeilenweise.pro b/libopie2/examples/opiedb/sqltest/zeilenweise.pro
index d2b95cb..1fa17cd 100644
--- a/libopie2/examples/opiedb/sqltest/zeilenweise.pro
+++ b/libopie2/examples/opiedb/sqltest/zeilenweise.pro
@@ -10,355 +10,4 @@ TARGET		= zeilenweise
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/libopie2/examples/opiemm/osoundsystemdemo/osoundsystemdemo.pro b/libopie2/examples/opiemm/osoundsystemdemo/osoundsystemdemo.pro
index fc622e4..95924be 100644
--- a/libopie2/examples/opiemm/osoundsystemdemo/osoundsystemdemo.pro
+++ b/libopie2/examples/opiemm/osoundsystemdemo/osoundsystemdemo.pro
@@ -9,359 +9,4 @@ TARGET          = osoundsystemdemo
 MOC_DIR     = moc
 OBJECTS_DIR = obj
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.pro b/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.pro
index d0bd12a..d7c1fc2 100644
--- a/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.pro
+++ b/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.pro
@@ -9,389 +9,7 @@ TARGET          = miniwellenreiter
 MOC_DIR         = moc
 OBJECTS_DIR     = obj
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 !isEmpty( LIBPCAP_INC_DIR ) {
    INCLUDEPATH = $$LIBPCAP_INC_DIR $$INCLUDEPATH
diff --git a/libopie2/examples/opienet/onetworkdemo/onetworkdemo.pro b/libopie2/examples/opienet/onetworkdemo/onetworkdemo.pro
index f7b898c..cf293b5 100644
--- a/libopie2/examples/opienet/onetworkdemo/onetworkdemo.pro
+++ b/libopie2/examples/opienet/onetworkdemo/onetworkdemo.pro
@@ -9,384 +9,4 @@ TARGET          = onetworkdemo
 MOC_DIR     = moc
 OBJECTS_DIR = obj
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/libopie2/examples/opieui/okeyconfigwidget/keyconfig.pro b/libopie2/examples/opieui/okeyconfigwidget/keyconfig.pro
index e5e2f47..5f379ef 100644
--- a/libopie2/examples/opieui/okeyconfigwidget/keyconfig.pro
+++ b/libopie2/examples/opieui/okeyconfigwidget/keyconfig.pro
@@ -9,360 +9,4 @@ DESTPATH += $(OPIEDIR)/include
 LIBS += -lopieui2 -lopiecore2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/libopie2/examples/opieui/olistviewdemo/olistviewdemo.pro b/libopie2/examples/opieui/olistviewdemo/olistviewdemo.pro
index 97b4b15..52c3ceb 100644
--- a/libopie2/examples/opieui/olistviewdemo/olistviewdemo.pro
+++ b/libopie2/examples/opieui/olistviewdemo/olistviewdemo.pro
@@ -14,367 +14,7 @@ OBJECTS_DIR = obj
 !contains( platform, x11 ) {
-  include(
+  include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 }
 contains( platform, x11 ) {
diff --git a/libopie2/examples/opieui/osplitter_example/osplitter_example.pro b/libopie2/examples/opieui/osplitter_example/osplitter_example.pro
index f490d50..9f156a1 100644
--- a/libopie2/examples/opieui/osplitter_example/osplitter_example.pro
+++ b/libopie2/examples/opieui/osplitter_example/osplitter_example.pro
@@ -10,366 +10,4 @@ DEPENDSPATH +=  $(OPIEDIR)/include
 LIBS += -lqpe -lopieui2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/libopie2/examples/opieui/osplitter_example/osplitter_mail.pro b/libopie2/examples/opieui/osplitter_example/osplitter_mail.pro
index 1fe3ab1..f9c43ef 100644
--- a/libopie2/examples/opieui/osplitter_example/osplitter_mail.pro
+++ b/libopie2/examples/opieui/osplitter_example/osplitter_mail.pro
@@ -9,368 +9,4 @@ HEADERS = osplitter_mail.h
 SOURCES = osplitter_mail.cpp
 LIBS += -lqpe -lopieui2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/libopie2/examples/opieui/oversatileviewdemo/oversatileviewdemo.pro b/libopie2/examples/opieui/oversatileviewdemo/oversatileviewdemo.pro
index 79f57bc..ff78095 100644
--- a/libopie2/examples/opieui/oversatileviewdemo/oversatileviewdemo.pro
+++ b/libopie2/examples/opieui/oversatileviewdemo/oversatileviewdemo.pro
@@ -12,372 +12,6 @@ TARGET          = opieuidemo
 MOC_DIR     = moc
 OBJECTS_DIR = obj
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/libopie2/examples/opieui/owidgetstack_example/owidgetstack_example.pro b/libopie2/examples/opieui/owidgetstack_example/owidgetstack_example.pro
index 9274248..4cfce9c 100644
--- a/libopie2/examples/opieui/owidgetstack_example/owidgetstack_example.pro
+++ b/libopie2/examples/opieui/owidgetstack_example/owidgetstack_example.pro
@@ -10,362 +10,4 @@ DEPENDSPATH += $(OPIEDIR)/include
 LIBS += -lqpe -lopieui2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/libopie2/libopie2.pro b/libopie2/libopie2.pro
index da7db94..509a3ce 100644
--- a/libopie2/libopie2.pro
+++ b/libopie2/libopie2.pro
@@ -3,342 +3,7 @@ unix:SUBDIRS    = opiecore opiedb opiepim opieui opienet opiemm opiesecurity exa
 !contains( platform, x11 ) {
  message( Configuring libopie2 for build on Opie )
-  include(
+  include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 }
 contains( platform, x11 ) {
diff --git a/libopie2/opiecore/opiecore.pro b/libopie2/opiecore/opiecore.pro
index ca40977..1786b08 100644
--- a/libopie2/opiecore/opiecore.pro
+++ b/libopie2/opiecore/opiecore.pro
@@ -42,348 +42,7 @@ SOURCES     += ofilenotify.cpp
    message( "ofilenotify is not available in a mac build !" )
 }
-include(
+include( device/device.pro )
- device/device.pro )
 INTERFACES  =
 TARGET      = opiecore2
@@ -393,350 +52,7 @@ DEPENDPATH  += $(OPIEDIR)/include
 !contains( platform, x11 ) {
  LIBS        = -lqpe
-  include(
+  include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 }
 contains( platform, x11 ) {
diff --git a/libopie2/opiedb/opiedb.pro b/libopie2/opiedb/opiedb.pro
index b7c8115..0f50883 100644
--- a/libopie2/opiedb/opiedb.pro
+++ b/libopie2/opiedb/opiedb.pro
@@ -28,344 +28,7 @@ DEPENDPATH  = $(OPIEDIR)/include
 LIBS       += -lopiecore2 -lqpe -lsqlite3
 !contains( platform, x11 ) {
-  include(
+  include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 }
 contains( platform, x11 ) {
diff --git a/libopie2/opiemm/opiemm.pro b/libopie2/opiemm/opiemm.pro
index 21dd532..c06e925 100644
--- a/libopie2/opiemm/opiemm.pro
+++ b/libopie2/opiemm/opiemm.pro
@@ -10,346 +10,7 @@ INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 !contains( platform, x11 ) {
-  include(
+  include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 }
 contains( platform, x11 ) {
diff --git a/libopie2/opienet/opienet.pro b/libopie2/opienet/opienet.pro
index fb9b8fc..98fa175 100644
--- a/libopie2/opienet/opienet.pro
+++ b/libopie2/opienet/opienet.pro
@@ -25,352 +25,7 @@ LIBS        += -lpcap
 !contains( platform, x11 ) {
-  include(
+  include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 }
 contains( platform, x11 ) {
diff --git a/libopie2/opiepim/backend/backends.pro b/libopie2/opiepim/backend/backends.pro
index d4e1730..739f74e 100644
--- a/libopie2/opiepim/backend/backends.pro
+++ b/libopie2/opiepim/backend/backends.pro
@@ -23,7 +23,7 @@ HEADERS += \
        backend/otodoaccessxml.h               
 contains( ENABLE_SQL_PIM_BACKEND, y ) {
-        message( Enabling the SQL Backend for libopiepim2 )
+        message ( Enabling the SQL Backend for libopiepim2 )
        DEFINES += __USE_SQL
        LIBS    += -lopiedb2
        HEADERS += backend/otodoaccesssql.h             \
@@ -35,6 +35,6 @@ contains( ENABLE_SQL_PIM_BACKEND, y ) {
 }
 !contains( ENABLE_SQL_PIM_BACKEND, y ) {
-        message( No SQL Backend in libopiepim2 )
+        message ( No SQL Backend in libopiepim2 )
 }
diff --git a/libopie2/opiepim/opiepim.pro b/libopie2/opiepim/opiepim.pro
index 9096c90..7c39303 100644
--- a/libopie2/opiepim/opiepim.pro
+++ b/libopie2/opiepim/opiepim.pro
@@ -9,2098 +9,16 @@ INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lopiecore2
-include(
+include( $(OPIEDIR)/gen.pro )
+include( core/core.pro )
+include( backend/backends.pro )
+include( ui/ui.pro )
+include( private/private.pro )
- $(OPIEDIR)/gen.pro )
-include(
- core/core.pro )
-include(
- backend/backends.pro )
-include(
- ui/ui.pro )
-include(
- private/private.pro )
 PRECOMPILED_HEADER = stable_pch.h
 !contains( platform, x11 ) {
-  include(
+  include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 }
 contains( platform, x11 ) {
diff --git a/libopie2/opiesecurity/opiesecurity.pro b/libopie2/opiesecurity/opiesecurity.pro
index 8c3066c..7171e67 100644
--- a/libopie2/opiesecurity/opiesecurity.pro
+++ b/libopie2/opiesecurity/opiesecurity.pro
@@ -14,337 +14,4 @@ VERSION     = 0.0.2
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/libopie2/opieui/opieui.pro b/libopie2/opieui/opieui.pro
index c0949bc..8cae43f 100644
--- a/libopie2/opieui/opieui.pro
+++ b/libopie2/opieui/opieui.pro
@@ -40,686 +40,8 @@ SOURCES     = oclickablelabel.cpp    \
              oversatileviewitem.cpp \
              owait.cpp
-include(
+include( big-screen/big-screen.pro )
+include( fileselector/fileselector.pro )
- big-screen/big-screen.pro )
-include(
- fileselector/fileselector.pro )
 INTERFACES  = otimepickerbase.ui
@@ -732,348 +54,7 @@ DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lopiecore2
 !contains( platform, x11 ) {
-  include(
+  include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 }
 contains( platform, x11 ) {
diff --git a/libopie2/tools/makemanuf.pro b/libopie2/tools/makemanuf.pro
index 0ba86a0..628ccba 100644
--- a/libopie2/tools/makemanuf.pro
+++ b/libopie2/tools/makemanuf.pro
@@ -12,341 +12,6 @@ INTERFACES      =
 LIBS            += -lopiecore2 -lopienet2
 TARGET          = makemanuf
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/libqtaux/libqtaux.pro b/libqtaux/libqtaux.pro
index 5de0f52..8781ad9 100644
--- a/libqtaux/libqtaux.pro
+++ b/libqtaux/libqtaux.pro
@@ -23,387 +23,4 @@ INCLUDEPATH += $(OPIEDIR)/include
 DESTDIR      = $(OPIEDIR)/lib
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/library/library.pro b/library/library.pro
index e2a704e..04e125f 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -132,79 +132,7 @@ TARGET		= qpe
        DESTDIR         = $(OPIEDIR)/lib$(PROJMAK)
        VERSION         = 1.5.0.1
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 contains( CONFIG, no-override ){
    DEFINES += OPIE_NO_OVERRIDE_QT
diff --git a/libslcompat/libslcompat.pro b/libslcompat/libslcompat.pro
index 8f0de99..75c8ff5 100644
--- a/libslcompat/libslcompat.pro
+++ b/libslcompat/libslcompat.pro
@@ -13,76 +13,4 @@ INCLUDEPATH += $(OPIEDIR)/include
 DESTDIR      = $(OPIEDIR)/lib
 LIBS        += -lopiecore2 -lopieui2 -lqtaux2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/applets/autorotateapplet/autorotateapplet.pro b/noncore/applets/autorotateapplet/autorotateapplet.pro
index b7ee99c..05b29f3 100644
--- a/noncore/applets/autorotateapplet/autorotateapplet.pro
+++ b/noncore/applets/autorotateapplet/autorotateapplet.pro
@@ -9,273 +9,5 @@ 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/noncore/applets/brightnessapplet/brightnessapplet.pro b/noncore/applets/brightnessapplet/brightnessapplet.pro
index 0367ac4..1976159 100644
--- a/noncore/applets/brightnessapplet/brightnessapplet.pro
+++ b/noncore/applets/brightnessapplet/brightnessapplet.pro
@@ -10,275 +10,4 @@ LIBS        += -lqpe -lopiecore2 -lopieui2
 VERSION     = 0.1.2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/applets/memoryapplet/memoryapplet.pro b/noncore/applets/memoryapplet/memoryapplet.pro
index 141e98f..57bb1c9 100644
--- a/noncore/applets/memoryapplet/memoryapplet.pro
+++ b/noncore/applets/memoryapplet/memoryapplet.pro
@@ -19,273 +19,4 @@ DEPENDPATH  +=
 VERSION     = 1.0.0
 LIBS        += -lqpe -lopiecore2 -lopieui2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/applets/networkapplet/networkapplet.pro b/noncore/applets/networkapplet/networkapplet.pro
index c500829..be322c7 100644
--- a/noncore/applets/networkapplet/networkapplet.pro
+++ b/noncore/applets/networkapplet/networkapplet.pro
@@ -9,267 +9,4 @@ DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2 -lopieui2 -lopienet2
 VERSION     = 0.1.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/applets/notesapplet/notesapplet.pro b/noncore/applets/notesapplet/notesapplet.pro
index b63ebfd..b503682 100644
--- a/noncore/applets/notesapplet/notesapplet.pro
+++ b/noncore/applets/notesapplet/notesapplet.pro
@@ -9,265 +9,4 @@ DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2
 VERSION   = 1.0.1
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/applets/pyquicklaunch/pyquicklaunch.pro b/noncore/applets/pyquicklaunch/pyquicklaunch.pro
index 24a5078..b100d44 100644
--- a/noncore/applets/pyquicklaunch/pyquicklaunch.pro
+++ b/noncore/applets/pyquicklaunch/pyquicklaunch.pro
@@ -10,269 +10,4 @@ DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2
 VERSION      = 0.0.1
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/applets/wirelessapplet/wirelessapplet.pro b/noncore/applets/wirelessapplet/wirelessapplet.pro
index c11c8ef..1995841 100644
--- a/noncore/applets/wirelessapplet/wirelessapplet.pro
+++ b/noncore/applets/wirelessapplet/wirelessapplet.pro
@@ -10,277 +10,4 @@ DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2 -lopienet2
 VERSION      = 0.1.1
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/applets/zkbapplet/applet/applet.pro b/noncore/applets/zkbapplet/applet/applet.pro
index 4371f4e..8391831 100644
--- a/noncore/applets/zkbapplet/applet/applet.pro
+++ b/noncore/applets/zkbapplet/applet/applet.pro
@@ -17,271 +17,4 @@ DEPENDPATH  +=
 VERSION     = 0.7.0
 LIBS        += -lqpe -lopiecore2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/applets/zkbapplet/keyzcfg/keyzcfg.pro b/noncore/applets/zkbapplet/keyzcfg/keyzcfg.pro
index decabbd..17f87ee 100644
--- a/noncore/applets/zkbapplet/keyzcfg/keyzcfg.pro
+++ b/noncore/applets/zkbapplet/keyzcfg/keyzcfg.pro
@@ -21,271 +21,4 @@ DEPENDPATH      += $(OPIEDIR)/include
        LIBS    += -lqpe -lopiecore2
        TARGET          = keyz-cfg
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/advancedfm/advancedfm.pro b/noncore/apps/advancedfm/advancedfm.pro
index d7ec0cd..74c1604 100644
--- a/noncore/apps/advancedfm/advancedfm.pro
+++ b/noncore/apps/advancedfm/advancedfm.pro
@@ -12,151 +12,4 @@ LIBS        += -lqpe -lqte -lopiecore2 -lopieui2
 DEFINES += NOQUICKLAUNCH
 }
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/checkbook/checkbook.pro b/noncore/apps/checkbook/checkbook.pro
index da9b2a4..67558bb 100644
--- a/noncore/apps/checkbook/checkbook.pro
+++ b/noncore/apps/checkbook/checkbook.pro
@@ -29,124 +29,4 @@ DEPENDPATH      += $(OPIEDIR)/include
 LIBS    += -lqpe -lopiecore2 -lopieui2
 TARGET    = checkbook
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/confedit/confedit.pro b/noncore/apps/confedit/confedit.pro
index 1a68f72..7b21f3a 100644
--- a/noncore/apps/confedit/confedit.pro
+++ b/noncore/apps/confedit/confedit.pro
@@ -6,114 +6,4 @@ DEPENDPATH    += $(OPIEDIR)/include
 LIBS          += -lqpe -lopiecore2
 TARGET        = confedit
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/dagger/dagger.pro b/noncore/apps/dagger/dagger.pro
index 5177e2f..127d46c 100644
--- a/noncore/apps/dagger/dagger.pro
+++ b/noncore/apps/dagger/dagger.pro
@@ -20,115 +20,7 @@ INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lopiecore2 -lopieui2 -lqpe -lsword
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 !isEmpty( LIBSWORD_INC_DIR ) {
    INCLUDEPATH = $$LIBSWORD_INC_DIR $$INCLUDEPATH
diff --git a/noncore/apps/odict/odict.pro b/noncore/apps/odict/odict.pro
index 8bd86c4..e7f6434 100644
--- a/noncore/apps/odict/odict.pro
+++ b/noncore/apps/odict/odict.pro
@@ -14,102 +14,4 @@ DEPENDPATH      += $(OPIEDIR)/include
        LIBS    += -lqpe -lstdc++ -lopiecore2 -lopieui2
        TARGET          = odict
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-bartender/bartender.pro b/noncore/apps/opie-bartender/bartender.pro
index 0edf50b..cdec93c 100644
--- a/noncore/apps/opie-bartender/bartender.pro
+++ b/noncore/apps/opie-bartender/bartender.pro
@@ -6,153 +6,4 @@ DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2
 TARGET      = bartender
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-console/opie-console.pro b/noncore/apps/opie-console/opie-console.pro
index 094b60d..a0e90bf 100644
--- a/noncore/apps/opie-console/opie-console.pro
+++ b/noncore/apps/opie-console/opie-console.pro
@@ -71,123 +71,7 @@ LIBS        += -lqpe -lopiecore2 -lopieui2 -lutil
 TARGET       = opie-console
 DEFINES += HAVE_OPENPTY
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 teneast {
    DEFINES -= HAVE_OPENPTY
diff --git a/noncore/apps/opie-console/test/console.pro b/noncore/apps/opie-console/test/console.pro
index 246d8ea..1933c69 100644
--- a/noncore/apps/opie-console/test/console.pro
+++ b/noncore/apps/opie-console/test/console.pro
@@ -18,118 +18,4 @@ TARGET       = test
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-gutenbrowser/opie-gutenbrowser.pro b/noncore/apps/opie-gutenbrowser/opie-gutenbrowser.pro
index d1d5eb4..ed8ff70 100644
--- a/noncore/apps/opie-gutenbrowser/opie-gutenbrowser.pro
+++ b/noncore/apps/opie-gutenbrowser/opie-gutenbrowser.pro
@@ -41,116 +41,4 @@ DEPENDPATH  += $(OPIEDIR)/include
 DESTDIR = $(OPIEDIR)/bin
 LIBS   += -lqpe -lpthread -lftplib -lopiecore2 -lopieui2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-reader/AportisCodec/AportisCodec.pro b/noncore/apps/opie-reader/AportisCodec/AportisCodec.pro
index 59a5b29..a64ab67 100644
--- a/noncore/apps/opie-reader/AportisCodec/AportisCodec.pro
+++ b/noncore/apps/opie-reader/AportisCodec/AportisCodec.pro
@@ -26,130 +26,4 @@ LIBS            += -lreader_pdb -lreader_codec
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-reader/CHM/CHM.pro b/noncore/apps/opie-reader/CHM/CHM.pro
index 23b7bb9..a623168 100644
--- a/noncore/apps/opie-reader/CHM/CHM.pro
+++ b/noncore/apps/opie-reader/CHM/CHM.pro
@@ -15,126 +15,4 @@ LIBS            += -lreader_codec
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
-include(
+include( $(OPIEDIR)/include.pro )
+\ No newline at end of file
- $(OPIEDIR)/include.pro )
-\ No newline at end of file
diff --git a/noncore/apps/opie-reader/HTMLFilter/HTMLFilter.pro b/noncore/apps/opie-reader/HTMLFilter/HTMLFilter.pro
index 52e5222..4842f23 100644
--- a/noncore/apps/opie-reader/HTMLFilter/HTMLFilter.pro
+++ b/noncore/apps/opie-reader/HTMLFilter/HTMLFilter.pro
@@ -17,146 +17,4 @@ TARGET		= HTMLfilter
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-reader/PluckerCodec/PluckerCodec.pro b/noncore/apps/opie-reader/PluckerCodec/PluckerCodec.pro
index d1eef0f..faaf1b7 100644
--- a/noncore/apps/opie-reader/PluckerCodec/PluckerCodec.pro
+++ b/noncore/apps/opie-reader/PluckerCodec/PluckerCodec.pro
@@ -15,138 +15,4 @@ LIBS            += -lreader_pdb -lreader_pluckerbase -lreader_codec
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-reader/WeaselCodec/WeaselCodec.pro b/noncore/apps/opie-reader/WeaselCodec/WeaselCodec.pro
index 0e3e04f..017894b 100644
--- a/noncore/apps/opie-reader/WeaselCodec/WeaselCodec.pro
+++ b/noncore/apps/opie-reader/WeaselCodec/WeaselCodec.pro
@@ -14,134 +14,4 @@ LIBS            += -lreader_pdb -lreader_codec
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-reader/codeclib/codeclib.pro b/noncore/apps/opie-reader/codeclib/codeclib.pro
index 021df0b..baaf070 100644
--- a/noncore/apps/opie-reader/codeclib/codeclib.pro
+++ b/noncore/apps/opie-reader/codeclib/codeclib.pro
@@ -14,132 +14,4 @@ TARGET		= reader_codec
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-reader/iSiloCodec/iSiloCodec.pro b/noncore/apps/opie-reader/iSiloCodec/iSiloCodec.pro
index 619ab7b..9c0f688 100644
--- a/noncore/apps/opie-reader/iSiloCodec/iSiloCodec.pro
+++ b/noncore/apps/opie-reader/iSiloCodec/iSiloCodec.pro
@@ -15,145 +15,5 @@ LIBS            += -lreader_pdb -lreader_codec
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-reader/opie-reader.pro b/noncore/apps/opie-reader/opie-reader.pro
index b523c95..170f7fa 100644
--- a/noncore/apps/opie-reader/opie-reader.pro
+++ b/noncore/apps/opie-reader/opie-reader.pro
@@ -11,146 +11,6 @@ SUBDIRS         = pluckerbaselib \
                  ppmsCodec \
                  reader
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-reader/pdblib/pdblib.pro b/noncore/apps/opie-reader/pdblib/pdblib.pro
index 41e44d7..ba8dcb7 100644
--- a/noncore/apps/opie-reader/pdblib/pdblib.pro
+++ b/noncore/apps/opie-reader/pdblib/pdblib.pro
@@ -13,140 +13,4 @@ TARGET		= reader_pdb
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-reader/pluckerbaselib/pluckerbaselib.pro b/noncore/apps/opie-reader/pluckerbaselib/pluckerbaselib.pro
index b9e194c..a66dc44 100644
--- a/noncore/apps/opie-reader/pluckerbaselib/pluckerbaselib.pro
+++ b/noncore/apps/opie-reader/pluckerbaselib/pluckerbaselib.pro
@@ -15,128 +15,4 @@ LIBS		+= -ldl
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-reader/ppmsCodec/ppmsCodec.pro b/noncore/apps/opie-reader/ppmsCodec/ppmsCodec.pro
index 986c0a2..be00535 100644
--- a/noncore/apps/opie-reader/ppmsCodec/ppmsCodec.pro
+++ b/noncore/apps/opie-reader/ppmsCodec/ppmsCodec.pro
@@ -16,136 +16,4 @@ LIBS            += -lreader_codec
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-reader/reader/reader.pro b/noncore/apps/opie-reader/reader/reader.pro
index e0f8f4e..6349ea7 100644
--- a/noncore/apps/opie-reader/reader/reader.pro
+++ b/noncore/apps/opie-reader/reader/reader.pro
@@ -84,142 +84,4 @@ DEPENDPATH	+= $(OPIEDIR)/include
        TARGET  = opie-reader
        LIBS    += -lopiecore2 -lopieui2 -lqpe -lreader_codec
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-sheet/opie-sheet.pro b/noncore/apps/opie-sheet/opie-sheet.pro
index 2704ac3..892bac9 100644
--- a/noncore/apps/opie-sheet/opie-sheet.pro
+++ b/noncore/apps/opie-sheet/opie-sheet.pro
@@ -21,108 +21,4 @@ DEPENDPATH    += $(OPIEDIR)/include
 LIBS          += -lqpe -lopiecore2
 TARGET        = opie-sheet
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-write/opie-write.pro b/noncore/apps/opie-write/opie-write.pro
index 5d6e0d5..af438f4 100644
--- a/noncore/apps/opie-write/opie-write.pro
+++ b/noncore/apps/opie-write/opie-write.pro
@@ -23,110 +23,4 @@ LIBS            += -lqpe -lopiecore2
 TARGET        = opie-write
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/oxygen/oxygen.pro b/noncore/apps/oxygen/oxygen.pro
index 7b0853b..d988f06 100644
--- a/noncore/apps/oxygen/oxygen.pro
+++ b/noncore/apps/oxygen/oxygen.pro
@@ -24,122 +24,4 @@ INTERFACES    = calcdlg.ui
 TARGET    = oxygen
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/tableviewer/tableviewer.pro b/noncore/apps/tableviewer/tableviewer.pro
index a92b008..0d65b27 100644
--- a/noncore/apps/tableviewer/tableviewer.pro
+++ b/noncore/apps/tableviewer/tableviewer.pro
@@ -35,155 +35,4 @@ INCLUDEPATH	+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
        LIBS    += -lqpe -lopiecore2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/tinykate/libkate/libkate.pro b/noncore/apps/tinykate/libkate/libkate.pro
index 6135093..8cb953b 100644
--- a/noncore/apps/tinykate/libkate/libkate.pro
+++ b/noncore/apps/tinykate/libkate/libkate.pro
@@ -77,148 +77,4 @@ TARGET      = kate
 INCLUDEPATH += $(OPIEDIR)/include
 DESTDIR      = $(OPIEDIR)/lib$(PROJMAK)
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/tinykate/mainwindow/mainwindow.pro b/noncore/apps/tinykate/mainwindow/mainwindow.pro
index 9d1dba2..e497bd1 100644
--- a/noncore/apps/tinykate/mainwindow/mainwindow.pro
+++ b/noncore/apps/tinykate/mainwindow/mainwindow.pro
@@ -9,149 +9,4 @@ DEPENDPATH     += $(OPIEDIR)/include
 LIBS           += -lqpe -lkate -lopiecore2 -lopieui2
 TARGET         = tinykate
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/zsafe/zsafe.pro b/noncore/apps/zsafe/zsafe.pro
index 4cf7299..226e344 100644
--- a/noncore/apps/zsafe/zsafe.pro
+++ b/noncore/apps/zsafe/zsafe.pro
@@ -11,109 +11,7 @@ DEPENDPATH   += $(OPIEDIR)/include
 LIBS         += -lqpe -lopiecore2 -lopieui2
 TARGET       = zsafe
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 QWS {
 message( "Configuring for multi-threaded Qt..." )
diff --git a/noncore/comm/keypebble/keypebble.pro b/noncore/comm/keypebble/keypebble.pro
index bf7ceed..2c7ff5f 100644
--- a/noncore/comm/keypebble/keypebble.pro
+++ b/noncore/comm/keypebble/keypebble.pro
@@ -31,159 +31,4 @@ LIBS            += -lqpe -lopiecore2
        TARGET  = keypebble
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/comm/mobilemsg/mobilemsg.pro b/noncore/comm/mobilemsg/mobilemsg.pro
index e9d80ec..e1f57f8 100644
--- a/noncore/comm/mobilemsg/mobilemsg.pro
+++ b/noncore/comm/mobilemsg/mobilemsg.pro
@@ -10,157 +10,4 @@ TARGET		= mobilemsg
        DESTDIR         = $(OPIEDIR)/bin
        INTERFACES= mobilemsgbase.ui
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/decorations/flat/flat.pro b/noncore/decorations/flat/flat.pro
index d1e1af3..46cb5e2 100644
--- a/noncore/decorations/flat/flat.pro
+++ b/noncore/decorations/flat/flat.pro
@@ -12,238 +12,4 @@ VERSION		= 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/decorations/liquid/liquid.pro b/noncore/decorations/liquid/liquid.pro
index 7ee306c..6448a5b 100644
--- a/noncore/decorations/liquid/liquid.pro
+++ b/noncore/decorations/liquid/liquid.pro
@@ -11,241 +11,4 @@ VERSION      = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/decorations/polished/polished.pro b/noncore/decorations/polished/polished.pro
index 0ebde44..2016cc1 100644
--- a/noncore/decorations/polished/polished.pro
+++ b/noncore/decorations/polished/polished.pro
@@ -12,240 +12,4 @@ VERSION		= 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/games/backgammon/backgammon.pro b/noncore/games/backgammon/backgammon.pro
index 2fa823b..75a1746 100644
--- a/noncore/games/backgammon/backgammon.pro
+++ b/noncore/games/backgammon/backgammon.pro
@@ -29,178 +29,4 @@ DEPENDPATH	+= $(OPIEDIR)/include
        LIBS    += -lqpe -lopiecore2 -lstdc++
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/games/bounce/bounce.pro b/noncore/games/bounce/bounce.pro
index 6d7d17e..6bbf698 100644
--- a/noncore/games/bounce/bounce.pro
+++ b/noncore/games/bounce/bounce.pro
@@ -6,182 +6,4 @@ DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2
        TARGET  = bounce
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/games/buzzword/buzzword.pro b/noncore/games/buzzword/buzzword.pro
index cbee307..76bf1c7 100644
--- a/noncore/games/buzzword/buzzword.pro
+++ b/noncore/games/buzzword/buzzword.pro
@@ -7,199 +7,4 @@ LIBS        += -lqpe -lopiecore2
        TARGET          = buzzword
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/games/fifteen/fifteen.pro b/noncore/games/fifteen/fifteen.pro
index 1082ee5..d8e7f72 100644
--- a/noncore/games/fifteen/fifteen.pro
+++ b/noncore/games/fifteen/fifteen.pro
@@ -10,181 +10,5 @@ LIBS            += -lqpe -lopiecore2 -lopieui2
        TARGET  = fifteen
 INTERFACES      = fifteenconfigdialogbase.ui
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 
diff --git a/noncore/games/go/go.pro b/noncore/games/go/go.pro
index 4888b33..918a125 100644
--- a/noncore/games/go/go.pro
+++ b/noncore/games/go/go.pro
@@ -15,161 +15,4 @@ LIBS            += -lqpe -lopiecore2
        TARGET  = go
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/games/kbill/kbill.pro b/noncore/games/kbill/kbill.pro
index 50ef3ac..8ecad10 100644
--- a/noncore/games/kbill/kbill.pro
+++ b/noncore/games/kbill/kbill.pro
@@ -13,165 +13,4 @@ DEPENDPATH	+= $(OPIEDIR)/include
        LIBS    += -lqpe -lstdc++
        DESTDIR =  $(OPIEDIR)/bin
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/games/kcheckers/kcheckers.pro b/noncore/games/kcheckers/kcheckers.pro
index 1cbbdcc..cc4401d 100644
--- a/noncore/games/kcheckers/kcheckers.pro
+++ b/noncore/games/kcheckers/kcheckers.pro
@@ -16,193 +16,4 @@ LIBS		+= -lqpe -lopiecore2
        TARGET  = kcheckers
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/games/kpacman/kpacman.pro b/noncore/games/kpacman/kpacman.pro
index bdafa1e..8c07f08 100644
--- a/noncore/games/kpacman/kpacman.pro
+++ b/noncore/games/kpacman/kpacman.pro
@@ -34,172 +34,4 @@ DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2
        TARGET  = kpacman
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/games/mindbreaker/mindbreaker.pro b/noncore/games/mindbreaker/mindbreaker.pro
index 9b5c5b2..e0578e2 100644
--- a/noncore/games/mindbreaker/mindbreaker.pro
+++ b/noncore/games/mindbreaker/mindbreaker.pro
@@ -8,184 +8,4 @@ DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/games/minesweep/minesweep.pro b/noncore/games/minesweep/minesweep.pro
index 060bb03..a1fc749 100644
--- a/noncore/games/minesweep/minesweep.pro
+++ b/noncore/games/minesweep/minesweep.pro
@@ -10,176 +10,4 @@ LIBS            += -lqpe -lopiecore2
        INTERFACES=
        TARGET  = minesweep
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/games/oyatzee/oyatzee.pro b/noncore/games/oyatzee/oyatzee.pro
index 366c8c6..f2a063a 100644
--- a/noncore/games/oyatzee/oyatzee.pro
+++ b/noncore/games/oyatzee/oyatzee.pro
@@ -6,197 +6,4 @@ INCLUDEPATH     += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/games/parashoot/parashoot.pro b/noncore/games/parashoot/parashoot.pro
index 41f909f..b7c28fb 100644
--- a/noncore/games/parashoot/parashoot.pro
+++ b/noncore/games/parashoot/parashoot.pro
@@ -8,195 +8,4 @@ LIBS            += -lqpe -lopiecore2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/games/qasteroids/qasteroids.pro b/noncore/games/qasteroids/qasteroids.pro
index 3448b06..ecb4888 100644
--- a/noncore/games/qasteroids/qasteroids.pro
+++ b/noncore/games/qasteroids/qasteroids.pro
@@ -8,163 +8,4 @@ LIBS            += -lqpe -lopiecore2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/games/sfcave-sdl/sfcave-sdl.pro b/noncore/games/sfcave-sdl/sfcave-sdl.pro
index 5b81252..a2f6682 100644
--- a/noncore/games/sfcave-sdl/sfcave-sdl.pro
+++ b/noncore/games/sfcave-sdl/sfcave-sdl.pro
@@ -52,177 +52,7 @@ HEADERS =   animatedimage.h \
        starfield.h \
        util.h
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 !isEmpty( LIBSDL_INC_DIR ) {
    INCLUDEPATH = $$LIBSDL_INC_DIR $$INCLUDEPATH
diff --git a/noncore/games/sfcave/sfcave.pro b/noncore/games/sfcave/sfcave.pro
index f2be336..8005693 100644
--- a/noncore/games/sfcave/sfcave.pro
+++ b/noncore/games/sfcave/sfcave.pro
@@ -7,188 +7,4 @@ DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/games/snake/snake.pro b/noncore/games/snake/snake.pro
index 386c598..c693297 100644
--- a/noncore/games/snake/snake.pro
+++ b/noncore/games/snake/snake.pro
@@ -7,167 +7,4 @@ DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/games/solitaire/solitaire.pro b/noncore/games/solitaire/solitaire.pro
index 4fe9579..f7c17be 100755
--- a/noncore/games/solitaire/solitaire.pro
+++ b/noncore/games/solitaire/solitaire.pro
@@ -17,170 +17,4 @@ DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/games/tetrix/tetrix.pro b/noncore/games/tetrix/tetrix.pro
index cece982..580a542 100644
--- a/noncore/games/tetrix/tetrix.pro
+++ b/noncore/games/tetrix/tetrix.pro
@@ -19,190 +19,4 @@ TARGET		= tetrix
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/games/tictac/tictac.pro b/noncore/games/tictac/tictac.pro
index f249c24..b8a866b 100644
--- a/noncore/games/tictac/tictac.pro
+++ b/noncore/games/tictac/tictac.pro
@@ -8,192 +8,4 @@ LIBS            += -lqpe -lopiecore2
        TARGET  = tictac
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/games/wordgame/wordgame.pro b/noncore/games/wordgame/wordgame.pro
index b9eb596..2b84181 100644
--- a/noncore/games/wordgame/wordgame.pro
+++ b/noncore/games/wordgame/wordgame.pro
@@ -9,186 +9,4 @@ DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/games/zlines/zlines.pro b/noncore/games/zlines/zlines.pro
index 6362ab5..fe8b9ae 100644
--- a/noncore/games/zlines/zlines.pro
+++ b/noncore/games/zlines/zlines.pro
@@ -7,193 +7,4 @@ INCLUDEPATH	+= $(OPIEDIR)/include/
        DEPENDPATH+= $(OPIEDIR)/include/
-include(
+include($(OPIEDIR)/include.pro)
-$(OPIEDIR)/include.pro)
diff --git a/noncore/games/zsame/zsame.pro b/noncore/games/zsame/zsame.pro
index 6b58b54..95c76bd 100644
--- a/noncore/games/zsame/zsame.pro
+++ b/noncore/games/zsame/zsame.pro
@@ -14,168 +14,4 @@ DEPENDPATH  += $(OPIEDIR)/include
 # we now also include opie
 LIBS += -lqpe -lopiecore2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/graphics/drawpad/drawpad.pro b/noncore/graphics/drawpad/drawpad.pro
index 841d50e..db44396 100644
--- a/noncore/graphics/drawpad/drawpad.pro
+++ b/noncore/graphics/drawpad/drawpad.pro
@@ -44,201 +44,4 @@ LIBS		+= -lqpe -lopiecore2 -lopieui2 -lqtaux2
        TARGET  = drawpad
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/graphics/opie-eye/phunk_view.pro b/noncore/graphics/opie-eye/phunk_view.pro
index cf71fa6..124cae3 100644
--- a/noncore/graphics/opie-eye/phunk_view.pro
+++ b/noncore/graphics/opie-eye/phunk_view.pro
@@ -20,203 +20,4 @@ DEPENDPATH  += $(OPIEDIR)/include
 LIBS += -lqpe -lopiecore2 -lopieui2 -lopiemm2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/graphics/opie-eye/slave/slave.pro b/noncore/graphics/opie-eye/slave/slave.pro
index 3d297c9..13a2961 100644
--- a/noncore/graphics/opie-eye/slave/slave.pro
+++ b/noncore/graphics/opie-eye/slave/slave.pro
@@ -17,204 +17,4 @@ DEPENDSPATH += $(OPIEDIR)/include
 LIBS += -lqpe -lopiecore2 -lopiemm2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/multimedia/camera/cmd/cmd.pro b/noncore/multimedia/camera/cmd/cmd.pro
index e177555..0a9d090 100644
--- a/noncore/multimedia/camera/cmd/cmd.pro
+++ b/noncore/multimedia/camera/cmd/cmd.pro
@@ -12,227 +12,5 @@ LIBS            += -lqpe -lopiecore2 -lcamera
 INTERFACES      =
 TARGET          = capture
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/multimedia/camera/gui/gui.pro b/noncore/multimedia/camera/gui/gui.pro
index ec0f7b4..7a9a20d 100644
--- a/noncore/multimedia/camera/gui/gui.pro
+++ b/noncore/multimedia/camera/gui/gui.pro
@@ -15,227 +15,5 @@ LIBS            += -lopiecore2 -lopieui2 -lcamera
 INTERFACES      =
 TARGET          = camera
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/multimedia/camera/lib/lib.pro b/noncore/multimedia/camera/lib/lib.pro
index 99b6655..8934359 100644
--- a/noncore/multimedia/camera/lib/lib.pro
+++ b/noncore/multimedia/camera/lib/lib.pro
@@ -18,229 +18,5 @@ VERSION         = 1.0.1
 TARGET          = camera
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/multimedia/opieplayer2/opieplayer2.pro b/noncore/multimedia/opieplayer2/opieplayer2.pro
index 7d58fd3..cd103ee 100644
--- a/noncore/multimedia/opieplayer2/opieplayer2.pro
+++ b/noncore/multimedia/opieplayer2/opieplayer2.pro
@@ -19,233 +19,7 @@ LIBS        += -lqpe -lpthread -lopiecore2 -lopieui2 -lqtaux2 -lxine
 MOC_DIR   = qpeobj
 OBJECTS_DIR = qpeobj
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 !isEmpty( LIBXINE_INC_DIR ) {
    INCLUDEPATH = $$LIBXINE_INC_DIR $$INCLUDEPATH
diff --git a/noncore/multimedia/opieplayer2/zeckeplayer.pro b/noncore/multimedia/opieplayer2/zeckeplayer.pro
index a5696ad..ba06081 100644
--- a/noncore/multimedia/opieplayer2/zeckeplayer.pro
+++ b/noncore/multimedia/opieplayer2/zeckeplayer.pro
@@ -10,232 +10,4 @@ LIBS            += -L/opt/QtPalmtop/lib -lxine -lxineutils
 TARGET          = zeckeplayer
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/multimedia/opierec/opierec.pro b/noncore/multimedia/opierec/opierec.pro
index 78d439e..6a5838a 100644
--- a/noncore/multimedia/opierec/opierec.pro
+++ b/noncore/multimedia/opierec/opierec.pro
@@ -32,239 +32,7 @@ contains(CONFIG, pdaudio) {
  DEPENDPATH  += $(OPIEDIR)/include
  LIBS            += -lqpe -lopiecore2 -lpthread
  TARGET    = opierec
-  include(
+  include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 }
diff --git a/noncore/multimedia/powerchord/powerchord.pro b/noncore/multimedia/powerchord/powerchord.pro
index 4198074..e9e5abc 100644
--- a/noncore/multimedia/powerchord/powerchord.pro
+++ b/noncore/multimedia/powerchord/powerchord.pro
@@ -20,225 +20,5 @@ DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2
        TARGET  = powerchord
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/multimedia/showimg/showimg.pro b/noncore/multimedia/showimg/showimg.pro
index 07579b0..74eceb8 100644
--- a/noncore/multimedia/showimg/showimg.pro
+++ b/noncore/multimedia/showimg/showimg.pro
@@ -6,226 +6,4 @@ INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2 -lopieui2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/multimedia/tonleiter/tonleiter.pro b/noncore/multimedia/tonleiter/tonleiter.pro
index 81a2515..b7577fa 100644
--- a/noncore/multimedia/tonleiter/tonleiter.pro
+++ b/noncore/multimedia/tonleiter/tonleiter.pro
@@ -6,222 +6,4 @@ DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2 
 TARGET    = tonleiter
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/net/ftplib/ftplib.pro b/noncore/net/ftplib/ftplib.pro
index e8af9ea..54bf5fe 100644
--- a/noncore/net/ftplib/ftplib.pro
+++ b/noncore/net/ftplib/ftplib.pro
@@ -7,94 +7,4 @@ INTERFACES  =
 TARGET    = ftplib
 QMAKE_LINK=$$QMAKE_CC
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/net/linphone/linphone.pro b/noncore/net/linphone/linphone.pro
index d4c2a27..ef3e61a 100644
--- a/noncore/net/linphone/linphone.pro
+++ b/noncore/net/linphone/linphone.pro
@@ -9,100 +9,4 @@ DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe -llinphone
        TARGET  = olinphone
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/net/mail/libmailwrapper/libmailwrapper.pro b/noncore/net/mail/libmailwrapper/libmailwrapper.pro
index 1b8f611..2f8c54d 100644
--- a/noncore/net/mail/libmailwrapper/libmailwrapper.pro
+++ b/noncore/net/mail/libmailwrapper/libmailwrapper.pro
@@ -50,91 +50,7 @@ contains( $(CONFIG_TARGET_MACOSX), y ){
 DESTDIR      = $(OPIEDIR)/lib
 TARGET       = mailwrapper
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 !isEmpty( LIBETPAN_INC_DIR ) {
    INCLUDEPATH = $$LIBETPAN_INC_DIR $$INCLUDEPATH
diff --git a/noncore/net/mail/mail.pro b/noncore/net/mail/mail.pro
index e2f548f..e394bbf 100644
--- a/noncore/net/mail/mail.pro
+++ b/noncore/net/mail/mail.pro
@@ -63,90 +63,7 @@ contains( CONFTEST, y ){
 TARGET       = opiemail
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 !isEmpty( LIBETPAN_INC_DIR ) {
    INCLUDEPATH = $$LIBETPAN_INC_DIR $$INCLUDEPATH
 }
diff --git a/noncore/net/mail/taskbarapplet/taskbarapplet.pro b/noncore/net/mail/taskbarapplet/taskbarapplet.pro
index 5b33977..258c745 100644
--- a/noncore/net/mail/taskbarapplet/taskbarapplet.pro
+++ b/noncore/net/mail/taskbarapplet/taskbarapplet.pro
@@ -9,87 +9,4 @@ LIBS		+=	-lmailwrapper -lqpe -lopiecore2
        TARGET          =mailapplet
        DESTDIR                 +=$(OPIEDIR)/plugins/applets/
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/net/opieftp/opieftp.pro b/noncore/net/opieftp/opieftp.pro
index e5917fd..fe69e15 100644
--- a/noncore/net/opieftp/opieftp.pro
+++ b/noncore/net/opieftp/opieftp.pro
@@ -6,96 +6,4 @@ INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2 -lftplib
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/net/opieirc/opieirc.pro b/noncore/net/opieirc/opieirc.pro
index 71c31d4..db89fa6 100644
--- a/noncore/net/opieirc/opieirc.pro
+++ b/noncore/net/opieirc/opieirc.pro
@@ -25,98 +25,4 @@ LIBS        += -lqpe -lopiecore2 -lopieui2 -lqtaux2
 TARGET      = opieirc
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/net/opierdesktop/opierdesktop.pro b/noncore/net/opierdesktop/opierdesktop.pro
index 5a8ace6..97120b5 100644
--- a/noncore/net/opierdesktop/opierdesktop.pro
+++ b/noncore/net/opierdesktop/opierdesktop.pro
@@ -22,95 +22,5 @@ INTERFACES      =
 TARGET          = ordesktop
 QMAKE_CXXFLAGS    += -DSHARP=1 -DWITH_OPENSSL=1
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/net/opietooth/applet/applet.pro b/noncore/net/opietooth/applet/applet.pro
index df15f5d..bb8a053 100644
--- a/noncore/net/opietooth/applet/applet.pro
+++ b/noncore/net/opietooth/applet/applet.pro
@@ -10,86 +10,4 @@ DEPENDPATH    += $(OPIEDIR)/include
 LIBS          += -lqpe -lopietooth1
 VERSION       = 0.0.3
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/net/opietooth/blue-pin/blue-pin.pro b/noncore/net/opietooth/blue-pin/blue-pin.pro
index 4ae6090..12a3110 100644
--- a/noncore/net/opietooth/blue-pin/blue-pin.pro
+++ b/noncore/net/opietooth/blue-pin/blue-pin.pro
@@ -8,86 +8,4 @@ LIBS            += -lqpe
 INTERFACES      = pindlgbase.ui
        TARGET  = bluepin
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/net/opietooth/lib/lib.pro b/noncore/net/opietooth/lib/lib.pro
index 370c54d..9d3c14d 100644
--- a/noncore/net/opietooth/lib/lib.pro
+++ b/noncore/net/opietooth/lib/lib.pro
@@ -7,82 +7,4 @@ INCLUDEPATH += $(OPIEDIR)/include .
        DESTDIR         = $(OPIEDIR)/lib
 LIBS += -lopiecore2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/net/opietooth/manager/manager.pro b/noncore/net/opietooth/manager/manager.pro
index 5200705..b468784 100644
--- a/noncore/net/opietooth/manager/manager.pro
+++ b/noncore/net/opietooth/manager/manager.pro
@@ -27,84 +27,4 @@ INTERFACES      = bluetoothbase.ui  devicedialog.ui rfcommassigndialogbase.ui rf
        TARGET          = bluetooth-manager
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro
index ce10df1..4ebac84 100644
--- a/noncore/net/wellenreiter/gui/gui.pro
+++ b/noncore/net/wellenreiter/gui/gui.pro
@@ -36,93 +36,7 @@ TARGET          = wellenreiter
 !contains( platform, x11 ) {
  message( qws )
-  include(
+  include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
  LIBS += -lqpe -lopiecore2 -lopieui2 -lopienet2
 }
diff --git a/noncore/net/wellenreiter/wellenreiter.pro b/noncore/net/wellenreiter/wellenreiter.pro
index cb7937a..e995db9 100644
--- a/noncore/net/wellenreiter/wellenreiter.pro
+++ b/noncore/net/wellenreiter/wellenreiter.pro
@@ -4,95 +4,7 @@ VERSION         = 1.0.3-cvs
 !contains( platform, x11 ) {
  message( Configuring Wellenreiter for build on Opie )
  SUBDIRS = gui
-  include(
+  include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 }
 contains( platform, x11 ) {
diff --git a/noncore/securityplugins/blueping/bluepingplugin.pro b/noncore/securityplugins/blueping/bluepingplugin.pro
index 06e88c2..308b16e 100644
--- a/noncore/securityplugins/blueping/bluepingplugin.pro
+++ b/noncore/securityplugins/blueping/bluepingplugin.pro
@@ -14,309 +14,5 @@ LIBS		+= -lqpe -lopieui2 -lopiecore2 -lopiesecurity2
 DESTDIR = $(OPIEDIR)/plugins/security
 TARGET = multiauthbluepingplugin
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/securityplugins/dummy/dummyplugin.pro b/noncore/securityplugins/dummy/dummyplugin.pro
index d5b4569..99988d7 100644
--- a/noncore/securityplugins/dummy/dummyplugin.pro
+++ b/noncore/securityplugins/dummy/dummyplugin.pro
@@ -15,308 +15,5 @@ LIBS		+= -lqpe -lopieui2 -lopiesecurity2
 DESTDIR = $(OPIEDIR)/plugins/security
 TARGET = multiauthdummyplugin
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/securityplugins/notice/noticeplugin.pro b/noncore/securityplugins/notice/noticeplugin.pro
index 21d907a..a21017a 100644
--- a/noncore/securityplugins/notice/noticeplugin.pro
+++ b/noncore/securityplugins/notice/noticeplugin.pro
@@ -14,309 +14,4 @@ LIBS		+= -lqpe -lopieui2 -lopiesecurity2
 DESTDIR = $(OPIEDIR)/plugins/security
 TARGET = multiauthnoticeplugin
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/securityplugins/pin/pinplugin.pro b/noncore/securityplugins/pin/pinplugin.pro
index f5f89bb..4d80a16 100644
--- a/noncore/securityplugins/pin/pinplugin.pro
+++ b/noncore/securityplugins/pin/pinplugin.pro
@@ -17,307 +17,5 @@ LIBS		+= -lqpe -lopieui2 -lopiesecurity2
 DESTDIR = $(OPIEDIR)/plugins/security
 TARGET = multiauthpinplugin
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
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
@@ -7,281 +7,4 @@ 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
@@ -36,284 +36,5 @@ 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
@@ -7,290 +7,4 @@ 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
@@ -7,291 +7,4 @@ 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
@@ -7,305 +7,4 @@ 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
@@ -9,293 +9,4 @@ 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
@@ -18,304 +18,4 @@ 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
@@ -11,301 +11,4 @@ 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
@@ -8,302 +8,4 @@ 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
@@ -11,300 +11,4 @@ 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
@@ -22,305 +22,7 @@ wirelessopts {
        SOURCES += wlanimp2.cpp
 }
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 !isEmpty( LIBPCAP_INC_DIR ) {
    INCLUDEPATH = $$LIBPCAP_INC_DIR $$INCLUDEPATH
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
@@ -19,286 +19,4 @@ 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
@@ -15,285 +15,4 @@ 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
@@ -14,285 +14,4 @@ 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
@@ -15,285 +15,4 @@ 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
@@ -14,285 +14,4 @@ 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
@@ -15,286 +15,4 @@ 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
@@ -21,285 +21,4 @@ INTERFACES = networksettingsGUI.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
@@ -25,286 +25,4 @@ 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
@@ -21,285 +21,4 @@ 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
@@ -15,286 +15,4 @@ 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
@@ -15,285 +15,4 @@ 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
@@ -15,285 +15,4 @@ 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
@@ -15,285 +15,4 @@ 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
@@ -31,282 +31,7 @@ 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
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
@@ -6,285 +6,4 @@ 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
@@ -7,288 +7,4 @@ 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
@@ -33,295 +33,4 @@ 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
@@ -7,299 +7,4 @@ 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
@@ -6,297 +6,4 @@ DEPENDPATH     += $(OPIEDIR)/include
 LIBS           += -lqpe -lopiecore2 -lopieui2 -lcrypt
 TARGET         = usermanager
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/styles/flat/flat.pro b/noncore/styles/flat/flat.pro
index 4390dd9..c3a7f79 100644
--- a/noncore/styles/flat/flat.pro
+++ b/noncore/styles/flat/flat.pro
@@ -12,244 +12,4 @@ VERSION		= 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/styles/fresh/fresh.pro b/noncore/styles/fresh/fresh.pro
index 5d8aa3d..e5d5e83 100644
--- a/noncore/styles/fresh/fresh.pro
+++ b/noncore/styles/fresh/fresh.pro
@@ -12,246 +12,4 @@ VERSION		= 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/styles/liquid/liquid.pro b/noncore/styles/liquid/liquid.pro
index 42b9ddc..8c6eb90 100644
--- a/noncore/styles/liquid/liquid.pro
+++ b/noncore/styles/liquid/liquid.pro
@@ -16,250 +16,4 @@ DESTDIR      = $(OPIEDIR)/plugins/styles
 TARGET       = liquid
 VERSION      = 1.0.1
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/styles/metal/metal.pro b/noncore/styles/metal/metal.pro
index 89e7bb4..662ccfc 100644
--- a/noncore/styles/metal/metal.pro
+++ b/noncore/styles/metal/metal.pro
@@ -9,247 +9,4 @@ DESTDIR      = $(OPIEDIR)/plugins/styles
 TARGET       = metal
 VERSION      = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/styles/phase/phase.pro b/noncore/styles/phase/phase.pro
index 868a99a..f8a1e9b 100644
--- a/noncore/styles/phase/phase.pro
+++ b/noncore/styles/phase/phase.pro
@@ -12,248 +12,4 @@ DESTDIR      = $(OPIEDIR)/plugins/styles
 TARGET       = phasestyle
 VERSION      = 0.4.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/styles/theme/theme.pro b/noncore/styles/theme/theme.pro
index ba33e2f..2eaac46 100644
--- a/noncore/styles/theme/theme.pro
+++ b/noncore/styles/theme/theme.pro
@@ -19,249 +19,4 @@ DESTDIR      = $(OPIEDIR)/plugins/styles
 TARGET       = theme
 VERSION      = 1.0.1
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/styles/web/web.pro b/noncore/styles/web/web.pro
index d9d76fc..1060ab4 100644
--- a/noncore/styles/web/web.pro
+++ b/noncore/styles/web/web.pro
@@ -11,242 +11,4 @@ DESTDIR      = $(OPIEDIR)/plugins/styles
 TARGET       = webstyle
 VERSION      = 0.4.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/todayplugins/fortune/fortune.pro b/noncore/todayplugins/fortune/fortune.pro
index 2835077..22ce564 100644
--- a/noncore/todayplugins/fortune/fortune.pro
+++ b/noncore/todayplugins/fortune/fortune.pro
@@ -17,218 +17,4 @@ LIBS+= -lqpe -lopiecore2 -lopiepim2 -lopieui2 -lqtaux2
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todayfortuneplugin
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/todayplugins/stockticker/stockticker.pro b/noncore/todayplugins/stockticker/stockticker.pro
index b767aea..810cc57 100644
--- a/noncore/todayplugins/stockticker/stockticker.pro
+++ b/noncore/todayplugins/stockticker/stockticker.pro
@@ -3,218 +3,4 @@ unix:SUBDIRS    = stockticker stocktickerlib
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/todayplugins/stockticker/stockticker/stockticker.pro b/noncore/todayplugins/stockticker/stockticker/stockticker.pro
index 8edbc21..cf6822a 100644
--- a/noncore/todayplugins/stockticker/stockticker/stockticker.pro
+++ b/noncore/todayplugins/stockticker/stockticker/stockticker.pro
@@ -9,220 +9,4 @@ DEPENDPATH      += $(OPIEDIR)/include
 LIBS+= -lqpe -lopiecore2 -lqtaux2
 DESTDIR = $(OPIEDIR)/bin
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro
index 99cb504..66f553d 100644
--- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro
+++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro
@@ -25,218 +25,4 @@ DEFINES += __UNIX__
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todaystocktickerplugin
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/todayplugins/weather/weather.pro b/noncore/todayplugins/weather/weather.pro
index 051861a..4a427dc 100644
--- a/noncore/todayplugins/weather/weather.pro
+++ b/noncore/todayplugins/weather/weather.pro
@@ -22,218 +22,4 @@ LIBS+= -lqpe -lopiecore2 -lopiepim2
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todayweatherplugin
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/tools/calc2/binary/binary.pro b/noncore/tools/calc2/binary/binary.pro
index 506c05f..1348d00 100644
--- a/noncore/tools/calc2/binary/binary.pro
+++ b/noncore/tools/calc2/binary/binary.pro
@@ -14,206 +14,4 @@
 #TARGET = binary
 #
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/tools/calc2/calc.pro b/noncore/tools/calc2/calc.pro
index abe213f..191a4df 100644
--- a/noncore/tools/calc2/calc.pro
+++ b/noncore/tools/calc2/calc.pro
@@ -9,206 +9,4 @@ LIBS += -lqpe -Wl,-export-dynamic
 TARGET = calc
 DESTDIR = $(OPIEDIR)/bin
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/tools/calc2/simple/simple.pro b/noncore/tools/calc2/simple/simple.pro
index 7c7ea9d..2312f99 100644
--- a/noncore/tools/calc2/simple/simple.pro
+++ b/noncore/tools/calc2/simple/simple.pro
@@ -11,206 +11,4 @@
 #DESTDIR = $(OPIEDIR)/plugins/calculator
 #
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/tools/calculator/calculator.pro b/noncore/tools/calculator/calculator.pro
index edc4b81..9f3e994 100644
--- a/noncore/tools/calculator/calculator.pro
+++ b/noncore/tools/calculator/calculator.pro
@@ -8,206 +8,4 @@ LIBS            += -lqpe -lopiecore2
        INTERFACES= calculator.ui
        TARGET  = calculator
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/tools/clock/clock.pro b/noncore/tools/clock/clock.pro
index d753556..33ea9a9 100644
--- a/noncore/tools/clock/clock.pro
+++ b/noncore/tools/clock/clock.pro
@@ -12,208 +12,4 @@ TARGET    = clock
        INTERFACES= clockbase.ui \
                alarmdlgbase.ui
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/tools/euroconv/euroconv.pro b/noncore/tools/euroconv/euroconv.pro
index 522d0ac..38ff320 100644
--- a/noncore/tools/euroconv/euroconv.pro
+++ b/noncore/tools/euroconv/euroconv.pro
@@ -10,214 +10,4 @@ LIBS            += -lqpe
        INTERFACES= 
 TARGET          = euroconv
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/tools/formatter/formatter.pro b/noncore/tools/formatter/formatter.pro
index 371e186..ca8e41b 100644
--- a/noncore/tools/formatter/formatter.pro
+++ b/noncore/tools/formatter/formatter.pro
@@ -6,212 +6,4 @@ INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/tools/opie-sh/opie-sh.pro b/noncore/tools/opie-sh/opie-sh.pro
index 673467f..57f7978 100644
--- a/noncore/tools/opie-sh/opie-sh.pro
+++ b/noncore/tools/opie-sh/opie-sh.pro
@@ -8,218 +8,4 @@ DEPENDPATH		+=$(OPIEDIR)/include
        LIBS                                    +=-lqpe
 TARGET                   = opie-sh
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/tools/pimconverter/converter.pro b/noncore/tools/pimconverter/converter.pro
index de72e8d..3f2d321 100644
--- a/noncore/tools/pimconverter/converter.pro
+++ b/noncore/tools/pimconverter/converter.pro
@@ -7,210 +7,4 @@ DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2 -lopiepim2 -lopiedb2 
        TARGET  = opimconverter
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/tools/pyquicklauncher/pyquicklauncher.pro b/noncore/tools/pyquicklauncher/pyquicklauncher.pro
index 107689c..e952278 100644
--- a/noncore/tools/pyquicklauncher/pyquicklauncher.pro
+++ b/noncore/tools/pyquicklauncher/pyquicklauncher.pro
@@ -6,208 +6,4 @@ SOURCES		= main.cpp
        TARGET  = pyquicklauncher
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/tools/remote/remote.pro b/noncore/tools/remote/remote.pro
index 76cdb97..880856c 100644
--- a/noncore/tools/remote/remote.pro
+++ b/noncore/tools/remote/remote.pro
@@ -8,216 +8,4 @@ DEPENDPATH	+=$(OPIEDIR)/include
        LIBS    +=-lqpe -lopiecore2
 TARGET          = remote
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/unsupported/filebrowser/filebrowser.pro b/noncore/unsupported/filebrowser/filebrowser.pro
index 1771609..a574110 100644
--- a/noncore/unsupported/filebrowser/filebrowser.pro
+++ b/noncore/unsupported/filebrowser/filebrowser.pro
@@ -9,263 +9,4 @@ LIBS            += -lqpe
        INTERFACES=
        TARGET        = filebrowser
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/unsupported/gsmtool/gsmtool.pro b/noncore/unsupported/gsmtool/gsmtool.pro
index 4cceb5a..13f0a7c 100644
--- a/noncore/unsupported/gsmtool/gsmtool.pro
+++ b/noncore/unsupported/gsmtool/gsmtool.pro
@@ -13,259 +13,4 @@ LIBS            += -lqpe -L$(GSMLIBDIR)/gsmlib/.libs -lgsmme
        INTERFACES= gsmtoolbase.ui
        TARGET  = gsmtool
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/unsupported/libopie/libopie.pro b/noncore/unsupported/libopie/libopie.pro
index d6c6485..a438bd5 100644
--- a/noncore/unsupported/libopie/libopie.pro
+++ b/noncore/unsupported/libopie/libopie.pro
@@ -99,254 +99,4 @@ INTERFACES      = otimepickerbase.ui orecurrancebase.ui
 TARGET          = opie
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/unsupported/libopie/pim/libopie.pro b/noncore/unsupported/libopie/pim/libopie.pro
index b71c578..a712b22 100644
--- a/noncore/unsupported/libopie/pim/libopie.pro
+++ b/noncore/unsupported/libopie/pim/libopie.pro
@@ -61,253 +61,4 @@ DESTDIR      = $(OPIEDIR)/lib$(PROJMAK)
 INTERFACES      = otimepickerbase.ui
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/unsupported/mail2/bend/bend.pro b/noncore/unsupported/mail2/bend/bend.pro
index 8f6fca4..52eea3d 100644
--- a/noncore/unsupported/mail2/bend/bend.pro
+++ b/noncore/unsupported/mail2/bend/bend.pro
@@ -9,250 +9,4 @@ LIBS		+=	-lcoremail -lqpe
        TARGET          =bend
        DESTDIR                 +=$(OPIEDIR)/plugins/applets/
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/unsupported/mail2/libmail/libmail.pro b/noncore/unsupported/mail2/libmail/libmail.pro
index fcba525..4595c21 100644
--- a/noncore/unsupported/mail2/libmail/libmail.pro
+++ b/noncore/unsupported/mail2/libmail/libmail.pro
@@ -23,251 +23,4 @@ LIBS		+=	-L$(OPIEDIR)/lib -lqpe
        TARGET          =coremail
 DESTDIR      = $(OPIEDIR)/lib
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/unsupported/mail2/mail.pro b/noncore/unsupported/mail2/mail.pro
index 52957b4..99152a6 100644
--- a/noncore/unsupported/mail2/mail.pro
+++ b/noncore/unsupported/mail2/mail.pro
@@ -43,251 +43,4 @@ INCLUDEPATH    += 	$(OPIEDIR)/include libmail
        LIBS           += -lcoremail -lqpe -lopie
        TARGET          = mail 
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/unsupported/mailit/mailit.pro b/noncore/unsupported/mailit/mailit.pro
index bcf6412..752f0b4 100644
--- a/noncore/unsupported/mailit/mailit.pro
+++ b/noncore/unsupported/mailit/mailit.pro
@@ -37,257 +37,4 @@ DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
 # -lssl
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/unsupported/oipkg/oipkg.pro b/noncore/unsupported/oipkg/oipkg.pro
index fc334b2..7ee9a14 100644
--- a/noncore/unsupported/oipkg/oipkg.pro
+++ b/noncore/unsupported/oipkg/oipkg.pro
@@ -37,252 +37,4 @@ INTERFACES	= runwindow.ui \
                pksettingsbase.ui
        TARGET  = oipkg
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/unsupported/qashmoney/qashmoney.pro b/noncore/unsupported/qashmoney/qashmoney.pro
index 9f7589a..1fea72f 100755
--- a/noncore/unsupported/qashmoney/qashmoney.pro
+++ b/noncore/unsupported/qashmoney/qashmoney.pro
@@ -45,264 +45,7 @@ DESTDIR = $(OPIEDIR)/bin
 unix:LIBS += -lm
 LIBS += -lqpe -lopiecore2 -lsqlite3
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 !isEmpty( LIBSQLITE_INC_DIR ) {
    INCLUDEPATH = $$LIBSQLITE_INC_DIR $$INCLUDEPATH
diff --git a/noncore/unsupported/qpdf/qpdf.pro b/noncore/unsupported/qpdf/qpdf.pro
index 04104f8..4dea23a 100644
--- a/noncore/unsupported/qpdf/qpdf.pro
+++ b/noncore/unsupported/qpdf/qpdf.pro
@@ -53,250 +53,4 @@ LIBS        += -L $(OPIEDIR)/lib -lqpe -lopie -lstdc++
 DESTDIR      = $(OPIEDIR)/bin
 TARGET       = qpdf
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/unsupported/ubrowser/ubrowser.pro b/noncore/unsupported/ubrowser/ubrowser.pro
index 4966863..7369137 100644
--- a/noncore/unsupported/ubrowser/ubrowser.pro
+++ b/noncore/unsupported/ubrowser/ubrowser.pro
@@ -8,256 +8,4 @@ TARGET          = ubrowser
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/rsync/rsync.pro b/rsync/rsync.pro
index 819cd1a..a9e341c 100644
--- a/rsync/rsync.pro
+++ b/rsync/rsync.pro
@@ -57,75 +57,4 @@ INCLUDEPATH += $(OPIEDIR)/include .
 LIBS        += -lopiecore2
 TARGET       = qrsync
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/x11/ipc/server/ocopserver.pro b/x11/ipc/server/ocopserver.pro
index 2fd951d..b1ed406 100644
--- a/x11/ipc/server/ocopserver.pro
+++ b/x11/ipc/server/ocopserver.pro
@@ -11,8 +11,4 @@ TARGET		= ocopserver
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/x11/ipc/server/server.pro b/x11/ipc/server/server.pro
index 33e038e..b1ed406 100644
--- a/x11/ipc/server/server.pro
+++ b/x11/ipc/server/server.pro
@@ -11,6 +11,4 @@ TARGET		= ocopserver
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/x11/libqpe-x11/libqpe-x11.pro b/x11/libqpe-x11/libqpe-x11.pro
index 99c50ee..45d2042 100644
--- a/x11/libqpe-x11/libqpe-x11.pro
+++ b/x11/libqpe-x11/libqpe-x11.pro
@@ -144,8 +144,4 @@ VERSION		= 1.5.0.1
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
author	mickeyl <mickeyl>	2004-12-24 20:12:34 (UTC)
committer	mickeyl <mickeyl>	2004-12-24 20:12:34 (UTC)
commit	15dc267bf93fd9d32cfa9a4c642d0b89761eda7d (patch) (unidiff)
tree	fc4014b9eb59dfddc61e55eadd7391f89fce1def
parent	c935fd64ef5892d32d3d55780f26643a47452752 (diff)
download	opie-15dc267bf93fd9d32cfa9a4c642d0b89761eda7d.zip opie-15dc267bf93fd9d32cfa9a4c642d0b89761eda7d.tar.gz opie-15dc267bf93fd9d32cfa9a4c642d0b89761eda7d.tar.bz2