96 files changed, 96 insertions, 96 deletions
diff --git a/noncore/applets/notesapplet/notesapplet.pro b/noncore/applets/notesapplet/notesapplet.pro
index 6b3d9b2..e4558f7 100644
--- a/noncore/applets/notesapplet/notesapplet.pro
+++ b/noncore/applets/notesapplet/notesapplet.pro
@@ -1,16 +1,16 @@
 TEMPLATE  = lib
 CONFIG    += qt warn_on release
 HEADERS =   notes.h notesappletimpl.h
 SOURCES =   notes.cpp notesappletimpl.cpp
 TARGET    = notesapplet
 DESTDIR   = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
 VERSION   = 1.0.0
 MOC_DIR=opieobj
 OBJECTS_DIR=opieobj
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/applets/wirelessapplet/wirelessapplet.pro b/noncore/applets/wirelessapplet/wirelessapplet.pro
index b8c9ef8..f82c8b6 100644
--- a/noncore/applets/wirelessapplet/wirelessapplet.pro
+++ b/noncore/applets/wirelessapplet/wirelessapplet.pro
@@ -1,32 +1,32 @@
 TEMPLATE     = lib
 CONFIG      += qt warn_on release
 HEADERS      = wireless.h wirelessappletimpl.h networkinfo.h mgraph.h advancedconfig.h
 SOURCES      = wireless.cpp wirelessappletimpl.cpp networkinfo.cpp mgraph.cpp advancedconfig.cpp
 INTERFACES   = advancedconfigbase.ui
 TARGET       = wirelessapplet
 DESTDIR      = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += ../$(OPIEDIR)/include
 LIBS        += -lqpe
 VERSION      = 0.1.0
 TRANSLATIONS = ../../../i18n/de/libwirelessapplet.ts \
         ../../../i18n/da/libwirelessapplet.ts \
         ../../../i18n/xx/libwirelessapplet.ts \
         ../../../i18n/en/libwirelessapplet.ts \
         ../../../i18n/es/libwirelessapplet.ts \
         ../../../i18n/fr/libwirelessapplet.ts \
         ../../../i18n/hu/libwirelessapplet.ts \
         ../../../i18n/ja/libwirelessapplet.ts \
         ../../../i18n/ko/libwirelessapplet.ts \
         ../../../i18n/no/libwirelessapplet.ts \
         ../../../i18n/pl/libwirelessapplet.ts \
         ../../../i18n/pt/libwirelessapplet.ts \
         ../../../i18n/pt_BR/libwirelessapplet.ts \
         ../../../i18n/sl/libwirelessapplet.ts \
         ../../../i18n/zh_CN/libwirelessapplet.ts \
         ../../../i18n/zh_TW/libwirelessapplet.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/advancedfm/advancedfm.pro b/noncore/apps/advancedfm/advancedfm.pro
index 233fbee..77a6fea 100644
--- a/noncore/apps/advancedfm/advancedfm.pro
+++ b/noncore/apps/advancedfm/advancedfm.pro
@@ -1,30 +1,30 @@
 TEMPLATE  = app
 CONFIG    += qt warn_on release
 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
 DESTDIR = $(OPIEDIR)/bin
 LIBS            += -lqpe -lopie
 TRANSLATIONS = ../../../i18n/de/advancedfm.ts \
         ../../../i18n/da/advancedfm.ts \
         ../../../i18n/xx/advancedfm.ts \
   ../../../i18n/en/advancedfm.ts \
   ../../../i18n/es/advancedfm.ts \
   ../../../i18n/fr/advancedfm.ts \
   ../../../i18n/hu/advancedfm.ts \
   ../../../i18n/ja/advancedfm.ts \
   ../../../i18n/ko/advancedfm.ts \
   ../../../i18n/no/advancedfm.ts \
   ../../../i18n/pl/advancedfm.ts \
   ../../../i18n/pt/advancedfm.ts \
   ../../../i18n/pt_BR/advancedfm.ts \
   ../../../i18n/sl/advancedfm.ts \
   ../../../i18n/zh_CN/advancedfm.ts \
   ../../../i18n/zh_TW/advancedfm.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/checkbook/checkbook.pro b/noncore/apps/checkbook/checkbook.pro
index 8ac63e3..d1a7d68 100644
--- a/noncore/apps/checkbook/checkbook.pro
+++ b/noncore/apps/checkbook/checkbook.pro
@@ -1,48 +1,48 @@
 TEMPLATE  = app
 CONFIG    = qt warn_on release
 HEADERS   = mainwindow.h \
      cbinfo.h        \
      traninfo.h      \
      graphinfo.h     \
      configuration.h \
      password.h      \
      checkbook.h     \
      transaction.h   \
      graph.h
 SOURCES   = main.cpp    \
      mainwindow.cpp    \
      cbinfo.cpp        \
      traninfo.cpp      \
      graphinfo.cpp     \
      configuration.cpp \
      password.cpp      \
      checkbook.cpp     \
      transaction.cpp   \ 
      graph.cpp
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS    += -lqpe -lopie
 TARGET    = checkbook
 DESTDIR   = $(OPIEDIR)/bin
 TRANSLATIONS = ../../../i18n/de/checkbook.ts \
         ../../../i18n/da/checkbook.ts \
         ../../../i18n/xx/checkbook.ts \
   ../../../i18n/en/checkbook.ts    \
   ../../../i18n/es/checkbook.ts    \
   ../../../i18n/fr/checkbook.ts    \
   ../../../i18n/hu/checkbook.ts    \
   ../../../i18n/ja/checkbook.ts    \
   ../../../i18n/ko/checkbook.ts    \
   ../../../i18n/no/checkbook.ts    \
   ../../../i18n/pl/checkbook.ts    \
   ../../../i18n/pt/checkbook.ts    \
   ../../../i18n/pt_BR/checkbook.ts \
   ../../../i18n/sl/checkbook.ts    \
   ../../../i18n/zh_CN/checkbook.ts \
   ../../../i18n/zh_TW/checkbook.ts \
   ../../../i18n/it/checkbook.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/confedit/confedit.pro b/noncore/apps/confedit/confedit.pro
index 05691b4..d9aaa2f 100644
--- a/noncore/apps/confedit/confedit.pro
+++ b/noncore/apps/confedit/confedit.pro
@@ -1,32 +1,32 @@
        DESTDIR         = $(OPIEDIR)/bin
        TEMPLATE= app
        #CONFIG         = qt warn_on release
        CONFIG  = qt warn_on debug
        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)/ioclude
 LIBS            += -lqpe
        INTERFACES= 
        TARGET  = confedit
 TRANSLATIONS = ../../../i18n/de/confedit.ts \
         ../../../i18n/da/confedit.ts \
         ../../../i18n/xx/confedit.ts \
         ../../../i18n/en/confedit.ts \
         ../../../i18n/es/confedit.ts \
         ../../../i18n/fr/confedit.ts \
         ../../../i18n/hu/confedit.ts \
         ../../../i18n/ja/confedit.ts \
         ../../../i18n/ko/confedit.ts \
         ../../../i18n/no/confedit.ts \
         ../../../i18n/pl/confedit.ts \
         ../../../i18n/pt/confedit.ts \
         ../../../i18n/pt_BR/confedit.ts \
         ../../../i18n/sl/confedit.ts \
         ../../../i18n/zh_CN/confedit.ts \
         ../../../i18n/zh_TW/confedit.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/odict/odict.pro b/noncore/apps/odict/odict.pro
index 51f7ca0..e43f935 100644
--- a/noncore/apps/odict/odict.pro
+++ b/noncore/apps/odict/odict.pro
@@ -1,42 +1,42 @@
        TEMPLATE= app
        CONFIG  = qt warn_on debug
        #CONFIG         = qt warn_on release
        HEADERS         = odict.h \
                                searchmethoddlg.h \
                                configdlg.h \
                                dingwidget.h \
                                dictwidget.h
        SOURCES         = main.cpp \
                  odict.cpp \
                  searchmethoddlg.cpp \
                  configdlg.cpp \
                  dictwidget.cpp \
                  dingwidget.cpp
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
        LIBS    += -lqpe -lstdc++ -lopie
        TARGET          = odict
        DESTDIR         = $(OPIEDIR)/bin
 TRANSLATIONS = ../../../i18n/de/odict.ts \
         ../../../i18n/xx/odict.ts \
         ../../../i18n/en/odict.ts \
         ../../../i18n/es/odict.ts \
         ../../../i18n/fr/odict.ts \
         ../../../i18n/hu/odict.ts \
         ../../../i18n/ja/odict.ts \
         ../../../i18n/ko/odict.ts \
         ../../../i18n/no/odict.ts \
         ../../../i18n/pl/odict.ts \
         ../../../i18n/pt/odict.ts \
         ../../../i18n/pt_BR/odict.ts \
         ../../../i18n/sl/odict.ts \
         ../../../i18n/zh_CN/odict.ts \
         ../../../i18n/zh_TW/odict.ts \
            ../../../i18n/it/odict.ts \
            ../../../i18n/da/odict.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-console/opie-console.pro b/noncore/apps/opie-console/opie-console.pro
index 5ffa46f..58b29ca 100644
--- a/noncore/apps/opie-console/opie-console.pro
+++ b/noncore/apps/opie-console/opie-console.pro
@@ -1,77 +1,77 @@
 TEMPLATE     = app
        TMAKE_CXXFLAGS+= -DHAVE_OPENPTY
 CONFIG       += qt warn_on release
        #CONFIG      = qt debug
 DESTDIR      = $(OPIEDIR)/bin
 HEADERS      = io_layer.h io_serial.h io_irda.h io_bt.h io_modem.h \
               file_layer.h filetransfer.h \
               metafactory.h \
               session.h \
               mainwindow.h \
               profile.h \
               profileconfig.h \
               profilemanager.h  \
               configwidget.h \
               tabwidget.h \
               configdialog.h \
               keytrans.h \
               transferdialog.h \
               profiledialogwidget.h \
               profileeditordialog.h \
               default.h \
               iolayerbase.h \
               serialconfigwidget.h irdaconfigwidget.h \
               btconfigwidget.h modemconfigwidget.h \
               atconfigdialog.h dialdialog.h \  
               procctl.h \
               function_keyboard.h  \
               receive_layer.h filereceive.h \
               script.h \
               dialer.h \
               terminalwidget.h \
               emulation_handler.h TECommon.h \
               TEHistory.h TEScreen.h TEWidget.h \
               TEmuVt102.h TEmulation.h MyPty.h \
               consoleconfigwidget.h
 SOURCES      = io_layer.cpp io_serial.cpp io_irda.cpp io_bt.cpp io_modem.cpp \
               file_layer.cpp filetransfer.cpp \
               main.cpp \
               metafactory.cpp \
               session.cpp \
               mainwindow.cpp \
               profile.cpp \
               profileconfig.cpp \
               profilemanager.cpp  \
               tabwidget.cpp \
               configdialog.cpp \
               keytrans.cpp \
               transferdialog.cpp \
               profiledialogwidget.cpp \
               profileeditordialog.cpp \
               iolayerbase.cpp \
               serialconfigwidget.cpp irdaconfigwidget.cpp \
               btconfigwidget.cpp modemconfigwidget.cpp \ 
               atconfigdialog.cpp dialdialog.cpp \
               default.cpp  procctl.cpp \
               function_keyboard.cpp  \
               receive_layer.cpp filereceive.cpp \
               script.cpp \
                   dialer.cpp \
               terminalwidget.cpp \
                emulation_handler.cpp TEHistory.cpp \
                TEScreen.cpp TEWidget.cpp \
                TEmuVt102.cpp TEmulation.cpp MyPty.cpp \
                consoleconfigwidget.cpp
                
 INTERFACES   = configurebase.ui editbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopie -lutil
 TARGET       = opie-console
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-console/test/console.pro b/noncore/apps/opie-console/test/console.pro
index ec3efbf..7b4c310 100644
--- a/noncore/apps/opie-console/test/console.pro
+++ b/noncore/apps/opie-console/test/console.pro
@@ -1,21 +1,21 @@
 TEMPLATE     = app
 #CONFIG       = qt warn_on release
        CONFIG      = qt debug
 #DESTDIR      = $(OPIEDIR)/bin
 HEADERS      = ../io_layer.h ../io_serial.h ../sz_transfer.h ../file_layer.h\
            senderui.h ../profile.h ../filetransfer.h ../procctl.h \
            ../filereceive.h ../receive_layer.h
 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 -lopie
 TARGET       = test
-include ( ../../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-reader/opie-reader.pro b/noncore/apps/opie-reader/opie-reader.pro
index aae9a01..409f9c7 100644
--- a/noncore/apps/opie-reader/opie-reader.pro
+++ b/noncore/apps/opie-reader/opie-reader.pro
@@ -1,77 +1,77 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        HEADERS         = Aportis.h \
                  Bkmks.h \
                  BuffDoc.h \
                  CAnnoEdit.h \
                  CBuffer.h \
                  CDrawBuffer.h \
                  CEncoding.h \
                  CExpander.h \
                  CFilter.h \
                  Filedata.h \
                  FontControl.h \
                  GraphicWin.h \
                  Markups.h \
                  Navigation.h \
                  Palm2QImage.h \
                  QFloatBar.h \
                  QTReader.h \
                  QTReaderApp.h \
                  QtrListView.h \
                  Queue.h \
                  StateData.h \
                  StyleConsts.h \
                  ZText.h \
                  arith.h \
                  cbkmkselector.h \
                  config.h \
                  fileBrowser.h \
                  infowin.h \
                  my_list.h \
                  name.h \
                  opie.h \
                  pdb.h \
                  plucker.h \
                  ppm.h \
                  ppm_expander.h \
                  ustring.h \
                  utypes.h \
                  version.h \
                  ztxt.h
        SOURCES         = Aportis.cpp \
                  Bkmks.cpp \
                  BuffDoc.cpp \
                  CBuffer.cpp \
                  CDrawBuffer.cpp \
                  CEncoding.cpp \
                  CFilter.cpp \
                  FontControl.cpp \
                  Navigation.cpp \
                  Palm2QImage.cpp \
                  QTReader.cpp \
                  QTReaderApp.cpp \
                  QtrListView.cpp \
                  StyleConsts.cpp \
                  arith_d.cpp \
                  fileBrowser.cpp \
                  infowin.cpp \
                  main.cpp \
                  pdb.cpp \
                  plucker.cpp \
                  ppm.cpp \
                  ppm_expander.cpp \
                  ztxt.cpp
        INTERFACES= 
        DESTDIR         =  $(OPIEDIR)/bin
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
        TARGET  =  reader
        LIBS    += -lqpe
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-sheet/opie-sheet.pro b/noncore/apps/opie-sheet/opie-sheet.pro
index 7256c0c..90f29fc 100644
--- a/noncore/apps/opie-sheet/opie-sheet.pro
+++ b/noncore/apps/opie-sheet/opie-sheet.pro
@@ -1,31 +1,31 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = mainwindow.h sheet.h cellformat.h finddlg.h numberdlg.h sortdlg.h textdlg.h
        SOURCES         = main.cpp mainwindow.cpp sheet.cpp cellformat.cpp finddlg.cpp numberdlg.cpp sortdlg.cpp textdlg.cpp
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
        TARGET  = sheetqt
 TRANSLATIONS = ../../../i18n/de/opie-sheet.ts \
         ../../../i18n/da/opie-sheet.ts \
         ../../../i18n/xx/opie-sheet.ts \
         ../../../i18n/en/opie-sheet.ts \
         ../../../i18n/es/opie-sheet.ts \
         ../../../i18n/fr/opie-sheet.ts \
         ../../../i18n/hu/opie-sheet.ts \
         ../../../i18n/ja/opie-sheet.ts \
         ../../../i18n/ko/opie-sheet.ts \
         ../../../i18n/no/opie-sheet.ts \
         ../../../i18n/pl/opie-sheet.ts \
         ../../../i18n/pt/opie-sheet.ts \
         ../../../i18n/pt_BR/opie-sheet.ts \
         ../../../i18n/sl/opie-sheet.ts \
         ../../../i18n/zh_CN/opie-sheet.ts \
         ../../../i18n/zh_TW/opie-sheet.ts \
            ../../../i18n/it/opie-sheet.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-write/opie-write.pro b/noncore/apps/opie-write/opie-write.pro
index 6a9d96d..f7bb296 100644
--- a/noncore/apps/opie-write/opie-write.pro
+++ b/noncore/apps/opie-write/opie-write.pro
@@ -1,29 +1,29 @@
        TEMPLATE= app
        CONFIG  += qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         =qcleanuphandler.h \
                qcomplextext_p.h \
                qrichtext_p.h \
                qstylesheet.h \
                qtextedit.h \
                mainwindow.h
        SOURCES         =qcomplextext.cpp \
                qstylesheet.cpp \
                qrichtext_p.cpp \
                qrichtext.cpp \
                qtextedit.cpp \
                main.cpp \
                mainwindow.cpp
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
        TARGET  = opie-write
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/tableviewer/tableviewer.pro b/noncore/apps/tableviewer/tableviewer.pro
index 91222d2..1c7905b 100644
--- a/noncore/apps/tableviewer/tableviewer.pro
+++ b/noncore/apps/tableviewer/tableviewer.pro
@@ -1,57 +1,57 @@
        TEMPLATE= app
        CONFIG  = qt warn_on debug
        DESTDIR         = $(OPIEDIR)/bin
        SUBDIRS         = db ui
        HEADERS         = tableviewer.h \
                  ui/commonwidgets.h \
                  ui/tvbrowseview.h \
                  ui/tvlistview.h \
                  ui/tvfilterview.h \
                  ui/tveditview.h \
                  ui/browsekeyentry.h \
                  ui/filterkeyentry.h \
                  ui/tvkeyedit.h \
                  db/datacache.h \
                  db/common.h \
                  db/xmlsource.h \
                  db/csvsource.h
        SOURCES         = main.cpp \
                  tableviewer.cpp \
                  ui/commonwidgets.cpp \
                  ui/tvbrowseview.cpp \
                  ui/tvfilterview.cpp \
                  ui/browsekeyentry.cpp \
                  ui/filterkeyentry.cpp \
                  ui/tvlistview.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
 TRANSLATIONS = ../../../i18n/de/tableviewer.ts \
         ../../../i18n/da/tableviewer.ts \
         ../../../i18n/xx/tableviewer.ts \
         ../../../i18n/en/tableviewer.ts \
         ../../../i18n/es/tableviewer.ts \
         ../../../i18n/fr/tableviewer.ts \
         ../../../i18n/hu/tableviewer.ts \
         ../../../i18n/ja/tableviewer.ts \
         ../../../i18n/ko/tableviewer.ts \
         ../../../i18n/no/tableviewer.ts \
         ../../../i18n/pl/tableviewer.ts \
         ../../../i18n/pt/tableviewer.ts \
         ../../../i18n/pt_BR/tableviewer.ts \
         ../../../i18n/sl/tableviewer.ts \
         ../../../i18n/zh_CN/tableviewer.ts \
         ../../../i18n/zh_TW/tableviewer.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/tinykate/libkate/libkate.pro b/noncore/apps/tinykate/libkate/libkate.pro
index 0dd5b4c..b0354e6 100644
--- a/noncore/apps/tinykate/libkate/libkate.pro
+++ b/noncore/apps/tinykate/libkate/libkate.pro
@@ -1,90 +1,90 @@
        TEMPLATE= lib
        CONFIG  = qt warn_on release
        HEADERS         = microkde/kapplication.h \
                  microkde/kconfig.h \
                  microkde/kdebug.h \
                  microkde/kdialog.h \
                  microkde/kdialogbase.h \
                  microkde/kfiledialog.h \
                  microkde/kglobal.h \
                  microkde/kiconloader.h \
                  microkde/klineedit.h \
                  microkde/klocale.h \
                  microkde/kmessagebox.h \
                  microkde/kprinter.h \
                  microkde/krestrictedline.h \
                  microkde/kseparator.h \
                  microkde/ksimpleconfig.h \
                  microkde/kstandarddirs.h \
                  microkde/ktempfile.h \
                  microkde/kunload.h \
                  microkde/kurlrequester.h \
                  microkde/kfontdialog.h \
                  microkde/krun.h \
                  microkde/knumvalidator.h \
                  microkde/kstaticdeleter.h \
                  microkde/klistview.h \
                  microkde/kglobalsettings.h \
                  microkde/kcolorbtn.h \
                  \
                  \
                  qt3back/qregexp3.h \
                  kde/ksharedptr.h \
                  document/katebuffer.h  document/katedialogs.h \
                  document/katetextline.h \
                  document/katecmd.h \
                  document/katehighlight.h \
                  document/katecmds.h    document/katedocument.h  \
                  document/katesyntaxdocument.h \
                  view/kateundohistory.h  \
                  view/kateview.h  \
                  view/kateviewdialog.h \
                  interfaces/view.h \
                  interfaces/document.h \
                  ktexteditor/ktexteditor.h
        SOURCES         = microkde/kapplication.cpp \
                  microkde/kdialogbase.cpp \
                  microkde/kconfig.cpp \
                  microkde/klocale.cpp \
                  microkde/kmessagebox.cpp \
                  microkde/kprocess.cpp \
                  microkde/kstandarddirs.cpp \
                  microkde/ktempfile.cpp \
                  microkde/kurlrequester.cpp \
                  microkde/kcolordialog.cpp \
                  microkde/kfontdialog.cpp \
                  microkde/krun.cpp \
                  microkde/knumvalidator.cpp \
                  microkde/kglobal.cpp \
                  microkde/kglobalsettings.cpp \
                  microkde/kcolorbtn.cpp \
                  \
                  \
                  qt3back/qregexp3.cpp \
                  ktexteditor/ktexteditor.cpp \
                  document/katebuffer.cpp  document/katedialogs.cpp \
                  document/katehighlight.cpp  \
                  document/katecmd.cpp   \
                  document/katesyntaxdocument.cpp document/katecmds.cpp \
                  document/katedocument.cpp    document/katetextline.cpp \
                  view/kateundohistory.cpp \
                  view/kateview.cpp \
                  view/kateviewdialog.cpp \
                  interfaces/interfaces.cpp
        INTERFACES= 
        INCLUDEPATH+= $(OPIEDIR)/include $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \
                        $(OPIEDIR)/noncore/apps/tinykate/libkate/document \
                        $(OPIEDIR)/noncore/apps/tinykate/libkate/view \
                        $(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \
                        $(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \
                        $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
        TARGET  = tinykate
 INCLUDEPATH += $(OPIEDIR)/include
 DESTDIR      = $(OPIEDIR)/lib$(PROJMAK)
-include ( ../../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/tinykate/tinykate.pro b/noncore/apps/tinykate/tinykate.pro
index 11b4e5d..61b60a6 100644
--- a/noncore/apps/tinykate/tinykate.pro
+++ b/noncore/apps/tinykate/tinykate.pro
@@ -1,20 +1,20 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = tinykate.h
        SOURCES         = tinykate.cpp main.cpp
        INTERFACES= 
        INCLUDEPATH+= $(OPIEDIR)/include $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \
                        $(OPIEDIR)/noncore/apps/tinykate/libkate/document \
                        $(OPIEDIR)/noncore/apps/tinykate/libkate/view \
                        $(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \
                        $(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \
                        $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -ltinykate -lopie
        TARGET  = tinykate
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/comm/keypebble/keypebble.pro b/noncore/comm/keypebble/keypebble.pro
index 83171ba..1eee074 100644
--- a/noncore/comm/keypebble/keypebble.pro
+++ b/noncore/comm/keypebble/keypebble.pro
@@ -1,55 +1,55 @@
 TEMPLATE        = app
 CONFIG          += qt warn_on release
 DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = d3des.h \
                  krfbbuffer.h \
                  krfbcanvas.h \
                  krfbconnection.h \
                  krfbdecoder.h \
                  krfblogin.h \
                  krfbserver.h \
                  krfbserverinfo.h \
                  kvnc.h \
                  kvncconndlg.h \
                  kvncbookmarkdlg.h \
                  version.h \
                  vncauth.h
        SOURCES         = d3des.c \
                  vncauth.c \
                  krfbbuffer.cpp \
                  krfbcanvas.cpp \
                  krfbconnection.cpp \
                  krfbdecoder.cpp \
                  krfblogin.cpp \
                  krfbserver.cpp \
                  kvnc.cpp \
                  kvncconndlg.cpp \
                  kvncbookmarkdlg.cpp \
                  main.cpp
        INTERFACES= kvncconndlgbase.ui \
                                                kvncbookmarkdlgbase.ui
 TARGET          = keypebble
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
 TRANSLATIONS = ../../../i18n/de/keypebble.ts \
         ../../../i18n/da/keypebble.ts \
         ../../../i18n/xx/keypebble.ts \
         ../../../i18n/en/keypebble.ts \
         ../../../i18n/es/keypebble.ts \
         ../../../i18n/fr/keypebble.ts \
         ../../../i18n/hu/keypebble.ts \
         ../../../i18n/ja/keypebble.ts \
         ../../../i18n/ko/keypebble.ts \
         ../../../i18n/no/keypebble.ts \
         ../../../i18n/pl/keypebble.ts \
         ../../../i18n/pt/keypebble.ts \
         ../../../i18n/pt_BR/keypebble.ts \
         ../../../i18n/sl/keypebble.ts \
         ../../../i18n/zh_CN/keypebble.ts \
         ../../../i18n/zh_TW/keypebble.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/comm/mobilemsg/mobilemsg.pro b/noncore/comm/mobilemsg/mobilemsg.pro
index 62fe70c..4a3bbd8 100644
--- a/noncore/comm/mobilemsg/mobilemsg.pro
+++ b/noncore/comm/mobilemsg/mobilemsg.pro
@@ -1,32 +1,32 @@
        TEMPLATE= app
        #CONFIG         = qt warn_on debug
        CONFIG  = qt warn_on release
        HEADERS         = mobilemsg.h
        SOURCES         = main.cpp mobilemsg.cpp
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
        TARGET  = mobilemsg
        DESTDIR         = $(OPIEDIR)/bin
        INTERFACES= mobilemsgbase.ui
 TRANSLATIONS = ../../../i18n/de/mobilemsg.ts \
         ../../../i18n/da/mobilemsg.ts \
         ../../../i18n/xx/mobilemsg.ts \
         ../../../i18n/en/mobilemsg.ts \
         ../../../i18n/es/mobilemsg.ts \
         ../../../i18n/fr/mobilemsg.ts \
         ../../../i18n/hu/mobilemsg.ts \
         ../../../i18n/ja/mobilemsg.ts \
         ../../../i18n/ko/mobilemsg.ts \
         ../../../i18n/no/mobilemsg.ts \
         ../../../i18n/pl/mobilemsg.ts \
         ../../../i18n/pt/mobilemsg.ts \
         ../../../i18n/pt_BR/mobilemsg.ts \
         ../../../i18n/sl/mobilemsg.ts \
         ../../../i18n/zh_CN/mobilemsg.ts \
         ../../../i18n/zh_TW/mobilemsg.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/decorations/flat/flat.pro b/noncore/decorations/flat/flat.pro
index 96b4b78..e691339 100644
--- a/noncore/decorations/flat/flat.pro
+++ b/noncore/decorations/flat/flat.pro
@@ -1,15 +1,15 @@
        TEMPLATE= lib
        CONFIG  += qt warn_on release
        HEADERS         = flat.h
        SOURCES         = flat.cpp
        TARGET  = flat
        DESTDIR         = $(OPIEDIR)/plugins/decorations
        INCLUDEPATH+= $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
        VERSION         = 1.0.0
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/decorations/liquid/liquid.pro b/noncore/decorations/liquid/liquid.pro
index d614a64..7c310a6 100644
--- a/noncore/decorations/liquid/liquid.pro
+++ b/noncore/decorations/liquid/liquid.pro
@@ -1,14 +1,14 @@
 TEMPLATE    =  lib
 CONFIG       = qt embedded release warn_on
 SOURCES     =  liquid.cpp               
 HEADERS     =  liquid.h               
 LIBS        += -lqpe 
 INCLUDEPATH += $(OPIEDIR)/include
 DESTDIR      = $(OPIEDIR)/plugins/decorations
 TARGET       = liquid
 VERSION      = 1.0.0
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/decorations/polished/polished.pro b/noncore/decorations/polished/polished.pro
index e9ee73a..1ee940e 100644
--- a/noncore/decorations/polished/polished.pro
+++ b/noncore/decorations/polished/polished.pro
@@ -1,15 +1,15 @@
        TEMPLATE= lib
        CONFIG  += qt warn_on release
        HEADERS         = polished.h
        SOURCES         = polished.cpp
        TARGET  = polished
        DESTDIR         = $(OPIEDIR)/plugins/decorations
        INCLUDEPATH+= $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
        VERSION         = 1.0.0
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/games/bounce/bounce.pro b/noncore/games/bounce/bounce.pro
index bb3e4df..b66c53d 100644
--- a/noncore/games/bounce/bounce.pro
+++ b/noncore/games/bounce/bounce.pro
@@ -1,32 +1,32 @@
        TEMPLATE= app
        #CONFIG         = qt warn_on debug
        CONFIG  = qt warn_on release
        HEADERS         = game.h kbounce.h 
        SOURCES         = game.cpp kbounce.cpp main.cpp
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS        += -lqpe
 DESTDIR     = $(OPIEDIR)/bin
        TARGET  = bounce 
 TRANSLATIONS = ../../../i18n/de/bounce.ts \
         ../../../i18n/da/bounce.ts \
         ../../../i18n/xx/bounce.ts \
         ../../../i18n/en/bounce.ts \
         ../../../i18n/es/bounce.ts \
         ../../../i18n/fr/bounce.ts \
         ../../../i18n/hu/bounce.ts \
         ../../../i18n/ja/bounce.ts \
         ../../../i18n/ko/bounce.ts \
         ../../../i18n/no/bounce.ts \
         ../../../i18n/pl/bounce.ts \
         ../../../i18n/pt/bounce.ts \
         ../../../i18n/pt_BR/bounce.ts \
         ../../../i18n/sl/bounce.ts \
         ../../../i18n/zh_CN/bounce.ts \
         ../../../i18n/zh_TW/bounce.ts \
            ../../../i18n/it/bounce.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/games/buzzword/buzzword.pro b/noncore/games/buzzword/buzzword.pro
index 61c7085..2ce48eb 100644
--- a/noncore/games/buzzword/buzzword.pro
+++ b/noncore/games/buzzword/buzzword.pro
@@ -1,31 +1,31 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        HEADERS         = buzzword.h 
        SOURCES         = buzzword.cpp main.cpp
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 DESTDIR     = $(OPIEDIR)/bin
 LIBS        += -lqpe
        TARGET  = buzzword 
 TRANSLATIONS = ../../../i18n/de/buzzword.ts \
         ../../../i18n/da/buzzword.ts \
         ../../../i18n/xx/buzzword.ts \
         ../../../i18n/en/buzzword.ts \
         ../../../i18n/es/buzzword.ts \
         ../../../i18n/fr/buzzword.ts \
         ../../../i18n/hu/buzzword.ts \
         ../../../i18n/ja/buzzword.ts \
         ../../../i18n/ko/buzzword.ts \
         ../../../i18n/no/buzzword.ts \
         ../../../i18n/pl/buzzword.ts \
         ../../../i18n/pt/buzzword.ts \
         ../../../i18n/pt_BR/buzzword.ts \
         ../../../i18n/sl/buzzword.ts \
         ../../../i18n/zh_CN/buzzword.ts \
         ../../../i18n/zh_TW/buzzword.ts \
            ../../../i18n/it/buzzword.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/games/chess/chess.pro b/noncore/games/chess/chess.pro
index a96eb66..4c9604f 100644
--- a/noncore/games/chess/chess.pro
+++ b/noncore/games/chess/chess.pro
@@ -1,35 +1,35 @@
        SOURCES+= chess.cpp main.cpp 
        HEADERS+= chess.h 
 DESTDIR = $(OPIEDIR)/bin
 TARGET = chess
        DEPENDPATH+= $(OPIEDIR)/include
 INTERFACES = mainwindow.ui 
        IMAGES= images/new.png images/repeat.png images/txt.png images/back.png 
        TEMPLATE=app
        CONFIG+= qt warn_on release
 INCLUDEPATH += $(OPIEDIR)/include
        LIBS+= -lqpe
        DBFILE= chess.db
        LANGUAGE= C++
        CPP_ALWAYS_CREATE_SOURCE= TRUE
 TRANSLATIONS = ../../../i18n/de/chess.ts \
         ../../../i18n/da/chess.ts \
         ../../../i18n/xx/chess.ts \
         ../../../i18n/en/chess.ts \
         ../../../i18n/es/chess.ts \
         ../../../i18n/fr/chess.ts \
         ../../../i18n/hu/chess.ts \
         ../../../i18n/ja/chess.ts \
         ../../../i18n/ko/chess.ts \
         ../../../i18n/no/chess.ts \
         ../../../i18n/pl/chess.ts \
         ../../../i18n/pt/chess.ts \
         ../../../i18n/pt_BR/chess.ts \
         ../../../i18n/sl/chess.ts \
         ../../../i18n/zh_CN/chess.ts \
         ../../../i18n/zh_TW/chess.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/games/fifteen/fifteen.pro b/noncore/games/fifteen/fifteen.pro
index d1c246d..6048b25 100644
--- a/noncore/games/fifteen/fifteen.pro
+++ b/noncore/games/fifteen/fifteen.pro
@@ -1,31 +1,31 @@
        DESTDIR         = $(OPIEDIR)/bin
        TEMPLATE= app
        CONFIG  = qt warn_on release
        HEADERS         = fifteen.h
        SOURCES         = fifteen.cpp \
                main.cpp
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
        TARGET  = fifteen
 TRANSLATIONS = ../../../i18n/de/fifteen.ts \
         ../../../i18n/da/fifteen.ts \
         ../../../i18n/xx/fifteen.ts \
         ../../../i18n/en/fifteen.ts \
         ../../../i18n/es/fifteen.ts \
         ../../../i18n/fr/fifteen.ts \
         ../../../i18n/hu/fifteen.ts \
         ../../../i18n/ja/fifteen.ts \
         ../../../i18n/ko/fifteen.ts \
         ../../../i18n/no/fifteen.ts \
         ../../../i18n/pl/fifteen.ts \
         ../../../i18n/pt/fifteen.ts \
         ../../../i18n/pt_BR/fifteen.ts \
         ../../../i18n/sl/fifteen.ts \
         ../../../i18n/zh_CN/fifteen.ts \
         ../../../i18n/zh_TW/fifteen.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/games/go/go.pro b/noncore/games/go/go.pro
index 1c98640..0cbcb69 100644
--- a/noncore/games/go/go.pro
+++ b/noncore/games/go/go.pro
@@ -1,38 +1,38 @@
        DESTDIR         = $(OPIEDIR)/bin
        TEMPLATE= app
        CONFIG  = qt warn_on release
        HEADERS         = amigo.h \
                  go.h \
                  goplayutils.h \
                  gowidget.h
        SOURCES         = amigo.c \
                goplayer.c \
                goplayutils.c \
                killable.c \
                gowidget.cpp \
                main.cpp
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
        TARGET  = go
 TRANSLATIONS = ../../../i18n/de/go.ts \
         ../../../i18n/da/go.ts \
         ../../../i18n/xx/go.ts \
         ../../../i18n/en/go.ts \
         ../../../i18n/es/go.ts \
         ../../../i18n/fr/go.ts \
         ../../../i18n/hu/go.ts \
         ../../../i18n/ja/go.ts \
         ../../../i18n/ko/go.ts \
         ../../../i18n/no/go.ts \
         ../../../i18n/pl/go.ts \
         ../../../i18n/pt/go.ts \
         ../../../i18n/pt_BR/go.ts \
         ../../../i18n/sl/go.ts \
         ../../../i18n/zh_CN/go.ts \
         ../../../i18n/zh_TW/go.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/games/kbill/kbill.pro b/noncore/games/kbill/kbill.pro
index 270fcab..db5dc10 100644
--- a/noncore/games/kbill/kbill.pro
+++ b/noncore/games/kbill/kbill.pro
@@ -1,35 +1,35 @@
        TEMPLATE = app
        CONFIG  = qt warn_on release
        HEADERS = kbill.h field.h Bucket.h Cable.h Computer.h Game.h Horde.h \
 Library.h MCursor.h Monster.h Network.h Picture.h Spark.h Strings.h \
 UI.h  objects.h inputbox.h
        SOURCES         = field.cpp Bucket.cc Cable.cc Computer.cc Game.cc Horde.cc \
 Library.cc MCursor.cc Monster.cc  Network.cc Picture.cc \ 
 Spark.cc UI.cpp inputbox.cpp kbill.cpp
 INTERFACES = helpdialog.ui
        TARGET          = kbill
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
        LIBS    += -lqpe -lstdc++
        DESTDIR =  $(OPIEDIR)/bin
 TRANSLATIONS = ../../../i18n/de/kbill.ts \
         ../../../i18n/da/kbill.ts \
         ../../../i18n/xx/kbill.ts \
         ../../../i18n/en/kbill.ts \
         ../../../i18n/es/kbill.ts \
         ../../../i18n/fr/kbill.ts \
         ../../../i18n/hu/kbill.ts \
         ../../../i18n/ja/kbill.ts \
         ../../../i18n/ko/kbill.ts \
         ../../../i18n/no/kbill.ts \
         ../../../i18n/pl/kbill.ts \
         ../../../i18n/pt/kbill.ts \
         ../../../i18n/pt_BR/kbill.ts \
         ../../../i18n/sl/kbill.ts \
         ../../../i18n/zh_CN/kbill.ts \
         ../../../i18n/zh_TW/kbill.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/games/kcheckers/kcheckers.pro b/noncore/games/kcheckers/kcheckers.pro
index d8b5231..c1631e7 100644
--- a/noncore/games/kcheckers/kcheckers.pro
+++ b/noncore/games/kcheckers/kcheckers.pro
@@ -1,39 +1,39 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        HEADERS         = checkers.h \
                  echeckers.h \
                  field.h \
                  kcheckers.h \
                  rcheckers.h
        SOURCES         = checkers.cpp \
                  echeckers.cpp \
                  field.cpp \
                  kcheckers.cpp \
                  main.cpp \
                  rcheckers.cpp
        INTERFACES= 
        INCLUDEPATH+= $(OPIEDIR)/include
        LIBS    += -lqpe
        DESTDIR         = $(OPIEDIR)/bin
        TARGET  = kcheckers
 TRANSLATIONS = ../../../i18n/de/kcheckers.ts \
         ../../../i18n/da/kcheckers.ts \
         ../../../i18n/xx/kcheckers.ts \
         ../../../i18n/en/kcheckers.ts \
         ../../../i18n/es/kcheckers.ts \
         ../../../i18n/fr/kcheckers.ts \
         ../../../i18n/hu/kcheckers.ts \
         ../../../i18n/ja/kcheckers.ts \
         ../../../i18n/ko/kcheckers.ts \
         ../../../i18n/no/kcheckers.ts \
         ../../../i18n/pl/kcheckers.ts \
         ../../../i18n/pt/kcheckers.ts \
         ../../../i18n/pt_BR/kcheckers.ts \
         ../../../i18n/sl/kcheckers.ts \
         ../../../i18n/zh_CN/kcheckers.ts \
         ../../../i18n/zh_TW/kcheckers.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/games/kpacman/kpacman.pro b/noncore/games/kpacman/kpacman.pro
index 594397a..bca34a4 100644
--- a/noncore/games/kpacman/kpacman.pro
+++ b/noncore/games/kpacman/kpacman.pro
@@ -1,62 +1,62 @@
        TEMPLATE= app
        #CONFIG         = qt warn_on debug
        CONFIG  = qt warn_on release
        #TMAKE_CXXFLAGS+= 
        HEADERS         = kpacmanwidget.h \
                    referee.h \
                    status.h \
                    painter.h \
                    score.h \
                    pacman.h \
                    monster.h \
                    keys.h \
                    fruit.h \
                    energizer.h \
                    board.h \
                    bitfont.h \
                    kpacman.h \
                    bitmaps.h \
                    colors.h \
                    config.h \
                    portable.h
        SOURCES         = kpacmanwidget.cpp \
                    referee.cpp \
                    status.cpp \
                    painter.cpp \
                    score.cpp \
                    pacman.cpp \
                    monster.cpp \
                    keys.cpp \
                    fruit.cpp \
                    energizer.cpp \
                    board.cpp \
                    bitfont.cpp \
                    kpacman.cpp \
                    config.cpp \
                    main.cpp 
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
 DESTDIR         = $(OPIEDIR)/bin
        TARGET  = kpacman
 TRANSLATIONS = ../../../i18n/de/kpacman.ts \
         ../../../i18n/da/kpacman.ts \
         ../../../i18n/xx/kpacman.ts \
         ../../../i18n/en/kpacman.ts \
         ../../../i18n/es/kpacman.ts \
         ../../../i18n/fr/kpacman.ts \
         ../../../i18n/hu/kpacman.ts \
         ../../../i18n/ja/kpacman.ts \
         ../../../i18n/ko/kpacman.ts \
         ../../../i18n/no/kpacman.ts \
         ../../../i18n/pl/kpacman.ts \
         ../../../i18n/pt/kpacman.ts \
         ../../../i18n/pt_BR/kpacman.ts \
         ../../../i18n/sl/kpacman.ts \
         ../../../i18n/zh_CN/kpacman.ts \
         ../../../i18n/zh_TW/kpacman.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/games/mindbreaker/mindbreaker.pro b/noncore/games/mindbreaker/mindbreaker.pro
index 5052467..ed0f79c 100644
--- a/noncore/games/mindbreaker/mindbreaker.pro
+++ b/noncore/games/mindbreaker/mindbreaker.pro
@@ -1,31 +1,31 @@
 TEMPLATE        = app
 CONFIG          += qt warn_on release
 DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = mindbreaker.h
        SOURCES         = main.cpp \
              mindbreaker.cpp
 TARGET          = mindbreaker
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
 TRANSLATIONS = ../../../i18n/de/mindbreaker.ts \
         ../../../i18n/da/mindbreaker.ts \
         ../../../i18n/xx/mindbreaker.ts \
         ../../../i18n/en/mindbreaker.ts \
         ../../../i18n/es/mindbreaker.ts \
         ../../../i18n/fr/mindbreaker.ts \
         ../../../i18n/hu/mindbreaker.ts \
         ../../../i18n/ja/mindbreaker.ts \
         ../../../i18n/ko/mindbreaker.ts \
         ../../../i18n/no/mindbreaker.ts \
         ../../../i18n/pl/mindbreaker.ts \
         ../../../i18n/pt/mindbreaker.ts \
         ../../../i18n/pt_BR/mindbreaker.ts \
         ../../../i18n/sl/mindbreaker.ts \
         ../../../i18n/zh_CN/mindbreaker.ts \
         ../../../i18n/zh_TW/mindbreaker.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/games/minesweep/minesweep.pro b/noncore/games/minesweep/minesweep.pro
index 3e234a4..9728ac7 100644
--- a/noncore/games/minesweep/minesweep.pro
+++ b/noncore/games/minesweep/minesweep.pro
@@ -1,35 +1,35 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = minefield.h \
                  minesweep.h
        SOURCES         = main.cpp \
                  minefield.cpp \
                  minesweep.cpp
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
        INTERFACES= 
        TARGET  = minesweep
 TRANSLATIONS = ../../../i18n/de/minesweep.ts \
         ../../../i18n/da/minesweep.ts \
         ../../../i18n/xx/minesweep.ts \
         ../../../i18n/en/minesweep.ts \
         ../../../i18n/es/minesweep.ts \
         ../../../i18n/fr/minesweep.ts \
         ../../../i18n/hu/minesweep.ts \
         ../../../i18n/ja/minesweep.ts \
         ../../../i18n/ko/minesweep.ts \
         ../../../i18n/no/minesweep.ts \
         ../../../i18n/pl/minesweep.ts \
         ../../../i18n/pt/minesweep.ts \
         ../../../i18n/pt_BR/minesweep.ts \
         ../../../i18n/sl/minesweep.ts \
         ../../../i18n/zh_CN/minesweep.ts \
         ../../../i18n/it/minesweep.ts \
         ../../../i18n/zh_TW/minesweep.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/games/parashoot/parashoot.pro b/noncore/games/parashoot/parashoot.pro
index d8e4b1f..999e28e 100644
--- a/noncore/games/parashoot/parashoot.pro
+++ b/noncore/games/parashoot/parashoot.pro
@@ -1,30 +1,30 @@
        TEMPLATE= app
        CONFIG  += qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = interface.h man.h cannon.h base.h bullet.h helicopter.h
        SOURCES         = main.cpp interface.cpp man.cpp cannon.cpp base.cpp bullet.cpp helicopter.cpp
        TARGET  = parashoot 
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
 TRANSLATIONS = ../../../i18n/de/parashoot.ts \
         ../../../i18n/da/parashoot.ts \
         ../../../i18n/xx/parashoot.ts \
         ../../../i18n/en/parashoot.ts \
         ../../../i18n/es/parashoot.ts \
         ../../../i18n/fr/parashoot.ts \
         ../../../i18n/hu/parashoot.ts \
         ../../../i18n/ja/parashoot.ts \
         ../../../i18n/ko/parashoot.ts \
         ../../../i18n/no/parashoot.ts \
         ../../../i18n/pl/parashoot.ts \
         ../../../i18n/pt/parashoot.ts \
         ../../../i18n/pt_BR/parashoot.ts \
         ../../../i18n/sl/parashoot.ts \
         ../../../i18n/zh_CN/parashoot.ts \
         ../../../i18n/zh_TW/parashoot.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/games/qasteroids/qasteroids.pro b/noncore/games/qasteroids/qasteroids.pro
index 39b2722..c6b18b0 100644
--- a/noncore/games/qasteroids/qasteroids.pro
+++ b/noncore/games/qasteroids/qasteroids.pro
@@ -1,30 +1,30 @@
        TEMPLATE= app
        CONFIG  += qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = ledmeter.h  sprites.h  toplevel.h  view.h
        SOURCES         = ledmeter.cpp  toplevel.cpp  view.cpp main.cpp
        TARGET  = qasteroids
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
 TRANSLATIONS = ../../../i18n/de/qasteroids.ts \
         ../../../i18n/da/qasteroids.ts \
         ../../../i18n/xx/qasteroids.ts \
         ../../../i18n/en/qasteroids.ts \
         ../../../i18n/es/qasteroids.ts \
         ../../../i18n/fr/qasteroids.ts \
         ../../../i18n/hu/qasteroids.ts \
         ../../../i18n/ja/qasteroids.ts \
         ../../../i18n/ko/qasteroids.ts \
         ../../../i18n/no/qasteroids.ts \
         ../../../i18n/pl/qasteroids.ts \
         ../../../i18n/pt/qasteroids.ts \
         ../../../i18n/pt_BR/qasteroids.ts \
         ../../../i18n/sl/qasteroids.ts \
         ../../../i18n/zh_CN/qasteroids.ts \
         ../../../i18n/zh_TW/qasteroids.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/games/sfcave-sdl/sfcave-sdl.pro b/noncore/games/sfcave-sdl/sfcave-sdl.pro
index e874f0d..a4eb918 100644
--- a/noncore/games/sfcave-sdl/sfcave-sdl.pro
+++ b/noncore/games/sfcave-sdl/sfcave-sdl.pro
@@ -1,55 +1,55 @@
        TEMPLATE= app
        CONFIG  += qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin 
        TARGET  = sfcave-sdl
 DEFINES = _REENTRANT main=SDL_main
 INCLUDEPATH += $(OPIEDIR)/include
 INCLUDEPATH += $(OPIEDIR)/include/SDL
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS += -lqpe -L${SDLDIR}/lib -lSDL -lSDLmain -lSDL_gfx -lSDL_image -lSDL_mixer -lstdc++ 
        SOURCES = animatedimage.cpp \
                bfont.cpp \
                font.cpp \
                game.cpp \
                menu.cpp \
                help.cpp \
                player.cpp \
                random.cpp \
                sfcave.cpp \
                sfcave_game.cpp \
                gates_game.cpp \
                fly_game.cpp \
                flyterrain.cpp \
                sound.cpp \
                terrain.cpp \
                settings.cpp \
                starfield.cpp \
                util.cpp
        HEADERS = animatedimage.h \
                bfont.h \
                constants.h \
                font.h \
                game.h \
                menu.h \
                player.h \
                random.h \
                rect.h \
                sfcave.h \
                help.h \
                sfcave_game.h \
                gates_game.h \
                fly_game.h \
                flyterrain.h \
                sound.h \
                terrain.h \
                stringtokenizer.h \
                settings.h \
                starfield.h \
                util.h
-include ( ../../../include.pro ) 
-\ No newline at end of file
+include ( $(OPIEDIR)/include.pro )
+\ No newline at end of file
diff --git a/noncore/games/sfcave/sfcave.pro b/noncore/games/sfcave/sfcave.pro
index 5941c20..bfb3c28 100644
--- a/noncore/games/sfcave/sfcave.pro
+++ b/noncore/games/sfcave/sfcave.pro
@@ -1,13 +1,13 @@
        TEMPLATE= app
        CONFIG  += qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        SOURCES = sfcave.cpp helpwindow.cpp random.cpp
        HEADERS = sfcave.h helpwindow.h random.h
        TARGET  = sfcave
        INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/games/snake/snake.pro b/noncore/games/snake/snake.pro
index 845c0a5..2c17467 100644
--- a/noncore/games/snake/snake.pro
+++ b/noncore/games/snake/snake.pro
@@ -1,30 +1,30 @@
        TEMPLATE= app
        CONFIG  += qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = snake.h target.h obstacle.h interface.h codes.h
        SOURCES         = snake.cpp target.cpp obstacle.cpp interface.cpp main.cpp
        TARGET  = snake
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
 TRANSLATIONS = ../../../i18n/de/snake.ts \
         ../../../i18n/da/snake.ts \
         ../../../i18n/xx/snake.ts \
         ../../../i18n/en/snake.ts \
         ../../../i18n/es/snake.ts \
         ../../../i18n/fr/snake.ts \
         ../../../i18n/hu/snake.ts \
         ../../../i18n/ja/snake.ts \
         ../../../i18n/ko/snake.ts \
         ../../../i18n/no/snake.ts \
         ../../../i18n/pl/snake.ts \
         ../../../i18n/pt/snake.ts \
         ../../../i18n/pt_BR/snake.ts \
         ../../../i18n/sl/snake.ts \
         ../../../i18n/zh_CN/snake.ts \
         ../../../i18n/zh_TW/snake.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/games/solitaire/solitaire.pro b/noncore/games/solitaire/solitaire.pro
index f86fc13..8bd6ac8 100755
--- a/noncore/games/solitaire/solitaire.pro
+++ b/noncore/games/solitaire/solitaire.pro
@@ -1,41 +1,41 @@
 TEMPLATE  = app
 CONFIG    += qt warn_on release
 DESTDIR   = $(OPIEDIR)/bin
 HEADERS   = canvascard.h canvasshapes.h cardgame.h cardgamelayout.h cardpile.h card.h carddeck.h \
    canvascardgame.h freecellcardgame.h chicanecardgame.h harpcardgame.h teeclubcardgame.h \
    patiencecardgame.h canvascardwindow.h
 SOURCES   = canvascard.cpp canvasshapes.cpp cardgame.cpp cardgamelayout.cpp \
   cardpile.cpp card.cpp carddeck.cpp canvascardgame.cpp freecellcardgame.cpp \
   chicanecardgame.cpp harpcardgame.cpp teeclubcardgame.cpp \
   patiencecardgame.cpp canvascardwindow.cpp main.cpp
 TARGET    = patience
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe
 TRANSLATIONS = ../../../i18n/de/patience.ts \
         ../../../i18n/da/patience.ts \
         ../../../i18n/xx/patience.ts \
   ../../../i18n/en/patience.ts \
   ../../../i18n/es/patience.ts \
   ../../../i18n/fr/patience.ts \
   ../../../i18n/hu/patience.ts \
   ../../../i18n/ja/patience.ts \
   ../../../i18n/ko/patience.ts \
   ../../../i18n/no/patience.ts \
   ../../../i18n/pl/patience.ts \
   ../../../i18n/pt/patience.ts \
   ../../../i18n/pt_BR/patience.ts \
   ../../../i18n/sl/patience.ts \
   ../../../i18n/zh_CN/patience.ts \
   ../../../i18n/zh_TW/patience.ts \
     ../../../i18n/it/patience.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/games/tetrix/tetrix.pro b/noncore/games/tetrix/tetrix.pro
index 48c6d93..061b4f3 100644
--- a/noncore/games/tetrix/tetrix.pro
+++ b/noncore/games/tetrix/tetrix.pro
@@ -1,39 +1,39 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = gtetrix.h \
                    qtetrix.h \
                    qtetrixb.h \
                    tpiece.h
        SOURCES         = main.cpp \
                    gtetrix.cpp \
                    qtetrix.cpp \
                    qtetrixb.cpp \
                    tpiece.cpp
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
        INTERFACES= 
        TARGET  = tetrix
 TRANSLATIONS = ../../../i18n/de/tetrix.ts \
         ../../../i18n/da/tetrix.ts \
         ../../../i18n/xx/tetrix.ts \
         ../../../i18n/en/tetrix.ts \
         ../../../i18n/es/tetrix.ts \
         ../../../i18n/fr/tetrix.ts \
         ../../../i18n/hu/tetrix.ts \
         ../../../i18n/ja/tetrix.ts \
         ../../../i18n/ko/tetrix.ts \
         ../../../i18n/no/tetrix.ts \
         ../../../i18n/pl/tetrix.ts \
         ../../../i18n/pt/tetrix.ts \
         ../../../i18n/pt_BR/tetrix.ts \
         ../../../i18n/sl/tetrix.ts \
         ../../../i18n/zh_CN/tetrix.ts \
         ../../../i18n/it/tetrix.ts \
         ../../../i18n/zh_TW/tetrix.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/games/tictac/tictac.pro b/noncore/games/tictac/tictac.pro
index 777bee2..fb6c0fd 100644
--- a/noncore/games/tictac/tictac.pro
+++ b/noncore/games/tictac/tictac.pro
@@ -1,31 +1,31 @@
 TEMPLATE  = app
 CONFIG    += qt warn_on release
 HEADERS   = tictac.h
 SOURCES   = main.cpp \
      tictac.cpp
 TARGET    = tictac
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe
 DESTDIR   = $(OPIEDIR)/bin
 TRANSLATIONS = ../../../i18n/de/tictac.ts \
         ../../../i18n/da/tictac.ts \
         ../../../i18n/xx/tictac.ts \
         ../../../i18n/en/tictac.ts \
         ../../../i18n/es/tictac.ts \
         ../../../i18n/fr/tictac.ts \
         ../../../i18n/hu/tictac.ts \
         ../../../i18n/ja/tictac.ts \
         ../../../i18n/ko/tictac.ts \
         ../../../i18n/no/tictac.ts \
         ../../../i18n/pl/tictac.ts \
         ../../../i18n/pt/tictac.ts \
         ../../../i18n/pt_BR/tictac.ts \
         ../../../i18n/sl/tictac.ts \
         ../../../i18n/zh_CN/tictac.ts \
         ../../../i18n/zh_TW/tictac.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/games/wordgame/wordgame.pro b/noncore/games/wordgame/wordgame.pro
index 3e330b2..e5609df 100644
--- a/noncore/games/wordgame/wordgame.pro
+++ b/noncore/games/wordgame/wordgame.pro
@@ -1,32 +1,32 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = wordgame.h
        SOURCES         = main.cpp \
                  wordgame.cpp
        INTERFACES= newgamebase.ui rulesbase.ui
        TARGET  = wordgame
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
 TRANSLATIONS = ../../../i18n/de/wordgame.ts \
         ../../../i18n/da/wordgame.ts \
         ../../../i18n/xx/wordgame.ts \
         ../../../i18n/en/wordgame.ts \
         ../../../i18n/es/wordgame.ts \
         ../../../i18n/fr/wordgame.ts \
         ../../../i18n/hu/wordgame.ts \
         ../../../i18n/ja/wordgame.ts \
         ../../../i18n/ko/wordgame.ts \
         ../../../i18n/no/wordgame.ts \
         ../../../i18n/pl/wordgame.ts \
         ../../../i18n/pt/wordgame.ts \
         ../../../i18n/pt_BR/wordgame.ts \
         ../../../i18n/sl/wordgame.ts \
         ../../../i18n/zh_CN/wordgame.ts \
         ../../../i18n/zh_TW/wordgame.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/graphics/drawpad/drawpad.pro b/noncore/graphics/drawpad/drawpad.pro
index 12d4ed3..cca6a34 100644
--- a/noncore/graphics/drawpad/drawpad.pro
+++ b/noncore/graphics/drawpad/drawpad.pro
@@ -1,68 +1,68 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        HEADERS         = drawpad.h \
                  drawpadcanvas.h \
                  ellipsetool.h \
                  erasetool.h \
                  exportdialog.h \
                  filltool.h \
                  filledellipsetool.h \
                  filledrectangletool.h \
                  importdialog.h \
                  linetool.h \
                  newpagedialog.h \
                  page.h \
                  pageinformationdialog.h \
                  pointtool.h \
                  rectangletool.h \
                  shapetool.h \
                  texttool.h \
                  thumbnailview.h \
                  tool.h
        SOURCES         = drawpad.cpp \
                  drawpadcanvas.cpp \
                  ellipsetool.cpp \
                  erasetool.cpp \
                  exportdialog.cpp \
                  filltool.cpp \
                  filledellipsetool.cpp \
                  filledrectangletool.cpp \
                  importdialog.cpp \
                  linetool.cpp \
                  main.cpp \
                  newpagedialog.cpp \
                  page.cpp \
                  pageinformationdialog.cpp \
                  pointtool.cpp \
                  rectangletool.cpp \
                  shapetool.cpp \
                  texttool.cpp \
                  thumbnailview.cpp \
                  tool.cpp
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
        LIBS    += -lqpe -lopie
        DESTDIR         = $(OPIEDIR)/bin
        TARGET  = drawpad
 TRANSLATIONS = ../../../i18n/de/drawpad.ts \
         ../../../i18n/da/drawpad.ts \
         ../../../i18n/xx/drawpad.ts \
         ../../../i18n/en/drawpad.ts \
         ../../../i18n/es/drawpad.ts \
         ../../../i18n/fr/drawpad.ts \
         ../../../i18n/hu/drawpad.ts \
         ../../../i18n/ja/drawpad.ts \
         ../../../i18n/ko/drawpad.ts \
         ../../../i18n/no/drawpad.ts \
         ../../../i18n/pl/drawpad.ts \
         ../../../i18n/pt/drawpad.ts \
         ../../../i18n/pt_BR/drawpad.ts \
         ../../../i18n/sl/drawpad.ts \
         ../../../i18n/zh_CN/drawpad.ts \
         ../../../i18n/it/drawpad.ts \
         ../../../i18n/zh_TW/drawpad.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/multimedia/opieplayer2/opieplayer2.pro b/noncore/multimedia/opieplayer2/opieplayer2.pro
index 2b22d31..355ec1a 100644
--- a/noncore/multimedia/opieplayer2/opieplayer2.pro
+++ b/noncore/multimedia/opieplayer2/opieplayer2.pro
@@ -1,30 +1,30 @@
 TEMPLATE  = app
 CONFIG    = qt warn_on release
 DESTDIR   = $(OPIEDIR)/bin
 HEADERS   = playlistselection.h mediaplayerstate.h xinecontrol.h \
               videowidget.h audiowidget.h playlistwidget.h om3u.h mediaplayer.h inputDialog.h \
            frame.h lib.h xinevideowidget.h volumecontrol.h playlistwidgetgui.h\
            alphablend.h yuv2rgb.h threadutil.h mediawidget.h playlistview.h playlistfileview.h \
            skin.h
 SOURCES   = main.cpp \
            playlistselection.cpp mediaplayerstate.cpp xinecontrol.cpp \
            videowidget.cpp audiowidget.cpp playlistwidget.cpp om3u.cpp mediaplayer.cpp inputDialog.cpp \
            frame.cpp lib.cpp nullvideo.c xinevideowidget.cpp volumecontrol.cpp \
            playlistwidgetgui.cpp\
            alphablend.c yuv2rgb.c yuv2rgb_arm.c yuv2rgb_arm4l.S \
            threadutil.cpp mediawidget.cpp playlistview.cpp playlistfileview.cpp \
            skin.cpp
 TARGET    = opieplayer2
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include 
 LIBS        += -lqpe -lpthread -lopie -lxine
 MOC_DIR   = qpeobj
 OBJECTS_DIR = qpeobj
 #INCLUDEPATH += $(OPIEDIR)/include
 #DEPENDPATH  += $(OPIEDIR)/include
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/multimedia/opieplayer2/zeckeplayer.pro b/noncore/multimedia/opieplayer2/zeckeplayer.pro
index be900a2..86480fe 100644
--- a/noncore/multimedia/opieplayer2/zeckeplayer.pro
+++ b/noncore/multimedia/opieplayer2/zeckeplayer.pro
@@ -1,13 +1,13 @@
        TEMPLATE= app
 DESTDIR         = .
        #CONFIG         = qt warn_on debug
        CONFIG  = qt warn_on release
        HEADERS         = frame.h lib.h
        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.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/multimedia/showimg/showimg.pro b/noncore/multimedia/showimg/showimg.pro
index 275d0c9..bab7e0f 100644
--- a/noncore/multimedia/showimg/showimg.pro
+++ b/noncore/multimedia/showimg/showimg.pro
@@ -1,30 +1,30 @@
 TEMPLATE        = app
 CONFIG          += qt warn_on release
 DESTDIR         = $(OPIEDIR)/bin
 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 -lopie
 TRANSLATIONS = ../../../i18n/de/showimg.ts \
         ../../../i18n/xx/showimg.ts \
   ../../../i18n/en/showimg.ts \
   ../../../i18n/es/showimg.ts \
   ../../../i18n/fr/showimg.ts \
   ../../../i18n/hu/showimg.ts \
   ../../../i18n/ja/showimg.ts \
   ../../../i18n/ko/showimg.ts \
   ../../../i18n/no/showimg.ts \
   ../../../i18n/pl/showimg.ts \
   ../../../i18n/pt/showimg.ts \
   ../../../i18n/pt_BR/showimg.ts \
   ../../../i18n/sl/showimg.ts \
   ../../../i18n/zh_CN/showimg.ts \
   ../../../i18n/zh_TW/showimg.ts \
   ../../../i18n/da/showimg.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/ftplib/ftplib.pro b/noncore/net/ftplib/ftplib.pro
index 918ddf9..a36c5d7 100644
--- a/noncore/net/ftplib/ftplib.pro
+++ b/noncore/net/ftplib/ftplib.pro
@@ -1,10 +1,10 @@
 TEMPLATE  = lib
 CONFIG    = qt warn_on release
 HEADERS   = ftplib.h
 SOURCES   = ftplib.c
 DESTDIR      = $(OPIEDIR)/lib$(PROJMAK)
 INTERFACES  = 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/opieftp/opieftp.pro b/noncore/net/opieftp/opieftp.pro
index f5d2af0..9819cf8 100644
--- a/noncore/net/opieftp/opieftp.pro
+++ b/noncore/net/opieftp/opieftp.pro
@@ -1,30 +1,30 @@
 TEMPLATE  = app
 CONFIG    += qt warn_on release
 HEADERS   = opieftp.h inputDialog.h ftplib.h
 SOURCES   = opieftp.cpp inputDialog.cpp main.cpp
 TARGET    = opieftp
 DESTDIR   = $(OPIEDIR)/bin
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lftplib
 TRANSLATIONS = ../../../i18n/de/opieftp.ts \
         ../../../i18n/da/opieftp.ts \
         ../../../i18n/xx/opieftp.ts \
         ../../../i18n/en/opieftp.ts \
         ../../../i18n/es/opieftp.ts \
         ../../../i18n/fr/opieftp.ts \
         ../../../i18n/hu/opieftp.ts \
         ../../../i18n/ja/opieftp.ts \
         ../../../i18n/ko/opieftp.ts \
         ../../../i18n/no/opieftp.ts \
         ../../../i18n/pl/opieftp.ts \
         ../../../i18n/pt/opieftp.ts \
         ../../../i18n/pt_BR/opieftp.ts \
         ../../../i18n/sl/opieftp.ts \
         ../../../i18n/zh_CN/opieftp.ts \
         ../../../i18n/zh_TW/opieftp.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/opieirc/opieirc.pro b/noncore/net/opieirc/opieirc.pro
index 3fe1961..37a6e85 100644
--- a/noncore/net/opieirc/opieirc.pro
+++ b/noncore/net/opieirc/opieirc.pro
@@ -1,28 +1,28 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = ircchannel.h ircconnection.h \
              ircmessage.h \
              ircmessageparser.h ircoutput.h \
              ircperson.h ircserver.h ircsession.h \
              mainwindow.h irctab.h ircservertab.h \
              ircchanneltab.h ircchannellist.h \
              ircserverlist.h ircservereditor.h \
              ircquerytab.h ircsettings.h ircmisc.h
        SOURCES         = ircchannel.cpp ircconnection.cpp \
              ircmessage.cpp \
              ircmessageparser.cpp ircoutput.cpp \
              ircperson.cpp ircserver.cpp \
              ircsession.cpp main.cpp mainwindow.cpp \
              irctab.cpp ircservertab.cpp \
              ircchanneltab.cpp ircchannellist.cpp \
              ircserverlist.cpp ircservereditor.cpp \
              ircquerytab.cpp ircsettings.cpp ircmisc.cpp
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS        += -lqpe -lopie
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/opietooth/applet/applet.pro b/noncore/net/opietooth/applet/applet.pro
index d713708..6b68284 100644
--- a/noncore/net/opietooth/applet/applet.pro
+++ b/noncore/net/opietooth/applet/applet.pro
@@ -1,32 +1,32 @@
 TEMPLATE      =  lib
 CONFIG        += qt warn_on release
 HEADERS       =  bluezapplet.h bluezappletimpl.h
 SOURCES       =  bluezapplet.cpp bluezappletimpl.cpp
 TARGET        =  bluetoothapplet
 DESTDIR       =  $(OPIEDIR)/plugins/applets
 INCLUDEPATH   += $(OPIEDIR)/include
 INCLUDEPATH   += $(OPIEDIR)/noncore/net/opietooth/lib
 DEPENDPATH    += $(OPIEDIR)/include
 LIBS          += -lqpe -lopietooth
 VERSION       = 0.0.3
 TRANSLATIONS = ../../../../i18n/de/libbluetoothapplet.ts \
         ../../../../i18n/da/libbluetoothapplet.ts \
         ../../../../i18n/xx/libbluetoothapplet.ts \
         ../../../../i18n/en/libbluetoothapplet.ts \
         ../../../../i18n/es/libbluetoothapplet.ts \
         ../../../../i18n/fr/libbluetoothapplet.ts \
         ../../../../i18n/hu/libbluetoothapplet.ts \
         ../../../../i18n/ja/libbluetoothapplet.ts \
         ../../../../i18n/ko/libbluetoothapplet.ts \
         ../../../../i18n/no/libbluetoothapplet.ts \
         ../../../../i18n/pl/libbluetoothapplet.ts \
         ../../../../i18n/pt/libbluetoothapplet.ts \
         ../../../../i18n/pt_BR/libbluetoothapplet.ts \
         ../../../../i18n/sl/libbluetoothapplet.ts \
         ../../../../i18n/zh_CN/libbluetoothapplet.ts \
         ../../../../i18n/zh_TW/libbluetoothapplet.ts
-include ( ../../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/opietooth/blue-pin/blue-pin.pro b/noncore/net/opietooth/blue-pin/blue-pin.pro
index 27295da..37c6ae8 100644
--- a/noncore/net/opietooth/blue-pin/blue-pin.pro
+++ b/noncore/net/opietooth/blue-pin/blue-pin.pro
@@ -1,33 +1,33 @@
 TEMPLATE        = app
 #CONFIG         = qt warn_on debug
 CONFIG          = qt warn_on release
 HEADERS         = pindlg.h 
 SOURCES         = main.cc pindlg.cc
 INCLUDEPATH     += $(OPIEDIR)/include
 INCLUDEPATH    += $(OPIEDIR)/noncore/opietooth/lib
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe 
 INTERFACES      = pindlgbase.ui
        DESTDIR         = $(OPIEDIR)/bin
 TARGET          = bluepin
 TRANSLATIONS = ../../../../i18n/de/bluepin.ts \
         ../../../../i18n/da/bluepin.ts \
         ../../../../i18n/xx/bluepin.ts \
         ../../../../i18n/en/bluepin.ts \
         ../../../../i18n/es/bluepin.ts \
         ../../../../i18n/fr/bluepin.ts \
         ../../../../i18n/hu/bluepin.ts \
         ../../../../i18n/ja/bluepin.ts \
         ../../../../i18n/ko/bluepin.ts \
         ../../../../i18n/no/bluepin.ts \
         ../../../../i18n/pl/bluepin.ts \
         ../../../../i18n/pt/bluepin.ts \
         ../../../../i18n/pt_BR/bluepin.ts \
         ../../../../i18n/sl/bluepin.ts \
         ../../../../i18n/zh_CN/bluepin.ts \
         ../../../../i18n/zh_TW/bluepin.ts
-include ( ../../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/opietooth/lib/lib.pro b/noncore/net/opietooth/lib/lib.pro
index a021941..88df1fb 100644
--- a/noncore/net/opietooth/lib/lib.pro
+++ b/noncore/net/opietooth/lib/lib.pro
@@ -1,30 +1,30 @@
 TEMPLATE        = lib
 CONFIG          += qte warn_on release
        HEADERS = connection.h parser.h device.h manager.h remotedevice.h services.h
        SOURCES         = connection.cpp parser.cc device.cc manager.cc remotedevice.cc services.cc
        TARGET  = opietooth
 INCLUDEPATH += $(OPIEDIR)/include .
        DESTDIR         = $(OPIEDIR)/lib$(PROJMAK)
 LIBS += -lopie
 #VERSION = 0.0.0
 TRANSLATIONS = ../../../../i18n/de/libopietooth.ts \
         ../../../../i18n/da/libopietooth.ts \
         ../../../../i18n/xx/libopietooth.ts \
         ../../../../i18n/en/libopietooth.ts \
         ../../../../i18n/es/libopietooth.ts \
         ../../../../i18n/fr/libopietooth.ts \
         ../../../../i18n/hu/libopietooth.ts \
         ../../../../i18n/ja/libopietooth.ts \
         ../../../../i18n/ko/libopietooth.ts \
         ../../../../i18n/no/libopietooth.ts \
         ../../../../i18n/pl/libopietooth.ts \
         ../../../../i18n/pt/libopietooth.ts \
         ../../../../i18n/pt_BR/libopietooth.ts \
         ../../../../i18n/sl/libopietooth.ts \
         ../../../../i18n/zh_CN/libopietooth.ts \
         ../../../../i18n/zh_TW/libopietooth.ts
-include ( ../../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/opietooth/manager/manager.pro b/noncore/net/opietooth/manager/manager.pro
index f3599bb..9249d8d 100644
--- a/noncore/net/opietooth/manager/manager.pro
+++ b/noncore/net/opietooth/manager/manager.pro
@@ -1,49 +1,49 @@
 TEMPLATE        = app
 CONFIG          = qt warn_on debug
 #CONFIG          = qt warn_on release
 HEADERS         = btconnectionitem.h btdeviceitem.h \
                  btserviceitem.h stdpopups.h \ 
                  popuphelper.h bluebase.h \ 
                  scandialog.h btlistitem.h \ 
                  hciconfwrapper.h bticonloader.h \
                  pppdialog.h obexdialog.h \
                  devicehandler.h rfcpopup.h obexpopup.h \
                  rfcommhelper.h
                  
 SOURCES         = btconnectionitem.cpp btdeviceitem.cpp \ 
                  btserviceitem.cpp stdpopups.cpp \
                  popuphelper.cpp main.cpp \
                  bluebase.cpp scandialog.cpp \ 
                  btlistitem.cpp hciconfwrapper.cpp \ 
                  bticonloader.cpp pppdialog.cpp \
                  obexdialog.cpp devicehandler.cpp \
                  rfcpopup.cpp obexpopup.cpp \
                  rfcommhelper.cpp
 INCLUDEPATH     += $(OPIEDIR)/include
 INCLUDEPATH     += $(OPIEDIR)/noncore/net/opietooth/lib
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe -lopietooth -lopie
 INTERFACES      = bluetoothbase.ui  devicedialog.ui  
 DESTDIR         = $(OPIEDIR)/bin
 TARGET          = bluetooth-manager
 TRANSLATIONS = ../../../../i18n/de/bluetooth-manager.ts \
         ../../../../i18n/da/bluetooth-manager.ts \
         ../../../../i18n/xx/bluetooth-manager.ts \
         ../../../../i18n/en/bluetooth-manager.ts \
         ../../../../i18n/es/bluetooth-manager.ts \
         ../../../../i18n/fr/bluetooth-manager.ts \
         ../../../../i18n/hu/bluetooth-manager.ts \
         ../../../../i18n/ja/bluetooth-manager.ts \
         ../../../../i18n/ko/bluetooth-manager.ts \
         ../../../../i18n/no/bluetooth-manager.ts \
         ../../../../i18n/pl/bluetooth-manager.ts \
         ../../../../i18n/pt/bluetooth-manager.ts \
         ../../../../i18n/pt_BR/bluetooth-manager.ts \
         ../../../../i18n/sl/bluetooth-manager.ts \
         ../../../../i18n/zh_CN/bluetooth-manager.ts \
         ../../../../i18n/zh_TW/bluetooth-manager.ts
-include ( ../../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/ubrowser/ubrowser.pro b/noncore/net/ubrowser/ubrowser.pro
index 09a2c79..cd1a989 100644
--- a/noncore/net/ubrowser/ubrowser.pro
+++ b/noncore/net/ubrowser/ubrowser.pro
@@ -1,13 +1,13 @@
        TEMPLATE=app
        CONFIG  +=qt warn_on release
        DESTDIR         =../../../bin
        HEADERS         = mainview.h httpfactory.h httpcomm.h
        SOURCES         = main.cpp mainview.cpp httpfactory.cpp httpcomm.cpp
        INCLUDEPATH+=../../../include
        DEPENDPATH+=../../../include
        LIBS    += -lqpe
 TARGET          = ubrowser
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/wellenreiter/contrib/orinoco_hopper/orinoco_hopper.pro b/noncore/net/wellenreiter/contrib/orinoco_hopper/orinoco_hopper.pro
index def42c0..30298d5 100644
--- a/noncore/net/wellenreiter/contrib/orinoco_hopper/orinoco_hopper.pro
+++ b/noncore/net/wellenreiter/contrib/orinoco_hopper/orinoco_hopper.pro
@@ -1,15 +1,15 @@
 DESTDIR         = $(OPIEDIR)/bin
 TEMPLATE        = app
 CONFIG          = warn_on debug
 #CONFIG         = warn_on release
 HEADERS         = 
 SOURCES         = orinoco_hopper.c
 INCLUDEPATH     +=
 DEPENDPATH      +=
 LIBS            +=
 INTERFACES      = 
 TARGET          = orinoco_hopper
-include ( ../../../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/wellenreiter/daemon/daemon.pro b/noncore/net/wellenreiter/daemon/daemon.pro
index 2599315..651af18 100644
--- a/noncore/net/wellenreiter/daemon/daemon.pro
+++ b/noncore/net/wellenreiter/daemon/daemon.pro
@@ -1,15 +1,15 @@
 DESTDIR         = $(OPIEDIR)/bin
 TEMPLATE        = app
 CONFIG          = warn_on debug
 #CONFIG         = warn_on release
 HEADERS         = source/config.hh source/daemon.hh
 SOURCES         = source/daemon.cc
 INCLUDEPATH     += ../
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lpcap -L$(OPIEDIR)/lib -lwellenreiter
 INTERFACES      = 
 TARGET          = wellenreiterd
-include ( ../../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/wellenreiter/gui/gui-x11.pro b/noncore/net/wellenreiter/gui/gui-x11.pro
index 06b2c06..856e0b2 100644
--- a/noncore/net/wellenreiter/gui/gui-x11.pro
+++ b/noncore/net/wellenreiter/gui/gui-x11.pro
@@ -1,15 +1,15 @@
 DESTDIR         = .
 TEMPLATE        = app
 CONFIG          = qt warn_on debug
 #CONFIG         = qt warn_on release
 HEADERS         = wellenreiterbase.h wellenreiter.h scanlistitem.h scanlist.h logwindow.h hexwindow.h configwindow.h resource.h wlan.h cardconfig.h manufacturers.h
 SOURCES         = main.cpp wellenreiterbase.cpp wellenreiter.cpp scanlistitem.cpp scanlist.cpp logwindow.cpp hexwindow.cpp configwindow.cpp resource.cpp wlan.cpp cardconfig.cpp manufacturers.cpp
 INCLUDEPATH     += ../
 DEPENDPATH      += ../
 LIBS            += -L. -lwellenreiter
 INTERFACES      = configbase.ui
 TARGET          = wellenreiter
-include ( ../../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro
index 397da25..39eda52 100644
--- a/noncore/net/wellenreiter/gui/gui.pro
+++ b/noncore/net/wellenreiter/gui/gui.pro
@@ -1,15 +1,15 @@
 DESTDIR         = $(OPIEDIR)/bin
 TEMPLATE        = app
 CONFIG          = qt warn_on debug
 #CONFIG         = qt warn_on release
 HEADERS         = wellenreiterbase.h wellenreiter.h scanlistitem.h scanlist.h logwindow.h hexwindow.h configwindow.h wlan.h cardconfig.h manufacturers.h
 SOURCES         = main.cpp wellenreiterbase.cpp wellenreiter.cpp scanlistitem.cpp scanlist.cpp logwindow.cpp hexwindow.cpp configwindow.cpp wlan.cpp cardconfig.cpp manufacturers.h
 INCLUDEPATH     += $(OPIEDIR)/include ../
 DEPENDPATH      += $(OPIEDIR)/include ../
 LIBS            += -lqpe -lopie -L. -lwellenreiter
 INTERFACES      = configbase.ui
 TARGET          = wellenreiter
-include ( ../../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/wellenreiter/libwellenreiter/libwellenreiter.pro b/noncore/net/wellenreiter/libwellenreiter/libwellenreiter.pro
index fd3b894..fb2e5e6 100644
--- a/noncore/net/wellenreiter/libwellenreiter/libwellenreiter.pro
+++ b/noncore/net/wellenreiter/libwellenreiter/libwellenreiter.pro
@@ -1,15 +1,15 @@
 TEMPLATE = lib
 CONFIG = warn_on debug
 VERSION = 0.2
 HEADERS = source/cardmode.hh source/wl_log.hh source/wl_proto.hh source/sniff.hh source/wl_sock.hh source/wl_types.hh
 SOURCES = source/cardmode.cc source/wl_log.cc source/wl_proto.cc source/sniff.cc source/wl_sock.cc
 LIBS =
 TMAKE_CFLAGS += -D__UNIX__
 DESTDIR = $(OPIEDIR)/lib
 TARGET = wellenreiter
-include ( ../../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/wellenreiter/wellenreiter.pro b/noncore/net/wellenreiter/wellenreiter.pro
index 229440f..6784af4 100644
--- a/noncore/net/wellenreiter/wellenreiter.pro
+++ b/noncore/net/wellenreiter/wellenreiter.pro
@@ -1,6 +1,6 @@
 TEMPLATE        = subdirs
 unix:SUBDIRS    = libwellenreiter daemon gui contrib/orinoco_hopper
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/appearance2/appearance2.pro b/noncore/settings/appearance2/appearance2.pro
index 26db92b..34684e0 100644
--- a/noncore/settings/appearance2/appearance2.pro
+++ b/noncore/settings/appearance2/appearance2.pro
@@ -1,32 +1,32 @@
 TEMPLATE  = app
 CONFIG    = qt warn_on release
 DESTDIR   = $(OPIEDIR)/bin
 HEADERS   = appearance.h editScheme.h sample.h
 SOURCES   = appearance.cpp editScheme.cpp main.cpp sample.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += ../$(OPIEDIR)/include
 LIBS            += -lqpe -lopie
 TARGET    = appearance
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 TRANSLATIONS = ../../../i18n/de/appearance.ts \
         ../../../i18n/xx/appearance.ts \
         ../../../i18n/en/appearance.ts \
         ../../../i18n/es/appearance.ts \
         ../../../i18n/fr/appearance.ts \
         ../../../i18n/hu/appearance.ts \
         ../../../i18n/ja/appearance.ts \
         ../../../i18n/ko/appearance.ts \
         ../../../i18n/no/appearance.ts \
         ../../../i18n/pl/appearance.ts \
         ../../../i18n/pt/appearance.ts \
         ../../../i18n/pt_BR/appearance.ts \
         ../../../i18n/sl/appearance.ts \
         ../../../i18n/zh_CN/appearance.ts \
         ../../../i18n/zh_TW/appearance.ts \
         ../../../i18n/da/appearance.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/aqpkg/aqpkg.pro b/noncore/settings/aqpkg/aqpkg.pro
index fc1f53d..98c358c 100644
--- a/noncore/settings/aqpkg/aqpkg.pro
+++ b/noncore/settings/aqpkg/aqpkg.pro
@@ -1,47 +1,47 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        HEADERS         = global.h \
                  mainwin.h \
                  datamgr.h \
                  settingsimpl.h \
                  ipkg.h \
                  package.h \
                  installdlgimpl.h \
                  instoptionsimpl.h \
                  destination.h \
                  utils.h \
                  server.h \
                  helpwindow.h \
                  letterpushbutton.h \
                  inputdlg.h \
                  categoryfilterimpl.h
        SOURCES         = mainwin.cpp \
                  datamgr.cpp \
                  mem.cpp \
                  settingsimpl.cpp \
                  ipkg.cpp \
                  main.cpp \
                  package.cpp \
                  installdlgimpl.cpp \
                  instoptionsimpl.cpp \
                  destination.cpp \
                  utils.cpp \
                  server.cpp \
                  helpwindow.cpp \
                  letterpushbutton.cpp \
                  inputdlg.cpp \
                  version.cpp \
                  categoryfilterimpl.cpp
        INTERFACES= settings.ui \
                  install.ui \
                  instoptions.ui \
                  categoryfilter.ui
        TARGET  = aqpkg
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopie -lstdc++
 DESTDIR = $(OPIEDIR)/bin
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/backup/backup.pro b/noncore/settings/backup/backup.pro
index a9bd572..60760bc 100644
--- a/noncore/settings/backup/backup.pro
+++ b/noncore/settings/backup/backup.pro
@@ -1,34 +1,34 @@
        TEMPLATE= app
        #CONFIG         = qt warn_on debug
        CONFIG  = qt warn_on release
        HEADERS         = backuprestore.h
        SOURCES         = main.cpp backuprestore.cpp
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
        INTERFACES= backuprestorebase.ui
        TARGET  = backup
        DESTDIR         = $(OPIEDIR)/bin
 TRANSLATIONS = ../../../i18n/de/backup.ts \
        ../../../i18n/xx/backup.ts \
        ../../../i18n/en/backup.ts \
        ../../../i18n/es/backup.ts \
        ../../../i18n/fr/backup.ts \
        ../../../i18n/hu/backup.ts \
        ../../../i18n/ja/backup.ts \
        ../../../i18n/ko/backup.ts \
        ../../../i18n/no/backup.ts \
        ../../../i18n/pl/backup.ts \
        ../../../i18n/pt/backup.ts \
        ../../../i18n/pt_BR/backup.ts \
        ../../../i18n/sl/backup.ts \
        ../../../i18n/zh_CN/backup.ts \
        ../../../i18n/zh_TW/backup.ts \
        ../../../i18n/it/backup.ts \
        ../../../i18n/da/backup.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/language/language.pro b/noncore/settings/language/language.pro
index 49da3ba..16fe37a 100644
--- a/noncore/settings/language/language.pro
+++ b/noncore/settings/language/language.pro
@@ -1,31 +1,31 @@
        TEMPLATE= app
        CONFIG  += qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = settings.h
        SOURCES         = language.cpp main.cpp
        INTERFACES= languagesettingsbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= ../$(OPIEDIR)/include
 LIBS            += -lqpe
        TARGET  = language
 TRANSLATIONS = ../../../i18n/de/language.ts \
         ../../../i18n/xx/language.ts \
         ../../../i18n/en/language.ts \
         ../../../i18n/es/language.ts \
         ../../../i18n/fr/language.ts \
         ../../../i18n/hu/language.ts \
         ../../../i18n/ja/language.ts \
         ../../../i18n/ko/language.ts \
         ../../../i18n/no/language.ts \
         ../../../i18n/pl/language.ts \
         ../../../i18n/pt/language.ts \
         ../../../i18n/pt_BR/language.ts \
         ../../../i18n/sl/language.ts \
         ../../../i18n/zh_CN/language.ts \
         ../../../i18n/zh_TW/language.ts \
         ../../../i18n/da/language.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/mediummount/mediummount.pro b/noncore/settings/mediummount/mediummount.pro
index 8762a1a..2063b04 100644
--- a/noncore/settings/mediummount/mediummount.pro
+++ b/noncore/settings/mediummount/mediummount.pro
@@ -1,31 +1,31 @@
        TEMPLATE= app
 DESTDIR         = $(OPIEDIR)/bin/
        #CONFIG         = qt warn_on debug
        CONFIG  = qt warn_on release
        HEADERS         = mediumwidget.h mediumglobal.h mainwindow.h
        SOURCES         = main.cpp mediumwidget.cc mediumglobal.cc mainwindow.cc
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
 TARGET          = mediummount
 TRANSLATIONS = ../../../i18n/de/mediummount.ts \
         ../../../i18n/da/mediummount.ts \
         ../../../i18n/xx/mediummount.ts \
         ../../../i18n/en/mediummount.ts \
         ../../../i18n/es/mediummount.ts \
         ../../../i18n/fr/mediummount.ts \
         ../../../i18n/hu/mediummount.ts \
         ../../../i18n/ja/mediummount.ts \
         ../../../i18n/ko/mediummount.ts \
         ../../../i18n/no/mediummount.ts \
         ../../../i18n/pl/mediummount.ts \
         ../../../i18n/pt/mediummount.ts \
         ../../../i18n/pt_BR/mediummount.ts \
         ../../../i18n/sl/mediummount.ts \
         ../../../i18n/zh_CN/mediummount.ts \
         ../../../i18n/zh_TW/mediummount.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/netsystemtime/netsystemtime.pro b/noncore/settings/netsystemtime/netsystemtime.pro
index ae098aa..3d0f299 100644
--- a/noncore/settings/netsystemtime/netsystemtime.pro
+++ b/noncore/settings/netsystemtime/netsystemtime.pro
@@ -1,32 +1,32 @@
        TEMPLATE= app
        CONFIG  = qt warn_on debug
        #CONFIG         = qt warn_on release
        HEADERS         = ntp.h settime.h 
        SOURCES         = main.cpp ntp.cpp settime.cpp 
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
        INTERFACES= ntpbase.ui
 DESTDIR         = $(OPIEDIR)/bin
        TARGET  = systemtime
 TRANSLATIONS = ../../../i18n/de/systemtime.ts \
         ../../../i18n/da/systemtime.ts \
         ../../../i18n/xx/systemtime.ts \
         ../../../i18n/en/systemtime.ts \
         ../../../i18n/es/systemtime.ts \
         ../../../i18n/fr/systemtime.ts \
         ../../../i18n/hu/systemtime.ts \
         ../../../i18n/ja/systemtime.ts \
         ../../../i18n/ko/systemtime.ts \
         ../../../i18n/no/systemtime.ts \
         ../../../i18n/pl/systemtime.ts \
         ../../../i18n/pt/systemtime.ts \
         ../../../i18n/pt_BR/systemtime.ts \
         ../../../i18n/sl/systemtime.ts \
         ../../../i18n/zh_CN/systemtime.ts \
         ../../../i18n/zh_TW/systemtime.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings/interfaces/interfaces.pro b/noncore/settings/networksettings/interfaces/interfaces.pro
index 233cacd..75dea47 100644
--- a/noncore/settings/networksettings/interfaces/interfaces.pro
+++ b/noncore/settings/networksettings/interfaces/interfaces.pro
@@ -1,16 +1,16 @@
 TEMPLATE        = lib
 CONFIG          += qt warn_on release
        #CONFIG         += qt warn_on debug
        DESTDIR         = $(OPIEDIR)/lib$(PROJMAK)
        HEADERS         = interface.h  interfaceinformationimp.h  interfaces.h  interfacesetupimp.h
        SOURCES         = interface.cpp interfaces.cpp interfaceinformationimp.cpp  interfacesetupimp.cpp
        INCLUDEPATH+= $(OPIEDIR)/include ../
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
        INTERFACES= interfaceadvanced.ui  interfaceinformation.ui  interfacesetup.ui
        TARGET  = interfaces
        VERSION         = 1.0.0
-include ( ../../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings/networksettings.pro b/noncore/settings/networksettings/networksettings.pro
index d1d0355..eb2b439 100644
--- a/noncore/settings/networksettings/networksettings.pro
+++ b/noncore/settings/networksettings/networksettings.pro
@@ -1,15 +1,15 @@
 DESTDIR   = $(OPIEDIR)/bin
 TEMPLATE  = app
 #CONFIG   = qt warn_on debug
 CONFIG    = qt warn_on release
 HEADERS   = mainwindowimp.h addconnectionimp.h defaultmodule.h  module.h
 SOURCES   = main.cpp mainwindowimp.cpp addconnectionimp.cpp
 INCLUDEPATH += $(OPIEDIR)/include interfaces/
 DEPENDPATH  += $(OPIEDIR)/include interfaces/ wlan/
 LIBS            += -lqpe -L$(OPIEDIR)/plugins/networksettings -Linterfaces/ -linterfaces
 INTERFACES  = mainwindow.ui addconnection.ui
 TARGET    = networksettings
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings/ppp/ppp.pro b/noncore/settings/networksettings/ppp/ppp.pro
index 42dc4a9..ec18a59 100644
--- a/noncore/settings/networksettings/ppp/ppp.pro
+++ b/noncore/settings/networksettings/ppp/ppp.pro
@@ -1,16 +1,16 @@
 TEMPLATE        = lib
 CONFIG          += qt warn_on release
        #CONFIG         += qt warn_on debug
 DESTDIR         = $(OPIEDIR)/plugins/networksetup
        HEADERS         = pppimp.h pppmodule.h
        SOURCES         = pppimp.cpp pppmodule.cpp
        INCLUDEPATH+= $(OPIEDIR)/include ../ ../interfaces/
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -L../interfaces/ -linterfaces
        INTERFACES= ppp.ui
        TARGET  = pppplugin
        VERSION         = 1.0.0
-include ( ../../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings/wlan/wlan.pro b/noncore/settings/networksettings/wlan/wlan.pro
index 5a8bfea..f193bcc 100644
--- a/noncore/settings/networksettings/wlan/wlan.pro
+++ b/noncore/settings/networksettings/wlan/wlan.pro
@@ -1,16 +1,16 @@
 TEMPLATE        = lib
 CONFIG          += qt warn_on release
        #CONFIG         += qt warn_on debug
 DESTDIR         = $(OPIEDIR)/plugins/networksettings
        HEADERS         = wlanimp.h infoimp.h wlanmodule.h wextensions.h
        SOURCES         = wlanimp.cpp infoimp.cpp wlanmodule.cpp wextensions.cpp
        INCLUDEPATH+= $(OPIEDIR)/include ../ ../interfaces/
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -L../interfaces/ -linterfaces
        INTERFACES= wlan.ui info.ui
        TARGET  = wlanplugin
        VERSION         = 1.0.0
-include ( ../../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/sound/sound.pro b/noncore/settings/sound/sound.pro
index f8ac76b..b0dd456 100644
--- a/noncore/settings/sound/sound.pro
+++ b/noncore/settings/sound/sound.pro
@@ -1,31 +1,31 @@
 TEMPLATE  = app
 CONFIG    += qt warn_on release
 DESTDIR   = $(OPIEDIR)/bin
 HEADERS   = soundsettings.h soundsettingsbase.h
 SOURCES   = soundsettings.cpp soundsettingsbase.cpp main.cpp
 #INTERFACES = soundsettingsbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe
 TARGET    = sound
 TRANSLATIONS = ../../../i18n/de/sound.ts \
         ../../../i18n/da/sound.ts \
         ../../../i18n/xx/sound.ts \
         ../../../i18n/en/sound.ts \
         ../../../i18n/es/sound.ts \
         ../../../i18n/fr/sound.ts \
         ../../../i18n/hu/sound.ts \
         ../../../i18n/ja/sound.ts \
         ../../../i18n/ko/sound.ts \
         ../../../i18n/no/sound.ts \
         ../../../i18n/pl/sound.ts \
         ../../../i18n/pt/sound.ts \
         ../../../i18n/pt_BR/sound.ts \
         ../../../i18n/sl/sound.ts \
         ../../../i18n/zh_CN/sound.ts \
         ../../../i18n/zh_TW/sound.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/sshkeys/sshkeys.pro b/noncore/settings/sshkeys/sshkeys.pro
index 96ed1f1..2ac94e2 100644
--- a/noncore/settings/sshkeys/sshkeys.pro
+++ b/noncore/settings/sshkeys/sshkeys.pro
@@ -1,33 +1,33 @@
 TEMPLATE = app
 CONFIG += qt warn_on release
 HEADERS = sshkeys.h
 SOURCES = main.cpp sshkeys.cpp
 TARGET = sshkeys
 INTERFACES = sshkeysbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH += $(OPIEDIR)/include
 LIBS += -lqpe -lopie
 DESTDIR = $(OPIEDIR)/bin
 TRANSLATIONS = ../../../i18n/de/sshkeys.ts \
        ../../../i18n/xx/sshkeys.ts \
        ../../../i18n/en/sshkeys.ts \
        ../../../i18n/es/sshkeys.ts \
        ../../../i18n/fr/sshkeys.ts \
        ../../../i18n/hu/sshkeys.ts \
        ../../../i18n/ja/sshkeys.ts \
        ../../../i18n/ko/sshkeys.ts \
        ../../../i18n/no/sshkeys.ts \
        ../../../i18n/pl/sshkeys.ts \
        ../../../i18n/pt/sshkeys.ts \
        ../../../i18n/pt_BR/sshkeys.ts \
        ../../../i18n/sl/sshkeys.ts \
        ../../../i18n/zh_CN/sshkeys.ts \
        ../../../i18n/zh_TW/sshkeys.ts \
        ../../../i18n/it/sshkeys.ts \
        ../../../i18n/da/sshkeys.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/sysinfo/sysinfo.pro b/noncore/settings/sysinfo/sysinfo.pro
index 18be20a..c4d4ea2 100644
--- a/noncore/settings/sysinfo/sysinfo.pro
+++ b/noncore/settings/sysinfo/sysinfo.pro
@@ -1,48 +1,48 @@
 TEMPLATE  = app
 CONFIG    = qt warn_on release
 DESTDIR   = $(OPIEDIR)/bin
 HEADERS   = memory.h \
      graph.h \
      load.h \
      storage.h \
      processinfo.h \
      modulesinfo.h \
      detail.h \
      versioninfo.h \
      sysinfo.h
 SOURCES   = main.cpp \
      memory.cpp \
      graph.cpp \
      load.cpp \
      storage.cpp \
      processinfo.cpp \
      modulesinfo.cpp \
      detail.cpp \
      versioninfo.cpp \
      sysinfo.cpp
 INTERFACES  = 
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
 TARGET    = sysinfo
 TRANSLATIONS = ../../../i18n/de/sysinfo.ts \
         ../../../i18n/xx/sysinfo.ts \
         ../../../i18n/en/sysinfo.ts \
         ../../../i18n/es/sysinfo.ts \
         ../../../i18n/fr/sysinfo.ts \
         ../../../i18n/hu/sysinfo.ts \
         ../../../i18n/ja/sysinfo.ts \
         ../../../i18n/ko/sysinfo.ts \
         ../../../i18n/no/sysinfo.ts \
         ../../../i18n/pl/sysinfo.ts \
         ../../../i18n/pt/sysinfo.ts \
         ../../../i18n/pt_BR/sysinfo.ts \
         ../../../i18n/sl/sysinfo.ts \
         ../../../i18n/zh_CN/sysinfo.ts \
         ../../../i18n/zh_TW/sysinfo.ts \
         ../../../i18n/da/sysinfo.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/tabmanager/tabmanager.pro b/noncore/settings/tabmanager/tabmanager.pro
index be03dda..db0b67c 100644
--- a/noncore/settings/tabmanager/tabmanager.pro
+++ b/noncore/settings/tabmanager/tabmanager.pro
@@ -1,31 +1,31 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        HEADERS         = tabmanager.h tabmainwindow.h tablistview.h tabmanagerbase.h tabapplnk.h
        SOURCES         = main.cpp tabmanager.cpp tabmanagerbase.cpp
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
        LIBS    += -lqpe
        INTERFACES= app.ui wait.ui
        TARGET  = tabmanager
        DESTDIR = $(OPIEDIR)/bin
        TRANSLATIONS =../../../i18n/de/tabmanager.ts \
         ../../../i18n/da/tabmanager.ts \
         ../../../i18n/xx/tabmanager.ts \
                ../../../i18n/en/tabmanager.ts \
                ../../../i18n/es/tabmanager.ts \
                ../../../i18n/fr/tabmanager.ts \
                ../../../i18n/hu/tabmanager.ts \
                ../../../i18n/ja/tabmanager.ts \
                ../../../i18n/ko/tabmanager.ts \
                ../../../i18n/no/tabmanager.ts \
                ../../../i18n/pl/tabmanager.ts \
                ../../../i18n/pt/tabmanager.ts \
                ../../../i18n/pt_BR/tabmanager.ts \
                ../../../i18n/sl/tabmanager.ts \
                ../../../i18n/zh_CN/tabmanager.ts \
                ../../../i18n/zh_TW/tabmanager.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/usermanager/usermanager.pro b/noncore/settings/usermanager/usermanager.pro
index c4c3dfd..473bffd 100644
--- a/noncore/settings/usermanager/usermanager.pro
+++ b/noncore/settings/usermanager/usermanager.pro
@@ -1,33 +1,33 @@
        TEMPLATE= app
        #CONFIG         = qt warn_on debug
        CONFIG  = qt warn_on release
        HEADERS         = usermanager.h userdialog.h groupdialog.h passwd.h
        SOURCES         = usermanager.cpp userdialog.cpp groupdialog.cpp passwd.h main.cpp
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopie -lcrypt
        TARGET  = usermanager
 DESTDIR         = $(OPIEDIR)/bin
 TRANSLATIONS = ../../../i18n/de/usermanager.ts \
        ../../../i18n/xx/usermanager.ts \
        ../../../i18n/en/usermanager.ts \
        ../../../i18n/es/usermanager.ts \
        ../../../i18n/fr/usermanager.ts \
        ../../../i18n/hu/usermanager.ts \
        ../../../i18n/ja/usermanager.ts \
        ../../../i18n/ko/usermanager.ts \
        ../../../i18n/no/usermanager.ts \
        ../../../i18n/pl/usermanager.ts \
        ../../../i18n/pt/usermanager.ts \
        ../../../i18n/pt_BR/usermanager.ts \
        ../../../i18n/sl/usermanager.ts \
        ../../../i18n/zh_CN/usermanager.ts \
        ../../../i18n/zh_TW/usermanager.ts \
        ../../../i18n/it/usermanager.ts \
        ../../../i18n/da/usermanager.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/styles/flat/flat.pro b/noncore/styles/flat/flat.pro
index 796697b..ed25d5c 100644
--- a/noncore/styles/flat/flat.pro
+++ b/noncore/styles/flat/flat.pro
@@ -1,15 +1,15 @@
        TEMPLATE= lib
        CONFIG  += qt warn_on release
        HEADERS         = flat.h
        SOURCES         = flat.cpp
        TARGET  = flatstyle
        DESTDIR         = $(OPIEDIR)/plugins/styles
        INCLUDEPATH+= $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
        VERSION         = 1.0.0
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/styles/fresh/fresh.pro b/noncore/styles/fresh/fresh.pro
index 2603909..88a8de3 100644
--- a/noncore/styles/fresh/fresh.pro
+++ b/noncore/styles/fresh/fresh.pro
@@ -1,15 +1,15 @@
        TEMPLATE= lib
        CONFIG  += qt warn_on release
        HEADERS         = fresh.h
        SOURCES         = fresh.cpp
        TARGET  = freshstyle
        DESTDIR         = $(OPIEDIR)/plugins/styles
        INCLUDEPATH+= $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
        VERSION         = 1.0.0
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/styles/liquid/liquid.pro b/noncore/styles/liquid/liquid.pro
index 588b373..da65982 100644
--- a/noncore/styles/liquid/liquid.pro
+++ b/noncore/styles/liquid/liquid.pro
@@ -1,38 +1,38 @@
 TEMPLATE    =  lib
 CONFIG       = qt embedded release warn_on
 SOURCES     =  liquid.cpp \
               effects.cpp \
               liquidset.cpp \
               plugin.cpp
               
 HEADERS     =  liquid.h \
               effects.h \
               liquidset.h \
               plugin.h
               
 LIBS       += -lqpe -lopie
 INCLUDEPATH += $(OPIEDIR)/include
 DESTDIR      = $(OPIEDIR)/plugins/styles
 TARGET       = liquid
 VERSION      = 1.0.0
 TRANSLATIONS = ../../../i18n/de/libliquid.ts \
         ../../../i18n/da/libliquid.ts \
         ../../../i18n/xx/libliquid.ts \
         ../../../i18n/en/libliquid.ts \
         ../../../i18n/es/libliquid.ts \
         ../../../i18n/fr/libliquid.ts \
         ../../../i18n/hu/libliquid.ts \
         ../../../i18n/ja/libliquid.ts \
         ../../../i18n/ko/libliquid.ts \
         ../../../i18n/no/libliquid.ts \
         ../../../i18n/pl/libliquid.ts \
         ../../../i18n/pt/libliquid.ts \
         ../../../i18n/pt_BR/libliquid.ts \
         ../../../i18n/sl/libliquid.ts \
         ../../../i18n/zh_CN/libliquid.ts \
         ../../../i18n/zh_TW/libliquid.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/styles/metal/metal.pro b/noncore/styles/metal/metal.pro
index 6c38a2d..3b88588 100644
--- a/noncore/styles/metal/metal.pro
+++ b/noncore/styles/metal/metal.pro
@@ -1,31 +1,31 @@
 TEMPLATE    =  lib
 CONFIG       = qt embedded release warn_on
 SOURCES     =  metal.cpp plugin.cpp
               
 HEADERS     =  metal.h plugin.h
 LIBS       += -lqpe
 INCLUDEPATH += $(OPIEDIR)/include
 DESTDIR      = $(OPIEDIR)/plugins/styles
 TARGET       = metal
 VERSION      = 1.0.0
 TRANSLATIONS = ../../../i18n/de/libmetal.ts \
         ../../../i18n/da/libmetal.ts \
         ../../../i18n/xx/libmetal.ts \
         ../../../i18n/en/libmetal.ts \
         ../../../i18n/es/libmetal.ts \
         ../../../i18n/fr/libmetal.ts \
         ../../../i18n/hu/libmetal.ts \
         ../../../i18n/ja/libmetal.ts \
         ../../../i18n/ko/libmetal.ts \
         ../../../i18n/no/libmetal.ts \
         ../../../i18n/pl/libmetal.ts \
         ../../../i18n/pt/libmetal.ts \
         ../../../i18n/pt_BR/libmetal.ts \
         ../../../i18n/sl/libmetal.ts \
         ../../../i18n/zh_CN/libmetal.ts \
         ../../../i18n/zh_TW/libmetal.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/styles/theme/theme.pro b/noncore/styles/theme/theme.pro
index 8865fbc..75fd87a 100644
--- a/noncore/styles/theme/theme.pro
+++ b/noncore/styles/theme/theme.pro
@@ -1,41 +1,41 @@
 TEMPLATE    =  lib
 CONFIG       = qt embedded debug warn_on
 SOURCES     =  ogfxeffect.cpp \
               othemestyle.cpp \
               othemebase.cpp \
               themeset.cpp \
               plugin.cpp
 HEADERS     = ogfxeffect.h \
              othemebase.h \
              othemestyle.h \
              themeset.h \
              plugin.h
               
 LIBS       += -lqpe
 INCLUDEPATH += $(OPIEDIR)/include
 DESTDIR      = $(OPIEDIR)/plugins/styles
 TARGET       = theme
 VERSION      = 1.0.0
 TRANSLATIONS = ../../../i18n/de/libtheme.ts \
         ../../../i18n/da/libtheme.ts \
         ../../../i18n/xx/libtheme.ts \
         ../../../i18n/en/libtheme.ts \
         ../../../i18n/es/libtheme.ts \
         ../../../i18n/fr/libtheme.ts \
         ../../../i18n/hu/libtheme.ts \
         ../../../i18n/ja/libtheme.ts \
         ../../../i18n/ko/libtheme.ts \
         ../../../i18n/no/libtheme.ts \
         ../../../i18n/pl/libtheme.ts \
         ../../../i18n/pt/libtheme.ts \
         ../../../i18n/pt_BR/libtheme.ts \
         ../../../i18n/sl/libtheme.ts \
         ../../../i18n/zh_CN/libtheme.ts \
         ../../../i18n/zh_TW/libtheme.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/todayplugins/fortune/fortune.pro b/noncore/todayplugins/fortune/fortune.pro
index dab1170..046f449 100644
--- a/noncore/todayplugins/fortune/fortune.pro
+++ b/noncore/todayplugins/fortune/fortune.pro
@@ -1,23 +1,23 @@
 TEMPLATE = lib
 #CONFIG -= moc
 CONFIG += qt debug
 # Input
 HEADERS = fortuneplugin.h fortunepluginimpl.h \
        fortunepluginwidget.h
 SOURCES = fortuneplugin.cpp fortunepluginimpl.cpp \
        fortunepluginwidget.cpp
 INCLUDEPATH     += $(OPIEDIR)/include \
                ../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
                ../ ../library
 LIBS+= -lqpe -lopie
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todayfortuneplugin
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/todayplugins/stockticker/stockticker.pro b/noncore/todayplugins/stockticker/stockticker.pro
index 659d4c3..202d3c3 100644
--- a/noncore/todayplugins/stockticker/stockticker.pro
+++ b/noncore/todayplugins/stockticker/stockticker.pro
@@ -1,6 +1,6 @@
 TEMPLATE        = subdirs
 unix:SUBDIRS    = stockticker stocktickerlib
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/todayplugins/stockticker/stockticker/stockticker.pro b/noncore/todayplugins/stockticker/stockticker/stockticker.pro
index 56353a3..f8e2f2e 100644
--- a/noncore/todayplugins/stockticker/stockticker/stockticker.pro
+++ b/noncore/todayplugins/stockticker/stockticker/stockticker.pro
@@ -1,14 +1,14 @@
 TEMPLATE  = app
 CONFIG    = qt warn_on release
 HEADERS   = inputDialog.h helpwindow.h
 SOURCES   = inputDialog.cpp helpwindow.cpp main.cpp
 INTERFACES  = 
 TARGET    = stockticker
 INCLUDEPATH     += $(OPIEDIR)/include 
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS+= -lqpe -lopie
 DESTDIR = $(OPIEDIR)/bin
-include ( ../../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro
index 73fda49..c94596f 100644
--- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro
+++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro
@@ -1,31 +1,31 @@
 TEMPLATE = lib
 CONFIG -= moc
 CONFIG += qt debug
 HEADERS = stocktickerplugin.h stocktickeruginimpl.h stocktickerpluginwidget.h stocktickerconfig.h \
      ../libstocks/csv.h \
      ../libstocks/http.h \
      ../libstocks/lists.h \
      ../libstocks/stocks.h
 SOURCES = stocktickerplugin.cpp stocktickerpluginimpl.cpp stocktickerpluginwidget.cpp stocktickerconfig.cpp \
      ../libstocks/csv.c \
      ../libstocks/currency.c \
      ../libstocks/history.c \
      ../libstocks/http.c \
      ../libstocks/lists.c \
      ../libstocks/stocks.c
 INCLUDEPATH     += $(OPIEDIR)/include \
    ../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
    ../ ../library
 LIBS+= -lqpe -lopie -lpthread
 TMAKE_CFLAGS += -D__UNIX__
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todaystocktickerplugin
-include ( ../../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/todayplugins/weather/weather.pro b/noncore/todayplugins/weather/weather.pro
index 5228f38..a7a0495 100644
--- a/noncore/todayplugins/weather/weather.pro
+++ b/noncore/todayplugins/weather/weather.pro
@@ -1,27 +1,27 @@
 TEMPLATE = lib
 #CONFIG -= moc
 CONFIG += qt debug
 HEADERS = weatherplugin.h       \
          weatherpluginimpl.h   \
          weatherpluginwidget.h \
          weatherconfig.h
 SOURCES = weatherplugin.cpp       \
          weatherpluginimpl.cpp   \
          weatherpluginwidget.cpp \
          weatherconfig.cpp
 INCLUDEPATH     += $(OPIEDIR)/include \
                ../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
                ../ ../library
 LIBS+= -lqpe -lopie
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todayweatherplugin
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/tools/calc2/binary/binary.pro b/noncore/tools/calc2/binary/binary.pro
index 92dd2f6..73f0be8 100644
--- a/noncore/tools/calc2/binary/binary.pro
+++ b/noncore/tools/calc2/binary/binary.pro
@@ -1,33 +1,33 @@
 #TEMPLATE = lib
 #CONFIG -= moc
 #CONFIG += qt release
 ## Input
 #INTERFACES += binary.ui
 #HEADERS = binaryimpl.h \
        #    binaryfactory.h 
 #SOURCES = binaryimpl.cpp \
        #    binaryfactory.cpp
 #INCLUDEPATH     += $(OPIEDIR)/include \
        #           $(OPIEDIR)/calc2
 #DEPENDPATH      += $(OPIEDIR)/include 
 #DESTDIR = $(OPIEDIR)/plugins/calculator
 #TARGET = binary
 #
 #TRANSLATIONS = ../../../../i18n/de/libbinary.ts \
        # ../../../../i18n/en/libbinary.ts \
        # ../../../../i18n/es/libbinary.ts \
        # ../../../../i18n/fr/libbinary.ts \
        # ../../../../i18n/hu/libbinary.ts \
        # ../../../../i18n/ja/libbinary.ts \
        # ../../../../i18n/ko/libbinary.ts \
        # ../../../../i18n/no/libbinary.ts \
        # ../../../../i18n/pl/libbinary.ts \
        # ../../../../i18n/pt/libbinary.ts \
        # ../../../../i18n/pt_BR/libbinary.ts \
        # ../../../../i18n/sl/libbinary.ts \
        # ../../../../i18n/zh_CN/libbinary.ts \
        # ../../../../i18n/zh_TW/libbinary.ts
-include ( ../../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/tools/calc2/calc.pro b/noncore/tools/calc2/calc.pro
index 31b277f..8dfba95 100644
--- a/noncore/tools/calc2/calc.pro
+++ b/noncore/tools/calc2/calc.pro
@@ -1,29 +1,29 @@
 #TEMPLATE = app
 #CONFIG += qt release
 ## Input
 #HEADERS += calc.h plugininterface.h instruction.h engine.h stdinstructions.h
 #SOURCES += calc.cpp main.cpp engine.cpp
 #INCLUDEPATH     += $(OPIEDIR)/include 
 #DEPENDPATH      += $(OPIEDIR)/include 
 #LIBS += -lqpe -Wl,-export-dynamic 
 #TARGET = calc
 #DESTDIR = $(OPIEDIR)/bin
 #
 #TRANSLATIONS = ../../../i18n/de/calc.pro \
        # ../../../i18n/en/calc.pro \
        # ../../../i18n/es/calc.pro \
        # ../../../i18n/fr/calc.pro \
        # ../../../i18n/hu/calc.pro \
        # ../../../i18n/ja/calc.pro \
        # ../../../i18n/ko/calc.pro \
        # ../../../i18n/no/calc.pro \
        # ../../../i18n/pl/calc.pro \
        # ../../../i18n/pt/calc.pro \
        # ../../../i18n/pt_BR/calc.pro \
        # ../../../i18n/sl/calc.pro \
        # ../../../i18n/zh_CN/calc.pro \
        # ../../../i18n/zh_TW/calc.pro
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/tools/calc2/simple/simple.pro b/noncore/tools/calc2/simple/simple.pro
index 772db73..990aa9e 100644
--- a/noncore/tools/calc2/simple/simple.pro
+++ b/noncore/tools/calc2/simple/simple.pro
@@ -1,30 +1,30 @@
 #TEMPLATE = lib
 #CONFIG -= moc
 #CONFIG += qt release
 ## Input
 #INTERFACES += simple.ui
 #HEADERS = simpleimpl.h  simplefactory.h stdinstructions.h
 #SOURCES = simpleimpl.cpp simplefactory.cpp
 #INCLUDEPATH     += $(OPIEDIR)/include \
        #           $(OPIEDIR)/calc2
 #DEPENDPATH      += $(OPIEDIR)/include 
 #DESTDIR = $(OPIEDIR)/plugins/calculator
 #
 #TRANSLATIONS = ../../../../i18n/de/lib.ts \
        # ../../../../i18n/en/lib.ts \
        # ../../../../i18n/es/lib.ts \
        # ../../../../i18n/fr/lib.ts \
        # ../../../../i18n/hu/lib.ts \
        # ../../../../i18n/ja/lib.ts \
        # ../../../../i18n/ko/lib.ts \
        # ../../../../i18n/no/lib.ts \
        # ../../../../i18n/pl/lib.ts \
        # ../../../../i18n/pt/lib.ts \
        # ../../../../i18n/pt_BR/lib.ts \
        # ../../../../i18n/sl/lib.ts \
        # ../../../../i18n/zh_CN/lib.ts \
        # ../../../../i18n/zh_TW/lib.ts
-include ( ../../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/tools/calculator/calculator.pro b/noncore/tools/calculator/calculator.pro
index 280d202..3c052e7 100644
--- a/noncore/tools/calculator/calculator.pro
+++ b/noncore/tools/calculator/calculator.pro
@@ -1,32 +1,32 @@
        DESTDIR         = $(OPIEDIR)/bin
        TEMPLATE= app
        CONFIG  = qt warn_on release
        HEADERS         = calculatorimpl.h
        SOURCES         = calculatorimpl.cpp \
                  main.cpp
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
        INTERFACES= calculator.ui
        TARGET  = calculator
 TRANSLATIONS = ../../../i18n/de/calculator.ts \
         ../../../i18n/xx/calculator.ts \
         ../../../i18n/en/calculator.ts \
         ../../../i18n/es/calculator.ts \
         ../../../i18n/fr/calculator.ts \
         ../../../i18n/hu/calculator.ts \
         ../../../i18n/ja/calculator.ts \
         ../../../i18n/ko/calculator.ts \
         ../../../i18n/no/calculator.ts \
         ../../../i18n/pl/calculator.ts \
         ../../../i18n/pt/calculator.ts \
         ../../../i18n/pt_BR/calculator.ts \
         ../../../i18n/sl/calculator.ts \
         ../../../i18n/zh_CN/calculator.ts \
         ../../../i18n/zh_TW/calculator.ts \
         ../../../i18n/da/calculator.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/tools/clock/clock.pro b/noncore/tools/clock/clock.pro
index c4ffdb9..29dd52b 100644
--- a/noncore/tools/clock/clock.pro
+++ b/noncore/tools/clock/clock.pro
@@ -1,32 +1,32 @@
 TEMPLATE  = app
 CONFIG    = qt warn_on release
 DESTDIR   = $(OPIEDIR)/bin
 HEADERS   = clock.h setAlarm.h
 SOURCES   = clock.cpp setAlarm.cpp \
      main.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
 INTERFACES  =
 TARGET    = clock
 TRANSLATIONS = ../../../i18n/de/clock.ts \
         ../../../i18n/xx/clock.ts \
         ../../../i18n/en/clock.ts \
         ../../../i18n/es/clock.ts \
         ../../../i18n/fr/clock.ts \
         ../../../i18n/hu/clock.ts \
         ../../../i18n/ja/clock.ts \
         ../../../i18n/ko/clock.ts \
         ../../../i18n/no/clock.ts \
         ../../../i18n/pl/clock.ts \
         ../../../i18n/pt/clock.ts \
         ../../../i18n/pt_BR/clock.ts \
         ../../../i18n/sl/clock.ts \
         ../../../i18n/zh_CN/clock.ts \
         ../../../i18n/zh_TW/clock.ts \
         ../../../i18n/da/clock.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/tools/formatter/formatter.pro b/noncore/tools/formatter/formatter.pro
index 48520da..b2e976b 100644
--- a/noncore/tools/formatter/formatter.pro
+++ b/noncore/tools/formatter/formatter.pro
@@ -1,30 +1,30 @@
 TEMPLATE  = app
 CONFIG    += qt warn_on release
 HEADERS   = formatter.h inputDialog.h output.h
 SOURCES   = formatter.cpp inputDialog.cpp output.cpp main.cpp
 TARGET    = formatter
 DESTDIR   = $(OPIEDIR)/bin
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe
 TRANSLATIONS = ../../../i18n/de/formatter.ts \
         ../../../i18n/da/formatter.ts \
         ../../../i18n/xx/formatter.ts \
         ../../../i18n/en/formatter.ts \
         ../../../i18n/es/formatter.ts \
         ../../../i18n/fr/formatter.ts \
         ../../../i18n/hu/formatter.ts \
         ../../../i18n/ja/formatter.ts \
         ../../../i18n/ko/formatter.ts \
         ../../../i18n/no/formatter.ts \
         ../../../i18n/pl/formatter.ts \
         ../../../i18n/pt/formatter.ts \
         ../../../i18n/pt_BR/formatter.ts \
         ../../../i18n/sl/formatter.ts \
         ../../../i18n/zh_CN/formatter.ts \
         ../../../i18n/zh_TW/formatter.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/tools/opie-sh/opie-sh.pro b/noncore/tools/opie-sh/opie-sh.pro
index 373df7d..a419362 100644
--- a/noncore/tools/opie-sh/opie-sh.pro
+++ b/noncore/tools/opie-sh/opie-sh.pro
@@ -1,30 +1,30 @@
        TEMPLATE                =app
        CONFIG                  +=qt warn_on release
        DESTDIR                         =$(OPIEDIR)/bin
        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
 TRANSLATIONS = ../../../i18n/de/opie-sh.ts \
         ../../../i18n/da/opie-sh.ts \
         ../../../i18n/xx/opie-sh.ts \
         ../../../i18n/en/opie-sh.ts \
         ../../../i18n/es/opie-sh.ts \
         ../../../i18n/fr/opie-sh.ts \
         ../../../i18n/hu/opie-sh.ts \
         ../../../i18n/ja/opie-sh.ts \
         ../../../i18n/ko/opie-sh.ts \
         ../../../i18n/no/opie-sh.ts \
         ../../../i18n/pl/opie-sh.ts \
         ../../../i18n/pt/opie-sh.ts \
         ../../../i18n/pt_BR/opie-sh.ts \
         ../../../i18n/sl/opie-sh.ts \
         ../../../i18n/zh_CN/opie-sh.ts \
         ../../../i18n/zh_TW/opie-sh.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/tools/remote/remote.pro b/noncore/tools/remote/remote.pro
index 50fcdbb..bd681be 100644
--- a/noncore/tools/remote/remote.pro
+++ b/noncore/tools/remote/remote.pro
@@ -1,30 +1,30 @@
        TEMPLATE=app
        CONFIG  +=qt warn_on release
        DESTDIR         =$(OPIEDIR)/bin
        HEADERS         = remotetab.h learntab.h configtab.h topgroup.h dvdgroup.h channelgroup.h vcrgroup.h buttondialog.h topgroupconf.h dvdgroupconf.h channelgroupconf.h vcrgroupconf.h mainview.h recorddialog.h helptab.h
        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 -lopie
 TARGET          = remote
 TRANSLATIONS = ../../../i18n/de/remote.ts \
         ../../../i18n/da/remote.ts \
         ../../../i18n/xx/remote.ts \
         ../../../i18n/en/remote.ts \
         ../../../i18n/es/remote.ts \
         ../../../i18n/fr/remote.ts \
         ../../../i18n/hu/remote.ts \
         ../../../i18n/ja/remote.ts \
         ../../../i18n/ko/remote.ts \
         ../../../i18n/no/remote.ts \
         ../../../i18n/pl/remote.ts \
         ../../../i18n/pt/remote.ts \
         ../../../i18n/pt_BR/remote.ts \
         ../../../i18n/sl/remote.ts \
         ../../../i18n/zh_CN/remote.ts \
         ../../../i18n/zh_TW/remote.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/unsupported/filebrowser/filebrowser.pro b/noncore/unsupported/filebrowser/filebrowser.pro
index c3f5427..43e6c0f 100644
--- a/noncore/unsupported/filebrowser/filebrowser.pro
+++ b/noncore/unsupported/filebrowser/filebrowser.pro
@@ -1,31 +1,31 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = inlineedit.h  filebrowser.h filePermissions.h
        SOURCES         = filebrowser.cpp inlineedit.cpp filePermissions.cpp main.cpp
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
        INTERFACES=
 TRANSLATIONS = ../../../i18n/de/filebrowser.ts \
         ../../../i18n/da/filebrowser.ts \
         ../../../i18n/xx/filebrowser.ts \
         ../../../i18n/en/filebrowser.ts \
         ../../../i18n/es/filebrowser.ts \
         ../../../i18n/fr/filebrowser.ts \
         ../../../i18n/hu/filebrowser.ts \
         ../../../i18n/ja/filebrowser.ts \
         ../../../i18n/ko/filebrowser.ts \
         ../../../i18n/no/filebrowser.ts \
         ../../../i18n/pl/filebrowser.ts \
         ../../../i18n/pt/filebrowser.ts \
         ../../../i18n/pt_BR/filebrowser.ts \
         ../../../i18n/sl/filebrowser.ts \
         ../../../i18n/zh_CN/filebrowser.ts \
         ../../../i18n/it/filebrowser.ts \
         ../../../i18n/zh_TW/filebrowser.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/unsupported/gsmtool/gsmtool.pro b/noncore/unsupported/gsmtool/gsmtool.pro
index 9a55fce..ca0620d 100644
--- a/noncore/unsupported/gsmtool/gsmtool.pro
+++ b/noncore/unsupported/gsmtool/gsmtool.pro
@@ -1,35 +1,35 @@
        TEMPLATE= app
        #CONFIG         = qt warn_on debug
        CONFIG  = qt warn_on release
 DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = gsmtool.h
        SOURCES         = main.cpp gsmtool.cpp
 # This doesn't actually work...
 TMAKE_CXXFLAGS  += -fexceptions
        INCLUDEPATH+= $(OPIEDIR)/include
        INCLUDEPATH+= $(GSMLIBDIR)
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -L$(GSMLIBDIR)/gsmlib/.libs -lgsmme
        INTERFACES= gsmtoolbase.ui
        TARGET  = gsmtool
 TRANSLATIONS = ../../../i18n/de/gsmtool.ts \
         ../../../i18n/da/gsmtool.ts \
         ../../../i18n/xx/gsmtool.ts \
         ../../../i18n/en/gsmtool.ts \
         ../../../i18n/es/gsmtool.ts \
         ../../../i18n/fr/gsmtool.ts \
         ../../../i18n/hu/gsmtool.ts \
         ../../../i18n/ja/gsmtool.ts \
         ../../../i18n/ko/gsmtool.ts \
         ../../../i18n/no/gsmtool.ts \
         ../../../i18n/pl/gsmtool.ts \
         ../../../i18n/pt/gsmtool.ts \
         ../../../i18n/pt_BR/gsmtool.ts \
         ../../../i18n/sl/gsmtool.ts \
         ../../../i18n/zh_CN/gsmtool.ts \
         ../../../i18n/zh_TW/gsmtool.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/unsupported/mail2/bend/bend.pro b/noncore/unsupported/mail2/bend/bend.pro
index 117e18e..ebb53b5 100644
--- a/noncore/unsupported/mail2/bend/bend.pro
+++ b/noncore/unsupported/mail2/bend/bend.pro
@@ -1,31 +1,31 @@
        TEMPLATE        =lib
        CONFIG          +=qt warn_on release
        HEADERS                 +=bend.h \
                        bendimpl.h
        SOURCES                 +=bend.cpp \
                        bendimpl.cpp
        INCLUDEPATH     +=$(OPIEDIR)/include ../libmail
        LIBS            +=-lmail -lqpe
        TARGET          =bend
        DESTDIR                 +=$(OPIEDIR)/plugins/applets/
 TRANSLATIONS = ../../../i18n/de/libbend.ts \
         ../../../i18n/da/libbend.ts \
         ../../../i18n/xx/libbend.ts \
         ../../../i18n/en/libbend.ts \
         ../../../i18n/es/libbend.ts \
         ../../../i18n/fr/libbend.ts \
         ../../../i18n/hu/libbend.ts \
         ../../../i18n/ja/libbend.ts \
         ../../../i18n/ko/libbend.ts \
         ../../../i18n/no/libbend.ts \
         ../../../i18n/pl/libbend.ts \
         ../../../i18n/pt/libbend.ts \
         ../../../i18n/pt_BR/libbend.ts \
         ../../../i18n/sl/libbend.ts \
         ../../../i18n/zh_CN/libbend.ts \
         ../../../i18n/zh_TW/libbend.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/unsupported/mail2/libmail/libmail.pro b/noncore/unsupported/mail2/libmail/libmail.pro
index 5f8e590..53cbb82 100644
--- a/noncore/unsupported/mail2/libmail/libmail.pro
+++ b/noncore/unsupported/mail2/libmail/libmail.pro
@@ -1,45 +1,45 @@
        TEMPLATE        =lib
        CONFIG          +=qt warn_on debug
        #CONFIG                 +=qt warn_on release
        HEADERS                 =configfile.h \
                        defines.h \
                        imapbase.h \
                        imaphandler.h \
                        imapresponse.h \
                        mailfactory.h \
                        md5.cpp \
                        miscfunctions.h \
                        smtphandler.h
        SOURCES                 =configfile.cpp \
                        imapbase.cpp \
                        imaphandler.cpp \
                        imapresponse.cpp \
                        mailfactory.cpp \
                        md5.h \
                        miscfunctions.cpp \
                        smtphandler.cpp
        INCLUDEPATH     +=$(OPIEDIR)/include
        LIBS            +=-L$(OPIEDIR)/lib -lqpe
        TARGET          =mail
 DESTDIR      = $(OPIEDIR)/lib
 TRANSLATIONS = ../../../i18n/de/libmail.ts \
         ../../../i18n/da/libmail.ts \
         ../../../i18n/xx/libmail.ts \
         ../../../i18n/en/libmail.ts \
         ../../../i18n/es/libmail.ts \
         ../../../i18n/fr/libmail.ts \
         ../../../i18n/hu/libmail.ts \
         ../../../i18n/ja/libmail.ts \
         ../../../i18n/ko/libmail.ts \
         ../../../i18n/no/libmail.ts \
         ../../../i18n/pl/libmail.ts \
         ../../../i18n/pt/libmail.ts \
         ../../../i18n/pt_BR/libmail.ts \
         ../../../i18n/sl/libmail.ts \
         ../../../i18n/zh_CN/libmail.ts \
         ../../../i18n/zh_TW/libmail.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/unsupported/mail2/mail.pro b/noncore/unsupported/mail2/mail.pro
index faaec9c..fb121be 100644
--- a/noncore/unsupported/mail2/mail.pro
+++ b/noncore/unsupported/mail2/mail.pro
@@ -1,67 +1,67 @@
        TEMPLATE        = app
        CONFIG          += qt warn_on debug
        #CONFIG                 += qt warn_on release
        HEADERS                 = accounteditor.h \
                          addresspicker.h \
                          composer.h \
                          composerbase.h \
                          configdiag.h \
                          folderwidget.h \
                          listviewplus.h \
                        mailstatusbar.h \
                          mailtable.h \
                          mainwindow.h \
                          mainwindowbase.h \
                          opendiag.h \
                          rename.h \
                          searchdiag.h \
                          viewmail.h \
                          viewmailbase.h
        SOURCES                 = accounteditor.cpp \
                          addresspicker.cpp \
                          composer.cpp \
                          composerbase.cpp \
                          configdiag.cpp \
                          folderwidget.cpp \
                          listviewplus.cpp \
                        mailstatusbar.cpp \
                          mailtable.cpp \
                          main.cpp \
                          mainwindow.cpp \
                          mainwindowbase.cpp \
                          opendiag.cpp \
                          rename.cpp \
                          searchdiag.cpp \
                          viewmail.cpp \
                          viewmailbase.cpp
        INTERFACES      = accounteditorbase.ui \
                          addresspickerbase.ui \
                          configdiagbase.ui \
                          opendiagbase.ui \
                          renamebase.ui \
                          searchdiagbase.ui
        INCLUDEPATH    += $(OPIEDIR)/include libmail
        LIBS           += -lmail -lqpe -lopie
        TARGET          = mail 
        DESTDIR                 = $(OPIEDIR)/bin
 TRANSLATIONS = ../../i18n/de/mail.ts \
         ../../i18n/da/mail.ts \
         ../../i18n/xx/mail.ts \
         ../../i18n/en/mail.ts \
         ../../i18n/es/mail.ts \
         ../../i18n/fr/mail.ts \
         ../../i18n/hu/mail.ts \
         ../../i18n/ja/mail.ts \
         ../../i18n/ko/mail.ts \
         ../../i18n/no/mail.ts \
         ../../i18n/pl/mail.ts \
         ../../i18n/pt/mail.ts \
         ../../i18n/pt_BR/mail.ts \
         ../../i18n/sl/mail.ts \
         ../../i18n/zh_CN/mail.ts \
         ../../i18n/zh_TW/mail.ts
-include ( ../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/unsupported/oipkg/oipkg.pro b/noncore/unsupported/oipkg/oipkg.pro
index 0cbaf47..71fba0c 100644
--- a/noncore/unsupported/oipkg/oipkg.pro
+++ b/noncore/unsupported/oipkg/oipkg.pro
@@ -1,59 +1,59 @@
        DESTDIR         = $(OPIEDIR)/bin
        TEMPLATE= app
        #CONFIG         = qt warn_on release
        CONFIG  = qt warn_on debug
        HEADERS         = mainwindow.h \
                pksettings.h \
                pmipkg.h \
                packagelistdoclnk.h \
                installdialog.h \
                utils.h \
                listviewitemoipkg.h \
                packagelistitem.h \
                packagelistremote.h \
                packagelist.h \
                packagelistlocal.h \
                packagelistview.h \
                package.h
        SOURCES         = main.cpp \
                mainwindow.cpp \
                utils.cpp \
                packagelistdoclnk.cpp \
                packagelistview.cpp \
                installdialog.cpp \
                listviewitemoipkg.cpp \
                packagelistremote.cpp \
                packagelistlocal.cpp \
                pksettings.cpp \
                pmipkg.cpp \
                packagelistitem.cpp \
                packagelist.cpp \
                package.cpp
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/ioclude
 LIBS            += -lqpe
 LIBS            += -lopie
        INTERFACES= runwindow.ui \
                pksettingsbase.ui
        TARGET  = oipkg
 TRANSLATIONS = ../../../i18n/de/oipkg.ts \
         ../../../i18n/da/oipkg.ts \
         ../../../i18n/xx/oipkg.ts \
         ../../../i18n/en/oipkg.ts \
         ../../../i18n/es/oipkg.ts \
         ../../../i18n/fr/oipkg.ts \
         ../../../i18n/hu/oipkg.ts \
         ../../../i18n/ja/oipkg.ts \
         ../../../i18n/ko/oipkg.ts \
         ../../../i18n/no/oipkg.ts \
         ../../../i18n/pl/oipkg.ts \
         ../../../i18n/pt/oipkg.ts \
         ../../../i18n/pt_BR/oipkg.ts \
         ../../../i18n/sl/oipkg.ts \
         ../../../i18n/zh_CN/oipkg.ts \
         ../../../i18n/zh_TW/oipkg.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/unsupported/qpdf/qpdf.pro b/noncore/unsupported/qpdf/qpdf.pro
index 7c92eda..f5ec264 100644
--- a/noncore/unsupported/qpdf/qpdf.pro
+++ b/noncore/unsupported/qpdf/qpdf.pro
@@ -1,76 +1,76 @@
 TEMPLATE    =  app
 CONFIG      *= qt embedded release warn_off
 CONFIG      -= warn_on
 SOURCES     =  xpdf/Array.cc \
               xpdf/BuiltinFont.cc \
               xpdf/BuiltinFontTables.cc \
               xpdf/CMap.cc \
               xpdf/Catalog.cc \
               xpdf/CharCodeToUnicode.cc \
               xpdf/Decrypt.cc \
               xpdf/Dict.cc \
               xpdf/Error.cc \
               xpdf/FontEncodingTables.cc \
               xpdf/Annot.cc \
               xpdf/Function.cc \
               xpdf/Gfx.cc \
               xpdf/GfxFont.cc \
               xpdf/GfxState.cc \
               xpdf/GlobalParams.cc \
               xpdf/Lexer.cc \
               xpdf/Link.cc \
               xpdf/NameToCharCode.cc \
               xpdf/Object.cc \
               xpdf/OutputDev.cc \
               xpdf/PDFDoc.cc \
               xpdf/Page.cc \
               xpdf/Parser.cc \
               xpdf/PSTokenizer.cc \
               xpdf/Stream.cc \
               xpdf/TextOutputDev.cc \
               xpdf/UnicodeMap.cc \
                       xpdf/XRef.cc \
               goo/GHash.cc \
               goo/GString.cc \
               goo/GList.cc \
               QOutputDev.cpp \
               QPEOutputDev.cpp \
               qpdf.cpp \
               qbusybar.cpp \
               gooStub.cpp
 HEADERS     =  QOutputDev.h \
               QPEOutputDev.h \
               qbusybar.h \
               qpdf.h
 INCLUDEPATH += . \
               .. \
               xpdf \
               $(OPIEDIR)/include \
               ../goo \ 
               goo
               
 LIBS        += -L $(OPIEDIR)/lib -lqpe -lopie -lstdc++
 DESTDIR      = $(OPIEDIR)/bin
 TARGET       = qpdf
 TRANSLATIONS = ../../../i18n/de/qpdf.ts \
         ../../../i18n/da/qpdf.ts \
         ../../../i18n/xx/qpdf.ts \
         ../../../i18n/en/qpdf.ts \
         ../../../i18n/es/qpdf.ts \
         ../../../i18n/fr/qpdf.ts \
         ../../../i18n/hu/qpdf.ts \
         ../../../i18n/ja/qpdf.ts \
         ../../../i18n/ko/qpdf.ts \
         ../../../i18n/no/qpdf.ts \
         ../../../i18n/pl/qpdf.ts \
         ../../../i18n/pt/qpdf.ts \
         ../../../i18n/pt_BR/qpdf.ts \
         ../../../i18n/sl/qpdf.ts \
         ../../../i18n/zh_CN/qpdf.ts \
         ../../../i18n/it/qpdf.ts \
         ../../../i18n/zh_TW/qpdf.ts
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )