40 files changed, 40 insertions, 40 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
@@ -7,25 +7,25 @@ DESTDIR		= $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include ..
 LIBS            += -lqpe -lopie
         VERSION         = 1.0.0
 
 TRANSLATIONS = ../../../i18n/de/libbatteryapplet.ts \
          ../../../i18n/da/libbatteryapplet.ts \
          ../../../i18n/xx/libbatteryapplet.ts \
          ../../../i18n/en/libbatteryapplet.ts \
          ../../../i18n/es/libbatteryapplet.ts \
          ../../../i18n/fr/libbatteryapplet.ts \
          ../../../i18n/hu/libbatteryapplet.ts \
          ../../../i18n/ja/libbatteryapplet.ts \
          ../../../i18n/ko/libbatteryapplet.ts \
          ../../../i18n/no/libbatteryapplet.ts \
          ../../../i18n/pl/libbatteryapplet.ts \
          ../../../i18n/pt/libbatteryapplet.ts \
          ../../../i18n/pt_BR/libbatteryapplet.ts \
          ../../../i18n/sl/libbatteryapplet.ts \
          ../../../i18n/zh_CN/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
@@ -7,25 +7,25 @@ DESTDIR		= $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include ../launcher
 LIBS            += -lqpe -lopie
         VERSION         = 1.0.0
 
 TRANSLATIONS = ../../../i18n/de/libcardmonapplet.ts \
          ../../../i18n/da/libcardmonapplet.ts \
          ../../../i18n/xx/libcardmonapplet.ts \
          ../../../i18n/en/libcardmonapplet.ts \
          ../../../i18n/es/libcardmonapplet.ts \
          ../../../i18n/fr/libcardmonapplet.ts \
          ../../../i18n/hu/libcardmonapplet.ts \
          ../../../i18n/ja/libcardmonapplet.ts \
          ../../../i18n/ko/libcardmonapplet.ts \
          ../../../i18n/no/libcardmonapplet.ts \
          ../../../i18n/pl/libcardmonapplet.ts \
          ../../../i18n/pt/libcardmonapplet.ts \
          ../../../i18n/pt_BR/libcardmonapplet.ts \
          ../../../i18n/sl/libcardmonapplet.ts \
          ../../../i18n/zh_CN/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
@@ -7,25 +7,25 @@ DESTDIR		= $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include
 LIBS            += -lqpe
         VERSION         = 1.0.0
 
 TRANSLATIONS = ../../../i18n/de/libclipboardapplet.ts \
          ../../../i18n/da/libclipboardapplet.ts \
          ../../../i18n/xx/libclipboardapplet.ts \
          ../../../i18n/en/libclipboardapplet.ts \
          ../../../i18n/es/libclipboardapplet.ts \
          ../../../i18n/fr/libclipboardapplet.ts \
          ../../../i18n/hu/libclipboardapplet.ts \
          ../../../i18n/ja/libclipboardapplet.ts \
          ../../../i18n/ko/libclipboardapplet.ts \
          ../../../i18n/no/libclipboardapplet.ts \
          ../../../i18n/pl/libclipboardapplet.ts \
          ../../../i18n/pt/libclipboardapplet.ts \
          ../../../i18n/pt_BR/libclipboardapplet.ts \
          ../../../i18n/sl/libclipboardapplet.ts \
          ../../../i18n/zh_CN/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
@@ -7,25 +7,25 @@ DESTDIR		= $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include ..
 LIBS            += -lqpe
         VERSION         = 1.0.0
 
 TRANSLATIONS = ../../../i18n/de/libclockapplet.ts \
          ../../../i18n/da/libclockapplet.ts \
          ../../../i18n/xx/libclockapplet.ts \
          ../../../i18n/en/libclockapplet.ts \
          ../../../i18n/es/libclockapplet.ts \
          ../../../i18n/fr/libclockapplet.ts \
          ../../../i18n/hu/libclockapplet.ts \
          ../../../i18n/ja/libclockapplet.ts \
          ../../../i18n/ko/libclockapplet.ts \
          ../../../i18n/no/libclockapplet.ts \
          ../../../i18n/pl/libclockapplet.ts \
          ../../../i18n/pt/libclockapplet.ts \
          ../../../i18n/pt_BR/libclockapplet.ts \
          ../../../i18n/sl/libclockapplet.ts \
          ../../../i18n/zh_CN/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
@@ -7,25 +7,25 @@ DESTDIR       = $(OPIEDIR)/plugins/applets
 INCLUDEPATH  += $(OPIEDIR)/include
 DEPENDPATH   += $(OPIEDIR)/include
 LIBS         += -lqpe
 VERSION       = 1.0.0
 
 TRANSLATIONS = ../../../i18n/de/libhomeapplet.ts \
          ../../../i18n/da/libhomeapplet.ts \
          ../../../i18n/xx/libhomeapplet.ts \
          ../../../i18n/en/libhomeapplet.ts \
          ../../../i18n/es/libhomeapplet.ts \
          ../../../i18n/fr/libhomeapplet.ts \
          ../../../i18n/hu/libhomeapplet.ts \
          ../../../i18n/ja/libhomeapplet.ts \
          ../../../i18n/ko/libhomeapplet.ts \
          ../../../i18n/no/libhomeapplet.ts \
          ../../../i18n/pl/libhomeapplet.ts \
          ../../../i18n/pt/libhomeapplet.ts \
          ../../../i18n/pt_BR/libhomeapplet.ts \
          ../../../i18n/sl/libhomeapplet.ts \
          ../../../i18n/zh_CN/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
@@ -7,25 +7,25 @@ DESTDIR   = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include
 LIBS            += -lqpe
 VERSION   = 1.0.0
 
 TRANSLATIONS = ../../../i18n/de/libirdaapplet.ts \
          ../../../i18n/da/libirdaapplet.ts \
          ../../../i18n/xx/libirdaapplet.ts \
          ../../../i18n/en/libirdaapplet.ts \
          ../../../i18n/es/libirdaapplet.ts \
          ../../../i18n/fr/libirdaapplet.ts \
          ../../../i18n/hu/libirdaapplet.ts \
          ../../../i18n/ja/libirdaapplet.ts \
          ../../../i18n/ko/libirdaapplet.ts \
          ../../../i18n/no/libirdaapplet.ts \
          ../../../i18n/pl/libirdaapplet.ts \
          ../../../i18n/pt/libirdaapplet.ts \
          ../../../i18n/pt_BR/libirdaapplet.ts \
          ../../../i18n/sl/libirdaapplet.ts \
          ../../../i18n/zh_CN/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
@@ -7,25 +7,25 @@ DESTDIR       = $(OPIEDIR)/plugins/applets
 INCLUDEPATH  += $(OPIEDIR)/include
 DEPENDPATH   += $(OPIEDIR)/include
 LIBS         += -lqpe
 VERSION       = 1.0.0
 
 TRANSLATIONS = ../../../i18n/de/liblogoutapplet.ts \
          ../../../i18n/da/liblogoutapplet.ts \
          ../../../i18n/xx/liblogoutapplet.ts \
          ../../../i18n/en/liblogoutapplet.ts \
          ../../../i18n/es/liblogoutapplet.ts \
          ../../../i18n/fr/liblogoutapplet.ts \
          ../../../i18n/hu/liblogoutapplet.ts \
          ../../../i18n/ja/liblogoutapplet.ts \
          ../../../i18n/ko/liblogoutapplet.ts \
          ../../../i18n/no/liblogoutapplet.ts \
          ../../../i18n/pl/liblogoutapplet.ts \
          ../../../i18n/pt/liblogoutapplet.ts \
          ../../../i18n/pt_BR/liblogoutapplet.ts \
          ../../../i18n/sl/liblogoutapplet.ts \
          ../../../i18n/zh_CN/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
@@ -8,25 +8,25 @@ INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/core/launcher
 DEPENDPATH      += ../$(OPIEDIR)/include
 INTERFACES      = obexinc.ui obexdlg.ui
 LIBS            += -lqpe -lopie
         VERSION         = 0.0.1
 
 TRANSLATIONS = ../../../i18n/de/libopieobex.ts \
          ../../../i18n/da/libopieobex.ts \
          ../../../i18n/xx/libopieobex.ts \
          ../../../i18n/en/libopieobex.ts \
          ../../../i18n/es/libopieobex.ts \
          ../../../i18n/fr/libopieobex.ts \
          ../../../i18n/hu/libopieobex.ts \
          ../../../i18n/ja/libopieobex.ts \
          ../../../i18n/ko/libopieobex.ts \
          ../../../i18n/no/libopieobex.ts \
          ../../../i18n/pl/libopieobex.ts \
          ../../../i18n/pt/libopieobex.ts \
          ../../../i18n/pt_BR/libopieobex.ts \
          ../../../i18n/sl/libopieobex.ts \
          ../../../i18n/zh_CN/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
@@ -1,16 +1,16 @@
 TEMPLATE  = lib
 CONFIG    += qt warn_on release
 HEADERS =   restart.h restartappletimpl.h
 SOURCES =   restart.cpp restartappletimpl.cpp
 TARGET    = restartapplet
 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/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
@@ -1,16 +1,16 @@
 TEMPLATE  = lib
 CONFIG    += qt warn_on release
 HEADERS =   restart.h
 SOURCES =   restart.cpp
 TARGET    = restartapplet
 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/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
@@ -9,25 +9,25 @@ DEPENDPATH      += ../$(OPIEDIR)/include
 LIBS            += -lqpe
 VERSION   = 1.0.0
 MOC_DIR=opieobj
 OBJECTS_DIR=opieobj
 
 TRANSLATIONS = ../../../i18n/de/libscreenshotapplet.ts \
          ../../../i18n/da/libscreenshotapplet.ts \
          ../../../i18n/xx/libscreenshotapplet.ts \
          ../../../i18n/en/libscreenshotapplet.ts \
          ../../../i18n/es/libscreenshotapplet.ts \
          ../../../i18n/fr/libscreenshotapplet.ts \
          ../../../i18n/hu/libscreenshotapplet.ts \
          ../../../i18n/ja/libscreenshotapplet.ts \
          ../../../i18n/ko/libscreenshotapplet.ts \
          ../../../i18n/no/libscreenshotapplet.ts \
          ../../../i18n/pl/libscreenshotapplet.ts \
          ../../../i18n/pt/libscreenshotapplet.ts \
          ../../../i18n/pt_BR/libscreenshotapplet.ts \
          ../../../i18n/sl/libscreenshotapplet.ts \
          ../../../i18n/zh_CN/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
@@ -7,25 +7,25 @@ DESTDIR       = $(OPIEDIR)/plugins/applets
 INCLUDEPATH  += $(OPIEDIR)/include
 DEPENDPATH   += $(OPIEDIR)/include
 LIBS         += -lqpe
 VERSION       = 1.0.0
 
 TRANSLATIONS = ../../../i18n/de/libsuspendapplet.ts \
          ../../../i18n/da/libsuspendapplet.ts \
          ../../../i18n/xx/libsuspendapplet.ts \
          ../../../i18n/en/libsuspendapplet.ts \
          ../../../i18n/es/libsuspendapplet.ts \
          ../../../i18n/fr/libsuspendapplet.ts \
          ../../../i18n/hu/libsuspendapplet.ts \
          ../../../i18n/ja/libsuspendapplet.ts \
          ../../../i18n/ko/libsuspendapplet.ts \
          ../../../i18n/no/libsuspendapplet.ts \
          ../../../i18n/pl/libsuspendapplet.ts \
          ../../../i18n/pt/libsuspendapplet.ts \
          ../../../i18n/pt_BR/libsuspendapplet.ts \
          ../../../i18n/sl/libsuspendapplet.ts \
          ../../../i18n/zh_CN/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
@@ -7,25 +7,25 @@ DESTDIR   =$(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
 VERSION   = 1.0.0
 
 TRANSLATIONS = ../../../i18n/de/libvmemoapplet.ts \
          ../../../i18n/da/libvmemoapplet.ts \
          ../../../i18n/xx/libvmemoapplet.ts \
    ../../../i18n/en/libvmemoapplet.ts \
    ../../../i18n/es/libvmemoapplet.ts \
    ../../../i18n/fr/libvmemoapplet.ts \
    ../../../i18n/hu/libvmemoapplet.ts \
    ../../../i18n/ja/libvmemoapplet.ts \
    ../../../i18n/ko/libvmemoapplet.ts \
    ../../../i18n/no/libvmemoapplet.ts \
    ../../../i18n/pl/libvmemoapplet.ts \
    ../../../i18n/pt/libvmemoapplet.ts \
    ../../../i18n/pt_BR/libvmemoapplet.ts \
    ../../../i18n/sl/libvmemoapplet.ts \
    ../../../i18n/zh_CN/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
@@ -7,25 +7,25 @@ DESTDIR		= $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include
 LIBS            += -lqpe
         VERSION         = 1.0.0
 
 TRANSLATIONS = ../../../i18n/de/libvolumeapplet.ts \
          ../../../i18n/da/libvolumeapplet.ts \
          ../../../i18n/xx/libvolumeapplet.ts \
          ../../../i18n/en/libvolumeapplet.ts \
          ../../../i18n/es/libvolumeapplet.ts \
          ../../../i18n/fr/libvolumeapplet.ts \
          ../../../i18n/hu/libvolumeapplet.ts \
          ../../../i18n/ja/libvolumeapplet.ts \
          ../../../i18n/ko/libvolumeapplet.ts \
          ../../../i18n/no/libvolumeapplet.ts \
          ../../../i18n/pl/libvolumeapplet.ts \
          ../../../i18n/pt/libvolumeapplet.ts \
          ../../../i18n/pt_BR/libvolumeapplet.ts \
          ../../../i18n/sl/libvolumeapplet.ts \
          ../../../i18n/zh_CN/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
@@ -1,23 +1,23 @@
 # This is part of the taskbar
 
 TRANSLATIONS = ../../../i18n/de/calibrate.pro.in.ts \
          ../../../i18n/da/calibrate.pro.in.ts \
          ../../../i18n/xx/calibrate.pro.in.ts \
          ../../../i18n/en/calibrate.pro.in.ts \
          ../../../i18n/es/calibrate.pro.in.ts \
          ../../../i18n/fr/calibrate.pro.in.ts \
          ../../../i18n/hu/calibrate.pro.in.ts \
          ../../../i18n/ja/calibrate.pro.in.ts \
          ../../../i18n/ko/calibrate.pro.in.ts \
          ../../../i18n/no/calibrate.pro.in.ts \
          ../../../i18n/pl/calibrate.pro.in.ts \
          ../../../i18n/pt/calibrate.pro.in.ts \
          ../../../i18n/pt_BR/calibrate.pro.in.ts \
          ../../../i18n/sl/calibrate.pro.in.ts \
          ../../../i18n/zh_CN/calibrate.pro.in.ts \
          ../../../i18n/it/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
@@ -36,25 +36,25 @@ INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
 TMAKE_CXXFLAGS += -DQT_QWS_OPIE -DHAVE_OPENPTY
 
 TRANSLATIONS = ../../../i18n/de/embeddedkonsole.ts \
         ../../../i18n/xx/embeddedkonsole.ts \
         ../../../i18n/en/embeddedkonsole.ts \
         ../../../i18n/es/embeddedkonsole.ts \
         ../../../i18n/fr/embeddedkonsole.ts \
         ../../../i18n/hu/embeddedkonsole.ts \
         ../../../i18n/ja/embeddedkonsole.ts \
         ../../../i18n/ko/embeddedkonsole.ts \
         ../../../i18n/no/embeddedkonsole.ts \
         ../../../i18n/pl/embeddedkonsole.ts \
         ../../../i18n/pt/embeddedkonsole.ts \
         ../../../i18n/pt_BR/embeddedkonsole.ts \
         ../../../i18n/sl/embeddedkonsole.ts \
         ../../../i18n/zh_CN/embeddedkonsole.ts \
         ../../../i18n/zh_TW/embeddedkonsole.ts \
         ../../../i18n/it/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
@@ -8,25 +8,25 @@ INCLUDEPATH += $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
         INTERFACES=
 
 TRANSLATIONS = ../../../i18n/de/helpbrowser.ts \
          ../../../i18n/xx/helpbrowser.ts \
          ../../../i18n/en/helpbrowser.ts \
          ../../../i18n/es/helpbrowser.ts \
          ../../../i18n/fr/helpbrowser.ts \
          ../../../i18n/hu/helpbrowser.ts \
          ../../../i18n/ja/helpbrowser.ts \
          ../../../i18n/ko/helpbrowser.ts \
          ../../../i18n/no/helpbrowser.ts \
          ../../../i18n/pl/helpbrowser.ts \
          ../../../i18n/pt/helpbrowser.ts \
          ../../../i18n/pt_BR/helpbrowser.ts \
          ../../../i18n/sl/helpbrowser.ts \
          ../../../i18n/zh_CN/helpbrowser.ts \
          ../../../i18n/it/helpbrowser.ts \
          ../../../i18n/zh_TW/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
@@ -7,25 +7,25 @@ INCLUDEPATH += $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
         INTERFACES= 
         TARGET  = qcop
 
 TRANSLATIONS = ../../../i18n/de/qcop.ts \
          ../../../i18n/da/qcop.ts \
          ../../../i18n/xx/qcop.ts \
          ../../../i18n/en/qcop.ts \
          ../../../i18n/es/qcop.ts \
          ../../../i18n/fr/qcop.ts \
          ../../../i18n/hu/qcop.ts \
          ../../../i18n/ja/qcop.ts \
          ../../../i18n/ko/qcop.ts \
          ../../../i18n/no/qcop.ts \
          ../../../i18n/pl/qcop.ts \
          ../../../i18n/pt/qcop.ts \
          ../../../i18n/pt_BR/qcop.ts \
          ../../../i18n/sl/qcop.ts \
          ../../../i18n/zh_CN/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
@@ -6,25 +6,25 @@ SOURCES = main.cpp textedit.cpp filePermissions.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
 TARGET    = textedit
 
 TRANSLATIONS = ../../../i18n/de/textedit.ts \
          ../../../i18n/da/textedit.ts \
          ../../../i18n/xx/textedit.ts \
          ../../../i18n/en/textedit.ts \
          ../../../i18n/es/textedit.ts \
          ../../../i18n/fr/textedit.ts \
          ../../../i18n/hu/textedit.ts \
          ../../../i18n/ja/textedit.ts \
          ../../../i18n/ko/textedit.ts \
          ../../../i18n/no/textedit.ts \
          ../../../i18n/pl/textedit.ts \
          ../../../i18n/pt/textedit.ts \
          ../../../i18n/pt_BR/textedit.ts \
          ../../../i18n/sl/textedit.ts \
          ../../../i18n/zh_CN/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
@@ -100,25 +100,25 @@ INCLUDEPATH += ../../rsync
         DEPENDPATH+= ../../rsync
         TARGET  = qpe
         LIBS    += -lqpe -lcrypt -lopie 
 
 TRANSLATIONS = ../../i18n/de/qpe.ts \
          ../../i18n/xx/qpe.ts \
          ../../i18n/en/qpe.ts \
          ../../i18n/es/qpe.ts \
          ../../i18n/fr/qpe.ts \
          ../../i18n/hu/qpe.ts \
          ../../i18n/ja/qpe.ts \
          ../../i18n/ko/qpe.ts \
          ../../i18n/no/qpe.ts \
          ../../i18n/pl/qpe.ts \
          ../../i18n/pt/qpe.ts \
          ../../i18n/pt_BR/qpe.ts \
          ../../i18n/sl/qpe.ts \
          ../../i18n/zh_CN/qpe.ts \
          ../../i18n/it/qpe.ts \
          ../../i18n/zh_TW/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
@@ -11,25 +11,25 @@ DESTDIR		=   ../../plugins/codecs
 INCLUDEPATH += $(OPIEDIR)/include ..
 DEPENDPATH      +=  ../$(OPIEDIR)/include ..
 LIBS            +=  -lqpe
         VERSION         =   1.0.0
 
 TRANSLATIONS = ../../../../i18n/de/libflashplugin.ts \
          ../../../../i18n/da/libflashplugin.ts \
          ../../../../i18n/xx/libflashplugin.ts \
          ../../../../i18n/en/libflashplugin.ts \
          ../../../../i18n/es/libflashplugin.ts \
          ../../../../i18n/fr/libflashplugin.ts \
          ../../../../i18n/hu/libflashplugin.ts \
          ../../../../i18n/ja/libflashplugin.ts \
          ../../../../i18n/ko/libflashplugin.ts \
          ../../../../i18n/no/libflashplugin.ts \
          ../../../../i18n/pl/libflashplugin.ts \
          ../../../../i18n/pt/libflashplugin.ts \
          ../../../../i18n/pt_BR/libflashplugin.ts \
          ../../../../i18n/sl/libflashplugin.ts \
          ../../../../i18n/zh_CN/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
@@ -15,25 +15,25 @@ DESTDIR   	= $(OPIEDIR)/plugins/codecs
 INCLUDEPATH += $(OPIEDIR)/include ..
 DEPENDPATH      += ../$(OPIEDIR)/include ..
 LIBS            += -lqpe -lm
 VERSION   =   1.0.0
 
 TRANSLATIONS = ../../../../i18n/de/libmadplugin.ts \
          ../../../../i18n/da/libmadplugin.ts \
          ../../../../i18n/xx/libmadplugin.ts \
          ../../../../i18n/en/libmadplugin.ts \
          ../../../../i18n/es/libmadplugin.ts \
          ../../../../i18n/fr/libmadplugin.ts \
          ../../../../i18n/hu/libmadplugin.ts \
          ../../../../i18n/ja/libmadplugin.ts \
          ../../../../i18n/ko/libmadplugin.ts \
          ../../../../i18n/no/libmadplugin.ts \
          ../../../../i18n/pl/libmadplugin.ts \
          ../../../../i18n/pt/libmadplugin.ts \
          ../../../../i18n/pt_BR/libmadplugin.ts \
          ../../../../i18n/sl/libmadplugin.ts \
          ../../../../i18n/zh_CN/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
@@ -44,25 +44,25 @@ DESTDIR   =   $(OPIEDIR)/plugins/codecs
 INCLUDEPATH += $(OPIEDIR)/include ..
 DEPENDPATH      +=  ../$(OPIEDIR)/include ..
 LIBS            +=  -lqpe -lpthread -lm
 VERSION   =   1.0.0
 
 TRANSLATIONS = ../../../../i18n/de/libmpeg3plugin.ts \
          ../../../../i18n/da/libmpeg3plugin.ts \
          ../../../../i18n/xx/libmpeg3plugin.ts \
          ../../../../i18n/en/libmpeg3plugin.ts \
          ../../../../i18n/es/libmpeg3plugin.ts \
          ../../../../i18n/fr/libmpeg3plugin.ts \
          ../../../../i18n/hu/libmpeg3plugin.ts \
          ../../../../i18n/ja/libmpeg3plugin.ts \
          ../../../../i18n/ko/libmpeg3plugin.ts \
          ../../../../i18n/no/libmpeg3plugin.ts \
          ../../../../i18n/pl/libmpeg3plugin.ts \
          ../../../../i18n/pt/libmpeg3plugin.ts \
          ../../../../i18n/pt_BR/libmpeg3plugin.ts \
          ../../../../i18n/sl/libmpeg3plugin.ts \
          ../../../../i18n/zh_CN/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
@@ -1,23 +1,23 @@
         TEMPLATE=   lib
         CONFIG  +=  qt warn_on release
         HEADERS         =   it_defs.h modplugin.h modpluginimpl.h sndfile.h stdafx.h memfile.h
         SOURCES        =   fastmix.cpp load_669.cpp load_amf.cpp load_ams.cpp \
                     load_dbm.cpp load_dmf.cpp load_dsm.cpp load_far.cpp \
                     load_it.cpp load_j2b.cpp load_mdl.cpp load_med.cpp \
                     load_mod.cpp load_mt2.cpp load_mtm.cpp load_okt.cpp \ 
                     load_psm.cpp load_ptm.cpp load_s3m.cpp load_stm.cpp \
                     load_ult.cpp load_umx.cpp load_xm.cpp \
                     mmcmp.cpp modplugin.cpp modpluginimpl.cpp snd_dsp.cpp \
                     snd_flt.cpp snd_fx.cpp sndfile.cpp sndmix.cpp tables.cpp \
                     memfile.cpp
         TARGET  =   modplugin
         DESTDIR         =   $(OPIEDIR)/plugins/codecs
         INCLUDEPATH +=  $(OPIEDIR)/include
 DEPENDPATH      +=  $(OPIEDIR)/include
 LIBS            +=  -lqpe -lm 
         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
@@ -16,25 +16,25 @@ DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lpthread -lopie
 
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 
 TRANSLATIONS = ../../../i18n/de/opieplayer.ts \
         ../../../i18n/da/opieplayer.ts \
         ../../../i18n/xx/opieplayer.ts \
         ../../../i18n/en/opieplayer.ts \
         ../../../i18n/es/opieplayer.ts \
         ../../../i18n/fr/opieplayer.ts \
         ../../../i18n/hu/opieplayer.ts \
         ../../../i18n/ja/opieplayer.ts \
         ../../../i18n/ko/opieplayer.ts \
         ../../../i18n/no/opieplayer.ts \
         ../../../i18n/pl/opieplayer.ts \
         ../../../i18n/pt/opieplayer.ts \
         ../../../i18n/pt_BR/opieplayer.ts \
         ../../../i18n/sl/opieplayer.ts \
         ../../../i18n/zh_CN/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
@@ -7,25 +7,25 @@ DESTDIR		=   $(OPIEDIR)/plugins/codecs
 INCLUDEPATH += $(OPIEDIR)/include ..
 DEPENDPATH      +=  ../$(OPIEDIR)/include ..
 LIBS            +=  -lqpe
         VERSION         =   1.0.0
 
 TRANSLATIONS = ../../../../i18n/de/libwavplugin.ts \
          ../../../../i18n/da/libwavplugin.ts \
          ../../../../i18n/xx/libwavplugin.ts \
          ../../../../i18n/en/libwavplugin.ts \
          ../../../../i18n/es/libwavplugin.ts \
          ../../../../i18n/fr/libwavplugin.ts \
          ../../../../i18n/hu/libwavplugin.ts \
          ../../../../i18n/ja/libwavplugin.ts \
          ../../../../i18n/ko/libwavplugin.ts \
          ../../../../i18n/no/libwavplugin.ts \
          ../../../../i18n/pl/libwavplugin.ts \
          ../../../../i18n/pt/libwavplugin.ts \
          ../../../../i18n/pt_BR/libwavplugin.ts \
          ../../../../i18n/sl/libwavplugin.ts \
          ../../../../i18n/zh_CN/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
@@ -25,25 +25,25 @@ usepam:DEFINES += USEPAM
 DESTDIR     = $(OPIEDIR)/bin
 TARGET      = opie-login
 
 TRANSLATIONS = ../../i18n/de/opie-login.ts \
         ../../i18n/xx/opie-login.ts \
         ../../i18n/en/opie-login.ts \
         ../../i18n/es/opie-login.ts \
         ../../i18n/fr/opie-login.ts \
         ../../i18n/hu/opie-login.ts \
         ../../i18n/ja/opie-login.ts \
         ../../i18n/ko/opie-login.ts \
         ../../i18n/no/opie-login.ts \
         ../../i18n/pl/opie-login.ts \
         ../../i18n/pt/opie-login.ts \
         ../../i18n/pt_BR/opie-login.ts \
         ../../i18n/sl/opie-login.ts \
         ../../i18n/zh_CN/opie-login.ts \
         ../../i18n/zh_TW/opie-login.ts \
         ../../i18n/it/opie-login.ts \
         ../../i18n/da/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
@@ -28,25 +28,25 @@ TARGET		= addressbook
 INCLUDEPATH += $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
 
 TRANSLATIONS = ../../../i18n/de/addressbook.ts \
          ../../../i18n/da/addressbook.ts \
          ../../../i18n/xx/addressbook.ts \
          ../../../i18n/en/addressbook.ts \
          ../../../i18n/es/addressbook.ts \
          ../../../i18n/fr/addressbook.ts \
          ../../../i18n/hu/addressbook.ts \
          ../../../i18n/ja/addressbook.ts \
          ../../../i18n/ko/addressbook.ts \
          ../../../i18n/no/addressbook.ts \
          ../../../i18n/pl/addressbook.ts \
          ../../../i18n/pt/addressbook.ts \
          ../../../i18n/pt_BR/addressbook.ts \
          ../../../i18n/sl/addressbook.ts \
          ../../../i18n/zh_CN/addressbook.ts \
          ../../../i18n/it/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
@@ -38,25 +38,25 @@ INCLUDEPATH += $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
         TARGET  = datebook
 
 TRANSLATIONS = ../../../i18n/de/datebook.ts \
          ../../../i18n/xx/datebook.ts \
          ../../../i18n/en/datebook.ts \
          ../../../i18n/es/datebook.ts \
          ../../../i18n/fr/datebook.ts \
          ../../../i18n/hu/datebook.ts \
          ../../../i18n/ja/datebook.ts \
          ../../../i18n/ko/datebook.ts \
          ../../../i18n/no/datebook.ts \
          ../../../i18n/pl/datebook.ts \
          ../../../i18n/pt/datebook.ts \
          ../../../i18n/pt_BR/datebook.ts \
          ../../../i18n/sl/datebook.ts \
          ../../../i18n/zh_CN/datebook.ts \
          ../../../i18n/it/datebook.ts \
          ../../../i18n/zh_TW/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
@@ -1,23 +1,23 @@
 TEMPLATE = lib
 CONFIG -= moc
 CONFIG += qt release
 
 # Input
 HEADERS = addressplugin.h addresspluginimpl.h addresspluginconfig.h  \
         addresspluginwidget.h
 SOURCES = addressplugin.cpp addresspluginimpl.cpp addresspluginconfig.cpp \
         addresspluginwidget.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include \
                 ../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
                 ../ ../library
 
 LIBS+= -lqpe -lopie
 
 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
@@ -1,21 +1,21 @@
 TEMPLATE = lib
 CONFIG -= moc
 CONFIG += qt release
 # Input
 HEADERS = datebookplugin.h datebookpluginimpl.h datebookpluginconfig.h \
         datebookevent.h datebookpluginwidget.h
 SOURCES = datebookplugin.cpp datebookpluginimpl.cpp datebookpluginconfig.cpp \
         datebookevent.cpp datebookpluginwidget.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include \
                 ../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
                 ../ ../library
 
 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
@@ -1,20 +1,20 @@
 TEMPLATE = lib
 CONFIG -= moc
 CONFIG += qt release
 
 # Input
 HEADERS = mailplugin.h mailpluginimpl.h mailpluginwidget.h
 SOURCES = mailplugin.cpp mailpluginimpl.cpp mailpluginwidget.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include \
                 ../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
                 ../ ../library
 
 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
@@ -1,22 +1,22 @@
 TEMPLATE = lib
 CONFIG -= moc
 CONFIG += qt release
 
 # Input
 HEADERS = todoplugin.h todopluginimpl.h todopluginconfig.h  \
         todopluginwidget.h
 SOURCES = todoplugin.cpp todopluginimpl.cpp todopluginconfig.cpp \
         todopluginwidget.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include \
                 ../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
                 ../ ../library
 
 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
@@ -9,25 +9,25 @@ LIBS            += -lqpe -lopie
         INTERFACES=
         TARGET  = today
         DESTDIR         = $(OPIEDIR)/bin
 
 TRANSLATIONS = ../../../i18n/de/today.ts \
          ../../../i18n/xx/today.ts \
          ../../../i18n/en/today.ts \
          ../../../i18n/es/today.ts \
          ../../../i18n/fr/today.ts \
          ../../../i18n/hu/today.ts \
          ../../../i18n/ja/today.ts \
          ../../../i18n/ko/today.ts \
          ../../../i18n/no/today.ts \
          ../../../i18n/pl/today.ts \
          ../../../i18n/pt/today.ts \
          ../../../i18n/pt_BR/today.ts \
          ../../../i18n/sl/today.ts \
          ../../../i18n/zh_CN/today.ts \
          ../../../i18n/zh_TW/today.ts \
             ../../../i18n/it/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
@@ -44,25 +44,25 @@ SOURCES	= smalltodo.cpp \
         TARGET  = todolist
 INCLUDEPATH += $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopie 
 
 TRANSLATIONS = ../../../i18n/de/todolist.ts \
          ../../../i18n/da/todolist.ts \
          ../../../i18n/xx/todolist.ts \
          ../../../i18n/en/todolist.ts \
          ../../../i18n/es/todolist.ts \
          ../../../i18n/fr/todolist.ts \
          ../../../i18n/hu/todolist.ts \
          ../../../i18n/ja/todolist.ts \
          ../../../i18n/ko/todolist.ts \
          ../../../i18n/no/todolist.ts \
          ../../../i18n/pl/todolist.ts \
          ../../../i18n/pt/todolist.ts \
          ../../../i18n/pt_BR/todolist.ts \
          ../../../i18n/sl/todolist.ts \
          ../../../i18n/zh_CN/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
@@ -15,25 +15,25 @@ INTERFACES   = remapdlgbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopie
 TARGET       = buttonsettings
 
 TRANSLATIONS = ../../../i18n/de/buttonsettings.ts \
          ../../../i18n/xx/buttonsettings.ts \
          ../../../i18n/en/buttonsettings.ts \
          ../../../i18n/es/buttonsettings.ts \
          ../../../i18n/fr/buttonsettings.ts \
          ../../../i18n/hu/buttonsettings.ts \
          ../../../i18n/ja/buttonsettings.ts \
          ../../../i18n/ko/buttonsettings.ts \
          ../../../i18n/no/buttonsettings.ts \
          ../../../i18n/pl/buttonsettings.ts \
          ../../../i18n/pt/buttonsettings.ts \
          ../../../i18n/pt_BR/buttonsettings.ts \
          ../../../i18n/sl/buttonsettings.ts \
          ../../../i18n/zh_CN/buttonsettings.ts \
          ../../../i18n/zh_TW/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
@@ -7,25 +7,25 @@ SOURCES = citytime.cpp citytimebase.cpp zonemap.cpp main.cpp sun.c stylusnormali
 TARGET = citytime
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
 
 TRANSLATIONS = ../../../i18n/de/citytime.ts \
          ../../../i18n/xx/citytime.ts \
          ../../../i18n/en/citytime.ts \
          ../../../i18n/es/citytime.ts \
          ../../../i18n/fr/citytime.ts \
          ../../../i18n/hu/citytime.ts \
          ../../../i18n/ja/citytime.ts \
          ../../../i18n/ko/citytime.ts \
          ../../../i18n/no/citytime.ts \
          ../../../i18n/pl/citytime.ts \
          ../../../i18n/pt/citytime.ts \
          ../../../i18n/pt_BR/citytime.ts \
          ../../../i18n/sl/citytime.ts \
          ../../../i18n/zh_CN/citytime.ts \
          ../../../i18n/zh_TW/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
@@ -2,25 +2,25 @@ TEMPLATE     = app
 CONFIG      += qt warn_on release
 DESTDIR      = $(OPIEDIR)/bin
 HEADERS      = launchersettings.h \
                tabssettings.h \
                taskbarsettings.h \
                menusettings.h \
                tabconfig.h \
                tabdialog.h
 
 SOURCES      = main.cpp \
                launchersettings.cpp \
                tabssettings.cpp \
                taskbarsettings.cpp \
                menusettings.cpp \
                tabdialog.cpp
 
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopie
 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
@@ -8,25 +8,25 @@ INCLUDEPATH += $(OPIEDIR)/include
         DEPENDPATH+= ../$(OPIEDIR)/include
 LIBS            += -lqpe -lopie
         TARGET  = light-and-power
 
 TRANSLATIONS = ../../../i18n/de/light-and-power.ts \
          ../../../i18n/xx/light-and-power.ts \
          ../../../i18n/en/light-and-power.ts \
          ../../../i18n/es/light-and-power.ts \
          ../../../i18n/fr/light-and-power.ts \
          ../../../i18n/hu/light-and-power.ts \
          ../../../i18n/ja/light-and-power.ts \
          ../../../i18n/ko/light-and-power.ts \
          ../../../i18n/no/light-and-power.ts \
          ../../../i18n/pl/light-and-power.ts \
          ../../../i18n/pt/light-and-power.ts \
          ../../../i18n/pt_BR/light-and-power.ts \
          ../../../i18n/sl/light-and-power.ts \
          ../../../i18n/zh_CN/light-and-power.ts \
          ../../../i18n/zh_TW/light-and-power.ts \
          ../../../i18n/it/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
@@ -7,25 +7,25 @@ INTERFACES	= securitybase.ui
 INCLUDEPATH += $(OPIEDIR)/include
         DEPENDPATH+= ../$(OPIEDIR)/include
 LIBS            += -lqpe
         TARGET  = security
 
 TRANSLATIONS = ../../../i18n/de/security.ts \
          ../../../i18n/xx/security.ts \
          ../../../i18n/en/security.ts \
          ../../../i18n/es/security.ts \
          ../../../i18n/fr/security.ts \
          ../../../i18n/hu/security.ts \
          ../../../i18n/ja/security.ts \
          ../../../i18n/ko/security.ts \
          ../../../i18n/no/security.ts \
          ../../../i18n/pl/security.ts \
          ../../../i18n/pt/security.ts \
          ../../../i18n/pt_BR/security.ts \
          ../../../i18n/sl/security.ts \
          ../../../i18n/zh_CN/security.ts \
          ../../../i18n/zh_TW/security.ts \
          ../../../i18n/da/security.ts
 
 
 
-include ( ../../../include.pro )
+include ( $(OPIEDIR)/include.pro )