56 files changed, 2131 insertions, 56 deletions

diff --git a/core/applets/aboutapplet/aboutapplet.pro b/core/applets/aboutapplet/aboutapplet.pro
index b239715..df59316 100644
--- a/core/applets/aboutapplet/aboutapplet.pro
+++ b/core/applets/aboutapplet/aboutapplet.pro
@@ -1,14 +1,51 @@
 TEMPLATE      = lib
 CONFIG       += qt plugin warn_on 
 HEADERS       = about.h
 SOURCES       = about.cpp
 INTERFACES    = widget.ui
 TARGET        = aboutapplet
 DESTDIR       = $(OPIEDIR)/plugins/applets
 INCLUDEPATH  += $(OPIEDIR)/include
 DEPENDPATH   += $(OPIEDIR)/include
 LIBS         += -lqpe
 VERSION       = 1.0.0
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/batteryapplet/batteryapplet.pro b/core/applets/batteryapplet/batteryapplet.pro
index f201db9..4bd8e91 100644
--- a/core/applets/batteryapplet/batteryapplet.pro
+++ b/core/applets/batteryapplet/batteryapplet.pro
@@ -1,13 +1,55 @@
         TEMPLATE= lib
         CONFIG  += qt plugin warn_on 
         HEADERS=   battery.h batterystatus.h
         SOURCES=   battery.cpp batterystatus.cpp
         TARGET  = batteryapplet
         DESTDIR         = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      +=  ..
 LIBS            += -lqpe -lopiecore2
         VERSION         = 1.0.0
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/cardmon/cardmon.pro b/core/applets/cardmon/cardmon.pro
index dfd1f12..b68ffd2 100644
--- a/core/applets/cardmon/cardmon.pro
+++ b/core/applets/cardmon/cardmon.pro
@@ -1,13 +1,71 @@
         TEMPLATE= lib
         CONFIG  += qt plugin warn_on 
         HEADERS         =cardmon.h
         SOURCES         =cardmon.cpp
         TARGET  = cardmonapplet
         DESTDIR         = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include ../launcher
 LIBS            += -lqpe -lopiecore2
         VERSION         = 1.0.0
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/clipboardapplet/clipboardapplet.pro b/core/applets/clipboardapplet/clipboardapplet.pro
index ba37e30..df4643a 100644
--- a/core/applets/clipboardapplet/clipboardapplet.pro
+++ b/core/applets/clipboardapplet/clipboardapplet.pro
@@ -1,13 +1,61 @@
         TEMPLATE= lib
         CONFIG  += qt plugin warn_on 
         HEADERS         =   clipboard.h
         SOURCES         =   clipboard.cpp
         TARGET  = clipboardapplet
         DESTDIR         = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += 
 LIBS            += -lqpe
         VERSION         = 1.0.0
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/clockapplet/clockapplet.pro b/core/applets/clockapplet/clockapplet.pro
index b681f5c..28b2332 100644
--- a/core/applets/clockapplet/clockapplet.pro
+++ b/core/applets/clockapplet/clockapplet.pro
@@ -1,13 +1,74 @@
         TEMPLATE= lib
         CONFIG  += qt plugin warn_on 
         HEADERS         = clock.h
         SOURCES         = clock.cpp
         TARGET  = clockapplet
         DESTDIR         = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      +=  ..
 LIBS            += -lqpe
         VERSION         = 1.0.0
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/homeapplet/homeapplet.pro b/core/applets/homeapplet/homeapplet.pro
index c23e55c..5deb9ae 100644
--- a/core/applets/homeapplet/homeapplet.pro
+++ b/core/applets/homeapplet/homeapplet.pro
@@ -1,13 +1,69 @@
 TEMPLATE      = lib
 CONFIG       += qt plugin warn_on 
 HEADERS       = home.h
 SOURCES       = home.cpp
 TARGET        = homeapplet
 DESTDIR       = $(OPIEDIR)/plugins/applets
 INCLUDEPATH  += $(OPIEDIR)/include
 DEPENDPATH   += $(OPIEDIR)/include
 LIBS         += -lqpe
 VERSION       = 1.0.0
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/irdaapplet/irdaapplet.pro b/core/applets/irdaapplet/irdaapplet.pro
index ea0e752..920ff4b 100644
--- a/core/applets/irdaapplet/irdaapplet.pro
+++ b/core/applets/irdaapplet/irdaapplet.pro
@@ -1,13 +1,75 @@
         TEMPLATE  = lib
         CONFIG    += qt plugin warn_on 
         HEADERS = irda.h
         SOURCES = irda.cpp
         TARGET    = irdaapplet
         DESTDIR   = $(OPIEDIR)/plugins/applets
         INCLUDEPATH+= $(OPIEDIR)/include
 DEPENDPATH      += 
 LIBS            += -lqpe
 VERSION   = 1.0.0
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/lockapplet/lockapplet.pro b/core/applets/lockapplet/lockapplet.pro
index b890585..2be6066 100644
--- a/core/applets/lockapplet/lockapplet.pro
+++ b/core/applets/lockapplet/lockapplet.pro
@@ -1,12 +1,64 @@
 TEMPLATE      = lib
 CONFIG       += qt plugn warn_on 
 HEADERS       = lock.h
 SOURCES       = lock.cpp
 TARGET        = lockapplet
 DESTDIR       = $(OPIEDIR)/plugins/applets
 INCLUDEPATH  += $(OPIEDIR)/include
 DEPENDPATH   += $(OPIEDIR)/include
 LIBS         += -lqpe -lopiesecurity2
 VERSION       = 1.0.0
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
diff --git a/core/applets/logoutapplet/logoutapplet.pro b/core/applets/logoutapplet/logoutapplet.pro
index 2cbd3a4..e93dc0b 100644
--- a/core/applets/logoutapplet/logoutapplet.pro
+++ b/core/applets/logoutapplet/logoutapplet.pro
@@ -1,13 +1,63 @@
 TEMPLATE      = lib
 CONFIG       += qt plugin warn_on 
 HEADERS       = logout.h
 SOURCES       = logout.cpp
 TARGET        = logoutapplet
 DESTDIR       = $(OPIEDIR)/plugins/applets
 INCLUDEPATH  += $(OPIEDIR)/include
 DEPENDPATH   += $(OPIEDIR)/include
 LIBS         += -lqpe
 VERSION       = 1.0.0
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/multikeyapplet/multikeyapplet.pro b/core/applets/multikeyapplet/multikeyapplet.pro
index d386998..571f4ab 100644
--- a/core/applets/multikeyapplet/multikeyapplet.pro
+++ b/core/applets/multikeyapplet/multikeyapplet.pro
@@ -1,13 +1,58 @@
         TEMPLATE= lib
         CONFIG  += qt plugin warn_on 
         HEADERS=   multikey.h
         SOURCES=   multikey.cpp
         TARGET  = multikeyapplet
         DESTDIR         = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      +=  ..
 LIBS            += -lqpe
         VERSION         = 1.0.0
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/restartapplet/restartapplet.pro b/core/applets/restartapplet/restartapplet.pro
index d8323ed..e616112 100644
--- a/core/applets/restartapplet/restartapplet.pro
+++ b/core/applets/restartapplet/restartapplet.pro
@@ -4,14 +4,71 @@ HEADERS =   restart.h restartappletimpl.h
 SOURCES =   restart.cpp restartappletimpl.cpp
 TARGET    = restartapplet
 DESTDIR   = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += 
 LIBS            += -lqpe
 VERSION   = 1.0.0
 MOC_DIR=opieobj
 OBJECTS_DIR=opieobj
 
 
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/restartapplet2/restartapplet.pro b/core/applets/restartapplet2/restartapplet.pro
index 21cffee..8e13235 100644
--- a/core/applets/restartapplet2/restartapplet.pro
+++ b/core/applets/restartapplet2/restartapplet.pro
@@ -4,14 +4,55 @@ HEADERS =   restart.h
 SOURCES =   restart.cpp
 TARGET    = restartapplet2
 DESTDIR   = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
 VERSION   = 1.0.0
 MOC_DIR=opieobj
 OBJECTS_DIR=opieobj
 
 
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/rotateapplet/rotateapplet.pro b/core/applets/rotateapplet/rotateapplet.pro
index 87233e3..ce95406 100644
--- a/core/applets/rotateapplet/rotateapplet.pro
+++ b/core/applets/rotateapplet/rotateapplet.pro
@@ -1,13 +1,57 @@
 TEMPLATE      = lib
 CONFIG       += qt plugn warn_on 
 HEADERS       = rotate.h
 SOURCES       = rotate.cpp
 TARGET        = rotateapplet
 DESTDIR       = $(OPIEDIR)/plugins/applets
 INCLUDEPATH  += $(OPIEDIR)/include
 DEPENDPATH   += $(OPIEDIR)/include
 LIBS         += -lqpe -lopiecore2
 VERSION       = 1.0.0
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/screenshotapplet/screenshotapplet.pro b/core/applets/screenshotapplet/screenshotapplet.pro
index e214643..5da3cf3 100644
--- a/core/applets/screenshotapplet/screenshotapplet.pro
+++ b/core/applets/screenshotapplet/screenshotapplet.pro
@@ -1,13 +1,73 @@
 TEMPLATE  = lib
 CONFIG    += qt plugin warn_on 
 HEADERS   = screenshot.h inputDialog.h
 SOURCES   = screenshot.cpp inputDialog.cpp
 TARGET    = screenshotapplet
 DESTDIR   = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += 
 LIBS            += -lqpe
 VERSION   = 1.0.0
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/suspendapplet/suspendapplet.pro b/core/applets/suspendapplet/suspendapplet.pro
index 0ef7825..df2c882 100644
--- a/core/applets/suspendapplet/suspendapplet.pro
+++ b/core/applets/suspendapplet/suspendapplet.pro
@@ -1,13 +1,67 @@
 TEMPLATE      = lib
 CONFIG       += qt plugin warn_on 
 HEADERS       = suspend.h
 SOURCES       = suspend.cpp
 TARGET        = suspendapplet
 DESTDIR       = $(OPIEDIR)/plugins/applets
 INCLUDEPATH  += $(OPIEDIR)/include
 DEPENDPATH   += $(OPIEDIR)/include
 LIBS         += -lqpe
 VERSION       = 1.0.0
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/vmemo/vmemo.pro b/core/applets/vmemo/vmemo.pro
index 23e6370..44d6656 100644
--- a/core/applets/vmemo/vmemo.pro
+++ b/core/applets/vmemo/vmemo.pro
@@ -1,13 +1,52 @@
 TEMPLATE  = lib
 CONFIG    += qt plugin warn_on 
 HEADERS =   vmemo.h adpcm.h
 SOURCES =   vmemo.cpp adpcm.c
 TARGET    = vmemoapplet
 DESTDIR   =$(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
 VERSION   = 1.0.0
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/volumeapplet/volumeapplet.pro b/core/applets/volumeapplet/volumeapplet.pro
index 4db3d12..eb75e9c 100644
--- a/core/applets/volumeapplet/volumeapplet.pro
+++ b/core/applets/volumeapplet/volumeapplet.pro
@@ -1,13 +1,72 @@
         TEMPLATE= lib
         CONFIG  += qt plugin warn_on 
         HEADERS         = volume.h oledbox.h
         SOURCES         = volume.cpp oledbox.cpp
         TARGET  = volumeapplet
         DESTDIR         = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += 
 LIBS            += -lqpe -lopiecore2
         VERSION         = 1.0.0
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/vtapplet/vtapplet.pro b/core/applets/vtapplet/vtapplet.pro
index bcca72c..90fc82a 100644
--- a/core/applets/vtapplet/vtapplet.pro
+++ b/core/applets/vtapplet/vtapplet.pro
@@ -1,13 +1,60 @@
 TEMPLATE      = lib
 CONFIG       += qt warn_on 
 HEADERS       = vt.h
 SOURCES       = vt.cpp
 TARGET        = vtapplet
 DESTDIR       = $(OPIEDIR)/plugins/applets
 INCLUDEPATH  += $(OPIEDIR)/include
 DEPENDPATH   += $(OPIEDIR)/include
 LIBS         += -lqpe
 VERSION       = 1.0.0
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/apps/calibrate/calibrate.pro b/core/apps/calibrate/calibrate.pro
index 5e2f58a..fcc0ba3 100644
--- a/core/apps/calibrate/calibrate.pro
+++ b/core/apps/calibrate/calibrate.pro
@@ -1,11 +1,34 @@
         TEMPLATE= app
         CONFIG  = qt warn_on 
         DESTDIR         = $(OPIEDIR)/bin
         HEADERS         = calibrate.h
         SOURCES         = calibrate.cpp main.cpp
         INCLUDEPATH+= $(QTDIR)/include $(OPIEDIR)/include
         DEPENDPATH+= $(QTDIR)/include $(OPIEDIR)/include
         TARGET  = calibrate
         LIBS    += -lqpe 
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
diff --git a/core/apps/embeddedkonsole/embeddedkonsole.pro b/core/apps/embeddedkonsole/embeddedkonsole.pro
index 1bff59d..018576f 100755
--- a/core/apps/embeddedkonsole/embeddedkonsole.pro
+++ b/core/apps/embeddedkonsole/embeddedkonsole.pro
@@ -27,13 +27,40 @@ SOURCES   = TEScreen.cpp \
       main.cpp
 INTERFACES =  commandeditdialogbase.ui smallcommandeditdialogbase.ui
 TARGET    = embeddedkonsole
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 
 DEFINES     += QT_QWS_OPIE HAVE_OPENPTY
 LIBS        += -lqpe -lopiecore2 -lqtaux2 -lutil
 
 #DEFINES     += HAVE_OPENPTY
 #LIBS        += -lqpe -lutil
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
diff --git a/core/apps/helpbrowser/helpbrowser.pro b/core/apps/helpbrowser/helpbrowser.pro
index 02cc013..9627819 100644
--- a/core/apps/helpbrowser/helpbrowser.pro
+++ b/core/apps/helpbrowser/helpbrowser.pro
@@ -1,11 +1,36 @@
 CONFIG    += qt warn_on  quick-app
         HEADERS         = helpbrowser.h magictextbrowser.h
         SOURCES         = helpbrowser.cpp magictextbrowser.cpp \
                   main.cpp
 INCLUDEPATH += $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2
         INTERFACES=
 TARGET          = helpbrowser
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
diff --git a/core/apps/oapp/oapp.pro b/core/apps/oapp/oapp.pro
index b715c0e..db52c13 100644
--- a/core/apps/oapp/oapp.pro
+++ b/core/apps/oapp/oapp.pro
@@ -6,13 +6,29 @@ VERSION		= 1.0.0
 
         LIBS    += -lqpe
         HEADERS         = \
                   oappplugin.h \
                   oappinterface.h
         SOURCES         = \
                   oappplugin.cpp
 
         DESTDIR         = $(OPIEDIR)/lib$(PROJMAK)
         INCLUDEPATH+= $(OPIEDIR)/include 
         DEPENDPATH+= $(OPIEDIR)/include .
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
diff --git a/core/apps/qcop/qcop.pro b/core/apps/qcop/qcop.pro
index a4b39d9..5e9c735 100644
--- a/core/apps/qcop/qcop.pro
+++ b/core/apps/qcop/qcop.pro
@@ -1,12 +1,30 @@
         TEMPLATE= app
         CONFIG  = qt warn_on 
         DESTDIR         = $(OPIEDIR)/bin
         HEADERS         = 
         SOURCES         = main.cpp
 INCLUDEPATH += $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
         INTERFACES= 
         TARGET  = qcop
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
diff --git a/core/apps/taboapp/taboapp.pro b/core/apps/taboapp/taboapp.pro
index 2f95187..645cc04 100644
--- a/core/apps/taboapp/taboapp.pro
+++ b/core/apps/taboapp/taboapp.pro
@@ -5,13 +5,32 @@ DESTDIR		= $(OPIEDIR)/bin
         SOURCES         = main.cpp
 
         INCLUDEPATH+= $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include .
         TARGET  = taboapp
         LIBS    += -lqpe -lopiecore2 -lopieui2 -loapp
         INCLUDEPATH+= $(OPIEDIR)/core/apps/oapp
         DEPENDPATH+= $(OPIEDIR)/core/apps/oapp
         MOC_DIR         = .build
         OBJECTS_DIR= .build
         UI_DIR  = .build
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
diff --git a/core/apps/textedit/textedit.pro b/core/apps/textedit/textedit.pro
index 560e772..7ec124f 100644
--- a/core/apps/textedit/textedit.pro
+++ b/core/apps/textedit/textedit.pro
@@ -1,9 +1,30 @@
 CONFIG    += qt warn_on  quick-app
 HEADERS = textedit.h filePermissions.h
 SOURCES = main.cpp textedit.cpp filePermissions.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2 -lopieui2
 TARGET    = textedit
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
diff --git a/core/launcher/server.pro b/core/launcher/server.pro
index 990e384..901a80f 100644
--- a/core/launcher/server.pro
+++ b/core/launcher/server.pro
@@ -77,13 +77,84 @@ INCLUDEPATH += $(OPIEDIR)/noncore/settings/mediummount
 DEPENDPATH  += $(OPIEDIR)/noncore/settings/mediummount
 
 LIBS        += -lqpe -lopiecore2 -lopieui2 -lopiesecurity2 -lqrsync
 TARGET       = qpe
 
 ## not ready for use yet
 # DEFINES += QPE_HAVE_DIRECT_ACCESS
 
 contains( $(CONFIG_TARGET_MACOSX), y ) {
   LIBS += -lcrypt
 }
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
diff --git a/core/multimedia/opieplayer/libflash/libflash.pro b/core/multimedia/opieplayer/libflash/libflash.pro
index eacd391..ac3cd8c 100644
--- a/core/multimedia/opieplayer/libflash/libflash.pro
+++ b/core/multimedia/opieplayer/libflash/libflash.pro
@@ -4,13 +4,47 @@ HEADERS		=   libflashplugin.h   libflashpluginimpl.h
         SOURCES         =   libflashplugin.cpp libflashpluginimpl.cpp \
                     adpcm.cc character.cc flash.cc graphic16.cc matrix.cc script.cc \
                     sprite.cc bitmap.cc cxform.cc font.cc graphic24.cc movie.cc \
                     shape.cc sqrt.cc button.cc displaylist.cc graphic.cc graphic32.cc \
                     program.cc sound.cc text.cc
         TARGET  =   flashplugin
         DESTDIR         =   ../../plugins/codecs
 INCLUDEPATH += $(OPIEDIR)/include ..
 DEPENDPATH      +=   ..
 LIBS            +=  -lqpe
         VERSION         =   1.0.0
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
diff --git a/core/multimedia/opieplayer/libmad/libmad.pro b/core/multimedia/opieplayer/libmad/libmad.pro
index 646726c..21d3ffd 100644
--- a/core/multimedia/opieplayer/libmad/libmad.pro
+++ b/core/multimedia/opieplayer/libmad/libmad.pro
@@ -2,25 +2,59 @@ TEMPLATE 	= lib
         CONFIG   +=  qt warn_on 
         HEADERS   = libmad_version.h fixed.h bit.h timer.h stream.h frame.h synth.h decoder.h \
                 layer12.h layer3.h huffman.h libmad_global.h mad.h libmadplugin.h libmadpluginimpl.h
         SOURCES   = version.c fixed.c bit.c timer.c stream.c frame.c synth.c decoder.c \
                 layer12.c layer3.c huffman.c libmadplugin.cpp libmadpluginimpl.cpp
         TARGET   = madplugin
         DESTDIR   = $(OPIEDIR)/plugins/codecs
 INCLUDEPATH += $(OPIEDIR)/include ..
 DEPENDPATH      +=  ..
 LIBS            += -lqpe -lm
 VERSION   =   1.0.0
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
         
 DEFINES += FPM_INTEL
 
 system(echo $QMAKESPEC | grep -s sharp) {
         DEFINES -= FPM_INTEL
         DEFINES += FPM_ARM
 }
 
 system(echo $QMAKESPEC | grep -s ipaq) {
         DEFINES -= FPM_INTEL
         DEFINES += FPM_ARM
 }
diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
index deb0cc2..8211182 100644
--- a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
+++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
@@ -37,13 +37,47 @@ SOURCES   =   libmpeg3plugin.cpp libmpeg3pluginimpl.cpp \
         video/reconstruct.c \
         video/seek.c \
         video/slice.c \
         video/vlc.c
 TARGET    =   mpeg3plugin
 TMAKE_CC=$(CXX)
 DESTDIR   =   $(OPIEDIR)/plugins/codecs
 INCLUDEPATH += $(OPIEDIR)/include ..
 DEPENDPATH      +=   ..
 LIBS            +=  -lqpe -lpthread -lm
 VERSION   =   1.0.0
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
diff --git a/core/multimedia/opieplayer/modplug/modplug.pro b/core/multimedia/opieplayer/modplug/modplug.pro
index 05c28a4..d6c4522 100644
--- a/core/multimedia/opieplayer/modplug/modplug.pro
+++ b/core/multimedia/opieplayer/modplug/modplug.pro
@@ -11,13 +11,43 @@ SOURCES	        =   fastmix.cpp load_669.cpp load_amf.cpp load_ams.cpp \
                     snd_flt.cpp snd_fx.cpp sndfile.cpp sndmix.cpp tables.cpp \
                     memfile.cpp
         TARGET  =   modplugin
         DESTDIR         =   $(OPIEDIR)/plugins/codecs
         INCLUDEPATH +=  $(OPIEDIR)/include
 DEPENDPATH      +=  $(OPIEDIR)/include
 LIBS            +=  -lqpe -lm 
         VERSION         =   1.0.0
 
 
 
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
diff --git a/core/multimedia/opieplayer/opieplayer.pro b/core/multimedia/opieplayer/opieplayer.pro
index 6ec9075..a13ba38 100644
--- a/core/multimedia/opieplayer/opieplayer.pro
+++ b/core/multimedia/opieplayer/opieplayer.pro
@@ -9,13 +9,47 @@ HEADERS   = loopcontrol.h mediaplayerplugininterface.h \
 SOURCES   = main.cpp \
       loopcontrol.cpp playlistselection.cpp mediaplayerstate.cpp \
       videowidget.cpp audiowidget.cpp playlistwidget.cpp \
       mediaplayer.cpp audiodevice.cpp inputDialog.cpp om3u.cpp
 TARGET    = opieplayer
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lpthread -lopiecore2 -lopieui2 -lqtaux2
 
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
diff --git a/core/multimedia/opieplayer/vorbis/libtremor.pro b/core/multimedia/opieplayer/vorbis/libtremor.pro
index dda5f6f..4a9f08b 100644
--- a/core/multimedia/opieplayer/vorbis/libtremor.pro
+++ b/core/multimedia/opieplayer/vorbis/libtremor.pro
@@ -1,12 +1,46 @@
 TEMPLATE  =   lib
 CONFIG    +=  qt warn_on 
 HEADERS   =   libtremorplugin.h libtremorinimpl.h
 SOURCES         =   libtremorplugin.cpp libtremorpluginimpl.cpp
 TARGET    =   tremorplugin
 DESTDIR   =   $(OPIEDIR)/plugins/codecs
 INCLUDEPATH += $(OPIEDIR)/include .. tremor
 DEPENDPATH      +=  $(OPIEDIR)/include .. tremor 
 LIBS            +=  -lqpe -lm -ltremor
 #-lvorbisidec
 VERSION   =   1.0.0
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
diff --git a/core/multimedia/opieplayer/vorbis/tremor/tremor.pro b/core/multimedia/opieplayer/vorbis/tremor/tremor.pro
index 2f406d4..4a3d017 100644
--- a/core/multimedia/opieplayer/vorbis/tremor/tremor.pro
+++ b/core/multimedia/opieplayer/vorbis/tremor/tremor.pro
@@ -31,13 +31,47 @@ SOURCES   = bitwise.c \
       sharedbook.c \
       synthesis.c \
       vorbisfile.c \
       window.c
 INTERFACES  = 
 DESTDIR      = $(OPIEDIR)/lib$(PROJMAK)
 #DESTDIR   =   $(OPIEDIR)/root/usr/lib
 INCLUDEPATH += $(OPIEDIR)/include ..
 DEPENDPATH      +=  $(OPIEDIR)/include ..
 #LIBS            +=  -lqpe
 VERSION   =   1.0.0
 QMAKE_LINK=$$QMAKE_CC
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
diff --git a/core/multimedia/opieplayer/vorbis/vorbis.pro b/core/multimedia/opieplayer/vorbis/vorbis.pro
index 5862dd0..3b577bd 100644
--- a/core/multimedia/opieplayer/vorbis/vorbis.pro
+++ b/core/multimedia/opieplayer/vorbis/vorbis.pro
@@ -1,11 +1,45 @@
 TEMPLATE  =   lib
 CONFIG    +=  qt warn_on 
 HEADERS   =   libtremorplugin.h libtremorpluginimpl.h
 SOURCES         =   libtremorplugin.cpp libtremorpluginimpl.cpp
 TARGET    =   tremorplugin
 DESTDIR   =   $(OPIEDIR)/plugins/codecs
 INCLUDEPATH += $(OPIEDIR)/include .. tremor
 DEPENDPATH      +=  $(OPIEDIR)/include .. tremor 
 LIBS            +=  -lqpe -lm -ltremor
 VERSION   =   1.0.0
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
diff --git a/core/multimedia/opieplayer/wavplugin/wavplugin.pro b/core/multimedia/opieplayer/wavplugin/wavplugin.pro
index 76aa736..0ab1a39 100644
--- a/core/multimedia/opieplayer/wavplugin/wavplugin.pro
+++ b/core/multimedia/opieplayer/wavplugin/wavplugin.pro
@@ -1,12 +1,46 @@
         TEMPLATE=   lib
         CONFIG  +=  qt plugin warn_on 
         HEADERS         =   wavplugin.h wavpluginimpl.h
         SOURCES        =   wavplugin.cpp wavpluginimpl.cpp
         TARGET  =   wavplugin
         DESTDIR         =   $(OPIEDIR)/plugins/codecs
 INCLUDEPATH += $(OPIEDIR)/include ..
 DEPENDPATH      +=   ..
 LIBS            +=  -lqpe
         VERSION         =   1.0.0
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
diff --git a/core/obex/obex.pro b/core/obex/obex.pro
index 2c2f38c..8291d53 100644
--- a/core/obex/obex.pro
+++ b/core/obex/obex.pro
@@ -1,13 +1,40 @@
         TEMPLATE= lib
         CONFIG  += qt warn_on 
         HEADERS=   obex.h obexhandler.h obexsend.h receiver.h obeximpl.h
         SOURCES=   obex.cc obexsend.cpp obexhandler.cpp receiver.cpp obeximpl.cpp
         TARGET  = opieobex
         DESTDIR         = $(OPIEDIR)/plugins/obex
 INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/core/launcher
 DEPENDPATH      += 
 LIBS            += -lqpe -lopiecore2
         VERSION         = 0.0.2
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(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 27b4e09..1a75196 100644
--- a/core/opie-login/opie-login.pro
+++ b/core/opie-login/opie-login.pro
@@ -15,16 +15,44 @@ SOURCES     = loginwindowimpl.cpp  \
               main.cpp
 
 INTERFACES  = loginwindow.ui passworddialog.ui
 
 INCLUDEPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate
 DEPENDPATH  += $(OPIEDIR)/include ../launcher ../apps/calibrate
 
 LIBS        += -lqpe -lopiecore2
 
 DESTDIR     = $(OPIEDIR)/bin
 TARGET      = opie-login
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(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 bcfdb62..2c50bb4 100644
--- a/core/pim/addressbook/addressbook.pro
+++ b/core/pim/addressbook/addressbook.pro
@@ -18,13 +18,27 @@ SOURCES	= main.cpp \
                   picker.cpp \
                   configdlg.cpp \
                   abconfig.cpp \
                   abview.cpp \
                   namelineedit.cpp
 
         INTERFACES= configdlg_base.ui
         TARGET  = addressbook
 INCLUDEPATH += $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2 -lopieui2 -lopiepim2
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
diff --git a/core/pim/datebook/datebook.pro b/core/pim/datebook/datebook.pro
index a79c25c..00f0374 100644
--- a/core/pim/datebook/datebook.pro
+++ b/core/pim/datebook/datebook.pro
@@ -29,13 +29,21 @@ INTERFACES	= dateentry.ui \
                   datebookdayheader.ui \
                   datebookweekheader.ui \
                   datebookweeklstheader.ui \
                   datebookweeklstdayhdr.ui \
                   repeatentrybase.ui \
                   datebooksettingsbase.ui \
                   noteentry.ui
 INCLUDEPATH += $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopieui2 -lopiecore2 -lopiepim2
         TARGET  = datebook
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
diff --git a/core/pim/datebook2/datebook2.pro b/core/pim/datebook2/datebook2.pro
index 6ae4057..6a209bb 100644
--- a/core/pim/datebook2/datebook2.pro
+++ b/core/pim/datebook2/datebook2.pro
@@ -17,13 +17,25 @@ SOURCES	= main.cpp \
           bookmanager.cpp \
           stringmanager.cpp \
           templatemanager.cpp \
           show.cpp \
           view.cpp \
           editor.cpp
 
 INCLUDEPATH += $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
         TARGET  = datebook2
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
diff --git a/core/pim/osearch/osearch.pro b/core/pim/osearch/osearch.pro
index e6779d5..0e4d926 100644
--- a/core/pim/osearch/osearch.pro
+++ b/core/pim/osearch/osearch.pro
@@ -27,13 +27,29 @@ HEADERS += mainwindow.h \
            contactitem.h \
            eventitem.h \
            applnksearch.h \
            applnkitem.h \
            doclnkitem.h \
            doclnksearch.h 
 
         TARGET= osearch
 
 INCLUDEPATH = $(OPIEDIR)/include
 DEPENDPATH += $(OPIEDIR)/include
 LIBS += -lqpe -lopiecore2 -lopiepim2 -lopieui2
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
diff --git a/core/pim/today/plugins/addressbook/addressbook.pro b/core/pim/today/plugins/addressbook/addressbook.pro
index 3877fad..b884350 100644
--- a/core/pim/today/plugins/addressbook/addressbook.pro
+++ b/core/pim/today/plugins/addressbook/addressbook.pro
@@ -9,13 +9,23 @@ SOURCES = addressplugin.cpp addresspluginimpl.cpp addresspluginconfig.cpp \
     addresspluginwidget.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include \
         ../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
         ../ ../library
 
 LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lqtaux2
 
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todayaddressbookplugin
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
diff --git a/core/pim/today/plugins/datebook/datebook.pro b/core/pim/today/plugins/datebook/datebook.pro
index 4af49db..383c0bd 100644
--- a/core/pim/today/plugins/datebook/datebook.pro
+++ b/core/pim/today/plugins/datebook/datebook.pro
@@ -9,13 +9,23 @@ SOURCES = datebookplugin.cpp datebookpluginimpl.cpp datebookpluginconfig.cpp \
 INTERFACES = datebookpluginconfigbase.ui
 
 INCLUDEPATH     += $(OPIEDIR)/include \
                 ../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
                 ../ ../library
 
 LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2
 
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todaydatebookplugin
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
diff --git a/core/pim/today/plugins/mail/mail.pro b/core/pim/today/plugins/mail/mail.pro
index 71d5186..15f9990 100644
--- a/core/pim/today/plugins/mail/mail.pro
+++ b/core/pim/today/plugins/mail/mail.pro
@@ -7,13 +7,23 @@ HEADERS = mailplugin.h mailpluginimpl.h mailpluginwidget.h
 SOURCES = mailplugin.cpp mailpluginimpl.cpp mailpluginwidget.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include \
                 ../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
                 ../ ../library
 
 LIBS+= -lqpe -lopiecore2 -lopiepim2
 
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todaymailplugin
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
diff --git a/core/pim/today/plugins/todolist/todolist.pro b/core/pim/today/plugins/todolist/todolist.pro
index b4b899f..82d4018 100644
--- a/core/pim/today/plugins/todolist/todolist.pro
+++ b/core/pim/today/plugins/todolist/todolist.pro
@@ -10,13 +10,23 @@ SOURCES = todoplugin.cpp todopluginimpl.cpp todopluginconfig.cpp \
 INTERFACES= todopluginconfigbase.ui
 
 INCLUDEPATH     += $(OPIEDIR)/include \
                 ../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
                 ../ ../library
 
 LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2
 
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todaytodolistplugin
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
diff --git a/core/pim/today/today.pro b/core/pim/today/today.pro
index 8b88c7d..453eef9 100644
--- a/core/pim/today/today.pro
+++ b/core/pim/today/today.pro
@@ -2,14 +2,24 @@ TEMPLATE	= app
         CONFIG  += qt warn on  quick-app
 
         HEADERS         = today.h todaybase.h todayconfig.h
         SOURCES         = today.cpp todaybase.cpp todayconfig.cpp main.cpp
 INTERFACES = todayconfigmiscbase.ui
 
         INCLUDEPATH+= $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2 -lopiepim2 -lopieui2 
 
         TARGET  = today
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
 
diff --git a/core/pim/todo/todo.pro b/core/pim/todo/todo.pro
index eea5db7..aae0a95 100644
--- a/core/pim/todo/todo.pro
+++ b/core/pim/todo/todo.pro
@@ -37,13 +37,19 @@ SOURCES	= smalltodo.cpp \
           quickeditimpl.cpp \
           quickedit.cpp \
           otaskeditor.cpp \
           taskeditoroverview.cpp \
           taskeditorstatus.cpp \
           taskeditoralarms.cpp
 
         TARGET  = todolist
 INCLUDEPATH += $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2 -lopieui2 -lopiepim2
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
diff --git a/core/qws/qws.pro b/core/qws/qws.pro
index 523508b..594ceb2 100644
--- a/core/qws/qws.pro
+++ b/core/qws/qws.pro
@@ -8,13 +8,29 @@ HEADERS		= \
                   oqwsserver.h
         SOURCES         = \
                   main.cpp \
                   transferserver.cpp \
                   qcopbridge.cpp \
                   oqwsserver.cpp
 
         INCLUDEPATH+= $(OPIEDIR)/include 
         DEPENDPATH+= $(OPIEDIR)/include .
         TARGET  = qws
         LIBS    += -lqpe -lopiecore2 -lopieui2
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
diff --git a/core/settings/button/button.pro b/core/settings/button/button.pro
index 7167c15..d9566c9 100644
--- a/core/settings/button/button.pro
+++ b/core/settings/button/button.pro
@@ -7,13 +7,78 @@ HEADERS      = buttonsettings.h \
 SOURCES      = main.cpp \
                buttonsettings.cpp \
                buttonutils.cpp \
                remapdlg.cpp
 
 INTERFACES   = remapdlgbase.ui
 
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2
         TARGET     = buttonsettings
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
diff --git a/core/settings/citytime/citytime.pro b/core/settings/citytime/citytime.pro
index 4b0b543..7f4e823 100644
--- a/core/settings/citytime/citytime.pro
+++ b/core/settings/citytime/citytime.pro
@@ -1,10 +1,79 @@
 CONFIG += qt warn_on  quick-app
 HEADERS = citytime.h citytimebase.h zonemap.h sun.h stylusnormalizer.h
 SOURCES = citytime.cpp citytimebase.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2
 
         TARGET= citytime
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
diff --git a/core/settings/launcher/launcher.pro b/core/settings/launcher/launcher.pro
index 8150ee6..17da998 100644
--- a/core/settings/launcher/launcher.pro
+++ b/core/settings/launcher/launcher.pro
@@ -16,13 +16,84 @@ SOURCES      = main.cpp \
                inputmethodsettings.cpp \
                doctabsettings.cpp \
                tabdialog.cpp
 
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2 -lopieui2 -lqtaux2
 TARGET       = launchersettings
 
 
 
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(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 caa4dbd..81bd1f5 100644
--- a/core/settings/light-and-power/light-and-power.pro
+++ b/core/settings/light-and-power/light-and-power.pro
@@ -1,11 +1,74 @@
         CONFIG  += qt warn_on  quick-app
         HEADERS         = light.h sensor.h calibration.h
         SOURCES         = light.cpp main.cpp sensor.cpp calibration.cpp
         INTERFACES= lightsettingsbase.ui sensorbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
         DEPENDPATH+= 
 LIBS            += -lqpe -lopiecore2
 
         TARGET  = light-and-power
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
diff --git a/core/settings/security/demo/multiauth.pro b/core/settings/security/demo/multiauth.pro
index ef931a5..8e71f66 100644
--- a/core/settings/security/demo/multiauth.pro
+++ b/core/settings/security/demo/multiauth.pro
@@ -3,15 +3,81 @@ CONFIG += qt warn_on
 
 HEADERS         =
 SOURCES         = main.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      +=
 
 LIBS            += -lqpe -lopiecore2 -lopieui2 -lopiesecurity2
 
 DESTDIR = $(OPIEDIR)/bin
 TARGET = multiauth
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
 
 
diff --git a/core/settings/security/security.pro b/core/settings/security/security.pro
index e9f4061..2526c45 100644
--- a/core/settings/security/security.pro
+++ b/core/settings/security/security.pro
@@ -1,10 +1,77 @@
 CONFIG += qt warn_on quick-app
 HEADERS         = multiauthconfig.h
 SOURCES         = multiauthconfig.cpp main.cpp
         INTERFACES= loginbase.ui syncbase.ui
 
 INCLUDEPATH     += $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2 -lopieui2 -lopiesecurity2
 TARGET = security
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
diff --git a/core/symlinker/symlinker.pro b/core/symlinker/symlinker.pro
index 50ad785..a2349dc 100644
--- a/core/symlinker/symlinker.pro
+++ b/core/symlinker/symlinker.pro
@@ -2,14 +2,49 @@ TEMPLATE    = app
 CONFIG      += qt warn_on
 DESTDIR     = $(OPIEDIR)/bin
 
 HEADERS     =
 SOURCES     = main.cpp
 INTERFACES  =
 
 TARGET      = opie-update-symlinks
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include .
 LIBS            += -lqpe -lopiecore2
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )
 
diff --git a/core/tools/quicklauncher/quicklauncher.pro b/core/tools/quicklauncher/quicklauncher.pro
index 927392d..5171f38 100644
--- a/core/tools/quicklauncher/quicklauncher.pro
+++ b/core/tools/quicklauncher/quicklauncher.pro
@@ -3,13 +3,41 @@ CONFIG		+= qt warn_on
         DESTDIR         = $(OPIEDIR)/bin
 
         HEADERS         = dropins.h
         SOURCES         = main.cpp
         INTERFACES= 
 
         INCLUDEPATH+= $(OPIEDIR)/include
         LIBS       += -lqpe -lopiecore2 -lopieui2
 
         TARGET  = quicklauncher
 
 
-include ( $(OPIEDIR)/include.pro )
+include(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(OPIEDIR)/include.pro )