56 files changed, 56 insertions, 2131 deletions

diff --git a/core/applets/aboutapplet/aboutapplet.pro b/core/applets/aboutapplet/aboutapplet.pro
index df59316..f12f7fd 100644
--- a/core/applets/aboutapplet/aboutapplet.pro
+++ b/core/applets/aboutapplet/aboutapplet.pro
@@ -7,45 +7,8 @@ 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 4bd8e91..ccab947 100644
--- a/core/applets/batteryapplet/batteryapplet.pro
+++ b/core/applets/batteryapplet/batteryapplet.pro
@@ -6,50 +6,8 @@ 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 b68ffd2..1ca30f2 100644
--- a/core/applets/cardmon/cardmon.pro
+++ b/core/applets/cardmon/cardmon.pro
@@ -6,66 +6,8 @@ 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 df4643a..647598d 100644
--- a/core/applets/clipboardapplet/clipboardapplet.pro
+++ b/core/applets/clipboardapplet/clipboardapplet.pro
@@ -6,56 +6,8 @@ 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 28b2332..910f44b 100644
--- a/core/applets/clockapplet/clockapplet.pro
+++ b/core/applets/clockapplet/clockapplet.pro
@@ -6,69 +6,8 @@ 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 5deb9ae..a8db61f 100644
--- a/core/applets/homeapplet/homeapplet.pro
+++ b/core/applets/homeapplet/homeapplet.pro
@@ -6,64 +6,8 @@ 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 920ff4b..095c13c 100644
--- a/core/applets/irdaapplet/irdaapplet.pro
+++ b/core/applets/irdaapplet/irdaapplet.pro
@@ -6,70 +6,8 @@ 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 2be6066..ce4761c 100644
--- a/core/applets/lockapplet/lockapplet.pro
+++ b/core/applets/lockapplet/lockapplet.pro
@@ -6,59 +6,7 @@ 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 e93dc0b..23cab02 100644
--- a/core/applets/logoutapplet/logoutapplet.pro
+++ b/core/applets/logoutapplet/logoutapplet.pro
@@ -6,58 +6,8 @@ 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 571f4ab..de0f34e 100644
--- a/core/applets/multikeyapplet/multikeyapplet.pro
+++ b/core/applets/multikeyapplet/multikeyapplet.pro
@@ -6,53 +6,8 @@ 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 e616112..5589040 100644
--- a/core/applets/restartapplet/restartapplet.pro
+++ b/core/applets/restartapplet/restartapplet.pro
@@ -10,65 +10,8 @@ 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 8e13235..60d34f2 100644
--- a/core/applets/restartapplet2/restartapplet.pro
+++ b/core/applets/restartapplet2/restartapplet.pro
@@ -10,49 +10,8 @@ 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 ce95406..67a0173 100644
--- a/core/applets/rotateapplet/rotateapplet.pro
+++ b/core/applets/rotateapplet/rotateapplet.pro
@@ -6,52 +6,8 @@ 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 5da3cf3..fe8299e 100644
--- a/core/applets/screenshotapplet/screenshotapplet.pro
+++ b/core/applets/screenshotapplet/screenshotapplet.pro
@@ -6,68 +6,8 @@ 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 df2c882..6607383 100644
--- a/core/applets/suspendapplet/suspendapplet.pro
+++ b/core/applets/suspendapplet/suspendapplet.pro
@@ -6,62 +6,8 @@ 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 44d6656..abec478 100644
--- a/core/applets/vmemo/vmemo.pro
+++ b/core/applets/vmemo/vmemo.pro
@@ -6,47 +6,8 @@ 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 eb75e9c..a76bafb 100644
--- a/core/applets/volumeapplet/volumeapplet.pro
+++ b/core/applets/volumeapplet/volumeapplet.pro
@@ -6,67 +6,8 @@ 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 90fc82a..6c4873c 100644
--- a/core/applets/vtapplet/vtapplet.pro
+++ b/core/applets/vtapplet/vtapplet.pro
@@ -6,55 +6,8 @@ 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 fcc0ba3..28c7f4a 100644
--- a/core/apps/calibrate/calibrate.pro
+++ b/core/apps/calibrate/calibrate.pro
@@ -5,30 +5,7 @@ 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 018576f..449d609 100755
--- a/core/apps/embeddedkonsole/embeddedkonsole.pro
+++ b/core/apps/embeddedkonsole/embeddedkonsole.pro
@@ -33,34 +33,7 @@ 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 9627819..2a275b4 100644
--- a/core/apps/helpbrowser/helpbrowser.pro
+++ b/core/apps/helpbrowser/helpbrowser.pro
@@ -5,32 +5,7 @@ SOURCES		= helpbrowser.cpp magictextbrowser.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 db52c13..9a09ee1 100644
--- a/core/apps/oapp/oapp.pro
+++ b/core/apps/oapp/oapp.pro
@@ -12,23 +12,7 @@ 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 5e9c735..8cb1b55 100644
--- a/core/apps/qcop/qcop.pro
+++ b/core/apps/qcop/qcop.pro
@@ -6,25 +6,7 @@ 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 645cc04..473007e 100644
--- a/core/apps/taboapp/taboapp.pro
+++ b/core/apps/taboapp/taboapp.pro
@@ -11,26 +11,7 @@ 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 7ec124f..f5786f1 100644
--- a/core/apps/textedit/textedit.pro
+++ b/core/apps/textedit/textedit.pro
@@ -3,28 +3,7 @@ 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 901a80f..e7c5bfd 100644
--- a/core/launcher/server.pro
+++ b/core/launcher/server.pro
@@ -83,78 +83,7 @@ TARGET       = qpe
 # 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 ac3cd8c..1acd41e 100644
--- a/core/multimedia/opieplayer/libflash/libflash.pro
+++ b/core/multimedia/opieplayer/libflash/libflash.pro
@@ -10,41 +10,7 @@ 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 21d3ffd..46af87f 100644
--- a/core/multimedia/opieplayer/libmad/libmad.pro
+++ b/core/multimedia/opieplayer/libmad/libmad.pro
@@ -8,47 +8,13 @@ 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
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
@@ -43,41 +43,7 @@ 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 d6c4522..7cd309e 100644
--- a/core/multimedia/opieplayer/modplug/modplug.pro
+++ b/core/multimedia/opieplayer/modplug/modplug.pro
@@ -17,37 +17,7 @@ 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 a13ba38..fa845bc 100644
--- a/core/multimedia/opieplayer/opieplayer.pro
+++ b/core/multimedia/opieplayer/opieplayer.pro
@@ -15,41 +15,7 @@ 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 4a9f08b..5b96400 100644
--- a/core/multimedia/opieplayer/vorbis/libtremor.pro
+++ b/core/multimedia/opieplayer/vorbis/libtremor.pro
@@ -6,41 +6,7 @@ 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 4a3d017..7163c28 100644
--- a/core/multimedia/opieplayer/vorbis/tremor/tremor.pro
+++ b/core/multimedia/opieplayer/vorbis/tremor/tremor.pro
@@ -37,41 +37,7 @@ 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 3b577bd..f7995d0 100644
--- a/core/multimedia/opieplayer/vorbis/vorbis.pro
+++ b/core/multimedia/opieplayer/vorbis/vorbis.pro
@@ -5,41 +5,7 @@ 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 0ab1a39..da89490 100644
--- a/core/multimedia/opieplayer/wavplugin/wavplugin.pro
+++ b/core/multimedia/opieplayer/wavplugin/wavplugin.pro
@@ -6,41 +6,7 @@ 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 8291d53..4e72bc4 100644
--- a/core/obex/obex.pro
+++ b/core/obex/obex.pro
@@ -6,35 +6,8 @@ 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 1a75196..ae3fb50 100644
--- a/core/opie-login/opie-login.pro
+++ b/core/opie-login/opie-login.pro
@@ -21,38 +21,10 @@ 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 2c50bb4..ca9636a 100644
--- a/core/pim/addressbook/addressbook.pro
+++ b/core/pim/addressbook/addressbook.pro
@@ -24,21 +24,7 @@ SOURCES	= main.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 00f0374..9e381ce 100644
--- a/core/pim/datebook/datebook.pro
+++ b/core/pim/datebook/datebook.pro
@@ -35,15 +35,7 @@ INTERFACES	= dateentry.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 6a209bb..d09e104 100644
--- a/core/pim/datebook2/datebook2.pro
+++ b/core/pim/datebook2/datebook2.pro
@@ -23,19 +23,7 @@ SOURCES	= main.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 0e4d926..20ce7d6 100644
--- a/core/pim/osearch/osearch.pro
+++ b/core/pim/osearch/osearch.pro
@@ -33,23 +33,7 @@ HEADERS += mainwindow.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 b884350..8dc2b09 100644
--- a/core/pim/today/plugins/addressbook/addressbook.pro
+++ b/core/pim/today/plugins/addressbook/addressbook.pro
@@ -15,17 +15,7 @@ DEPENDPATH      += $(OPIEDIR)/include \
 
 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 383c0bd..7cf038c 100644
--- a/core/pim/today/plugins/datebook/datebook.pro
+++ b/core/pim/today/plugins/datebook/datebook.pro
@@ -15,17 +15,7 @@ DEPENDPATH      += $(OPIEDIR)/include \
 
 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 15f9990..93bf969 100644
--- a/core/pim/today/plugins/mail/mail.pro
+++ b/core/pim/today/plugins/mail/mail.pro
@@ -13,17 +13,7 @@ DEPENDPATH      += $(OPIEDIR)/include \
 
 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 82d4018..8d41222 100644
--- a/core/pim/today/plugins/todolist/todolist.pro
+++ b/core/pim/today/plugins/todolist/todolist.pro
@@ -16,17 +16,7 @@ DEPENDPATH      += $(OPIEDIR)/include \
 
 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 453eef9..4ee3514 100644
--- a/core/pim/today/today.pro
+++ b/core/pim/today/today.pro
@@ -8,18 +8,8 @@ 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 aae0a95..6c082cf 100644
--- a/core/pim/todo/todo.pro
+++ b/core/pim/todo/todo.pro
@@ -43,13 +43,7 @@ SOURCES	= smalltodo.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 594ceb2..730fc3a 100644
--- a/core/qws/qws.pro
+++ b/core/qws/qws.pro
@@ -14,23 +14,7 @@ SOURCES		= \
 
         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 d9566c9..d7f2a5d 100644
--- a/core/settings/button/button.pro
+++ b/core/settings/button/button.pro
@@ -13,72 +13,7 @@ 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 7f4e823..26b76eb 100644
--- a/core/settings/citytime/citytime.pro
+++ b/core/settings/citytime/citytime.pro
@@ -4,76 +4,7 @@ SOURCES = citytime.cpp citytimebase.cpp zonemap.cpp main.cpp sun.c stylusnormali
 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 17da998..24ae675 100644
--- a/core/settings/launcher/launcher.pro
+++ b/core/settings/launcher/launcher.pro
@@ -22,78 +22,7 @@ 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 81bd1f5..e1f3cb1 100644
--- a/core/settings/light-and-power/light-and-power.pro
+++ b/core/settings/light-and-power/light-and-power.pro
@@ -5,70 +5,7 @@ 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 8e71f66..ecf5803 100644
--- a/core/settings/security/demo/multiauth.pro
+++ b/core/settings/security/demo/multiauth.pro
@@ -9,75 +9,9 @@ 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 2526c45..7fb0f5e 100644
--- a/core/settings/security/security.pro
+++ b/core/settings/security/security.pro
@@ -4,74 +4,7 @@ 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 a2349dc..5de86d2 100644
--- a/core/symlinker/symlinker.pro
+++ b/core/symlinker/symlinker.pro
@@ -8,43 +8,8 @@ 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 5171f38..3a7660c 100644
--- a/core/tools/quicklauncher/quicklauncher.pro
+++ b/core/tools/quicklauncher/quicklauncher.pro
@@ -9,35 +9,7 @@ INTERFACES	=
         INCLUDEPATH+= $(OPIEDIR)/include
         LIBS       += -lqpe -lopiecore2 -lopieui2
 
         TARGET  = quicklauncher
 
 
-include(
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- $(OPIEDIR)/include.pro )
+include( $(OPIEDIR)/include.pro )