159 files changed, 161 insertions, 160 deletions

diff --git a/core/applets/batteryapplet/batteryapplet.pro b/core/applets/batteryapplet/batteryapplet.pro
index bded8a7..0222d74 100644
--- a/core/applets/batteryapplet/batteryapplet.pro
+++ b/core/applets/batteryapplet/batteryapplet.pro
@@ -27,5 +27,5 @@ TRANSLATIONS = ../../../i18n/de/libbatteryapplet.ts \
          ../../../i18n/zh_TW/libbatteryapplet.ts
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/applets/cardmon/cardmon.pro b/core/applets/cardmon/cardmon.pro
index c1ef6b2..07cb221 100644
--- a/core/applets/cardmon/cardmon.pro
+++ b/core/applets/cardmon/cardmon.pro
@@ -27,5 +27,5 @@ TRANSLATIONS = ../../../i18n/de/libcardmonapplet.ts \
          ../../../i18n/zh_TW/libcardmonapplet.ts
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/applets/clipboardapplet/clipboardapplet.pro b/core/applets/clipboardapplet/clipboardapplet.pro
index 535bcc8..f46fdf5 100644
--- a/core/applets/clipboardapplet/clipboardapplet.pro
+++ b/core/applets/clipboardapplet/clipboardapplet.pro
@@ -27,5 +27,5 @@ TRANSLATIONS = ../../../i18n/de/libclipboardapplet.ts \
          ../../../i18n/zh_TW/libclipboardapplet.ts
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/applets/clockapplet/clockapplet.pro b/core/applets/clockapplet/clockapplet.pro
index 21591d1..ea6a0e5 100644
--- a/core/applets/clockapplet/clockapplet.pro
+++ b/core/applets/clockapplet/clockapplet.pro
@@ -27,5 +27,5 @@ TRANSLATIONS = ../../../i18n/de/libclockapplet.ts \
          ../../../i18n/zh_TW/libclockapplet.ts
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/applets/homeapplet/homeapplet.pro b/core/applets/homeapplet/homeapplet.pro
index c6c1169..65e87e0 100644
--- a/core/applets/homeapplet/homeapplet.pro
+++ b/core/applets/homeapplet/homeapplet.pro
@@ -27,5 +27,5 @@ TRANSLATIONS = ../../../i18n/de/libhomeapplet.ts \
          ../../../i18n/zh_TW/libhomeapplet.ts
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/applets/irdaapplet/irdaapplet.pro b/core/applets/irdaapplet/irdaapplet.pro
index 2a5f094..6242794 100644
--- a/core/applets/irdaapplet/irdaapplet.pro
+++ b/core/applets/irdaapplet/irdaapplet.pro
@@ -27,5 +27,5 @@ TRANSLATIONS = ../../../i18n/de/libirdaapplet.ts \
          ../../../i18n/zh_TW/libirdaapplet.ts
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/applets/logoutapplet/logoutapplet.pro b/core/applets/logoutapplet/logoutapplet.pro
index 91ef0a9..4950ece 100644
--- a/core/applets/logoutapplet/logoutapplet.pro
+++ b/core/applets/logoutapplet/logoutapplet.pro
@@ -27,5 +27,5 @@ TRANSLATIONS = ../../../i18n/de/liblogoutapplet.ts \
          ../../../i18n/zh_TW/liblogoutapplet.ts
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/applets/obex/obex.pro b/core/applets/obex/obex.pro
index 8d55241..d7cc338 100644
--- a/core/applets/obex/obex.pro
+++ b/core/applets/obex/obex.pro
@@ -28,5 +28,5 @@ TRANSLATIONS = ../../../i18n/de/libopieobex.ts \
          ../../../i18n/zh_TW/libopieobex.ts
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/applets/restartapplet/restartapplet.pro b/core/applets/restartapplet/restartapplet.pro
index aeaf400..838ceda 100644
--- a/core/applets/restartapplet/restartapplet.pro
+++ b/core/applets/restartapplet/restartapplet.pro
@@ -12,5 +12,5 @@ MOC_DIR=opieobj
 OBJECTS_DIR=opieobj
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/applets/restartapplet2/restartapplet.pro b/core/applets/restartapplet2/restartapplet.pro
index f1d805c..f5fe9a0 100644
--- a/core/applets/restartapplet2/restartapplet.pro
+++ b/core/applets/restartapplet2/restartapplet.pro
@@ -12,5 +12,5 @@ MOC_DIR=opieobj
 OBJECTS_DIR=opieobj
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/applets/screenshotapplet/screenshotapplet.pro b/core/applets/screenshotapplet/screenshotapplet.pro
index 337d4ae..f105d82 100644
--- a/core/applets/screenshotapplet/screenshotapplet.pro
+++ b/core/applets/screenshotapplet/screenshotapplet.pro
@@ -29,5 +29,5 @@ TRANSLATIONS = ../../../i18n/de/libscreenshotapplet.ts \
          ../../../i18n/zh_TW/libscreenshotapplet.ts
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/applets/suspendapplet/suspendapplet.pro b/core/applets/suspendapplet/suspendapplet.pro
index d8ad58d..c072642 100644
--- a/core/applets/suspendapplet/suspendapplet.pro
+++ b/core/applets/suspendapplet/suspendapplet.pro
@@ -27,5 +27,5 @@ TRANSLATIONS = ../../../i18n/de/libsuspendapplet.ts \
          ../../../i18n/zh_TW/libsuspendapplet.ts
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/applets/vmemo/vmemo.pro b/core/applets/vmemo/vmemo.pro
index bd87aa5..75a5936 100644
--- a/core/applets/vmemo/vmemo.pro
+++ b/core/applets/vmemo/vmemo.pro
@@ -27,5 +27,5 @@ TRANSLATIONS = ../../../i18n/de/libvmemoapplet.ts \
    ../../../i18n/zh_TW/libvmemoapplet.ts
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/applets/volumeapplet/volumeapplet.pro b/core/applets/volumeapplet/volumeapplet.pro
index bae4b43..3c2a9da 100644
--- a/core/applets/volumeapplet/volumeapplet.pro
+++ b/core/applets/volumeapplet/volumeapplet.pro
@@ -27,5 +27,5 @@ TRANSLATIONS = ../../../i18n/de/libvolumeapplet.ts \
          ../../../i18n/zh_TW/libvolumeapplet.ts
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/apps/calibrate/calibrate.pro b/core/apps/calibrate/calibrate.pro
index f7f8849..861ec15 100644
--- a/core/apps/calibrate/calibrate.pro
+++ b/core/apps/calibrate/calibrate.pro
@@ -19,5 +19,5 @@ TRANSLATIONS = ../../../i18n/de/calibrate.pro.in.ts \
          ../../../i18n/zh_TW/calibrate.pro.in.ts
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/apps/embeddedkonsole/embeddedkonsole.pro b/core/apps/embeddedkonsole/embeddedkonsole.pro
index 55d0b93..ca2ee0f 100755
--- a/core/apps/embeddedkonsole/embeddedkonsole.pro
+++ b/core/apps/embeddedkonsole/embeddedkonsole.pro
@@ -56,5 +56,5 @@ TRANSLATIONS = ../../../i18n/de/embeddedkonsole.ts \
         ../../../i18n/da/embeddedkonsole.ts
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/apps/helpbrowser/helpbrowser.pro b/core/apps/helpbrowser/helpbrowser.pro
index 222a408..8891d97 100644
--- a/core/apps/helpbrowser/helpbrowser.pro
+++ b/core/apps/helpbrowser/helpbrowser.pro
@@ -28,5 +28,5 @@ TRANSLATIONS = ../../../i18n/de/helpbrowser.ts \
          ../../../i18n/da/helpbrowser.ts
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/apps/qcop/qcop.pro b/core/apps/qcop/qcop.pro
index 4ca0ceb..9048683 100644
--- a/core/apps/qcop/qcop.pro
+++ b/core/apps/qcop/qcop.pro
@@ -27,5 +27,5 @@ TRANSLATIONS = ../../../i18n/de/qcop.ts \
          ../../../i18n/zh_TW/qcop.ts
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/apps/textedit/textedit.pro b/core/apps/textedit/textedit.pro
index f90b914..f5e16a0 100644
--- a/core/apps/textedit/textedit.pro
+++ b/core/apps/textedit/textedit.pro
@@ -26,5 +26,5 @@ TRANSLATIONS = ../../../i18n/de/textedit.ts \
          ../../../i18n/zh_TW/textedit.ts
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro
index 729b182..d0a573b 100644
--- a/core/launcher/launcher.pro
+++ b/core/launcher/launcher.pro
@@ -120,5 +120,5 @@ TRANSLATIONS = ../../i18n/de/qpe.ts \
          ../../i18n/da/qpe.ts
 
 
 
-include ( ../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/multimedia/opieplayer/libflash/libflash.pro b/core/multimedia/opieplayer/libflash/libflash.pro
index 5ffb9a5..d21e122 100644
--- a/core/multimedia/opieplayer/libflash/libflash.pro
+++ b/core/multimedia/opieplayer/libflash/libflash.pro
@@ -31,5 +31,5 @@ TRANSLATIONS = ../../../../i18n/de/libflashplugin.ts \
          ../../../../i18n/zh_TW/libflashplugin.ts
 
 
 
-include ( ../../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/multimedia/opieplayer/libmad/libmad.pro b/core/multimedia/opieplayer/libmad/libmad.pro
index edcc22c..d1528a2 100644
--- a/core/multimedia/opieplayer/libmad/libmad.pro
+++ b/core/multimedia/opieplayer/libmad/libmad.pro
@@ -35,5 +35,5 @@ TRANSLATIONS = ../../../../i18n/de/libmadplugin.ts \
          ../../../../i18n/zh_TW/libmadplugin.ts
 
 
 
-include ( ../../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
index 17d289a..38b99ec 100644
--- a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
+++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
@@ -64,5 +64,5 @@ TRANSLATIONS = ../../../../i18n/de/libmpeg3plugin.ts \
          ../../../../i18n/zh_TW/libmpeg3plugin.ts
 
 
 
-include ( ../../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/multimedia/opieplayer/modplug/modplug.pro b/core/multimedia/opieplayer/modplug/modplug.pro
index 84b8eef..b53ebbb 100644
--- a/core/multimedia/opieplayer/modplug/modplug.pro
+++ b/core/multimedia/opieplayer/modplug/modplug.pro
@@ -19,5 +19,5 @@ VERSION		=   1.0.0
 
 
 
 
-include ( ../../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/multimedia/opieplayer/opieplayer.pro b/core/multimedia/opieplayer/opieplayer.pro
index 9489fd5..5ea5c06 100644
--- a/core/multimedia/opieplayer/opieplayer.pro
+++ b/core/multimedia/opieplayer/opieplayer.pro
@@ -36,5 +36,5 @@ TRANSLATIONS = ../../../i18n/de/opieplayer.ts \
         ../../../i18n/zh_TW/opieplayer.ts
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/multimedia/opieplayer/wavplugin/wavplugin.pro b/core/multimedia/opieplayer/wavplugin/wavplugin.pro
index d1ac78a..4f98c53 100644
--- a/core/multimedia/opieplayer/wavplugin/wavplugin.pro
+++ b/core/multimedia/opieplayer/wavplugin/wavplugin.pro
@@ -27,5 +27,5 @@ TRANSLATIONS = ../../../../i18n/de/libwavplugin.ts \
          ../../../../i18n/zh_TW/libwavplugin.ts
 
 
 
-include ( ../../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/opie-login/opie-login.pro b/core/opie-login/opie-login.pro
index d628cbb..ce700ff 100644
--- a/core/opie-login/opie-login.pro
+++ b/core/opie-login/opie-login.pro
@@ -45,5 +45,5 @@ TRANSLATIONS = ../../i18n/de/opie-login.ts \
 
 
 
 
-include ( ../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/pim/addressbook/addressbook.pro b/core/pim/addressbook/addressbook.pro
index 5003b35..0e8521e 100644
--- a/core/pim/addressbook/addressbook.pro
+++ b/core/pim/addressbook/addressbook.pro
@@ -48,5 +48,5 @@ TRANSLATIONS = ../../../i18n/de/addressbook.ts \
          ../../../i18n/zh_TW/addressbook.ts
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/pim/datebook/datebook.pro b/core/pim/datebook/datebook.pro
index da33bfe..b4206a9 100644
--- a/core/pim/datebook/datebook.pro
+++ b/core/pim/datebook/datebook.pro
@@ -58,5 +58,5 @@ TRANSLATIONS = ../../../i18n/de/datebook.ts \
          ../../../i18n/da/datebook.ts
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/pim/today/plugins/addressbook/addressbook.pro b/core/pim/today/plugins/addressbook/addressbook.pro
index abe5a50..fd7d786 100644
--- a/core/pim/today/plugins/addressbook/addressbook.pro
+++ b/core/pim/today/plugins/addressbook/addressbook.pro
@@ -19,5 +19,5 @@ DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todayaddressbookplugin
 
 
 
-include ( ../../../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/pim/today/plugins/datebook/datebook.pro b/core/pim/today/plugins/datebook/datebook.pro
index d093ac1..838e2fb 100644
--- a/core/pim/today/plugins/datebook/datebook.pro
+++ b/core/pim/today/plugins/datebook/datebook.pro
@@ -17,5 +17,5 @@ LIBS+= -lqpe -lopie
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todaydatebookplugin
 
 
-include ( ../../../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/pim/today/plugins/mail/mail.pro b/core/pim/today/plugins/mail/mail.pro
index ef00c41..3d1c6d3 100644
--- a/core/pim/today/plugins/mail/mail.pro
+++ b/core/pim/today/plugins/mail/mail.pro
@@ -16,5 +16,5 @@ LIBS+= -lqpe -lopie
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todaymailplugin
 
 
-include ( ../../../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/pim/today/plugins/todolist/todolist.pro b/core/pim/today/plugins/todolist/todolist.pro
index f3aeb52..9d95ff0 100644
--- a/core/pim/today/plugins/todolist/todolist.pro
+++ b/core/pim/today/plugins/todolist/todolist.pro
@@ -18,5 +18,5 @@ LIBS+= -lqpe -lopie
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todaytodolistplugin
 
 
-include ( ../../../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/pim/today/today.pro b/core/pim/today/today.pro
index 12807eb..a6d6dae 100644
--- a/core/pim/today/today.pro
+++ b/core/pim/today/today.pro
@@ -29,5 +29,5 @@ TRANSLATIONS = ../../../i18n/de/today.ts \
             ../../../i18n/da/today.ts
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/pim/todo/todo.pro b/core/pim/todo/todo.pro
index 12b6a48..1708451 100644
--- a/core/pim/todo/todo.pro
+++ b/core/pim/todo/todo.pro
@@ -64,5 +64,5 @@ TRANSLATIONS = ../../../i18n/de/todolist.ts \
          ../../../i18n/zh_TW/todolist.ts
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/settings/button/button.pro b/core/settings/button/button.pro
index 95a5c91..e757da9 100644
--- a/core/settings/button/button.pro
+++ b/core/settings/button/button.pro
@@ -35,5 +35,5 @@ TRANSLATIONS = ../../../i18n/de/buttonsettings.ts \
          ../../../i18n/da/buttonsettings.ts
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/settings/citytime/citytime.pro b/core/settings/citytime/citytime.pro
index a189a2b..2eb3dad 100644
--- a/core/settings/citytime/citytime.pro
+++ b/core/settings/citytime/citytime.pro
@@ -27,5 +27,5 @@ TRANSLATIONS = ../../../i18n/de/citytime.ts \
          ../../../i18n/da/citytime.ts
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/settings/launcher/launcher.pro b/core/settings/launcher/launcher.pro
index 1c17eff..e532852 100644
--- a/core/settings/launcher/launcher.pro
+++ b/core/settings/launcher/launcher.pro
@@ -22,5 +22,5 @@ TARGET       = launchersettings
 
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/settings/light-and-power/light-and-power.pro b/core/settings/light-and-power/light-and-power.pro
index 95e7632..2577c98 100644
--- a/core/settings/light-and-power/light-and-power.pro
+++ b/core/settings/light-and-power/light-and-power.pro
@@ -28,5 +28,5 @@ TRANSLATIONS = ../../../i18n/de/light-and-power.ts \
          ../../../i18n/da/light-and-power.ts
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/settings/security/security.pro b/core/settings/security/security.pro
index 4564522..dbb4099 100644
--- a/core/settings/security/security.pro
+++ b/core/settings/security/security.pro
@@ -27,5 +27,5 @@ TRANSLATIONS = ../../../i18n/de/security.ts \
          ../../../i18n/da/security.ts
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/development/keyview/keyview.pro b/development/keyview/keyview.pro
index ecdc64b..daec481 100644
--- a/development/keyview/keyview.pro
+++ b/development/keyview/keyview.pro
@@ -28,5 +28,5 @@ TRANSLATIONS = ../i18n/de/keyview.ts \
          ../i18n/zh_TW/keyview.ts
 
 
 
-include ( ../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/example/example.pro b/example/example.pro
index d23a1d8..ab233c8 100644
--- a/example/example.pro
+++ b/example/example.pro
@@ -27,5 +27,5 @@ TRANSLATIONS = ../i18n/de/example.ts \
          ../i18n/zh_TW/example.ts
 
 
 
-include ( ../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/freetype/freetype.pro b/freetype/freetype.pro
index 19451d7..bdc37f6 100644
--- a/freetype/freetype.pro
+++ b/freetype/freetype.pro
@@ -11,5 +11,5 @@ LIBS            += -lqpe -lfreetype
         VERSION         = 1.0.0
 
 
 
-include ( ../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/inputmethods/dvorak/dvorak.pro b/inputmethods/dvorak/dvorak.pro
index 751fe52..2d41e8d 100644
--- a/inputmethods/dvorak/dvorak.pro
+++ b/inputmethods/dvorak/dvorak.pro
@@ -30,5 +30,5 @@ TRANSLATIONS = ../../i18n/de/libqdvorak.ts \
          ../../i18n/zh_TW/libqdvorak.ts
 
 
 
-include ( ../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/inputmethods/handwriting/handwriting.pro b/inputmethods/handwriting/handwriting.pro
index 8c7a5de..9dcf8a1 100644
--- a/inputmethods/handwriting/handwriting.pro
+++ b/inputmethods/handwriting/handwriting.pro
@@ -48,5 +48,5 @@ TRANSLATIONS = ../../i18n/de/libqhandwriting.ts \
          ../../i18n/zh_TW/libqhandwriting.ts
 
 
 
-include ( ../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/inputmethods/jumpx/jumpx.pro b/inputmethods/jumpx/jumpx.pro
index 647e59b..f78ebe2 100644
--- a/inputmethods/jumpx/jumpx.pro
+++ b/inputmethods/jumpx/jumpx.pro
@@ -29,5 +29,5 @@ TRANSLATIONS = ../../i18n/de/libqjumpx.ts \
          ../../i18n/zh_TW/libqjumpx.ts
 
 
 
-include ( ../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/inputmethods/keyboard/keyboard.pro b/inputmethods/keyboard/keyboard.pro
index 5d51806..8172089 100644
--- a/inputmethods/keyboard/keyboard.pro
+++ b/inputmethods/keyboard/keyboard.pro
@@ -30,5 +30,5 @@ TRANSLATIONS = ../../i18n/de/libqkeyboard.ts \
          ../../i18n/zh_TW/libqkeyboard.ts
 
 
 
-include ( ../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/inputmethods/kjumpx/kjumpx.pro b/inputmethods/kjumpx/kjumpx.pro
index 0074824..4b864b8 100644
--- a/inputmethods/kjumpx/kjumpx.pro
+++ b/inputmethods/kjumpx/kjumpx.pro
@@ -29,5 +29,5 @@ TRANSLATIONS = ../../i18n/de/libqkjumpx.ts \
          ../../i18n/zh_TW/libqkjumpx.ts
 
 
 
-include ( ../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/inputmethods/multikey/multikey.pro b/inputmethods/multikey/multikey.pro
index 8b06c69..3a50c06 100644
--- a/inputmethods/multikey/multikey.pro
+++ b/inputmethods/multikey/multikey.pro
@@ -30,5 +30,5 @@ TRANSLATIONS    = ../../i18n/pt_BR/libqmultikey.ts \
  ../../i18n/da/libqmultikey.ts
 
 
 
-include ( ../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/inputmethods/pickboard/pickboard.pro b/inputmethods/pickboard/pickboard.pro
index 9b5c46c..59b0e8a 100644
--- a/inputmethods/pickboard/pickboard.pro
+++ b/inputmethods/pickboard/pickboard.pro
@@ -27,5 +27,5 @@ TRANSLATIONS = ../../i18n/de/libqpickboard.ts \
          ../../i18n/zh_TW/libqpickboard.ts
 
 
 
-include ( ../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/inputmethods/unikeyboard/unikeyboard.pro b/inputmethods/unikeyboard/unikeyboard.pro
index 1e3f00b..5d07ee2 100644
--- a/inputmethods/unikeyboard/unikeyboard.pro
+++ b/inputmethods/unikeyboard/unikeyboard.pro
@@ -27,5 +27,5 @@ TRANSLATIONS = ../../i18n/de/libqunikeyboard.ts \
          ../../i18n/zh_TW/libqunikeyboard.ts
 
 
 
-include ( ../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/libopie/libopie.pro b/libopie/libopie.pro
index 799f3b0..675e1fa 100644
--- a/libopie/libopie.pro
+++ b/libopie/libopie.pro
@@ -104,5 +104,5 @@ TRANSLATIONS = ../i18n/de/libopie.ts \
    ../i18n/da/libopie.ts
 
 
 
-include ( ../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/libopie/ofileselector/libopie.pro b/libopie/ofileselector/libopie.pro
index cf22b5e..b91dbb6 100644
--- a/libopie/ofileselector/libopie.pro
+++ b/libopie/ofileselector/libopie.pro
@@ -99,5 +99,5 @@ TRANSLATIONS = ../i18n/de/libopie.ts \
    ../i18n/da/libopie.ts
 
 
 
-include ( ../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/libopie/pim/libopie.pro b/libopie/pim/libopie.pro
index b1ec9f7..da6417e 100644
--- a/libopie/pim/libopie.pro
+++ b/libopie/pim/libopie.pro
@@ -79,5 +79,5 @@ TRANSLATIONS = ../i18n/de/libopie.ts \
    ../i18n/da/libopie.ts
 
 
 
-include ( ../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/library/library.pro b/library/library.pro
index b0d07b8..00639bf 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -1,6 +1,7 @@
         TEMPLATE= lib
-        CONFIG  += qt warn_on release
+        #CONFIG         += qt warn_on release
+        CONFIG  += qt warn_on debug
         HEADERS=   calendar.h \
             global.h \
             resource.h \
             xmlreader.h \
@@ -145,5 +146,5 @@ TRANSLATIONS = ../i18n/de/libqpe.ts \
          ../i18n/zh_TW/libqpe.ts \
          ../i18n/da/libqpe.ts
 
 
-include ( ../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/libsql/libopiesql.pro b/libsql/libopiesql.pro
index 4fc6cc7..75b9c7e 100644
--- a/libsql/libopiesql.pro
+++ b/libsql/libopiesql.pro
@@ -27,5 +27,5 @@ LIBS += -lsqlite
 
 
 
 
-include ( ../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/libsql/test/spaltenweise.pro b/libsql/test/spaltenweise.pro
index af68407..f54fada 100644
--- a/libsql/test/spaltenweise.pro
+++ b/libsql/test/spaltenweise.pro
@@ -9,5 +9,5 @@ TARGET		= spaltenweise
 
 
 
 
-include ( ../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/libsql/test/test.pro b/libsql/test/test.pro
index d756189..83ecb44 100644
--- a/libsql/test/test.pro
+++ b/libsql/test/test.pro
@@ -9,5 +9,5 @@ TARGET		= sqltest
 
 
 
 
-include ( ../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/libsql/test/zeilenweise.pro b/libsql/test/zeilenweise.pro
index 3e69897..e5cfcc7 100644
--- a/libsql/test/zeilenweise.pro
+++ b/libsql/test/zeilenweise.pro
@@ -9,5 +9,5 @@ TARGET		= zeilenweise
 
 
 
 
-include ( ../../include.pro )
+include ( $(OPIEDIR)/include.pro )
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
@@ -12,5 +12,5 @@ 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
@@ -28,5 +28,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -26,5 +26,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -44,5 +44,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -28,5 +28,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -38,5 +38,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -73,5 +73,5 @@ 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
@@ -17,5 +17,5 @@ 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
@@ -73,5 +73,5 @@ 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
@@ -27,5 +27,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -25,5 +25,5 @@ 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
@@ -53,5 +53,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -86,5 +86,5 @@ 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
@@ -16,5 +16,5 @@ 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
@@ -51,5 +51,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -28,5 +28,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -11,5 +11,5 @@ 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
@@ -10,5 +10,5 @@ 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
@@ -11,5 +11,5 @@ 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
@@ -28,5 +28,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -27,5 +27,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -31,5 +31,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -27,5 +27,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -34,5 +34,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -31,5 +31,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -35,5 +35,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -58,5 +58,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -27,5 +27,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -31,5 +31,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -26,5 +26,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -26,5 +26,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -51,5 +51,5 @@ HEADERS = 	animatedimage.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
@@ -9,5 +9,5 @@ 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
@@ -26,5 +26,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -37,5 +37,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -35,5 +35,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -27,5 +27,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -28,5 +28,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -64,5 +64,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -26,5 +26,5 @@ OBJECTS_DIR = qpeobj
 
 
 
 
-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
@@ -9,5 +9,5 @@ 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
@@ -26,5 +26,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -6,5 +6,5 @@ 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
@@ -26,5 +26,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -24,5 +24,5 @@ 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
@@ -28,5 +28,5 @@ TRANSLATIONS = ../../../../i18n/de/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
@@ -29,5 +29,5 @@ TRANSLATIONS = ../../../../i18n/de/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
@@ -26,5 +26,5 @@ TRANSLATIONS = ../../../../i18n/de/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
@@ -45,5 +45,5 @@ TRANSLATIONS = ../../../../i18n/de/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
@@ -9,5 +9,5 @@ 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
@@ -11,5 +11,5 @@ 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
@@ -11,5 +11,5 @@ 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
@@ -11,5 +11,5 @@ 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
@@ -11,5 +11,5 @@ 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
@@ -11,5 +11,5 @@ 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
@@ -2,5 +2,5 @@ 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
@@ -28,5 +28,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -43,5 +43,5 @@ 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
@@ -30,5 +30,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -27,5 +27,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -27,5 +27,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -28,5 +28,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -12,5 +12,5 @@ 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
@@ -11,5 +11,5 @@ 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
@@ -12,5 +12,5 @@ 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
@@ -12,5 +12,5 @@ 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
@@ -27,5 +27,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -29,5 +29,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -44,5 +44,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -27,5 +27,5 @@ TRANSLATIONS =	../../../i18n/de/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
@@ -29,5 +29,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -11,5 +11,5 @@ 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
@@ -11,5 +11,5 @@ 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
@@ -34,5 +34,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -27,5 +27,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -37,5 +37,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -19,5 +19,5 @@ 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
@@ -2,5 +2,5 @@ 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
@@ -10,5 +10,5 @@ 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
@@ -27,5 +27,5 @@ 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
@@ -23,5 +23,5 @@ 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
@@ -29,5 +29,5 @@
         # ../../../../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
@@ -25,5 +25,5 @@
         # ../../../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
@@ -26,5 +26,5 @@
         # ../../../../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
@@ -28,5 +28,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -28,5 +28,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -26,5 +26,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -26,5 +26,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -26,5 +26,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -27,5 +27,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -31,5 +31,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -27,5 +27,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -41,5 +41,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -63,5 +63,5 @@ TRANSLATIONS = ../../i18n/de/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
@@ -55,5 +55,5 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -72,5 +72,5 @@ TRANSLATIONS = ../../../i18n/de/qpdf.ts \
          ../../../i18n/zh_TW/qpdf.ts
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/quickexec/quickexec.pro b/quickexec/quickexec.pro
index c0e77b8..96a3518 100644
--- a/quickexec/quickexec.pro
+++ b/quickexec/quickexec.pro
@@ -24,5 +24,5 @@ TRANSLATIONS = ../i18n/de/quickexec.ts \
          ../i18n/zh_TW/quickexec.ts
 
 
 
-include ( ../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/x11/ipc/server/ocopserver.pro b/x11/ipc/server/ocopserver.pro
index b6d4af5..496b782 100644
--- a/x11/ipc/server/ocopserver.pro
+++ b/x11/ipc/server/ocopserver.pro
@@ -10,5 +10,5 @@ TARGET		= ocopserver
 
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/x11/ipc/server/server.pro b/x11/ipc/server/server.pro
index b6d4af5..496b782 100644
--- a/x11/ipc/server/server.pro
+++ b/x11/ipc/server/server.pro
@@ -10,5 +10,5 @@ TARGET		= ocopserver
 
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )
diff --git a/x11/libqpe-x11/libqpe-x11.pro b/x11/libqpe-x11/libqpe-x11.pro
index b61ba3f..b96d347 100644
--- a/x11/libqpe-x11/libqpe-x11.pro
+++ b/x11/libqpe-x11/libqpe-x11.pro
@@ -143,5 +143,5 @@ VERSION		= 1.5.0.1
 
 
 
 
-include ( ../../include.pro )
+include ( $(OPIEDIR)/include.pro )