28 files changed, 28 insertions, 3564 deletions
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
@@ -3,160 +3,13 @@ CONFIG    += qte warn_on quick-app debug
 HEADERS   = advancedfm.h filePermissions.h output.h
 SOURCES   = advancedfm.cpp advancedfmData.cpp advancedfmMenu.cpp filePermissions.cpp output.cpp main.cpp
 TARGET    = advancedfm
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 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
@@ -20,133 +20,13 @@ SOURCES   = main.cpp    \
      password.cpp      \
      checkbook.cpp     \
      transaction.cpp   \
      tabledef.cpp      \
      listedit.cpp      \
      cfg.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
@@ -1,119 +1,9 @@
 CONFIG        = qt warn_on quick-app
 HEADERS       = mainwindow.h listviewconfdir.h listviewitemconffile.h listviewitemconfigentry.h editwidget.h listviewitemconf.h
 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
@@ -11,128 +11,20 @@ HEADERS      = mainwindow.h      \
               navbar.h          \
               searchbar.h       \
               opentextdlg.h     \
               configuredlg.h    \
               textwidget.h      \
               swordoptionlist.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
@@ -5,111 +5,13 @@ HEADERS		= odict.h \
                                dingwidget.h
        SOURCES         = main.cpp \
                  odict.cpp \
                  searchmethoddlg.cpp \
                  configdlg.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
@@ -1,158 +1,9 @@
 CONFIG    = qt quick-app
 HEADERS   = bartender.h newdrinks.h showdrinks.h inputDialog.h searchresults.h bac.h
 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
@@ -62,134 +62,18 @@ SOURCES      = io_layer.cpp io_serial.cpp io_irda.cpp io_bt.cpp io_modem.cpp \
        consoleconfigwidget.cpp fixit.cpp \
        comboboxhelper.cpp
 DESTDIR      = $(OPIEDIR)/bin/
 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
@@ -9,127 +9,13 @@ SOURCES      = ../io_layer.cpp ../io_serial.cpp \
               ../profile.cpp ../sz_transfer.cpp ../file_layer.cpp\
               main.cpp senderui.cpp   ../filetransfer.cpp ../procctl.cpp \
           ../filereceive.cpp ../receive_layer.cpp
 INTERFACES   = sender.ui
 INCLUDEPATH += $(OPIEDIR)/include
 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
@@ -32,125 +32,13 @@ SOURCES   =  LibraryDialog.cpp \
          output.cpp \
          NetworkDialog.cpp \
          gutenbrowserData.cpp \
          gutenbrowser.cpp \
          main.cpp
 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
@@ -17,139 +17,13 @@ HEADERS		= Aportis.h \
        SOURCES         = Aportis.cpp
        INTERFACES= 
        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
@@ -6,135 +6,13 @@ HEADERS		= CHM.h chm_lib.h lzx.h
        SOURCES         = CHM.cpp chm_lib.c lzx.c
        INTERFACES=
        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
@@ -8,155 +8,13 @@ HEADERS		= CFilter.h \
        SOURCES         = striphtml.cpp
 # copy data file to install directory
 QMAKE_PRE_LINK = mkdir -p $(OPIEDIR)/plugins/reader/data && cp ../HTMLentities $(OPIEDIR)/plugins/reader/data/HTMLentities
        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
@@ -6,147 +6,13 @@ HEADERS		= plucker.h
        SOURCES         = plucker.cpp \
                  Palm2QImage.cpp
        INTERFACES= 
        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
@@ -5,143 +5,13 @@ CONFIG		= qt warn_on release dll
        HEADERS         = ztxt.h
        SOURCES         = ztxt.cpp
        INTERFACES= 
        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
@@ -5,141 +5,13 @@ CONFIG		= qt warn_on release dll
        HEADERS         = pdb.h
        SOURCES         = CExpander.cpp CBuffer.cpp StyleConsts.cpp \
                  hrule.cpp Navigation.cpp Bkmks.cpp
        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
@@ -6,154 +6,14 @@ CONFIG		= qt warn_on release dll
        SOURCES         = iSilo.cpp
        INTERFACES= 
        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
@@ -2,155 +2,15 @@ TEMPLATE        = subdirs
 SUBDIRS         = pluckerbaselib \
                  codeclib \
                  pdblib \
                  PluckerCodec \
                  AportisCodec \
                  CHM \
                  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
@@ -4,149 +4,13 @@ TEMPLATE	= lib
        CONFIG  = qt warn_on release dll
        HEADERS         = pdb.h
        SOURCES         = pdb.cpp
        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
@@ -6,137 +6,13 @@ HEADERS		= pdb.h \
                  util.h
        SOURCES         = plucker_base.cpp
        INTERFACES= 
        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
@@ -7,145 +7,13 @@ HEADERS		= Aportis.h
        SOURCES         = ppm_expander.cpp \
                  ppm.cpp \
                  arith_d.cpp
        INTERFACES= 
        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
@@ -75,151 +75,13 @@ SOURCES		= BuffDoc.cpp \
                  main.cpp \
                  orkey.cpp \
                  util.cpp \
                  version.cpp
        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
@@ -12,117 +12,13 @@ SOURCES       = main.cpp \
                sheet.cpp \
                cellformat.cpp \
                finddlg.cpp \
                numberdlg.cpp \
                sortdlg.cpp \
                textdlg.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
@@ -14,119 +14,13 @@ SOURCES    =    qcomplextext.cpp \
        qrichtext.cpp \
        qtextedit.cpp \
        main.cpp \
        mainwindow.cpp
 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
@@ -15,131 +15,13 @@ SOURCES        = main.cpp \
          kmolelements.cpp \
          dataTable.cpp \
          psewidget.cpp \
          oxyframe.cpp \
          datawidgetui.cpp
 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
@@ -26,164 +26,13 @@ SOURCES		= main.cpp \
                  ui/tveditview.cpp \
                  ui/tvkeyedit.cpp \
                  db/datacache.cpp \
                  db/xmlsource.cpp \
                  db/csvsource.cpp \
                  db/common.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
@@ -68,157 +68,13 @@ SOURCES     = microkde/kapplication.cpp \
              view/kateview.cpp \
              view/kateviewdialog.cpp \
              interfaces/interfaces.cpp
 INTERFACES  =
 INCLUDEPATH += microkde document view interfaces ktexteditor qt3back
 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
@@ -1,157 +1,12 @@
 TEMPLATE       = app
 CONFIG         = qt warn_on quick-app
 DESTDIR        = $(OPIEDIR)/bin
 HEADERS        = tinykate.h
 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
@@ -2,127 +2,25 @@ CONFIG       = qt quick-app
 HEADERS      = zsafe.h krc2.h category.h categorylist.h zlistview.h \
               scqtfiledlg.h
 SOURCES      = main.cpp zsafe.cpp krc2.cpp category.cpp \
               categorylist.cpp zlistview.cpp shadedlistitem.cpp\
               scqtfileedit.cpp scqtfileedit.moc.cpp \
               scqtfiledlg.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..." )
 }
 win32 {
    TEMPLATE = app
    DEFINES += DESKTOP QT_DLL QT_THREAD_SUPPORT
    SOURCES += extra/qsettings.cpp
    HEADERS += extra/qsettings.h
            INCLUDEPATH+= extra