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 /noncore
parent: c935fd64ef5892d32d3d55780f26643a47452752 (diff)
download: opie-15dc267bf93fd9d32cfa9a4c642d0b89761eda7d.zip
opie-15dc267bf93fd9d32cfa9a4c642d0b89761eda7d.tar.gz
opie-15dc267bf93fd9d32cfa9a4c642d0b89761eda7d.tar.bz2
159 files changed, 159 insertions, 32660 deletions
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
@@ -6,276 +6,8 @@ TARGET        = autorotateapplet
 DESTDIR       = $(OPIEDIR)/plugins/applets
 INCLUDEPATH   += $(OPIEDIR)/include
 DEPENDPATH    += $(OPIEDIR)/include ../launcher
 LIBS          += -lqpe -lopiecore2
 VERSION       = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/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
@@ -7,278 +7,7 @@ DESTDIR     = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 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
@@ -16,276 +16,7 @@ TARGET      = memoryapplet
 DESTDIR     = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 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
@@ -6,270 +6,7 @@ TARGET      = networkapplet
 DESTDIR     = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 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
@@ -6,268 +6,7 @@ TARGET      = notesapplet
 DESTDIR     = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 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
@@ -7,272 +7,7 @@ TARGET       = pyquicklaunch
 DESTDIR      = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 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
@@ -7,280 +7,7 @@ TARGET       = wirelessapplet
 DESTDIR      = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 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
@@ -14,274 +14,7 @@ TARGET      = zkbapplet
 DESTDIR     = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include ../keyzcfg
 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
@@ -18,274 +18,7 @@ SOURCES		= main.cpp \
 INCLUDEPATH     += $(OPIEDIR)/include
 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
@@ -9,154 +9,7 @@ LIBS        += -lqpe -lqte -lopiecore2 -lopieui2
 !contains(CONFIG,quick-app) {
 DESTDIR = $(OPIEDIR)/bin
 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
@@ -26,127 +26,7 @@ SOURCES   = main.cpp    \
      graph.cpp
 INCLUDEPATH     += $(OPIEDIR)/include
 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
@@ -3,117 +3,7 @@ HEADERS       = mainwindow.h listviewconfdir.h listviewitemconffile.h listviewit
 SOURCES       = main.cpp mainwindow.cpp listviewconfdir.cpp listviewitemconffile.cpp listviewitemconfigentry.cpp editwidget.cpp listviewitemconf.cpp
 INCLUDEPATH   += $(OPIEDIR)/include
 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
@@ -17,121 +17,13 @@ HEADERS      = mainwindow.h      \
 TARGET       = dagger
 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
 }
 !isEmpty( LIBSWORD_LIB_DIR ) {
    LIBS = -L$$LIBSWORD_LIB_DIR $$LIBS
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
@@ -11,105 +11,7 @@ SOURCES		= main.cpp \
                  dingwidget.cpp
 INCLUDEPATH     += $(OPIEDIR)/include
 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
@@ -3,156 +3,7 @@ HEADERS   = bartender.h newdrinks.h showdrinks.h inputDialog.h searchresults.h b
 SOURCES   = main.cpp bartender.cpp newdrinks.cpp showdrinks.cpp inputDialog.cpp searchresults.cpp bac.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 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
@@ -68,128 +68,12 @@ INTERFACES   = configurebase.ui editbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2 -lopieui2 -lutil
 TARGET       = opie-console
 DEFINES += HAVE_OPENPTY
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 teneast {
    DEFINES -= HAVE_OPENPTY
    DEFINES += EAST FSCKED_DISTRI
 }
 \ No newline at end of file
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
@@ -15,121 +15,7 @@ DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2
 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
@@ -38,119 +38,7 @@ TARGET    = gutenbrowser
 INCLUDEPATH += $(OPIEDIR)/include
 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
@@ -23,133 +23,7 @@ DESTDIR		= $(OPIEDIR)/plugins/reader/codecs
        TARGET  = Aportis
 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
@@ -12,129 +12,7 @@ DESTDIR		= $(OPIEDIR)/plugins/reader/codecs
        TARGET  = CHM
 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
@@ -14,149 +14,7 @@ INTERFACES	=
        DESTDIR         = $(OPIEDIR)/plugins/reader/filters
        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
@@ -12,141 +12,7 @@ DESTDIR		= $(OPIEDIR)/plugins/reader/codecs
        TARGET  = Plucker
 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
@@ -11,137 +11,7 @@ DESTDIR		= $(OPIEDIR)/plugins/reader/codecs
        TARGET  = Weasel
 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
@@ -11,135 +11,7 @@ INTERFACES	=
        DESTDIR         = $(OPIEDIR)/lib
        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
@@ -12,148 +12,8 @@ DESTDIR		= $(OPIEDIR)/plugins/reader/codecs
        TARGET  = iSilo
 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
@@ -8,149 +8,9 @@ SUBDIRS         = pluckerbaselib \
                  HTMLFilter \
                  WeaselCodec \
                  iSiloCodec \
                  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
@@ -10,143 +10,7 @@ INTERFACES	=
        DESTDIR         = $(OPIEDIR)/lib
        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
@@ -12,131 +12,7 @@ DESTDIR		= $(OPIEDIR)/lib
        TARGET  = reader_pluckerbase
        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
@@ -13,139 +13,7 @@ DESTDIR		= $(OPIEDIR)/plugins/reader/codecs
        TARGET  = ppms
 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
@@ -81,145 +81,7 @@ INTERFACES	=
        DESTDIR         = $(OPIEDIR)/bin
        INCLUDEPATH+= $(OPIEDIR)/include
        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
@@ -18,111 +18,7 @@ SOURCES       = main.cpp \
                Excel.cpp
 INCLUDEPATH   += $(OPIEDIR)/include
 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
@@ -20,113 +20,7 @@ INCLUDEPATH    += $(OPIEDIR)/include
 DEPENDPATH    += $(OPIEDIR)/include
 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
@@ -21,125 +21,7 @@ INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2
 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
@@ -32,158 +32,7 @@ SOURCES		= main.cpp \
        INTERFACES= ui/tvkeyedit_gen.ui
        TARGET  = tableviewer
        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
@@ -74,151 +74,7 @@ DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lqtaux2 -lopiecore2 -lopieui2
 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
@@ -6,152 +6,7 @@ SOURCES        = tinykate.cpp main.cpp
 INCLUDEPATH    = $(OPIEDIR)/include ../libkate \
                 ../libkate/ktexteditor ../libkate/document ../libkate/microkde ../libkate/qt3back ../libkate/view ../libkate/interfaces
 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
@@ -8,115 +8,13 @@ SOURCES      = main.cpp zsafe.cpp krc2.cpp category.cpp \
 INTERFACES   = newdialog.ui searchdialog.ui passworddialog.ui categorydialog.ui infoform.ui wait.ui
 INCLUDEPATH  += $(OPIEDIR)/include
 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
@@ -28,162 +28,7 @@ INTERFACES	= kvncconndlgbase.ui kvncbookmarkdlgbase.ui
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 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
@@ -7,160 +7,7 @@ INCLUDEPATH	+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
        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
@@ -9,241 +9,7 @@ DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
        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
@@ -8,244 +8,7 @@ DESTDIR      = $(OPIEDIR)/plugins/decorations
 TARGET       = liquid
 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
@@ -9,243 +9,7 @@ DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
        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
@@ -26,181 +26,7 @@ SOURCES   = main.cpp \
        TARGET          = backgammon
        INCLUDEPATH+= $(OPIEDIR)/include
        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
@@ -3,185 +3,7 @@ HEADERS		= game.h kbounce.h
        SOURCES         = game.cpp kbounce.cpp main.cpp
        INCLUDEPATH+= $(OPIEDIR)/include
        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
@@ -4,202 +4,7 @@ SOURCES		= buzzword.cpp main.cpp
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 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
@@ -7,184 +7,8 @@ SOURCES		= fifteen.cpp \
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 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
@@ -12,164 +12,7 @@ SOURCES		= amigo.c \
 INCLUDEPATH     += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 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
@@ -10,168 +10,7 @@ INTERFACES = helpdialog.ui
        TARGET          = kbill
        INCLUDEPATH+= $(OPIEDIR)/include
        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
@@ -13,196 +13,7 @@ SOURCES		= checkers.cpp \
        INTERFACES=
        INCLUDEPATH+= $(OPIEDIR)/include
        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
@@ -31,175 +31,7 @@ SOURCES		= kpacmanwidget.cpp \
                    main.cpp 
        INCLUDEPATH+= $(OPIEDIR)/include
        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
@@ -5,187 +5,7 @@ SOURCES		= main.cpp \
 TARGET          = mindbreaker
 INCLUDEPATH += $(OPIEDIR)/include
 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
@@ -7,179 +7,7 @@ SOURCES		= main.cpp \
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 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
@@ -3,200 +3,7 @@ HEADERS		= oyatzee.h
        SOURCES         = main.cpp oyatzee.cpp
        TARGET  = oyatzee
 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
@@ -5,198 +5,7 @@ TARGET		= parashoot
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 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
@@ -5,166 +5,7 @@ TARGET		= qasteroids
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 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
@@ -49,183 +49,13 @@ HEADERS =   animatedimage.h \
        terrain.h \
        stringtokenizer.h \
        settings.h \
        starfield.h \
        util.h
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 !isEmpty( LIBSDL_INC_DIR ) {
    INCLUDEPATH = $$LIBSDL_INC_DIR $$INCLUDEPATH
 }
 !isEmpty( LIBSDL_LIB_DIR ) {
    LIBS = -L$$LIBSDL_LIB_DIR $$LIBS
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
@@ -4,191 +4,7 @@ HEADERS 	= sfcave.h helpwindow.h random.h
        TARGET  = sfcave
        INCLUDEPATH += $(OPIEDIR)/include
        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
@@ -4,170 +4,7 @@ SOURCES		= snake.cpp target.cpp obstacle.cpp interface.cpp main.cpp
        TARGET  = snake
 INCLUDEPATH += $(OPIEDIR)/include
        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
@@ -14,173 +14,7 @@ TARGET    = patience
 INCLUDEPATH += $(OPIEDIR)/include
 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
@@ -16,193 +16,7 @@ LIBS            += -lqpe -lopiecore2 -lstdc++
        INTERFACES=
        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
@@ -5,195 +5,7 @@ SOURCES   = main.cpp \
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 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
@@ -6,189 +6,7 @@ INTERFACES	= newgamebase.ui rulesbase.ui
        TARGET  = wordgame
 INCLUDEPATH += $(OPIEDIR)/include
        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
@@ -4,196 +4,7 @@ SOURCES		= ballpainter.cpp field.cpp klines.cpp main.cpp prompt.cpp cell.cpp lin
        TARGET  = zlines
        LIBS    += -lqpe -lopiecore2
        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
@@ -11,171 +11,7 @@ INCLUDEPATH += $(OPIEDIR)/include dropin
 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
@@ -41,204 +41,7 @@ SOURCES		= drawpad.cpp \
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
        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
@@ -17,206 +17,7 @@ INCLUDEPATH += . $(OPIEDIR)/include
 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
@@ -14,207 +14,7 @@ SOURCES = main.cpp gif_slave.cpp   slavereciever.cpp \
 INCLUDEPATH += $(OPIEDIR)/include ../
 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
@@ -9,230 +9,8 @@ SOURCES         = capture.cpp
 INCLUDEPATH     += $(OPIEDIR)/include ../lib
 DEPENDPATH      += $(OPIEDIR)/include ../lib
 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
@@ -12,230 +12,8 @@ SOURCES         = previewwidget.cpp \
 INCLUDEPATH     += $(OPIEDIR)/include ../lib
 DEPENDPATH      += $(OPIEDIR)/include ../lib
 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
@@ -15,232 +15,8 @@ DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lopiecore2
 INTERFACES      =
 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
@@ -16,239 +16,13 @@ TARGET    = opieplayer2
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 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
 }
 !isEmpty( LIBXINE_LIB_DIR ) {
    LIBS = -L$$LIBXINE_LIB_DIR $$LIBS
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
@@ -7,235 +7,7 @@ SOURCES		= alphablend.c yuv2rgb.c nullvideo.o frame.cpp lib.cpp mainTest.cpp
        INCLUDEPATH+= $(OPIEDIR)/include /opt/QtPalmtop/include
        DEPENDPATH+= $(OPIEDIR)/include /opt/QtPalmtop/include
 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
@@ -29,242 +29,10 @@ contains(CONFIG, pdaudio) {
 !contains(CONFIG, pdaudio) {
  INCLUDEPATH += $(OPIEDIR)/include
  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
@@ -17,228 +17,8 @@ SOURCES		= main.cpp        \
        INCLUDEPATH+= $(OPIEDIR)/include
        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
@@ -3,229 +3,7 @@ HEADERS   = showimg.h ImageFileSelector.h settingsdialog.h settingsdialogbase.h
 SOURCES   = main.cpp showimg.cpp ImageFileSelector.cpp settingsdialog.cpp settingsdialogbase.cpp
 TARGET          = showimg
 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
@@ -3,225 +3,7 @@ HEADERS   = mainwidget.h tonleiterdata.h tonleiterdatahelper.h fretboard.h menuw
 SOURCES   = mainwidget.cpp tonleiterdata.cpp tonleiterdatahelper.cpp fretboard.cpp menuwidget.cpp main.cpp editinst.cpp editstringwidget.cpp editscale.cpp pianoscale.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 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
@@ -4,97 +4,7 @@ HEADERS   = ftplib.h
 SOURCES   = ftplib.c
 DESTDIR      = $(OPIEDIR)/lib$(PROJMAK)
 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
@@ -6,103 +6,7 @@ INTERFACES = mainwidget.ui settingsdialog.ui
        INCLUDEPATH+= $(OPIEDIR)/include  /usr/include/linphone  /usr/include/osipua /usr/include/ortp /usr/include/glib-2.0 /usr/lib/glib-2.0/include
        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
@@ -47,97 +47,13 @@ contains( $(CONFIG_TARGET_MACOSX), y ){
    LIBS    += -liconv
 }
 DESTDIR      = $(OPIEDIR)/lib
 TARGET       = mailwrapper
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 !isEmpty( LIBETPAN_INC_DIR ) {
    INCLUDEPATH = $$LIBETPAN_INC_DIR $$INCLUDEPATH
 }
 !isEmpty( LIBETPAN_LIB_DIR ) {
    LIBS = -L$$LIBETPAN_LIB_DIR $$LIBS
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
@@ -60,96 +60,13 @@ contains( CONFTEST, y ){
 }else{
    LIBS        += -lqpe -lopieui2 -lopiecore2 -lopiepim2 -lmailwrapper -lopiemm2
 }
 TARGET       = opiemail
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 !isEmpty( LIBETPAN_INC_DIR ) {
    INCLUDEPATH = $$LIBETPAN_INC_DIR $$INCLUDEPATH
 }
 !isEmpty( LIBETPAN_LIB_DIR ) {
    LIBS = -Wl,-rpath-link,$$LIBETPAN_LIB_DIR $$LIBS
 }
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
@@ -6,90 +6,7 @@ SOURCES		+=	mailapplet.cpp \
                        mailappletimpl.cpp 
 INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/noncore/net/mail
        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
@@ -3,99 +3,7 @@ HEADERS     = opieftp.h inputDialog.h
 SOURCES     = opieftp.cpp inputDialog.cpp main.cpp
 TARGET      = opieftp
 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
@@ -22,101 +22,7 @@ DEPENDPATH  += $(OPIEDIR)/include
 PRECOMPILED_HEADER = stable.h
 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
@@ -19,98 +19,8 @@ INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe -lm -lcrypto
 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
@@ -7,89 +7,7 @@ DESTDIR       =  $(OPIEDIR)/plugins/applets
 INCLUDEPATH   += $(OPIEDIR)/include
 INCLUDEPATH   += $(OPIEDIR)/noncore/net/opietooth/lib
 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
@@ -5,89 +5,7 @@ INCLUDEPATH     += $(OPIEDIR)/include
 INCLUDEPATH    += $(OPIEDIR)/noncore/opietooth/lib
 DEPENDPATH      += $(OPIEDIR)/include
 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
@@ -4,85 +4,7 @@ HEADERS 	= connection.h parser.h device.h manager.h remotedevice.h services.h st
        SOURCES         = connection.cpp parser.cc device.cc manager.cc remotedevice.cc services.cc startpanconnection.cpp startdunconnection.cpp
        TARGET  = opietooth1
 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
@@ -24,87 +24,7 @@ INCLUDEPATH     += $(OPIEDIR)/noncore/net/opietooth/lib
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe -lopietooth1 -lopiecore2 -lopieui2
 INTERFACES      = bluetoothbase.ui  devicedialog.ui rfcommassigndialogbase.ui rfcommdialogitembase.ui
        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
@@ -33,99 +33,13 @@ INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 INTERFACES      = configbase.ui
 TARGET          = wellenreiter
 !contains( platform, x11 ) {
  message( qws )
-  include(
+  include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
  LIBS += -lqpe -lopiecore2 -lopieui2 -lopienet2
 }
 contains( platform, x11 ) {
  LIBS += -L$(OPIEDIR)/output/lib -Wl,-rpath,$(OPIEDIR)/output/lib -Wl,-rpath,/usr/local/lib -lwellenreiter
  SOURCES += resource.cpp
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
@@ -1,101 +1,13 @@
 TEMPLATE        = subdirs
 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 ) {
  message( Configuring Wellenreiter for build on Qt/X11 )
  SUBDIRS = lib gui
  system( mkdir -p $OPIEDIR/lib $OPIEDIR/bin $OPIEDIR/share/pics )
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
@@ -11,312 +11,8 @@ DEPENDPATH	+=
        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
@@ -12,311 +12,8 @@ DEPENDPATH	+=
        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
@@ -11,312 +11,7 @@ DEPENDPATH	+=
        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
@@ -14,310 +14,8 @@ DEPENDPATH	+=
        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
@@ -4,284 +4,7 @@ SOURCES   = appearance.cpp editScheme.cpp main.cpp sample.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2 -lopieui2 -lqtaux2
 TARGET         = appearance
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/aqpkg/aqpkg.pro b/noncore/settings/aqpkg/aqpkg.pro
index 8d4b3dc..41540cb 100644
--- a/noncore/settings/aqpkg/aqpkg.pro
+++ b/noncore/settings/aqpkg/aqpkg.pro
@@ -33,287 +33,8 @@ SOURCES        = mainwin.cpp \
          categoryfilterimpl.cpp
 TARGET        = aqpkg
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2 -lopieui2 
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/backup/backup.pro b/noncore/settings/backup/backup.pro
index df30ab1..de2a977 100644
--- a/noncore/settings/backup/backup.pro
+++ b/noncore/settings/backup/backup.pro
@@ -4,293 +4,7 @@ SOURCES		= main.cpp backuprestore.cpp
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2 -lopieui2
        INTERFACES= backuprestorebase.ui errordialog.ui
        TARGET  = backup
 VERSION     = 0.8.1
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/doctab/doctab.pro b/noncore/settings/doctab/doctab.pro
index 9f82fad..34e6829 100644
--- a/noncore/settings/doctab/doctab.pro
+++ b/noncore/settings/doctab/doctab.pro
@@ -4,294 +4,7 @@ SOURCES        = doctab.cpp main.cpp
 INTERFACES    = doctabsettingsbase.ui
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH    += 
 LIBS            += -lqpe -lopiecore2
 TARGET        = doctab
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/language/language.pro b/noncore/settings/language/language.pro
index fe33a05..a34ed7f 100644
--- a/noncore/settings/language/language.pro
+++ b/noncore/settings/language/language.pro
@@ -4,308 +4,7 @@ SOURCES        = language.cpp main.cpp
 INTERFACES    = languagesettingsbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH    += 
 LIBS            += -lqpe -lopiecore2
 TARGET        = language
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/mediummount/mediummount.pro b/noncore/settings/mediummount/mediummount.pro
index 73245f9..6eb54c4 100644
--- a/noncore/settings/mediummount/mediummount.pro
+++ b/noncore/settings/mediummount/mediummount.pro
@@ -6,296 +6,7 @@ HEADERS        = mediumwidget.h mediumglobal.h mainwindow.h
 SOURCES        = main.cpp mediumwidget.cc mediumglobal.cc mainwindow.cc
 INCLUDEPATH    += $(OPIEDIR)/include
 DEPENDPATH    += $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2
 TARGET          = mediummount
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/netsystemtime/netsystemtime.pro b/noncore/settings/netsystemtime/netsystemtime.pro
index 7cb56b5..109684e 100644
--- a/noncore/settings/netsystemtime/netsystemtime.pro
+++ b/noncore/settings/netsystemtime/netsystemtime.pro
@@ -15,307 +15,7 @@ SOURCES        = main.cpp                \
 INCLUDEPATH    += $(OPIEDIR)/include
 DEPENDPATH    += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2 -lopieui2
 TARGET        = systemtime
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings/interfaces/interfaces.pro b/noncore/settings/networksettings/interfaces/interfaces.pro
index b2a55c4..0135cb4 100644
--- a/noncore/settings/networksettings/interfaces/interfaces.pro
+++ b/noncore/settings/networksettings/interfaces/interfaces.pro
@@ -8,304 +8,7 @@ INCLUDEPATH	+= $(OPIEDIR)/include ../
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2
        INTERFACES= interfaceadvanced.ui  interfaceinformation.ui  interfacesetup.ui
        TARGET  = interfaces
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings/mainwindow/mainwindow.pro b/noncore/settings/networksettings/mainwindow/mainwindow.pro
index de9760a..57d23a3 100644
--- a/noncore/settings/networksettings/mainwindow/mainwindow.pro
+++ b/noncore/settings/networksettings/mainwindow/mainwindow.pro
@@ -5,305 +5,7 @@ INCLUDEPATH += $(OPIEDIR)/include ../interfaces/ .
 DEPENDPATH  += $(OPIEDIR)/include ../interfaces/ ../wlan/ ../ppp/
 LIBS        += -lqpe -L$(OPIEDIR)/plugins/networksettings -L../interfaces -linterfaces -lopiecore2 -lopieui2
 INTERFACES = mainwindow.ui addconnection.ui
 TARGET    = networksettings
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings/ppp/ppp.pro b/noncore/settings/networksettings/ppp/ppp.pro
index fc3e950..297dda8 100644
--- a/noncore/settings/networksettings/ppp/ppp.pro
+++ b/noncore/settings/networksettings/ppp/ppp.pro
@@ -8,303 +8,7 @@ DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe -L../interfaces/ -linterfaces
        TARGET  = kppp
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings/wlan/wlan.pro b/noncore/settings/networksettings/wlan/wlan.pro
index 19856b2..e975dde 100644
--- a/noncore/settings/networksettings/wlan/wlan.pro
+++ b/noncore/settings/networksettings/wlan/wlan.pro
@@ -19,311 +19,13 @@ wirelessopts {
 ! wirelessopts {
                HEADERS+= wlanimp2.h
        SOURCES += wlanimp2.cpp
 }
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 !isEmpty( LIBPCAP_INC_DIR ) {
    INCLUDEPATH = $$LIBPCAP_INC_DIR $$INCLUDEPATH
 }
 !isEmpty( LIBPCAP_LIB_DIR ) {
    LIBS = -L$$LIBPCAP_LIB_DIR $$LIBS
diff --git a/noncore/settings/networksettings2/bluetooth/bluetooth.pro b/noncore/settings/networksettings2/bluetooth/bluetooth.pro
index 602ace2..8170d46 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetooth.pro
+++ b/noncore/settings/networksettings2/bluetooth/bluetooth.pro
@@ -16,289 +16,7 @@ INCLUDEPATH	+= $(OPIEDIR)/include ../ ../networksettings2
        DEPENDPATH+= $(OPIEDIR)/include ../ ../networksettings2
 LIBS            += -lqpe
        INTERFACES= bluetoothBNEPGUI.ui bluetoothRFCOMMGUI.ui
        TARGET  = bluetooth
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings2/cable/cable.pro b/noncore/settings/networksettings2/cable/cable.pro
index dac96c6..8a046b7 100644
--- a/noncore/settings/networksettings2/cable/cable.pro
+++ b/noncore/settings/networksettings2/cable/cable.pro
@@ -12,288 +12,7 @@ INCLUDEPATH	+= $(OPIEDIR)/include ../ ../networksettings2
        DEPENDPATH+= $(OPIEDIR)/include ../ ../networksettings2
 LIBS            += -lqpe
        INTERFACES= cableGUI.ui
        TARGET  = cable
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings2/irda/irda.pro b/noncore/settings/networksettings2/irda/irda.pro
index e8f605c..4613abe 100644
--- a/noncore/settings/networksettings2/irda/irda.pro
+++ b/noncore/settings/networksettings2/irda/irda.pro
@@ -11,288 +11,7 @@ INCLUDEPATH	+= $(OPIEDIR)/include ../ ../networksettings2
        DEPENDPATH+= $(OPIEDIR)/include ../ ../networksettings2
 LIBS            += -lqpe 
        INTERFACES= irdaGUI.ui
        TARGET  = irda
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings2/lancard/lancard.pro b/noncore/settings/networksettings2/lancard/lancard.pro
index 80bcb84..6f04e01 100644
--- a/noncore/settings/networksettings2/lancard/lancard.pro
+++ b/noncore/settings/networksettings2/lancard/lancard.pro
@@ -12,288 +12,7 @@ INCLUDEPATH	+= $(OPIEDIR)/include ../ ../networksettings2
        DEPENDPATH+= $(OPIEDIR)/include ../ ../networksettings2
 LIBS            += -lqpe
        INTERFACES= lancardGUI.ui
        TARGET  = lancard
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings2/modem/modem.pro b/noncore/settings/networksettings2/modem/modem.pro
index fcca183..25e29d4 100644
--- a/noncore/settings/networksettings2/modem/modem.pro
+++ b/noncore/settings/networksettings2/modem/modem.pro
@@ -11,288 +11,7 @@ INCLUDEPATH	+= $(OPIEDIR)/include ../ ../networksettings2
        DEPENDPATH+= $(OPIEDIR)/include ../ ../networksettings2
 LIBS            += -lqpe
        INTERFACES= modemGUI.ui
        TARGET  = modem
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings2/network/network.pro b/noncore/settings/networksettings2/network/network.pro
index 69f9235..05df007 100644
--- a/noncore/settings/networksettings2/network/network.pro
+++ b/noncore/settings/networksettings2/network/network.pro
@@ -12,289 +12,7 @@ INCLUDEPATH	+= $(OPIEDIR)/include ../ ../networksettings2
        DEPENDPATH+= $(OPIEDIR)/include ../ ../networksettings2
 LIBS            += -lqpe
        INTERFACES= networkGUI.ui
        TARGET  = network
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings2/networksettings.pro b/noncore/settings/networksettings2/networksettings.pro
index d2c54da..5d9efbb 100644
--- a/noncore/settings/networksettings2/networksettings.pro
+++ b/noncore/settings/networksettings2/networksettings.pro
@@ -18,288 +18,7 @@ INTERFACES = networksettingsGUI.ui \
             editconnectionGUI.ui \
             activatevpnGUI.ui \
             activateprofileGUI.ui
 TARGET    = $(OPIEDIR)/bin/networksettings2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings2/networksettings2/networksettings2.pro b/noncore/settings/networksettings2/networksettings2/networksettings2.pro
index e4480e9..d1e42b7 100644
--- a/noncore/settings/networksettings2/networksettings2/networksettings2.pro
+++ b/noncore/settings/networksettings2/networksettings2/networksettings2.pro
@@ -22,289 +22,7 @@ INCLUDEPATH	+= $(OPIEDIR)/include ../networksettings2
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2 -lopieui2
        INTERFACES= 
        TARGET  = networksettings2
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings2/ppp/ppp.pro b/noncore/settings/networksettings2/ppp/ppp.pro
index ad5aa7a..f866bee 100644
--- a/noncore/settings/networksettings2/ppp/ppp.pro
+++ b/noncore/settings/networksettings2/ppp/ppp.pro
@@ -18,288 +18,7 @@ INCLUDEPATH	+= $(OPIEDIR)/include ../ ../networksettings2
        DEPENDPATH+= $(OPIEDIR)/include ../ ../networksettings2
 LIBS            += -lqpe
        INTERFACES= PPPGUI.ui PPPAuthGUI.ui PPPIPGUI.ui PPPDNSGUI.ui
        TARGET  = ppp
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings2/profile/profile.pro b/noncore/settings/networksettings2/profile/profile.pro
index 218a100..f980034 100644
--- a/noncore/settings/networksettings2/profile/profile.pro
+++ b/noncore/settings/networksettings2/profile/profile.pro
@@ -12,289 +12,7 @@ INCLUDEPATH	+= $(OPIEDIR)/include ../ ../networksettings2
        DEPENDPATH+= $(OPIEDIR)/include ../ ../networksettings2
 LIBS            += -lqpe
        INTERFACES= profileGUI.ui
        TARGET  = profile
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings2/usb/usb.pro b/noncore/settings/networksettings2/usb/usb.pro
index e7f8f42..37c1bde 100644
--- a/noncore/settings/networksettings2/usb/usb.pro
+++ b/noncore/settings/networksettings2/usb/usb.pro
@@ -12,288 +12,7 @@ INCLUDEPATH	+= $(OPIEDIR)/include ../ ../networksettings2
        DEPENDPATH+= $(OPIEDIR)/include ../ ../networksettings2
 LIBS            += -lqpe
        INTERFACES= usbGUI.ui
        TARGET  = usb
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings2/vpn/vpn.pro b/noncore/settings/networksettings2/vpn/vpn.pro
index 8c7d634..a131a1f 100644
--- a/noncore/settings/networksettings2/vpn/vpn.pro
+++ b/noncore/settings/networksettings2/vpn/vpn.pro
@@ -12,288 +12,7 @@ INCLUDEPATH	+= $(OPIEDIR)/include ../ ../networksettings2
        DEPENDPATH+= $(OPIEDIR)/include ../ ../networksettings2
 LIBS            += -lqpe
        INTERFACES= vpnGUI.ui
        TARGET  = vpn
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings2/wlan/wlan.pro b/noncore/settings/networksettings2/wlan/wlan.pro
index 0a47263..f4c55df 100644
--- a/noncore/settings/networksettings2/wlan/wlan.pro
+++ b/noncore/settings/networksettings2/wlan/wlan.pro
@@ -12,288 +12,7 @@ INCLUDEPATH	+= $(OPIEDIR)/include ../ ../networksettings2
        DEPENDPATH+= $(OPIEDIR)/include ../ ../networksettings2
 LIBS            += -lqpe
        INTERFACES= wlanGUI.ui
        TARGET  = wlan
        VERSION         = 1.0.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/packagemanager/packagemanager.pro b/noncore/settings/packagemanager/packagemanager.pro
index fef32f3..c7b2273 100644
--- a/noncore/settings/packagemanager/packagemanager.pro
+++ b/noncore/settings/packagemanager/packagemanager.pro
@@ -28,288 +28,13 @@ DEFINES     += IPKG_LIB
 DEFINES     += HAVE_MKDTEMP
 TARGET       = packagemanager
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2 -lopieui2 -lipkg
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 !isEmpty( LIBIPK_INC_DIR ) {
    INCLUDEPATH = $$LIBIPK_INC_DIR $$INCLUDEPATH
 }
 !isEmpty( LIBIPK_LIB_DIR ) {
    LIBS = -L$$LIBIPK_LIB_DIR $$LIBS
diff --git a/noncore/settings/sound/sound.pro b/noncore/settings/sound/sound.pro
index dde608d..4a66be5 100644
--- a/noncore/settings/sound/sound.pro
+++ b/noncore/settings/sound/sound.pro
@@ -3,288 +3,7 @@ HEADERS     = soundsettings.h soundsettingsbase.h
 SOURCES     = soundsettings.cpp soundsettingsbase.cpp main.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2
 TARGET      = sound
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/sshkeys/sshkeys.pro b/noncore/settings/sshkeys/sshkeys.pro
index 5b9a298..7968637 100644
--- a/noncore/settings/sshkeys/sshkeys.pro
+++ b/noncore/settings/sshkeys/sshkeys.pro
@@ -4,291 +4,7 @@ SOURCES = main.cpp sshkeys.cpp
 TARGET = sshkeys
 INTERFACES = sshkeysbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH += $(OPIEDIR)/include
 LIBS += -lqpe -lopiecore2
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/sysinfo/sysinfo.pro b/noncore/settings/sysinfo/sysinfo.pro
index 8143714..46d6117 100644
--- a/noncore/settings/sysinfo/sysinfo.pro
+++ b/noncore/settings/sysinfo/sysinfo.pro
@@ -30,298 +30,7 @@ INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2 -lopieui2
 DEFINES     += UNIX
 TARGET    = sysinfo
 VERSION   = 1.2.0
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/tabmanager/tabmanager.pro b/noncore/settings/tabmanager/tabmanager.pro
index 09dc0bf..fa91d99 100644
--- a/noncore/settings/tabmanager/tabmanager.pro
+++ b/noncore/settings/tabmanager/tabmanager.pro
@@ -4,302 +4,7 @@ SOURCES		= main.cpp tabmanager.cpp tabmanagerbase.cpp
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
        LIBS    += -lqpe -lopiecore2
        INTERFACES= app.ui wait.ui
        TARGET  = tabmanager
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/usermanager/usermanager.pro b/noncore/settings/usermanager/usermanager.pro
index 991307d..efdf963 100644
--- a/noncore/settings/usermanager/usermanager.pro
+++ b/noncore/settings/usermanager/usermanager.pro
@@ -3,300 +3,7 @@ HEADERS        = usermanager.h userdialog.h groupdialog.h passwd.h
 SOURCES        = usermanager.cpp userdialog.cpp groupdialog.cpp passwd.cpp main.cpp
 INCLUDEPATH    += $(OPIEDIR)/include
 DEPENDPATH     += $(OPIEDIR)/include
 LIBS           += -lqpe -lopiecore2 -lopieui2 -lcrypt
 TARGET         = usermanager
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
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
@@ -9,247 +9,7 @@ DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
        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
@@ -9,249 +9,7 @@ DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
        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
@@ -13,253 +13,7 @@ HEADERS     =  liquid.h \
 LIBS        += -lqpe -lqtaux2 -lopiecore2
 INCLUDEPATH += $(OPIEDIR)/include
 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
@@ -6,250 +6,7 @@ HEADERS     =  metal.h plugin.h
 LIBS       += -lqpe
 INCLUDEPATH += $(OPIEDIR)/include
 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
@@ -9,251 +9,7 @@ HEADERS     =   bitmaps.h \
 LIBS        += -lqpe 
 INCLUDEPATH += $(OPIEDIR)/include
 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
@@ -16,252 +16,7 @@ HEADERS     = ogfxeffect.h \
 LIBS       += -lqpe -lopiecore2
 INCLUDEPATH += $(OPIEDIR)/include
 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
@@ -8,245 +8,7 @@ HEADERS     =   webstyle.h \
 LIBS        += -lqpe 
 INCLUDEPATH += $(OPIEDIR)/include
 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
@@ -14,221 +14,7 @@ DEPENDPATH      += $(OPIEDIR)/include \
 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
@@ -1,220 +1,6 @@
 TEMPLATE        = subdirs
 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
@@ -6,223 +6,7 @@ INTERFACES  =
 TARGET    = stocktickertest
 INCLUDEPATH     += $(OPIEDIR)/include
 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
@@ -22,221 +22,7 @@ DEPENDPATH      += $(OPIEDIR)/include \
 LIBS    += -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lqtaux2 -lpthread
 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
@@ -19,221 +19,7 @@ DEPENDPATH      += $(OPIEDIR)/include \
 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
@@ -11,209 +11,7 @@
        #           $(OPIEDIR)/calc2
 #DEPENDPATH      += $(OPIEDIR)/include 
 #DESTDIR = $(OPIEDIR)/plugins/calculator
 #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
@@ -6,209 +6,7 @@ SOURCES += calc.cpp main.cpp engine.cpp
 INCLUDEPATH     += $(OPIEDIR)/include 
 DEPENDPATH      += $(OPIEDIR)/include 
 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
@@ -8,209 +8,7 @@
 #INCLUDEPATH     += $(OPIEDIR)/include \
        #           $(OPIEDIR)/calc2
 #DEPENDPATH      += $(OPIEDIR)/include 
 #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
@@ -5,209 +5,7 @@ SOURCES		= calculatorimpl.cpp \
 INCLUDEPATH     += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 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
@@ -9,211 +9,7 @@ LIBS            += -lqpe -lopiecore2 -lopieui2 -lpthread
 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
@@ -7,217 +7,7 @@ SOURCES		= calcdisplay.cpp  \
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 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
@@ -3,215 +3,7 @@ HEADERS     = formatter.h inputDialog.h output.h
 SOURCES     = formatter.cpp inputDialog.cpp output.cpp main.cpp
 TARGET      = formatter
 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
@@ -5,221 +5,7 @@ HEADERS				=mbox.h fviewer.h inputdialog.h
        SOURCES                         =opie-sh.cpp mbox.cpp fviewer.cpp inputdialog.cpp
        INCLUDEPATH     +=$(OPIEDIR)/include
        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
@@ -4,213 +4,7 @@ SOURCES		=  converter.cpp
 INTERFACES      =  converter_base.ui
        INCLUDEPATH+= $(OPIEDIR)/include
        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
@@ -3,211 +3,7 @@ CONFIG		+= console warn_on
        CONFIG  -= qt
        DESTDIR         = $(OPIEDIR)/bin
        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
@@ -5,219 +5,7 @@ HEADERS		= remotetab.h learntab.h configtab.h topgroup.h dvdgroup.h channelgroup
        SOURCES         =remote.cpp remotetab.cpp learntab.cpp configtab.cpp topgroup.cpp dvdgroup.cpp channelgroup.cpp vcrgroup.cpp buttondialog.cpp topgroupconf.cpp dvdgroupconf.cpp channelgroupconf.cpp vcrgroupconf.cpp mainview.cpp recorddialog.cpp helptab.cpp
        INCLUDEPATH+=$(OPIEDIR)/include
        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
@@ -6,266 +6,7 @@ SOURCES		= filebrowser.cpp inlineedit.cpp filePermissions.cpp main.cpp
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 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
@@ -10,262 +10,7 @@ INCLUDEPATH	+= $(OPIEDIR)/include
        #INCLUDEPATH+= $(GSMLIBDIR)
        DEPENDPATH+= $(OPIEDIR)/include
 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
@@ -96,257 +96,7 @@ DESTDIR      = $(OPIEDIR)/lib$(PROJMAK)
 LIBS += -lqpe
 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
@@ -58,256 +58,7 @@ TARGET    = opie
 INCLUDEPATH += $(OPIEDIR)/include
 DESTDIR      = $(OPIEDIR)/lib$(PROJMAK)
 #VERSION = 1.0.0
 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
@@ -6,253 +6,7 @@ SOURCES		+=	bend.cpp \
                        bendimpl.cpp
        INCLUDEPATH     +=$(OPIEDIR)/include ../libmail
        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
@@ -20,254 +20,7 @@ SOURCES		=	configfile.cpp \
                        smtphandler.cpp
        INCLUDEPATH     +=$(OPIEDIR)/include
        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
@@ -40,254 +40,7 @@ INTERFACES	= 	accounteditorbase.ui \
                          renamebase.ui \
                          searchdiagbase.ui
        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
@@ -34,260 +34,7 @@ SOURCES   = emailclient.cpp \
 INCLUDEPATH += $(OPIEDIR)/include
 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
@@ -34,255 +34,7 @@ DEPENDPATH	+= $(OPIEDIR)/ioclude
 LIBS            += -lqpe
 LIBS            += -lopie
        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
@@ -42,270 +42,13 @@ DEPENDPATH = $(OPIEDIR)/include
 TARGET = qashmoney
 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
 }
 !isEmpty( LIBSQLITE_LIB_DIR ) {
    LIBS = -L$$LIBSQLITE_LIB_DIR $$LIBS
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
@@ -50,253 +50,7 @@ INCLUDEPATH += . \
               goo
               
 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
@@ -5,259 +5,7 @@ INCLUDEPATH	+=../../../include
        DEPENDPATH+=../../../include
        LIBS    += -lqpe
 TARGET          = ubrowser
-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 /noncore
parent	c935fd64ef5892d32d3d55780f26643a47452752 (diff)
download	opie-15dc267bf93fd9d32cfa9a4c642d0b89761eda7d.zip opie-15dc267bf93fd9d32cfa9a4c642d0b89761eda7d.tar.gz opie-15dc267bf93fd9d32cfa9a4c642d0b89761eda7d.tar.bz2