Committing in .

Modified Files:
	configure mkipks addressbook/Makefile.in
	addressbook/addressbook.pro calc2/calc.pro
	calc2/binary/binary.pro calc2/simple/simple.pro
	calculator/Makefile.in calculator/calculator.pro
	cardmon/Makefile.in cardmon/cardmon.pro chess/chess.pro
	citytime/Makefile.in citytime/citytime.pro clock/Makefile.in
	clock/clock.pro datebook/Makefile.in datebook/datebook.pro
	dictionary/dictionary.pro doc/qcop.doc doc/start.doc
	embeddedkonsole/Makefile.in
	embeddedkonsole/embeddedkonsole.pro etc/init.d/qpe
	example/example.pro fifteen/Makefile.in fifteen/fifteen.pro
	filebrowser/Makefile.in filebrowser/filebrowser.pro
	freetype/freetype.pro go/Makefile.in go/go.pro
	helpbrowser/Makefile.in helpbrowser/helpbrowser.pro
	inputmethods/handwriting/Makefile.in
	inputmethods/handwriting/handwriting.pro
	inputmethods/keyboard/Makefile.in
	inputmethods/keyboard/keyboard.pro
	inputmethods/pickboard/Makefile.in
	inputmethods/pickboard/pickboard.pro
	inputmethods/unikeyboard/Makefile.in
	inputmethods/unikeyboard/unikeyboard.pro keypebble/Makefile.in
	keypebble/keypebble.pro library/Makefile.in library/global.cpp
	library/library.pro library/qpeapplication.cpp
	mindbreaker/Makefile.in mindbreaker/mindbreaker.pro
	minesweep/Makefile.in minesweep/minesweep.pro
	mpegplayer/Makefile.in mpegplayer/mpegplayer.pro
	mpegplayer/libflash/libflash.pro mpegplayer/libmad/Makefile.in
	mpegplayer/libmad/libmad.pro mpegplayer/libmpeg3/Makefile.in
	mpegplayer/libmpeg3/libmpeg3.pro
	mpegplayer/libmpeg3/audio/Makefile
	mpegplayer/libmpeg3/video/Makefile
	mpegplayer/wavplugin/Makefile.in
	mpegplayer/wavplugin/wavplugin.pro netsetup/Makefile.in
	netsetup/README netsetup/netsetup.pro
	netsetup/dialup/Makefile.in netsetup/dialup/dialup.pro
	netsetup/lan/Makefile.in netsetup/lan/lan.pro
	parashoot/Makefile.in parashoot/parashoot.pro
	qasteroids/Makefile.in qasteroids/qasteroids.pro
	qcop/Makefile.in qcop/qcop.pro qipkg/Makefile.in
	qipkg/qipkg.pro scripts/q_functions
	settings/appearance/Makefile.in
	settings/appearance/appearance.pro
	settings/language/Makefile.in settings/language/language.pro
	settings/light-and-power/Makefile.in
	settings/light-and-power/light-and-power.pro
	settings/rotation/Makefile.in settings/rotation/rotation.pro
	settings/security/Makefile.in settings/security/security.pro
	settings/sound/Makefile.in settings/sound/sound.pro
	settings/systemtime/Makefile.in
	settings/systemtime/systemtime.pro showimg/Makefile.in
	showimg/showimg.pro single/Makefile.in single/single.pro
	snake/Makefile.in snake/snake.pro solitaire/Makefile.in
	solitaire/solitaire.pro spreadsheet/Makefile.in
	spreadsheet/spreadsheet.pro sysinfo/Makefile.in
	sysinfo/sysinfo.pro tableviewer/tableviewer.pro
	taskbar/Makefile.in taskbar/main.cpp taskbar/taskbar.pro
	taskbar/batteryapplet/Makefile.in
	taskbar/batteryapplet/batteryapplet.pro
	taskbar/clipboardapplet/clipboardapplet.pro
	taskbar/clockapplet/Makefile.in
	taskbar/clockapplet/clockapplet.pro
	taskbar/netmonapplet/Makefile.in
	taskbar/netmonapplet/netmonapplet.pro
	taskbar/volumeapplet/Makefile.in
	taskbar/volumeapplet/volumeapplet.pro tetrix/Makefile.in
	tetrix/tetrix.pro textedit/Makefile.in textedit/textedit.pro
	todo/Makefile.in todo/todo.pro tux/Makefile.in tux/tux.pro
	website/htdocs/build.html website/htdocs/development.html
	website/htdocs/refman/qcop.html
	website/htdocs/refman/qpeapplication.html wordgame/Makefile.in
	wordgame/wordgame.pro
Log Message:
	Changed QPEDIR to OPIEDIR in .pro files, and documentation,
	and regenerated all Makefile.in's that were affected.

103 files changed, 1088 insertions, 1055 deletions

diff --git a/configure b/configure
index d36fd44..7824e36 100755
--- a/configure
+++ b/configure
@@ -13,3 +13,3 @@ QCONFIGARG=
 touch .test.qpe.
-if [ '!' -f ${QPEDIR}/.test.qpe. ];
+if [ '!' -f ${OPIEDIR}/.test.qpe. ];
 then
@@ -18,8 +18,8 @@ then
     echo
-    echo '   The environment variable $QPEDIR is not set correctly. It is currently'
-    echo '   set to "'$QPEDIR'", but it should be set to this directory,'
+    echo '   The environment variable $OPIEDIR is not set correctly. It is currently'
+    echo '   set to "'$OPIEDIR'", but it should be set to this directory,'
     echo '   which is "'`pwd`'".'
     echo
-    echo '   Please read the INSTALL file for instructions on how to set $QPEDIR'
-    echo '   correctly. If you have set $QPEDIR in your .profile or .login, you '
+    echo '   Please read the INSTALL file for instructions on how to set $OPIEDIR'
+    echo '   correctly. If you have set $OPIEDIR in your .profile or .login, you '
     echo '   will need to log out and log in again to make the setting effective.'
@@ -156,3 +156,3 @@ for a in $TOMAKE ; do
                     -t $H/qt/tmake/propagate.t $f.pro |
-                    sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$QPEDIR|\$(QPEDIR)|g" >Makefile.in;
+                    sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$OPIEDIR|\$(OPIEDIR)|g" >Makefile.in;
         )
diff --git a/core/applets/batteryapplet/Makefile.in b/core/applets/batteryapplet/Makefile.in
index 0493fd6..ccf997b 100644
--- a/core/applets/batteryapplet/Makefile.in
+++ b/core/applets/batteryapplet/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
diff --git a/core/applets/batteryapplet/batteryapplet.pro b/core/applets/batteryapplet/batteryapplet.pro
index fa0fca8..dcb606d 100644
--- a/core/applets/batteryapplet/batteryapplet.pro
+++ b/core/applets/batteryapplet/batteryapplet.pro
@@ -6,4 +6,4 @@ TARGET		= batteryapplet
         DESTDIR         = ../../plugins/applets
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH      += ../$(QPEDIR)/include ..
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH      += ../$(OPIEDIR)/include ..
 LIBS            += -lqpe
diff --git a/core/applets/clipboardapplet/clipboardapplet.pro b/core/applets/clipboardapplet/clipboardapplet.pro
index b0624ef..9832984 100644
--- a/core/applets/clipboardapplet/clipboardapplet.pro
+++ b/core/applets/clipboardapplet/clipboardapplet.pro
@@ -6,4 +6,4 @@ TARGET		= clipboardapplet
         DESTDIR         = ../../plugins/applets
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH      += ../$(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH      += ../$(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/core/applets/clockapplet/Makefile.in b/core/applets/clockapplet/Makefile.in
index fcf737e..742f25f 100644
--- a/core/applets/clockapplet/Makefile.in
+++ b/core/applets/clockapplet/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
diff --git a/core/applets/clockapplet/clockapplet.pro b/core/applets/clockapplet/clockapplet.pro
index 29a4e8b..1392680 100644
--- a/core/applets/clockapplet/clockapplet.pro
+++ b/core/applets/clockapplet/clockapplet.pro
@@ -6,4 +6,4 @@ TARGET		= clockapplet
         DESTDIR         = ../../plugins/applets
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH      += ../$(QPEDIR)/include ..
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH      += ../$(OPIEDIR)/include ..
 LIBS            += -lqpe
diff --git a/core/applets/volumeapplet/Makefile.in b/core/applets/volumeapplet/Makefile.in
index 7020cb7..49acf38 100644
--- a/core/applets/volumeapplet/Makefile.in
+++ b/core/applets/volumeapplet/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
diff --git a/core/applets/volumeapplet/volumeapplet.pro b/core/applets/volumeapplet/volumeapplet.pro
index a33cf81..fedaed7 100644
--- a/core/applets/volumeapplet/volumeapplet.pro
+++ b/core/applets/volumeapplet/volumeapplet.pro
@@ -6,4 +6,4 @@ TARGET		= volumeapplet
         DESTDIR         = ../../plugins/applets
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH      += ../$(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH      += ../$(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/core/apps/embeddedkonsole/Makefile.in b/core/apps/embeddedkonsole/Makefile.in
index b858cd4..8a69557 100644
--- a/core/apps/embeddedkonsole/Makefile.in
+++ b/core/apps/embeddedkonsole/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -16,3 +16,3 @@ UIC	=	$(SYSCONF_UIC)
 
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
@@ -185,3 +185,3 @@ keytrans.o: keytrans.cpp \
                 keytrans.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
                 default.keytab.h
@@ -189,5 +189,6 @@ keytrans.o: keytrans.cpp \
 konsole.o: konsole.cpp \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/qpetoolbar.h \
-                $(QPEDIR)/include/qpe/qpemenubar.h \
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/qpetoolbar.h \
+                $(OPIEDIR)/include/qpe/qpemenubar.h \
+                $(OPIEDIR)/include/qpe/config.h \
                 konsole.h \
@@ -214,3 +215,3 @@ main.o: main.cpp \
                 session.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
diff --git a/core/apps/embeddedkonsole/embeddedkonsole.pro b/core/apps/embeddedkonsole/embeddedkonsole.pro
index b757ea5..3452014 100755
--- a/core/apps/embeddedkonsole/embeddedkonsole.pro
+++ b/core/apps/embeddedkonsole/embeddedkonsole.pro
@@ -4,3 +4,3 @@ CONFIG		+= qt warn_on release
 
-        DESTDIR         = $(QPEDIR)/bin
+        DESTDIR         = $(OPIEDIR)/bin
 
@@ -30,5 +30,5 @@ TARGET		= embeddedkonsole
 
-INCLUDEPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
 
-        DEPENDPATH+= $(QPEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 
diff --git a/core/apps/helpbrowser/Makefile.in b/core/apps/helpbrowser/Makefile.in
index 8f0ce0e..ed3ea03 100644
--- a/core/apps/helpbrowser/Makefile.in
+++ b/core/apps/helpbrowser/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -16,3 +16,3 @@ UIC	=	$(SYSCONF_UIC)
 
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
@@ -102,7 +102,7 @@ helpbrowser.o: helpbrowser.cpp \
                 helpbrowser.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/global.h \
-                $(QPEDIR)/include/qpe/qpemenubar.h \
-                $(QPEDIR)/include/qpe/qpetoolbar.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/global.h \
+                $(OPIEDIR)/include/qpe/qpemenubar.h \
+                $(OPIEDIR)/include/qpe/qpetoolbar.h
 
@@ -110,3 +110,3 @@ main.o: main.cpp \
                 helpbrowser.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
diff --git a/core/apps/helpbrowser/helpbrowser.pro b/core/apps/helpbrowser/helpbrowser.pro
index 43230f1..f6ede8b 100644
--- a/core/apps/helpbrowser/helpbrowser.pro
+++ b/core/apps/helpbrowser/helpbrowser.pro
@@ -2,3 +2,3 @@ TEMPLATE	= app
         CONFIG  = qt warn_on release
-        DESTDIR         = $(QPEDIR)/bin
+        DESTDIR         = $(OPIEDIR)/bin
         HEADERS         = helpbrowser.h
@@ -6,4 +6,4 @@ SOURCES		= helpbrowser.cpp \
                   main.cpp
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/core/apps/qcop/Makefile.in b/core/apps/qcop/Makefile.in
index 0a12320..fd543f5 100644
--- a/core/apps/qcop/Makefile.in
+++ b/core/apps/qcop/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -99,3 +99,3 @@ REQUIRES=
 main.o: main.cpp \
-                $(QPEDIR)/include/qpe/qcopenvelope_qws.h
+                $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
 
diff --git a/core/apps/qcop/qcop.pro b/core/apps/qcop/qcop.pro
index b52bfd8..3ffe796 100644
--- a/core/apps/qcop/qcop.pro
+++ b/core/apps/qcop/qcop.pro
@@ -5,4 +5,4 @@ HEADERS		=
         SOURCES         = main.cpp
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/core/apps/textedit/Makefile.in b/core/apps/textedit/Makefile.in
index 84542bb..997f2a4 100644
--- a/core/apps/textedit/Makefile.in
+++ b/core/apps/textedit/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -16,3 +16,3 @@ UIC	=	$(SYSCONF_UIC)
 
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
@@ -102,4 +102,4 @@ main.o: main.cpp \
                 textedit.h \
-                $(QPEDIR)/include/qpe/filemanager.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/filemanager.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
@@ -107,11 +107,11 @@ textedit.o: textedit.cpp \
                 textedit.h \
-                $(QPEDIR)/include/qpe/filemanager.h \
-                $(QPEDIR)/include/qpe/global.h \
-                $(QPEDIR)/include/qpe/fileselector.h \
-                $(QPEDIR)/include/qpe/applnk.h \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/config.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/qpemenubar.h \
-                $(QPEDIR)/include/qpe/qpetoolbar.h
+                $(OPIEDIR)/include/qpe/filemanager.h \
+                $(OPIEDIR)/include/qpe/global.h \
+                $(OPIEDIR)/include/qpe/fileselector.h \
+                $(OPIEDIR)/include/qpe/applnk.h \
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/qpemenubar.h \
+                $(OPIEDIR)/include/qpe/qpetoolbar.h
 
@@ -119,3 +119,3 @@ moc_textedit.o: moc_textedit.cpp \
                 textedit.h \
-                $(QPEDIR)/include/qpe/filemanager.h
+                $(OPIEDIR)/include/qpe/filemanager.h
 
diff --git a/core/apps/textedit/textedit.pro b/core/apps/textedit/textedit.pro
index 3f5473e..23b8d8d 100644
--- a/core/apps/textedit/textedit.pro
+++ b/core/apps/textedit/textedit.pro
@@ -3,3 +3,3 @@ CONFIG		+= qt warn_on release
 
-        DESTDIR         = $(QPEDIR)/bin
+        DESTDIR         = $(OPIEDIR)/bin
 
@@ -9,4 +9,4 @@ SOURCES	= main.cpp textedit.cpp
 
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/core/launcher/Makefile.in b/core/launcher/Makefile.in
index e129fca..5e2dbe5 100644
--- a/core/launcher/Makefile.in
+++ b/core/launcher/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include -I$(QPEDIR)/calibrate -I$(QPEDIR)/rsync
+        INCPATH =-I$(OPIEDIR)/include -I$(OPIEDIR)/calibrate -I$(OPIEDIR)/rsync
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -16,3 +16,3 @@ UIC	=	$(SYSCONF_UIC)
 
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
@@ -45,20 +45,20 @@ HEADERS =	background.h \
                 irserver.h \
-                $(QPEDIR)/rsync/buf.h \
-                $(QPEDIR)/rsync/checksum.h \
-                $(QPEDIR)/rsync/command.h \
-                $(QPEDIR)/rsync/emit.h \
-                $(QPEDIR)/rsync/job.h \
-                $(QPEDIR)/rsync/netint.h \
-                $(QPEDIR)/rsync/protocol.h \
-                $(QPEDIR)/rsync/prototab.h \
-                $(QPEDIR)/rsync/rsync.h \
-                $(QPEDIR)/rsync/search.h \
-                $(QPEDIR)/rsync/stream.h \
-                $(QPEDIR)/rsync/sumset.h \
-                $(QPEDIR)/rsync/trace.h \
-                $(QPEDIR)/rsync/types.h \
-                $(QPEDIR)/rsync/util.h \
-                $(QPEDIR)/rsync/whole.h \
-                $(QPEDIR)/rsync/config_rsync.h \
-                $(QPEDIR)/rsync/qrsync.h
+                $(OPIEDIR)/rsync/buf.h \
+                $(OPIEDIR)/rsync/checksum.h \
+                $(OPIEDIR)/rsync/command.h \
+                $(OPIEDIR)/rsync/emit.h \
+                $(OPIEDIR)/rsync/job.h \
+                $(OPIEDIR)/rsync/netint.h \
+                $(OPIEDIR)/rsync/protocol.h \
+                $(OPIEDIR)/rsync/prototab.h \
+                $(OPIEDIR)/rsync/rsync.h \
+                $(OPIEDIR)/rsync/search.h \
+                $(OPIEDIR)/rsync/stream.h \
+                $(OPIEDIR)/rsync/sumset.h \
+                $(OPIEDIR)/rsync/trace.h \
+                $(OPIEDIR)/rsync/types.h \
+                $(OPIEDIR)/rsync/util.h \
+                $(OPIEDIR)/rsync/whole.h \
+                $(OPIEDIR)/rsync/config_rsync.h \
+                $(OPIEDIR)/rsync/qrsync.h
         SOURCES =background.cpp \
@@ -77,3 +77,3 @@ SOURCES =	background.cpp \
                 launcherview.cpp \
-                $(QPEDIR)/calibrate/calibrate.cpp \
+                $(OPIEDIR)/calibrate/calibrate.cpp \
                 transferserver.cpp \
@@ -84,28 +84,28 @@ SOURCES =	background.cpp \
                 main.cpp \
-                $(QPEDIR)/rsync/base64.c \
-                $(QPEDIR)/rsync/buf.c \
-                $(QPEDIR)/rsync/checksum.c \
-                $(QPEDIR)/rsync/command.c \
-                $(QPEDIR)/rsync/delta.c \
-                $(QPEDIR)/rsync/emit.c \
-                $(QPEDIR)/rsync/hex.c \
-                $(QPEDIR)/rsync/job.c \
-                $(QPEDIR)/rsync/mdfour.c \
-                $(QPEDIR)/rsync/mksum.c \
-                $(QPEDIR)/rsync/msg.c \
-                $(QPEDIR)/rsync/netint.c \
-                $(QPEDIR)/rsync/patch.c \
-                $(QPEDIR)/rsync/prototab.c \
-                $(QPEDIR)/rsync/readsums.c \
-                $(QPEDIR)/rsync/scoop.c \
-                $(QPEDIR)/rsync/search.c \
-                $(QPEDIR)/rsync/stats.c \
-                $(QPEDIR)/rsync/stream.c \
-                $(QPEDIR)/rsync/sumset.c \
-                $(QPEDIR)/rsync/trace.c \
-                $(QPEDIR)/rsync/tube.c \
-                $(QPEDIR)/rsync/util.c \
-                $(QPEDIR)/rsync/version.c \
-                $(QPEDIR)/rsync/whole.c \
-                $(QPEDIR)/rsync/qrsync.cpp
+                $(OPIEDIR)/rsync/base64.c \
+                $(OPIEDIR)/rsync/buf.c \
+                $(OPIEDIR)/rsync/checksum.c \
+                $(OPIEDIR)/rsync/command.c \
+                $(OPIEDIR)/rsync/delta.c \
+                $(OPIEDIR)/rsync/emit.c \
+                $(OPIEDIR)/rsync/hex.c \
+                $(OPIEDIR)/rsync/job.c \
+                $(OPIEDIR)/rsync/mdfour.c \
+                $(OPIEDIR)/rsync/mksum.c \
+                $(OPIEDIR)/rsync/msg.c \
+                $(OPIEDIR)/rsync/netint.c \
+                $(OPIEDIR)/rsync/patch.c \
+                $(OPIEDIR)/rsync/prototab.c \
+                $(OPIEDIR)/rsync/readsums.c \
+                $(OPIEDIR)/rsync/scoop.c \
+                $(OPIEDIR)/rsync/search.c \
+                $(OPIEDIR)/rsync/stats.c \
+                $(OPIEDIR)/rsync/stream.c \
+                $(OPIEDIR)/rsync/sumset.c \
+                $(OPIEDIR)/rsync/trace.c \
+                $(OPIEDIR)/rsync/tube.c \
+                $(OPIEDIR)/rsync/util.c \
+                $(OPIEDIR)/rsync/version.c \
+                $(OPIEDIR)/rsync/whole.c \
+                $(OPIEDIR)/rsync/qrsync.cpp
         OBJECTS =background.o \
@@ -124,3 +124,3 @@ OBJECTS =	background.o \
                 launcherview.o \
-                $(QPEDIR)/calibrate/calibrate.o \
+                $(OPIEDIR)/calibrate/calibrate.o \
                 transferserver.o \
@@ -131,28 +131,28 @@ OBJECTS =	background.o \
                 main.o \
-                $(QPEDIR)/rsync/base64.o \
-                $(QPEDIR)/rsync/buf.o \
-                $(QPEDIR)/rsync/checksum.o \
-                $(QPEDIR)/rsync/command.o \
-                $(QPEDIR)/rsync/delta.o \
-                $(QPEDIR)/rsync/emit.o \
-                $(QPEDIR)/rsync/hex.o \
-                $(QPEDIR)/rsync/job.o \
-                $(QPEDIR)/rsync/mdfour.o \
-                $(QPEDIR)/rsync/mksum.o \
-                $(QPEDIR)/rsync/msg.o \
-                $(QPEDIR)/rsync/netint.o \
-                $(QPEDIR)/rsync/patch.o \
-                $(QPEDIR)/rsync/prototab.o \
-                $(QPEDIR)/rsync/readsums.o \
-                $(QPEDIR)/rsync/scoop.o \
-                $(QPEDIR)/rsync/search.o \
-                $(QPEDIR)/rsync/stats.o \
-                $(QPEDIR)/rsync/stream.o \
-                $(QPEDIR)/rsync/sumset.o \
-                $(QPEDIR)/rsync/trace.o \
-                $(QPEDIR)/rsync/tube.o \
-                $(QPEDIR)/rsync/util.o \
-                $(QPEDIR)/rsync/version.o \
-                $(QPEDIR)/rsync/whole.o \
-                $(QPEDIR)/rsync/qrsync.o \
+                $(OPIEDIR)/rsync/base64.o \
+                $(OPIEDIR)/rsync/buf.o \
+                $(OPIEDIR)/rsync/checksum.o \
+                $(OPIEDIR)/rsync/command.o \
+                $(OPIEDIR)/rsync/delta.o \
+                $(OPIEDIR)/rsync/emit.o \
+                $(OPIEDIR)/rsync/hex.o \
+                $(OPIEDIR)/rsync/job.o \
+                $(OPIEDIR)/rsync/mdfour.o \
+                $(OPIEDIR)/rsync/mksum.o \
+                $(OPIEDIR)/rsync/msg.o \
+                $(OPIEDIR)/rsync/netint.o \
+                $(OPIEDIR)/rsync/patch.o \
+                $(OPIEDIR)/rsync/prototab.o \
+                $(OPIEDIR)/rsync/readsums.o \
+                $(OPIEDIR)/rsync/scoop.o \
+                $(OPIEDIR)/rsync/search.o \
+                $(OPIEDIR)/rsync/stats.o \
+                $(OPIEDIR)/rsync/stream.o \
+                $(OPIEDIR)/rsync/sumset.o \
+                $(OPIEDIR)/rsync/trace.o \
+                $(OPIEDIR)/rsync/tube.o \
+                $(OPIEDIR)/rsync/util.o \
+                $(OPIEDIR)/rsync/version.o \
+                $(OPIEDIR)/rsync/whole.o \
+                $(OPIEDIR)/rsync/qrsync.o \
                 shutdown.o \
@@ -274,4 +274,4 @@ background.o: background.cpp \
                 shutdown.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/resource.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/resource.h
 
@@ -281,3 +281,3 @@ desktop.o: desktop.cpp \
                 shutdown.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
                 info.h \
@@ -286,5 +286,5 @@ desktop.o: desktop.cpp \
                 launcherview.h \
-                $(QPEDIR)/include/qpe/storage.h \
+                $(OPIEDIR)/include/qpe/storage.h \
                 mrulist.h \
-                $(QPEDIR)/include/qpe/applnk.h \
+                $(OPIEDIR)/include/qpe/applnk.h \
                 qcopbridge.h \
@@ -292,3 +292,3 @@ desktop.o: desktop.cpp \
                 taskbar.h \
-                $(QPEDIR)/include/qpe/custom.h \
+                $(OPIEDIR)/include/qpe/custom.h \
                 transferserver.h \
@@ -296,8 +296,8 @@ desktop.o: desktop.cpp \
                 packageslave.h \
-                $(QPEDIR)/include/qpe/mimetype.h \
-                $(QPEDIR)/include/qpe/password.h \
-                $(QPEDIR)/include/qpe/config.h \
-                $(QPEDIR)/include/qpe/power.h \
-                $(QPEDIR)/include/qpe/qcopenvelope_qws.h \
-                $(QPEDIR)/include/qpe/global.h
+                $(OPIEDIR)/include/qpe/mimetype.h \
+                $(OPIEDIR)/include/qpe/password.h \
+                $(OPIEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/power.h \
+                $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
+                $(OPIEDIR)/include/qpe/global.h
 
@@ -309,5 +309,5 @@ info.o: info.cpp \
                 shutdown.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/version.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/version.h
 
@@ -316,3 +316,3 @@ appicons.o: appicons.cpp \
                 appicons.h \
-                $(QPEDIR)/include/qpe/qcopenvelope_qws.h
+                $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
 
@@ -321,15 +321,15 @@ taskbar.o: taskbar.cpp \
                 inputmethods.h \
-                $(QPEDIR)/include/qpe/inputmethodinterface.h \
-                $(QPEDIR)/include/qpe/qcom.h \
-                $(QPEDIR)/include/qpe/quuid.h \
+                $(OPIEDIR)/include/qpe/inputmethodinterface.h \
+                $(OPIEDIR)/include/qpe/qcom.h \
+                $(OPIEDIR)/include/qpe/quuid.h \
                 mrulist.h \
-                $(QPEDIR)/include/qpe/applnk.h \
+                $(OPIEDIR)/include/qpe/applnk.h \
                 systray.h \
-                $(QPEDIR)/include/qpe/taskbarappletinterface.h \
-                $(QPEDIR)/calibrate/calibrate.h \
+                $(OPIEDIR)/include/qpe/taskbarappletinterface.h \
+                $(OPIEDIR)/calibrate/calibrate.h \
                 wait.h \
-                $(QPEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/resource.h \
                 appicons.h \
                 taskbar.h \
-                $(QPEDIR)/include/qpe/custom.h \
+                $(OPIEDIR)/include/qpe/custom.h \
                 desktop.h \
@@ -337,5 +337,5 @@ taskbar.o: taskbar.cpp \
                 shutdown.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/qcopenvelope_qws.h \
-                $(QPEDIR)/include/qpe/global.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
+                $(OPIEDIR)/include/qpe/global.h \
                 ../taskbar/apps.h \
@@ -343,5 +343,7 @@ taskbar.o: taskbar.cpp \
                 ../datebook/datebook.h \
-                $(QPEDIR)/include/qpe/datebookdb.h \
-                $(QPEDIR)/include/qpe/event.h \
-                $(QPEDIR)/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/datebookdb.h \
+                $(OPIEDIR)/include/qpe/event.h \
+                $(OPIEDIR)/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/timeconversion.h \
+                $(OPIEDIR)/include/qpe/qpcglobal.h \
                 ../helpbrowser/helpbrowser.h \
@@ -349,3 +351,3 @@ taskbar.o: taskbar.cpp \
                 ../textedit/textedit.h \
-                $(QPEDIR)/include/qpe/filemanager.h \
+                $(OPIEDIR)/include/qpe/filemanager.h \
                 ../todo/mainwindow.h \
@@ -357,3 +359,3 @@ taskbar.o: taskbar.cpp \
                 ../settings/systemtime/settime.h \
-                $(QPEDIR)/include/qpe/timestring.h \
+                $(OPIEDIR)/include/qpe/timestring.h \
                 ../filebrowser/filebrowser.h \
@@ -362,8 +364,8 @@ taskbar.o: taskbar.cpp \
                 ../parashoot/interface.h \
-                $(QPEDIR)/include/qpe/sound.h \
+                $(OPIEDIR)/include/qpe/sound.h \
                 ../mpegplayer/mediaplayer.h \
-                $(QPEDIR)/include/qpe/qlibrary.h \
+                $(OPIEDIR)/include/qpe/qlibrary.h \
                 ../embeddedkonsole/konsole.h \
                 ../wordgame/wordgame.h \
-                $(QPEDIR)/include/qpe/qdawg.h
+                $(OPIEDIR)/include/qpe/qdawg.h
 
@@ -372,3 +374,3 @@ sidething.o: sidething.cpp \
                 startmenu.h \
-                $(QPEDIR)/include/qpe/resource.h
+                $(OPIEDIR)/include/qpe/resource.h
 
@@ -376,5 +378,5 @@ mrulist.o: mrulist.cpp \
                 mrulist.h \
-                $(QPEDIR)/include/qpe/applnk.h \
-                $(QPEDIR)/include/qpe/global.h \
-                $(QPEDIR)/include/qpe/resource.h
+                $(OPIEDIR)/include/qpe/applnk.h \
+                $(OPIEDIR)/include/qpe/global.h \
+                $(OPIEDIR)/include/qpe/resource.h
 
@@ -382,3 +384,3 @@ stabmon.o: stabmon.cpp \
                 stabmon.h \
-                $(QPEDIR)/include/qpe/qcopenvelope_qws.h
+                $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
 
@@ -386,18 +388,18 @@ inputmethods.o: inputmethods.cpp \
                 inputmethods.h \
-                $(QPEDIR)/include/qpe/inputmethodinterface.h \
-                $(QPEDIR)/include/qpe/qcom.h \
-                $(QPEDIR)/include/qpe/quuid.h \
-                $(QPEDIR)/include/qpe/config.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/qlibrary.h
+                $(OPIEDIR)/include/qpe/inputmethodinterface.h \
+                $(OPIEDIR)/include/qpe/qcom.h \
+                $(OPIEDIR)/include/qpe/quuid.h \
+                $(OPIEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/qlibrary.h
 
 systray.o: systray.cpp \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/qlibrary.h \
-                $(QPEDIR)/include/qpe/qcom.h \
-                $(QPEDIR)/include/qpe/quuid.h \
-                $(QPEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/qlibrary.h \
+                $(OPIEDIR)/include/qpe/qcom.h \
+                $(OPIEDIR)/include/qpe/quuid.h \
+                $(OPIEDIR)/include/qpe/config.h \
                 quicklauncher.h \
                 systray.h \
-                $(QPEDIR)/include/qpe/taskbarappletinterface.h
+                $(OPIEDIR)/include/qpe/taskbarappletinterface.h
 
@@ -405,3 +407,3 @@ wait.o: wait.cpp \
                 wait.h \
-                $(QPEDIR)/include/qpe/resource.h
+                $(OPIEDIR)/include/qpe/resource.h
 
@@ -410,18 +412,23 @@ shutdownimpl.o: shutdownimpl.cpp \
                 shutdown.h \
-                $(QPEDIR)/include/qpe/global.h
+                $(OPIEDIR)/include/qpe/global.h
 
 launcher.o: launcher.cpp \
-                $(QPEDIR)/include/qpe/qcopenvelope_qws.h \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/applnk.h \
-                $(QPEDIR)/include/qpe/config.h \
-                $(QPEDIR)/include/qpe/global.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/mimetype.h \
-                $(QPEDIR)/include/qpe/storage.h \
+                $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/applnk.h \
+                $(OPIEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/global.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/mimetype.h \
+                $(OPIEDIR)/include/qpe/storage.h \
+                $(OPIEDIR)/include/qpe/palmtoprecord.h \
                 launcherview.h \
                 launcher.h \
-                $(QPEDIR)/include/qpe/lnkproperties.h \
+                syncdialog.h \
+                desktop.h \
+                shutdownimpl.h \
+                shutdown.h \
+                $(OPIEDIR)/include/qpe/lnkproperties.h \
                 mrulist.h \
-                $(QPEDIR)/rsync/qrsync.h
+                $(OPIEDIR)/rsync/qrsync.h
 
@@ -429,19 +436,21 @@ launcherview.o: launcherview.cpp \
                 launcherview.h \
-                $(QPEDIR)/include/qpe/storage.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/applnk.h \
-                $(QPEDIR)/include/qpe/qpedebug.h \
-                $(QPEDIR)/include/qpe/categories.h \
-                $(QPEDIR)/include/qpe/categoryselect.h \
-                $(QPEDIR)/include/qpe/menubutton.h \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/qpetoolbar.h
-
-$(QPEDIR)/calibrate/calibrate.o: $(QPEDIR)/calibrate/calibrate.cpp \
-                $(QPEDIR)/calibrate/calibrate.h \
-                $(QPEDIR)/include/qpe/resource.h
+                $(OPIEDIR)/include/qpe/storage.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/applnk.h \
+                $(OPIEDIR)/include/qpe/qpedebug.h \
+                $(OPIEDIR)/include/qpe/categories.h \
+                $(OPIEDIR)/include/qpe/categoryselect.h \
+                $(OPIEDIR)/include/qpe/menubutton.h \
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/qpetoolbar.h
+
+$(OPIEDIR)/calibrate/calibrate.o: $(OPIEDIR)/calibrate/calibrate.cpp \
+                $(OPIEDIR)/calibrate/calibrate.h \
+                $(OPIEDIR)/include/qpe/resource.h
 
 transferserver.o: transferserver.cpp \
-                $(QPEDIR)/include/qpe/qprocess.h \
-                $(QPEDIR)/include/qpe/process.h \
+                $(OPIEDIR)/include/qpe/qprocess.h \
+                $(OPIEDIR)/include/qpe/process.h \
+                $(OPIEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
                 transferserver.h
@@ -450,4 +459,4 @@ packageslave.o: packageslave.cpp \
                 packageslave.h \
-                $(QPEDIR)/include/qpe/process.h \
-                $(QPEDIR)/include/qpe/qcopenvelope_qws.h
+                $(OPIEDIR)/include/qpe/process.h \
+                $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
 
@@ -455,6 +464,6 @@ irserver.o: irserver.cpp \
                 irserver.h \
-                $(QPEDIR)/include/qpe/qlibrary.h \
-                $(QPEDIR)/include/qpe/qcom.h \
-                $(QPEDIR)/include/qpe/quuid.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/qlibrary.h \
+                $(OPIEDIR)/include/qpe/qcom.h \
+                $(OPIEDIR)/include/qpe/quuid.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
                 obexinterface.h
@@ -463,4 +472,5 @@ qcopbridge.o: qcopbridge.cpp \
                 qcopbridge.h \
-                $(QPEDIR)/include/qpe/qcopenvelope_qws.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                transferserver.h \
+                $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
@@ -470,9 +480,9 @@ startmenu.o: startmenu.cpp \
                 mrulist.h \
-                $(QPEDIR)/include/qpe/applnk.h \
+                $(OPIEDIR)/include/qpe/applnk.h \
                 info.h \
                 background.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/config.h \
-                $(QPEDIR)/include/qpe/global.h \
-                $(QPEDIR)/include/qpe/resource.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/global.h \
+                $(OPIEDIR)/include/qpe/resource.h
 
@@ -482,233 +492,233 @@ main.o: main.cpp \
                 shutdown.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
                 taskbar.h \
-                $(QPEDIR)/include/qpe/custom.h \
+                $(OPIEDIR)/include/qpe/custom.h \
                 stabmon.h \
-                $(QPEDIR)/include/qpe/network.h \
-                $(QPEDIR)/include/qpe/config.h \
-                $(QPEDIR)/include/qpe/qcopenvelope_qws.h \
-                $(QPEDIR)/include/qpe/alarmserver.h \
+                $(OPIEDIR)/include/qpe/network.h \
+                $(OPIEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
+                $(OPIEDIR)/include/qpe/alarmserver.h \
                 ../calibrate/calibrate.h \
                 ../login/qdmdialogimpl.h \
-                $(QPEDIR)/include/qpe/global.h
-
-$(QPEDIR)/rsync/base64.o: $(QPEDIR)/rsync/base64.c \
-                $(QPEDIR)/rsync/config_rsync.h \
-                $(QPEDIR)/rsync/config_linux.h \
-                $(QPEDIR)/rsync/rsync.h
-
-$(QPEDIR)/rsync/buf.o: $(QPEDIR)/rsync/buf.c \
-                $(QPEDIR)/rsync/config_rsync.h \
-                $(QPEDIR)/rsync/config_linux.h \
-                $(QPEDIR)/rsync/rsync.h \
-                $(QPEDIR)/rsync/trace.h \
-                $(QPEDIR)/rsync/buf.h \
-                $(QPEDIR)/rsync/util.h
-
-$(QPEDIR)/rsync/checksum.o: $(QPEDIR)/rsync/checksum.c \
-                $(QPEDIR)/rsync/config_rsync.h \
-                $(QPEDIR)/rsync/config_linux.h \
-                $(QPEDIR)/rsync/rsync.h \
-                $(QPEDIR)/rsync/checksum.h
-
-$(QPEDIR)/rsync/command.o: $(QPEDIR)/rsync/command.c \
-                $(QPEDIR)/rsync/config_rsync.h \
-                $(QPEDIR)/rsync/config_linux.h \
-                $(QPEDIR)/rsync/rsync.h \
-                $(QPEDIR)/rsync/command.h
-
-$(QPEDIR)/rsync/delta.o: $(QPEDIR)/rsync/delta.c \
-                $(QPEDIR)/rsync/config_rsync.h \
-                $(QPEDIR)/rsync/config_linux.h \
-                $(QPEDIR)/rsync/rsync.h \
-                $(QPEDIR)/rsync/emit.h \
-                $(QPEDIR)/rsync/stream.h \
-                $(QPEDIR)/rsync/util.h \
-                $(QPEDIR)/rsync/sumset.h \
-                $(QPEDIR)/rsync/job.h \
-                $(QPEDIR)/rsync/trace.h \
-                $(QPEDIR)/rsync/checksum.h \
-                $(QPEDIR)/rsync/search.h \
-                $(QPEDIR)/rsync/types.h
-
-$(QPEDIR)/rsync/emit.o: $(QPEDIR)/rsync/emit.c \
-                $(QPEDIR)/rsync/config_rsync.h \
-                $(QPEDIR)/rsync/config_linux.h \
-                $(QPEDIR)/rsync/rsync.h \
-                $(QPEDIR)/rsync/command.h \
-                $(QPEDIR)/rsync/protocol.h \
-                $(QPEDIR)/rsync/trace.h \
-                $(QPEDIR)/rsync/emit.h \
-                $(QPEDIR)/rsync/prototab.h \
-                $(QPEDIR)/rsync/netint.h \
-                $(QPEDIR)/rsync/sumset.h \
-                $(QPEDIR)/rsync/job.h
-
-$(QPEDIR)/rsync/hex.o: $(QPEDIR)/rsync/hex.c \
-                $(QPEDIR)/rsync/config_rsync.h \
-                $(QPEDIR)/rsync/config_linux.h \
-                $(QPEDIR)/rsync/rsync.h
-
-$(QPEDIR)/rsync/job.o: $(QPEDIR)/rsync/job.c \
-                $(QPEDIR)/rsync/config_rsync.h \
-                $(QPEDIR)/rsync/config_linux.h \
-                $(QPEDIR)/rsync/rsync.h \
-                $(QPEDIR)/rsync/stream.h \
-                $(QPEDIR)/rsync/util.h \
-                $(QPEDIR)/rsync/sumset.h \
-                $(QPEDIR)/rsync/job.h \
-                $(QPEDIR)/rsync/trace.h
-
-$(QPEDIR)/rsync/mdfour.o: $(QPEDIR)/rsync/mdfour.c \
-                $(QPEDIR)/rsync/config_rsync.h \
-                $(QPEDIR)/rsync/config_linux.h \
-                $(QPEDIR)/rsync/rsync.h \
-                $(QPEDIR)/rsync/trace.h \
-                $(QPEDIR)/rsync/types.h
-
-$(QPEDIR)/rsync/mksum.o: $(QPEDIR)/rsync/mksum.c \
-                $(QPEDIR)/rsync/config_rsync.h \
-                $(QPEDIR)/rsync/config_linux.h \
-                $(QPEDIR)/rsync/rsync.h \
-                $(QPEDIR)/rsync/stream.h \
-                $(QPEDIR)/rsync/util.h \
-                $(QPEDIR)/rsync/sumset.h \
-                $(QPEDIR)/rsync/job.h \
-                $(QPEDIR)/rsync/protocol.h \
-                $(QPEDIR)/rsync/netint.h \
-                $(QPEDIR)/rsync/trace.h \
-                $(QPEDIR)/rsync/checksum.h
-
-$(QPEDIR)/rsync/msg.o: $(QPEDIR)/rsync/msg.c \
-                $(QPEDIR)/rsync/config_rsync.h \
-                $(QPEDIR)/rsync/config_linux.h \
-                $(QPEDIR)/rsync/rsync.h
-
-$(QPEDIR)/rsync/netint.o: $(QPEDIR)/rsync/netint.c \
-                $(QPEDIR)/rsync/config_rsync.h \
-                $(QPEDIR)/rsync/config_linux.h \
-                $(QPEDIR)/rsync/rsync.h \
-                $(QPEDIR)/rsync/job.h \
-                $(QPEDIR)/rsync/netint.h \
-                $(QPEDIR)/rsync/trace.h \
-                $(QPEDIR)/rsync/stream.h
-
-$(QPEDIR)/rsync/patch.o: $(QPEDIR)/rsync/patch.c \
-                $(QPEDIR)/rsync/config_rsync.h \
-                $(QPEDIR)/rsync/config_linux.h \
-                $(QPEDIR)/rsync/rsync.h \
-                $(QPEDIR)/rsync/util.h \
-                $(QPEDIR)/rsync/trace.h \
-                $(QPEDIR)/rsync/protocol.h \
-                $(QPEDIR)/rsync/netint.h \
-                $(QPEDIR)/rsync/command.h \
-                $(QPEDIR)/rsync/sumset.h \
-                $(QPEDIR)/rsync/prototab.h \
-                $(QPEDIR)/rsync/stream.h \
-                $(QPEDIR)/rsync/job.h
-
-$(QPEDIR)/rsync/prototab.o: $(QPEDIR)/rsync/prototab.c \
-                $(QPEDIR)/rsync/config_rsync.h \
-                $(QPEDIR)/rsync/config_linux.h \
-                $(QPEDIR)/rsync/rsync.h \
-                $(QPEDIR)/rsync/protocol.h \
-                $(QPEDIR)/rsync/command.h \
-                $(QPEDIR)/rsync/prototab.h
-
-$(QPEDIR)/rsync/readsums.o: $(QPEDIR)/rsync/readsums.c \
-                $(QPEDIR)/rsync/config_rsync.h \
-                $(QPEDIR)/rsync/config_linux.h \
-                $(QPEDIR)/rsync/rsync.h \
-                $(QPEDIR)/rsync/sumset.h \
-                $(QPEDIR)/rsync/job.h \
-                $(QPEDIR)/rsync/trace.h \
-                $(QPEDIR)/rsync/netint.h \
-                $(QPEDIR)/rsync/protocol.h \
-                $(QPEDIR)/rsync/util.h \
-                $(QPEDIR)/rsync/stream.h
-
-$(QPEDIR)/rsync/scoop.o: $(QPEDIR)/rsync/scoop.c \
-                $(QPEDIR)/rsync/config_rsync.h \
-                $(QPEDIR)/rsync/config_linux.h \
-                $(QPEDIR)/rsync/rsync.h \
-                $(QPEDIR)/rsync/job.h \
-                $(QPEDIR)/rsync/stream.h \
-                $(QPEDIR)/rsync/trace.h \
-                $(QPEDIR)/rsync/util.h
-
-$(QPEDIR)/rsync/search.o: $(QPEDIR)/rsync/search.c \
-                $(QPEDIR)/rsync/config_rsync.h \
-                $(QPEDIR)/rsync/config_linux.h \
-                $(QPEDIR)/rsync/rsync.h \
-                $(QPEDIR)/rsync/trace.h \
-                $(QPEDIR)/rsync/util.h \
-                $(QPEDIR)/rsync/sumset.h \
-                $(QPEDIR)/rsync/search.h \
-                $(QPEDIR)/rsync/checksum.h
-
-$(QPEDIR)/rsync/stats.o: $(QPEDIR)/rsync/stats.c \
-                $(QPEDIR)/rsync/config_rsync.h \
-                $(QPEDIR)/rsync/config_linux.h \
-                $(QPEDIR)/rsync/rsync.h \
-                $(QPEDIR)/rsync/trace.h
-
-$(QPEDIR)/rsync/stream.o: $(QPEDIR)/rsync/stream.c \
-                $(QPEDIR)/rsync/config_rsync.h \
-                $(QPEDIR)/rsync/config_linux.h \
-                $(QPEDIR)/rsync/rsync.h \
-                $(QPEDIR)/rsync/stream.h \
-                $(QPEDIR)/rsync/util.h \
-                $(QPEDIR)/rsync/trace.h
-
-$(QPEDIR)/rsync/sumset.o: $(QPEDIR)/rsync/sumset.c \
-                $(QPEDIR)/rsync/config_rsync.h \
-                $(QPEDIR)/rsync/config_linux.h \
-                $(QPEDIR)/rsync/rsync.h \
-                $(QPEDIR)/rsync/sumset.h \
-                $(QPEDIR)/rsync/util.h \
-                $(QPEDIR)/rsync/trace.h
-
-$(QPEDIR)/rsync/trace.o: $(QPEDIR)/rsync/trace.c \
-                $(QPEDIR)/rsync/config_rsync.h \
-                $(QPEDIR)/rsync/config_linux.h \
-                $(QPEDIR)/rsync/rsync.h \
-                $(QPEDIR)/rsync/util.h \
-                $(QPEDIR)/rsync/trace.h
-
-$(QPEDIR)/rsync/tube.o: $(QPEDIR)/rsync/tube.c \
-                $(QPEDIR)/rsync/config_rsync.h \
-                $(QPEDIR)/rsync/config_linux.h \
-                $(QPEDIR)/rsync/rsync.h \
-                $(QPEDIR)/rsync/trace.h \
-                $(QPEDIR)/rsync/util.h \
-                $(QPEDIR)/rsync/job.h \
-                $(QPEDIR)/rsync/stream.h
-
-$(QPEDIR)/rsync/util.o: $(QPEDIR)/rsync/util.c \
-                $(QPEDIR)/rsync/config_rsync.h \
-                $(QPEDIR)/rsync/config_linux.h \
-                $(QPEDIR)/rsync/util.h \
-                $(QPEDIR)/rsync/rsync.h \
-                $(QPEDIR)/rsync/trace.h
-
-$(QPEDIR)/rsync/version.o: $(QPEDIR)/rsync/version.c \
-                $(QPEDIR)/rsync/config_rsync.h \
-                $(QPEDIR)/rsync/config_linux.h \
-                $(QPEDIR)/rsync/rsync.h
-
-$(QPEDIR)/rsync/whole.o: $(QPEDIR)/rsync/whole.c \
-                $(QPEDIR)/rsync/config_rsync.h \
-                $(QPEDIR)/rsync/config_linux.h \
-                $(QPEDIR)/rsync/rsync.h \
-                $(QPEDIR)/rsync/trace.h \
-                $(QPEDIR)/rsync/fileutil.h \
-                $(QPEDIR)/rsync/sumset.h \
-                $(QPEDIR)/rsync/job.h \
-                $(QPEDIR)/rsync/buf.h \
-                $(QPEDIR)/rsync/whole.h \
-                $(QPEDIR)/rsync/util.h
-
-$(QPEDIR)/rsync/qrsync.o: $(QPEDIR)/rsync/qrsync.cpp \
-                $(QPEDIR)/rsync/qrsync.h \
-                $(QPEDIR)/rsync/rsync.h
+                $(OPIEDIR)/include/qpe/global.h
+
+$(OPIEDIR)/rsync/base64.o: $(OPIEDIR)/rsync/base64.c \
+                $(OPIEDIR)/rsync/config_rsync.h \
+                $(OPIEDIR)/rsync/config_linux.h \
+                $(OPIEDIR)/rsync/rsync.h
+
+$(OPIEDIR)/rsync/buf.o: $(OPIEDIR)/rsync/buf.c \
+                $(OPIEDIR)/rsync/config_rsync.h \
+                $(OPIEDIR)/rsync/config_linux.h \
+                $(OPIEDIR)/rsync/rsync.h \
+                $(OPIEDIR)/rsync/trace.h \
+                $(OPIEDIR)/rsync/buf.h \
+                $(OPIEDIR)/rsync/util.h
+
+$(OPIEDIR)/rsync/checksum.o: $(OPIEDIR)/rsync/checksum.c \
+                $(OPIEDIR)/rsync/config_rsync.h \
+                $(OPIEDIR)/rsync/config_linux.h \
+                $(OPIEDIR)/rsync/rsync.h \
+                $(OPIEDIR)/rsync/checksum.h
+
+$(OPIEDIR)/rsync/command.o: $(OPIEDIR)/rsync/command.c \
+                $(OPIEDIR)/rsync/config_rsync.h \
+                $(OPIEDIR)/rsync/config_linux.h \
+                $(OPIEDIR)/rsync/rsync.h \
+                $(OPIEDIR)/rsync/command.h
+
+$(OPIEDIR)/rsync/delta.o: $(OPIEDIR)/rsync/delta.c \
+                $(OPIEDIR)/rsync/config_rsync.h \
+                $(OPIEDIR)/rsync/config_linux.h \
+                $(OPIEDIR)/rsync/rsync.h \
+                $(OPIEDIR)/rsync/emit.h \
+                $(OPIEDIR)/rsync/stream.h \
+                $(OPIEDIR)/rsync/util.h \
+                $(OPIEDIR)/rsync/sumset.h \
+                $(OPIEDIR)/rsync/job.h \
+                $(OPIEDIR)/rsync/trace.h \
+                $(OPIEDIR)/rsync/checksum.h \
+                $(OPIEDIR)/rsync/search.h \
+                $(OPIEDIR)/rsync/types.h
+
+$(OPIEDIR)/rsync/emit.o: $(OPIEDIR)/rsync/emit.c \
+                $(OPIEDIR)/rsync/config_rsync.h \
+                $(OPIEDIR)/rsync/config_linux.h \
+                $(OPIEDIR)/rsync/rsync.h \
+                $(OPIEDIR)/rsync/command.h \
+                $(OPIEDIR)/rsync/protocol.h \
+                $(OPIEDIR)/rsync/trace.h \
+                $(OPIEDIR)/rsync/emit.h \
+                $(OPIEDIR)/rsync/prototab.h \
+                $(OPIEDIR)/rsync/netint.h \
+                $(OPIEDIR)/rsync/sumset.h \
+                $(OPIEDIR)/rsync/job.h
+
+$(OPIEDIR)/rsync/hex.o: $(OPIEDIR)/rsync/hex.c \
+                $(OPIEDIR)/rsync/config_rsync.h \
+                $(OPIEDIR)/rsync/config_linux.h \
+                $(OPIEDIR)/rsync/rsync.h
+
+$(OPIEDIR)/rsync/job.o: $(OPIEDIR)/rsync/job.c \
+                $(OPIEDIR)/rsync/config_rsync.h \
+                $(OPIEDIR)/rsync/config_linux.h \
+                $(OPIEDIR)/rsync/rsync.h \
+                $(OPIEDIR)/rsync/stream.h \
+                $(OPIEDIR)/rsync/util.h \
+                $(OPIEDIR)/rsync/sumset.h \
+                $(OPIEDIR)/rsync/job.h \
+                $(OPIEDIR)/rsync/trace.h
+
+$(OPIEDIR)/rsync/mdfour.o: $(OPIEDIR)/rsync/mdfour.c \
+                $(OPIEDIR)/rsync/config_rsync.h \
+                $(OPIEDIR)/rsync/config_linux.h \
+                $(OPIEDIR)/rsync/rsync.h \
+                $(OPIEDIR)/rsync/trace.h \
+                $(OPIEDIR)/rsync/types.h
+
+$(OPIEDIR)/rsync/mksum.o: $(OPIEDIR)/rsync/mksum.c \
+                $(OPIEDIR)/rsync/config_rsync.h \
+                $(OPIEDIR)/rsync/config_linux.h \
+                $(OPIEDIR)/rsync/rsync.h \
+                $(OPIEDIR)/rsync/stream.h \
+                $(OPIEDIR)/rsync/util.h \
+                $(OPIEDIR)/rsync/sumset.h \
+                $(OPIEDIR)/rsync/job.h \
+                $(OPIEDIR)/rsync/protocol.h \
+                $(OPIEDIR)/rsync/netint.h \
+                $(OPIEDIR)/rsync/trace.h \
+                $(OPIEDIR)/rsync/checksum.h
+
+$(OPIEDIR)/rsync/msg.o: $(OPIEDIR)/rsync/msg.c \
+                $(OPIEDIR)/rsync/config_rsync.h \
+                $(OPIEDIR)/rsync/config_linux.h \
+                $(OPIEDIR)/rsync/rsync.h
+
+$(OPIEDIR)/rsync/netint.o: $(OPIEDIR)/rsync/netint.c \
+                $(OPIEDIR)/rsync/config_rsync.h \
+                $(OPIEDIR)/rsync/config_linux.h \
+                $(OPIEDIR)/rsync/rsync.h \
+                $(OPIEDIR)/rsync/job.h \
+                $(OPIEDIR)/rsync/netint.h \
+                $(OPIEDIR)/rsync/trace.h \
+                $(OPIEDIR)/rsync/stream.h
+
+$(OPIEDIR)/rsync/patch.o: $(OPIEDIR)/rsync/patch.c \
+                $(OPIEDIR)/rsync/config_rsync.h \
+                $(OPIEDIR)/rsync/config_linux.h \
+                $(OPIEDIR)/rsync/rsync.h \
+                $(OPIEDIR)/rsync/util.h \
+                $(OPIEDIR)/rsync/trace.h \
+                $(OPIEDIR)/rsync/protocol.h \
+                $(OPIEDIR)/rsync/netint.h \
+                $(OPIEDIR)/rsync/command.h \
+                $(OPIEDIR)/rsync/sumset.h \
+                $(OPIEDIR)/rsync/prototab.h \
+                $(OPIEDIR)/rsync/stream.h \
+                $(OPIEDIR)/rsync/job.h
+
+$(OPIEDIR)/rsync/prototab.o: $(OPIEDIR)/rsync/prototab.c \
+                $(OPIEDIR)/rsync/config_rsync.h \
+                $(OPIEDIR)/rsync/config_linux.h \
+                $(OPIEDIR)/rsync/rsync.h \
+                $(OPIEDIR)/rsync/protocol.h \
+                $(OPIEDIR)/rsync/command.h \
+                $(OPIEDIR)/rsync/prototab.h
+
+$(OPIEDIR)/rsync/readsums.o: $(OPIEDIR)/rsync/readsums.c \
+                $(OPIEDIR)/rsync/config_rsync.h \
+                $(OPIEDIR)/rsync/config_linux.h \
+                $(OPIEDIR)/rsync/rsync.h \
+                $(OPIEDIR)/rsync/sumset.h \
+                $(OPIEDIR)/rsync/job.h \
+                $(OPIEDIR)/rsync/trace.h \
+                $(OPIEDIR)/rsync/netint.h \
+                $(OPIEDIR)/rsync/protocol.h \
+                $(OPIEDIR)/rsync/util.h \
+                $(OPIEDIR)/rsync/stream.h
+
+$(OPIEDIR)/rsync/scoop.o: $(OPIEDIR)/rsync/scoop.c \
+                $(OPIEDIR)/rsync/config_rsync.h \
+                $(OPIEDIR)/rsync/config_linux.h \
+                $(OPIEDIR)/rsync/rsync.h \
+                $(OPIEDIR)/rsync/job.h \
+                $(OPIEDIR)/rsync/stream.h \
+                $(OPIEDIR)/rsync/trace.h \
+                $(OPIEDIR)/rsync/util.h
+
+$(OPIEDIR)/rsync/search.o: $(OPIEDIR)/rsync/search.c \
+                $(OPIEDIR)/rsync/config_rsync.h \
+                $(OPIEDIR)/rsync/config_linux.h \
+                $(OPIEDIR)/rsync/rsync.h \
+                $(OPIEDIR)/rsync/trace.h \
+                $(OPIEDIR)/rsync/util.h \
+                $(OPIEDIR)/rsync/sumset.h \
+                $(OPIEDIR)/rsync/search.h \
+                $(OPIEDIR)/rsync/checksum.h
+
+$(OPIEDIR)/rsync/stats.o: $(OPIEDIR)/rsync/stats.c \
+                $(OPIEDIR)/rsync/config_rsync.h \
+                $(OPIEDIR)/rsync/config_linux.h \
+                $(OPIEDIR)/rsync/rsync.h \
+                $(OPIEDIR)/rsync/trace.h
+
+$(OPIEDIR)/rsync/stream.o: $(OPIEDIR)/rsync/stream.c \
+                $(OPIEDIR)/rsync/config_rsync.h \
+                $(OPIEDIR)/rsync/config_linux.h \
+                $(OPIEDIR)/rsync/rsync.h \
+                $(OPIEDIR)/rsync/stream.h \
+                $(OPIEDIR)/rsync/util.h \
+                $(OPIEDIR)/rsync/trace.h
+
+$(OPIEDIR)/rsync/sumset.o: $(OPIEDIR)/rsync/sumset.c \
+                $(OPIEDIR)/rsync/config_rsync.h \
+                $(OPIEDIR)/rsync/config_linux.h \
+                $(OPIEDIR)/rsync/rsync.h \
+                $(OPIEDIR)/rsync/sumset.h \
+                $(OPIEDIR)/rsync/util.h \
+                $(OPIEDIR)/rsync/trace.h
+
+$(OPIEDIR)/rsync/trace.o: $(OPIEDIR)/rsync/trace.c \
+                $(OPIEDIR)/rsync/config_rsync.h \
+                $(OPIEDIR)/rsync/config_linux.h \
+                $(OPIEDIR)/rsync/rsync.h \
+                $(OPIEDIR)/rsync/util.h \
+                $(OPIEDIR)/rsync/trace.h
+
+$(OPIEDIR)/rsync/tube.o: $(OPIEDIR)/rsync/tube.c \
+                $(OPIEDIR)/rsync/config_rsync.h \
+                $(OPIEDIR)/rsync/config_linux.h \
+                $(OPIEDIR)/rsync/rsync.h \
+                $(OPIEDIR)/rsync/trace.h \
+                $(OPIEDIR)/rsync/util.h \
+                $(OPIEDIR)/rsync/job.h \
+                $(OPIEDIR)/rsync/stream.h
+
+$(OPIEDIR)/rsync/util.o: $(OPIEDIR)/rsync/util.c \
+                $(OPIEDIR)/rsync/config_rsync.h \
+                $(OPIEDIR)/rsync/config_linux.h \
+                $(OPIEDIR)/rsync/util.h \
+                $(OPIEDIR)/rsync/rsync.h \
+                $(OPIEDIR)/rsync/trace.h
+
+$(OPIEDIR)/rsync/version.o: $(OPIEDIR)/rsync/version.c \
+                $(OPIEDIR)/rsync/config_rsync.h \
+                $(OPIEDIR)/rsync/config_linux.h \
+                $(OPIEDIR)/rsync/rsync.h
+
+$(OPIEDIR)/rsync/whole.o: $(OPIEDIR)/rsync/whole.c \
+                $(OPIEDIR)/rsync/config_rsync.h \
+                $(OPIEDIR)/rsync/config_linux.h \
+                $(OPIEDIR)/rsync/rsync.h \
+                $(OPIEDIR)/rsync/trace.h \
+                $(OPIEDIR)/rsync/fileutil.h \
+                $(OPIEDIR)/rsync/sumset.h \
+                $(OPIEDIR)/rsync/job.h \
+                $(OPIEDIR)/rsync/buf.h \
+                $(OPIEDIR)/rsync/whole.h \
+                $(OPIEDIR)/rsync/util.h
+
+$(OPIEDIR)/rsync/qrsync.o: $(OPIEDIR)/rsync/qrsync.cpp \
+                $(OPIEDIR)/rsync/qrsync.h \
+                $(OPIEDIR)/rsync/rsync.h
 
@@ -726,4 +736,3 @@ syncdialog.cpp: syncdialog.ui
 
-shutdown.o: shutdown.cpp \
-                shutdown.h
+shutdown.o: shutdown.cpp
 
@@ -738,3 +747,3 @@ moc_desktop.o: moc_desktop.cpp \
                 shutdown.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
@@ -749,3 +758,3 @@ moc_taskbar.o: moc_taskbar.cpp \
                 taskbar.h \
-                $(QPEDIR)/include/qpe/custom.h
+                $(OPIEDIR)/include/qpe/custom.h
 
@@ -757,5 +766,5 @@ moc_inputmethods.o: moc_inputmethods.cpp \
                 inputmethods.h \
-                $(QPEDIR)/include/qpe/inputmethodinterface.h \
-                $(QPEDIR)/include/qpe/qcom.h \
-                $(QPEDIR)/include/qpe/quuid.h
+                $(OPIEDIR)/include/qpe/inputmethodinterface.h \
+                $(OPIEDIR)/include/qpe/qcom.h \
+                $(OPIEDIR)/include/qpe/quuid.h
 
@@ -763,5 +772,5 @@ moc_systray.o: moc_systray.cpp \
                 systray.h \
-                $(QPEDIR)/include/qpe/taskbarappletinterface.h \
-                $(QPEDIR)/include/qpe/qcom.h \
-                $(QPEDIR)/include/qpe/quuid.h
+                $(OPIEDIR)/include/qpe/taskbarappletinterface.h \
+                $(OPIEDIR)/include/qpe/qcom.h \
+                $(OPIEDIR)/include/qpe/quuid.h
 
@@ -774,3 +783,3 @@ moc_launcher.o: moc_launcher.cpp \
                 launcherview.h \
-                $(QPEDIR)/include/qpe/storage.h
+                $(OPIEDIR)/include/qpe/storage.h
 
@@ -778,3 +787,3 @@ moc_launcherview.o: moc_launcherview.cpp \
                 launcherview.h \
-                $(QPEDIR)/include/qpe/storage.h
+                $(OPIEDIR)/include/qpe/storage.h
 
@@ -801,3 +810,3 @@ moc_shutdown.o: appicons.moc \
                 appicons.h \
-                $(QPEDIR)/include/qpe/qcopenvelope_qws.h
+                $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
 
diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro
index 7d7c9ac..0078faf 100644
--- a/core/launcher/launcher.pro
+++ b/core/launcher/launcher.pro
@@ -4,3 +4,3 @@ CONFIG		= qt warn_on release
 
-        DESTDIR         = $(QPEDIR)/bin
+        DESTDIR         = $(OPIEDIR)/bin
 
@@ -26,20 +26,20 @@ HEADERS		= background.h \
                 irserver.h \
-        $(QPEDIR)/rsync/buf.h \
-        $(QPEDIR)/rsync/checksum.h \
-        $(QPEDIR)/rsync/command.h \
-        $(QPEDIR)/rsync/emit.h \
-        $(QPEDIR)/rsync/job.h \
-        $(QPEDIR)/rsync/netint.h \
-        $(QPEDIR)/rsync/protocol.h \
-        $(QPEDIR)/rsync/prototab.h \
-        $(QPEDIR)/rsync/rsync.h \
-        $(QPEDIR)/rsync/search.h \
-        $(QPEDIR)/rsync/stream.h \
-        $(QPEDIR)/rsync/sumset.h \
-        $(QPEDIR)/rsync/trace.h \
-        $(QPEDIR)/rsync/types.h \
-        $(QPEDIR)/rsync/util.h \
-        $(QPEDIR)/rsync/whole.h \
-        $(QPEDIR)/rsync/config_rsync.h \
-        $(QPEDIR)/rsync/qrsync.h
+        $(OPIEDIR)/rsync/buf.h \
+        $(OPIEDIR)/rsync/checksum.h \
+        $(OPIEDIR)/rsync/command.h \
+        $(OPIEDIR)/rsync/emit.h \
+        $(OPIEDIR)/rsync/job.h \
+        $(OPIEDIR)/rsync/netint.h \
+        $(OPIEDIR)/rsync/protocol.h \
+        $(OPIEDIR)/rsync/prototab.h \
+        $(OPIEDIR)/rsync/rsync.h \
+        $(OPIEDIR)/rsync/search.h \
+        $(OPIEDIR)/rsync/stream.h \
+        $(OPIEDIR)/rsync/sumset.h \
+        $(OPIEDIR)/rsync/trace.h \
+        $(OPIEDIR)/rsync/types.h \
+        $(OPIEDIR)/rsync/util.h \
+        $(OPIEDIR)/rsync/whole.h \
+        $(OPIEDIR)/rsync/config_rsync.h \
+        $(OPIEDIR)/rsync/qrsync.h
         #         quicklauncher.h \
@@ -60,3 +60,3 @@ SOURCES		= background.cpp \
                   launcherview.cpp \
-                  $(QPEDIR)/calibrate/calibrate.cpp \
+                  $(OPIEDIR)/calibrate/calibrate.cpp \
                   transferserver.cpp \
@@ -67,28 +67,28 @@ SOURCES		= background.cpp \
                   main.cpp \
-        $(QPEDIR)/rsync/base64.c \
-        $(QPEDIR)/rsync/buf.c \
-        $(QPEDIR)/rsync/checksum.c \
-        $(QPEDIR)/rsync/command.c \
-        $(QPEDIR)/rsync/delta.c \
-        $(QPEDIR)/rsync/emit.c \
-        $(QPEDIR)/rsync/hex.c \
-        $(QPEDIR)/rsync/job.c \
-        $(QPEDIR)/rsync/mdfour.c \
-        $(QPEDIR)/rsync/mksum.c \
-        $(QPEDIR)/rsync/msg.c \
-        $(QPEDIR)/rsync/netint.c \
-        $(QPEDIR)/rsync/patch.c \
-        $(QPEDIR)/rsync/prototab.c \
-        $(QPEDIR)/rsync/readsums.c \
-        $(QPEDIR)/rsync/scoop.c \
-        $(QPEDIR)/rsync/search.c \
-        $(QPEDIR)/rsync/stats.c \
-        $(QPEDIR)/rsync/stream.c \
-        $(QPEDIR)/rsync/sumset.c \
-        $(QPEDIR)/rsync/trace.c \
-        $(QPEDIR)/rsync/tube.c \
-        $(QPEDIR)/rsync/util.c \
-        $(QPEDIR)/rsync/version.c \
-        $(QPEDIR)/rsync/whole.c \
-        $(QPEDIR)/rsync/qrsync.cpp
+        $(OPIEDIR)/rsync/base64.c \
+        $(OPIEDIR)/rsync/buf.c \
+        $(OPIEDIR)/rsync/checksum.c \
+        $(OPIEDIR)/rsync/command.c \
+        $(OPIEDIR)/rsync/delta.c \
+        $(OPIEDIR)/rsync/emit.c \
+        $(OPIEDIR)/rsync/hex.c \
+        $(OPIEDIR)/rsync/job.c \
+        $(OPIEDIR)/rsync/mdfour.c \
+        $(OPIEDIR)/rsync/mksum.c \
+        $(OPIEDIR)/rsync/msg.c \
+        $(OPIEDIR)/rsync/netint.c \
+        $(OPIEDIR)/rsync/patch.c \
+        $(OPIEDIR)/rsync/prototab.c \
+        $(OPIEDIR)/rsync/readsums.c \
+        $(OPIEDIR)/rsync/scoop.c \
+        $(OPIEDIR)/rsync/search.c \
+        $(OPIEDIR)/rsync/stats.c \
+        $(OPIEDIR)/rsync/stream.c \
+        $(OPIEDIR)/rsync/sumset.c \
+        $(OPIEDIR)/rsync/trace.c \
+        $(OPIEDIR)/rsync/tube.c \
+        $(OPIEDIR)/rsync/util.c \
+        $(OPIEDIR)/rsync/version.c \
+        $(OPIEDIR)/rsync/whole.c \
+        $(OPIEDIR)/rsync/qrsync.cpp
 
@@ -96,10 +96,10 @@ INTERFACES	= shutdown.ui syncdialog.ui
 
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= $(QPEDIR)/include .
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include .
 
-INCLUDEPATH += $(QPEDIR)/calibrate
-        DEPENDPATH+= $(QPEDIR)/calibrate
+INCLUDEPATH += $(OPIEDIR)/calibrate
+        DEPENDPATH+= $(OPIEDIR)/calibrate
 
-INCLUDEPATH += $(QPEDIR)/rsync
-        DEPENDPATH+= $(QPEDIR)/rsync
+INCLUDEPATH += $(OPIEDIR)/rsync
+        DEPENDPATH+= $(OPIEDIR)/rsync
 
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index 024f9cc..12c2a7c 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -87,3 +87,3 @@ void initCassiopeia()
     setenv( "QTDIR", "/", 1 );
-    setenv( "QPEDIR", "/", 1 );
+    setenv( "OPIEDIR", "/", 1 );
     setenv( "HOME", "/home", 1 );
diff --git a/core/multimedia/opieplayer/Makefile.in b/core/multimedia/opieplayer/Makefile.in
index 5fca66e..6e007ec 100644
--- a/core/multimedia/opieplayer/Makefile.in
+++ b/core/multimedia/opieplayer/Makefile.in
@@ -5,6 +5,6 @@
         CXX     =$(SYSCONF_CXX) $(QT_CXX_MT)
-        CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) -DQCONFIG=\"qpe\"
+        CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
         CC      =$(SYSCONF_CC) $(QT_C_MT)
-        CFLAGS  =$(SYSCONF_CFLAGS) -DQCONFIG=\"qpe\"
-        INCPATH =-I$(QPEDIR)/include
+        CFLAGS  =$(SYSCONF_CFLAGS)
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -16,3 +16,3 @@ UIC	=	$(SYSCONF_UIC)
 
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
@@ -137,6 +137,6 @@ REQUIRES=
 main.o: main.cpp \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
                 mediaplayerstate.h \
                 playlistwidget.h \
-                $(QPEDIR)/include/qpe/applnk.h \
+                $(OPIEDIR)/include/qpe/applnk.h \
                 audiowidget.h \
@@ -145,5 +145,5 @@ main.o: main.cpp \
                 mediaplayer.h \
-                $(QPEDIR)/include/qpe/qlibrary.h \
-                $(QPEDIR)/include/qpe/qcom.h \
-                $(QPEDIR)/include/qpe/quuid.h \
+                $(OPIEDIR)/include/qpe/qlibrary.h \
+                $(OPIEDIR)/include/qpe/qcom.h \
+                $(OPIEDIR)/include/qpe/quuid.h \
                 mediaplayerplugininterface.h
@@ -151,4 +151,4 @@ main.o: main.cpp \
 loopcontrol.o: loopcontrol.cpp \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/qcopenvelope_qws.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
                 loopcontrol.h \
@@ -157,4 +157,4 @@ loopcontrol.o: loopcontrol.cpp \
                 mediaplayerplugininterface.h \
-                $(QPEDIR)/include/qpe/qcom.h \
-                $(QPEDIR)/include/qpe/quuid.h \
+                $(OPIEDIR)/include/qpe/qcom.h \
+                $(OPIEDIR)/include/qpe/quuid.h \
                 mediaplayerstate.h
@@ -162,4 +162,4 @@ loopcontrol.o: loopcontrol.cpp \
 playlistselection.o: playlistselection.cpp \
-                $(QPEDIR)/include/qpe/applnk.h \
-                $(QPEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/applnk.h \
+                $(OPIEDIR)/include/qpe/resource.h \
                 playlistselection.h
@@ -167,7 +167,7 @@ playlistselection.o: playlistselection.cpp \
 mediaplayerstate.o: mediaplayerstate.cpp \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/qlibrary.h \
-                $(QPEDIR)/include/qpe/qcom.h \
-                $(QPEDIR)/include/qpe/quuid.h \
-                $(QPEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/qlibrary.h \
+                $(OPIEDIR)/include/qpe/qcom.h \
+                $(OPIEDIR)/include/qpe/quuid.h \
+                $(OPIEDIR)/include/qpe/config.h \
                 mediaplayerplugininterface.h \
@@ -179,7 +179,7 @@ mediaplayerstate.o: mediaplayerstate.cpp \
 videowidget.o: videowidget.cpp \
-                $(QPEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/resource.h \
                 videowidget.h \
                 mediaplayerplugininterface.h \
-                $(QPEDIR)/include/qpe/qcom.h \
-                $(QPEDIR)/include/qpe/quuid.h \
+                $(OPIEDIR)/include/qpe/qcom.h \
+                $(OPIEDIR)/include/qpe/quuid.h \
                 mediaplayerstate.h
@@ -187,3 +187,3 @@ videowidget.o: videowidget.cpp \
 audiowidget.o: audiowidget.cpp \
-                $(QPEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/resource.h \
                 audiowidget.h \
@@ -192,9 +192,9 @@ audiowidget.o: audiowidget.cpp \
 playlistwidget.o: playlistwidget.cpp \
-                $(QPEDIR)/include/qpe/qpemenubar.h \
-                $(QPEDIR)/include/qpe/qpetoolbar.h \
-                $(QPEDIR)/include/qpe/fileselector.h \
-                $(QPEDIR)/include/qpe/applnk.h \
-                $(QPEDIR)/include/qpe/config.h \
-                $(QPEDIR)/include/qpe/global.h \
-                $(QPEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/qpemenubar.h \
+                $(OPIEDIR)/include/qpe/qpetoolbar.h \
+                $(OPIEDIR)/include/qpe/fileselector.h \
+                $(OPIEDIR)/include/qpe/applnk.h \
+                $(OPIEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/global.h \
+                $(OPIEDIR)/include/qpe/resource.h \
                 playlistselection.h \
@@ -204,8 +204,8 @@ playlistwidget.o: playlistwidget.cpp \
 mediaplayer.o: mediaplayer.cpp \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/qlibrary.h \
-                $(QPEDIR)/include/qpe/qcom.h \
-                $(QPEDIR)/include/qpe/quuid.h \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/qlibrary.h \
+                $(OPIEDIR)/include/qpe/qcom.h \
+                $(OPIEDIR)/include/qpe/quuid.h \
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/config.h \
                 mediaplayer.h \
@@ -213,3 +213,3 @@ mediaplayer.o: mediaplayer.cpp \
                 playlistwidget.h \
-                $(QPEDIR)/include/qpe/applnk.h \
+                $(OPIEDIR)/include/qpe/applnk.h \
                 audiowidget.h \
@@ -220,6 +220,6 @@ mediaplayer.o: mediaplayer.cpp \
 audiodevice.o: audiodevice.cpp \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/config.h \
                 audiodevice.h \
-                $(QPEDIR)/include/qpe/qcopenvelope_qws.h
+                $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
 
@@ -230,3 +230,3 @@ moc_playlistselection.o: moc_playlistselection.cpp \
                 playlistselection.h \
-                $(QPEDIR)/include/qpe/applnk.h
+                $(OPIEDIR)/include/qpe/applnk.h
 
@@ -243,3 +243,3 @@ moc_playlistwidget.o: moc_playlistwidget.cpp \
                 playlistwidget.h \
-                $(QPEDIR)/include/qpe/applnk.h
+                $(OPIEDIR)/include/qpe/applnk.h
 
@@ -247,5 +247,5 @@ moc_mediaplayer.o: moc_mediaplayer.cpp \
                 mediaplayer.h \
-                $(QPEDIR)/include/qpe/qlibrary.h \
-                $(QPEDIR)/include/qpe/qcom.h \
-                $(QPEDIR)/include/qpe/quuid.h \
+                $(OPIEDIR)/include/qpe/qlibrary.h \
+                $(OPIEDIR)/include/qpe/qcom.h \
+                $(OPIEDIR)/include/qpe/quuid.h \
                 mediaplayerplugininterface.h
diff --git a/core/multimedia/opieplayer/libflash/libflash.pro b/core/multimedia/opieplayer/libflash/libflash.pro
index d144f0b..bf97fbf 100644
--- a/core/multimedia/opieplayer/libflash/libflash.pro
+++ b/core/multimedia/opieplayer/libflash/libflash.pro
@@ -10,4 +10,4 @@ TARGET		=   flashplugin
         DESTDIR         =   ../../plugins/codecs
-INCLUDEPATH += $(QPEDIR)/include ..
-DEPENDPATH      +=  ../$(QPEDIR)/include ..
+INCLUDEPATH += $(OPIEDIR)/include ..
+DEPENDPATH      +=  ../$(OPIEDIR)/include ..
 LIBS            +=  -lqpe
diff --git a/core/multimedia/opieplayer/libmad/Makefile.in b/core/multimedia/opieplayer/libmad/Makefile.in
index 9e17769..19ded26 100644
--- a/core/multimedia/opieplayer/libmad/Makefile.in
+++ b/core/multimedia/opieplayer/libmad/Makefile.in
@@ -5,6 +5,6 @@
         CXX     =$(SYSCONF_CXX) $(QT_CXX_MT)
-        CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) -DQCONFIG=\"qpe\"
+        CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
         CC      =$(SYSCONF_CC) $(QT_C_MT)
-        CFLAGS  =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -DQCONFIG=\"qpe\"
-        INCPATH =-I$(QPEDIR)/include -I..
+        CFLAGS  =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
+        INCPATH =-I$(OPIEDIR)/include -I..
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
diff --git a/core/multimedia/opieplayer/libmad/libmad.pro b/core/multimedia/opieplayer/libmad/libmad.pro
index e3f75b7..6c40a15 100644
--- a/core/multimedia/opieplayer/libmad/libmad.pro
+++ b/core/multimedia/opieplayer/libmad/libmad.pro
@@ -8,4 +8,4 @@ TARGET		=   madplugin
         DESTDIR         =   ../../plugins/codecs
-INCLUDEPATH += $(QPEDIR)/include ..
-DEPENDPATH      +=  ../$(QPEDIR)/include ..
+INCLUDEPATH += $(OPIEDIR)/include ..
+DEPENDPATH      +=  ../$(OPIEDIR)/include ..
 LIBS            +=  -lqpe -lm
diff --git a/core/multimedia/opieplayer/libmpeg3/Makefile.in b/core/multimedia/opieplayer/libmpeg3/Makefile.in
index 1817902..9881815 100644
--- a/core/multimedia/opieplayer/libmpeg3/Makefile.in
+++ b/core/multimedia/opieplayer/libmpeg3/Makefile.in
@@ -5,6 +5,6 @@
         CXX     =$(SYSCONF_CXX) $(QT_CXX_MT)
-        CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) -DQCONFIG=\"qpe\"
+        CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
         CC      =$(SYSCONF_CC) $(QT_C_MT)
-        CFLAGS  =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -DQCONFIG=\"qpe\"
-        INCPATH =-I$(QPEDIR)/include -I..
+        CFLAGS  =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
+        INCPATH =-I$(OPIEDIR)/include -I..
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
index e2c35d3..b1426d1 100644
--- a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
+++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
@@ -38,4 +38,4 @@ TARGET		=   mpeg3plugin
         DESTDIR         =   ../../plugins/codecs
-INCLUDEPATH += $(QPEDIR)/include ..
-DEPENDPATH      +=  ../$(QPEDIR)/include ..
+INCLUDEPATH += $(OPIEDIR)/include ..
+DEPENDPATH      +=  ../$(OPIEDIR)/include ..
 LIBS            +=  -lqpe -lpthread -lm
diff --git a/core/multimedia/opieplayer/mpegplayer.pro b/core/multimedia/opieplayer/mpegplayer.pro
index d6952f8..3b8d4b0 100644
--- a/core/multimedia/opieplayer/mpegplayer.pro
+++ b/core/multimedia/opieplayer/mpegplayer.pro
@@ -2,3 +2,3 @@ TEMPLATE	= app
         CONFIG  = qt warn_on release
-        DESTDIR         = $(QPEDIR)/bin
+        DESTDIR         = $(OPIEDIR)/bin
         HEADERS         = loopcontrol.h mediaplayerplugininterface.h playlistselection.h mediaplayerstate.h \
@@ -9,4 +9,4 @@ SOURCES		= main.cpp \
         TARGET  = mpegplayer
-        INCLUDEPATH+= $(QPEDIR)/include
-        DEPENDPATH+= $(QPEDIR)/include
+        INCLUDEPATH+= $(OPIEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lpthread
@@ -14,3 +14,3 @@ LIBS            += -lqpe -lpthread
         # INTERFACES= 
-# INCLUDEPATH += $(QPEDIR)/include
+# INCLUDEPATH += $(OPIEDIR)/include
 # CONFIG+=static
@@ -18,3 +18,3 @@ LIBS            += -lqpe -lpthread
         # LIBS  += libmpeg3/libmpeg3.a -lpthread
-        # LIBS  += $(QPEDIR)/plugins/codecs/liblibmadplugin.so
+        # LIBS  += $(OPIEDIR)/plugins/codecs/liblibmadplugin.so
 
diff --git a/core/multimedia/opieplayer/wavplugin/Makefile.in b/core/multimedia/opieplayer/wavplugin/Makefile.in
index c9203f8..e9fec6c 100644
--- a/core/multimedia/opieplayer/wavplugin/Makefile.in
+++ b/core/multimedia/opieplayer/wavplugin/Makefile.in
@@ -5,6 +5,6 @@
         CXX     =$(SYSCONF_CXX) $(QT_CXX_MT)
-        CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) -DQCONFIG=\"qpe\"
+        CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
         CC      =$(SYSCONF_CC) $(QT_C_MT)
-        CFLAGS  =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -DQCONFIG=\"qpe\"
-        INCPATH =-I$(QPEDIR)/include -I..
+        CFLAGS  =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
+        INCPATH =-I$(OPIEDIR)/include -I..
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
diff --git a/core/multimedia/opieplayer/wavplugin/wavplugin.pro b/core/multimedia/opieplayer/wavplugin/wavplugin.pro
index 4663813..2160431 100644
--- a/core/multimedia/opieplayer/wavplugin/wavplugin.pro
+++ b/core/multimedia/opieplayer/wavplugin/wavplugin.pro
@@ -6,4 +6,4 @@ TARGET		=   wavplugin
         DESTDIR         =   ../../plugins/codecs
-INCLUDEPATH += $(QPEDIR)/include ..
-DEPENDPATH      +=  ../$(QPEDIR)/include ..
+INCLUDEPATH += $(OPIEDIR)/include ..
+DEPENDPATH      +=  ../$(OPIEDIR)/include ..
 LIBS            +=  -lqpe
diff --git a/core/pim/addressbook/Makefile.in b/core/pim/addressbook/Makefile.in
index 93c73c3..c46d0e5 100644
--- a/core/pim/addressbook/Makefile.in
+++ b/core/pim/addressbook/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -16,3 +16,3 @@ UIC	=	$(SYSCONF_UIC)
 
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
@@ -90,3 +90,3 @@ moc: $(SRCMOC)
 tmake:
-        tmake p4addressbook.pro
+        tmake addressbook.pro
 
@@ -125,4 +125,4 @@ main.o: main.cpp \
                 addressbook.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/qcopenvelope_qws.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
 
@@ -130,8 +130,8 @@ addressbook.o: addressbook.cpp \
                 abeditor.h \
-                $(QPEDIR)/include/qpe/contact.h \
-                $(QPEDIR)/include/qpe/palmtoprecord.h \
-                $(QPEDIR)/include/qpe/recordfields.h \
+                $(OPIEDIR)/include/qpe/contact.h \
+                $(OPIEDIR)/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/recordfields.h \
                 ablabel.h \
                 abtable.h \
-                $(QPEDIR)/include/qpe/categories.h \
+                $(OPIEDIR)/include/qpe/categories.h \
                 addresssettings.h \
@@ -139,12 +139,12 @@ addressbook.o: addressbook.cpp \
                 addressbook.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/config.h \
-                $(QPEDIR)/include/qpe/finddialog.h \
-                $(QPEDIR)/include/qpe/global.h \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/ir.h \
-                $(QPEDIR)/include/qpe/qpemessagebox.h \
-                $(QPEDIR)/include/qpe/qcopenvelope_qws.h \
-                $(QPEDIR)/include/qpe/qpemenubar.h \
-                $(QPEDIR)/include/qpe/qpetoolbar.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/finddialog.h \
+                $(OPIEDIR)/include/qpe/global.h \
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/ir.h \
+                $(OPIEDIR)/include/qpe/qpemessagebox.h \
+                $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
+                $(OPIEDIR)/include/qpe/qpemenubar.h \
+                $(OPIEDIR)/include/qpe/qpetoolbar.h
 
@@ -152,9 +152,9 @@ abeditor.o: abeditor.cpp \
                 abeditor.h \
-                $(QPEDIR)/include/qpe/contact.h \
-                $(QPEDIR)/include/qpe/palmtoprecord.h \
-                $(QPEDIR)/include/qpe/recordfields.h \
+                $(OPIEDIR)/include/qpe/contact.h \
+                $(OPIEDIR)/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/recordfields.h \
                 addresspicker.h \
-                $(QPEDIR)/include/qpe/categoryselect.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/qpedialog.h
+                $(OPIEDIR)/include/qpe/categoryselect.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/qpedialog.h
 
@@ -162,17 +162,17 @@ ablabel.o: ablabel.cpp \
                 ablabel.h \
-                $(QPEDIR)/include/qpe/contact.h \
-                $(QPEDIR)/include/qpe/palmtoprecord.h \
-                $(QPEDIR)/include/qpe/recordfields.h \
-                $(QPEDIR)/include/qpe/stringutil.h
+                $(OPIEDIR)/include/qpe/contact.h \
+                $(OPIEDIR)/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/recordfields.h \
+                $(OPIEDIR)/include/qpe/stringutil.h
 
 abtable.o: abtable.cpp \
-                $(QPEDIR)/include/qpe/categoryselect.h \
-                $(QPEDIR)/include/qpe/config.h \
-                $(QPEDIR)/include/qpe/stringutil.h \
-                $(QPEDIR)/include/qpe/qcopenvelope_qws.h \
+                $(OPIEDIR)/include/qpe/categoryselect.h \
+                $(OPIEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/stringutil.h \
+                $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
                 abtable.h \
-                $(QPEDIR)/include/qpe/categories.h \
-                $(QPEDIR)/include/qpe/contact.h \
-                $(QPEDIR)/include/qpe/palmtoprecord.h \
-                $(QPEDIR)/include/qpe/recordfields.h
+                $(OPIEDIR)/include/qpe/categories.h \
+                $(OPIEDIR)/include/qpe/contact.h \
+                $(OPIEDIR)/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/recordfields.h
 
@@ -181,6 +181,6 @@ addresssettings.o: addresssettings.cpp \
                 addresssettingsbase.h \
-                $(QPEDIR)/include/qpe/config.h \
-                $(QPEDIR)/include/qpe/contact.h \
-                $(QPEDIR)/include/qpe/palmtoprecord.h \
-                $(QPEDIR)/include/qpe/recordfields.h
+                $(OPIEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/contact.h \
+                $(OPIEDIR)/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/recordfields.h
 
@@ -201,5 +201,5 @@ moc_abeditor.o: moc_abeditor.cpp \
                 abeditor.h \
-                $(QPEDIR)/include/qpe/contact.h \
-                $(QPEDIR)/include/qpe/palmtoprecord.h \
-                $(QPEDIR)/include/qpe/recordfields.h
+                $(OPIEDIR)/include/qpe/contact.h \
+                $(OPIEDIR)/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/recordfields.h
 
@@ -207,5 +207,5 @@ moc_ablabel.o: moc_ablabel.cpp \
                 ablabel.h \
-                $(QPEDIR)/include/qpe/contact.h \
-                $(QPEDIR)/include/qpe/palmtoprecord.h \
-                $(QPEDIR)/include/qpe/recordfields.h
+                $(OPIEDIR)/include/qpe/contact.h \
+                $(OPIEDIR)/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/recordfields.h
 
@@ -213,6 +213,6 @@ moc_abtable.o: moc_abtable.cpp \
                 abtable.h \
-                $(QPEDIR)/include/qpe/categories.h \
-                $(QPEDIR)/include/qpe/contact.h \
-                $(QPEDIR)/include/qpe/palmtoprecord.h \
-                $(QPEDIR)/include/qpe/recordfields.h
+                $(OPIEDIR)/include/qpe/categories.h \
+                $(OPIEDIR)/include/qpe/contact.h \
+                $(OPIEDIR)/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/recordfields.h
 
diff --git a/core/pim/addressbook/addressbook.pro b/core/pim/addressbook/addressbook.pro
index 8d3401d..32e21a2 100644
--- a/core/pim/addressbook/addressbook.pro
+++ b/core/pim/addressbook/addressbook.pro
@@ -2,3 +2,3 @@ TEMPLATE	= app
         CONFIG  = qt warn_on release
-        DESTDIR         = $(QPEDIR)/bin
+        DESTDIR         = $(OPIEDIR)/bin
         HEADERS= addressbook.h \
@@ -17,4 +17,4 @@ INTERFACES	= addresssettingsbase.ui
         TARGET  = addressbook
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/core/pim/datebook/Makefile.in b/core/pim/datebook/Makefile.in
index bdc69dc..0c3282e 100644
--- a/core/pim/datebook/Makefile.in
+++ b/core/pim/datebook/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -16,3 +16,3 @@ UIC	=	$(SYSCONF_UIC)
 
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
@@ -162,6 +162,8 @@ main.o: main.cpp \
                 datebook.h \
-                $(QPEDIR)/include/qpe/datebookdb.h \
-                $(QPEDIR)/include/qpe/event.h \
-                $(QPEDIR)/include/qpe/palmtoprecord.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/datebookdb.h \
+                $(OPIEDIR)/include/qpe/event.h \
+                $(OPIEDIR)/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/timeconversion.h \
+                $(OPIEDIR)/include/qpe/qpcglobal.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
@@ -169,11 +171,13 @@ datebookday.o: datebookday.cpp \
                 datebookday.h \
-                $(QPEDIR)/include/qpe/event.h \
-                $(QPEDIR)/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/event.h \
+                $(OPIEDIR)/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/timeconversion.h \
+                $(OPIEDIR)/include/qpe/qpcglobal.h \
                 datebookdayheaderimpl.h \
                 datebookdayheader.h \
-                $(QPEDIR)/include/qpe/datebookdb.h \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/timestring.h \
-                $(QPEDIR)/include/qpe/qpedebug.h
+                $(OPIEDIR)/include/qpe/datebookdb.h \
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/timestring.h \
+                $(OPIEDIR)/include/qpe/qpedebug.h
 
@@ -181,5 +185,7 @@ datebook.o: datebook.cpp \
                 datebook.h \
-                $(QPEDIR)/include/qpe/datebookdb.h \
-                $(QPEDIR)/include/qpe/event.h \
-                $(QPEDIR)/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/datebookdb.h \
+                $(OPIEDIR)/include/qpe/event.h \
+                $(OPIEDIR)/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/timeconversion.h \
+                $(OPIEDIR)/include/qpe/qpcglobal.h \
                 datebookday.h \
@@ -190,16 +196,16 @@ datebook.o: datebook.cpp \
                 dateentry.h \
-                $(QPEDIR)/include/qpe/datebookmonth.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/config.h \
-                $(QPEDIR)/include/qpe/qpedebug.h \
-                $(QPEDIR)/include/qpe/finddialog.h \
-                $(QPEDIR)/include/qpe/ir.h \
-                $(QPEDIR)/include/qpe/qpemenubar.h \
-                $(QPEDIR)/include/qpe/qpemessagebox.h \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/sound.h \
-                $(QPEDIR)/include/qpe/timestring.h \
-                $(QPEDIR)/include/qpe/qpetoolbar.h \
-                $(QPEDIR)/include/qpe/tzselect.h \
-                $(QPEDIR)/include/qpe/xmlreader.h
+                $(OPIEDIR)/include/qpe/datebookmonth.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/qpedebug.h \
+                $(OPIEDIR)/include/qpe/finddialog.h \
+                $(OPIEDIR)/include/qpe/ir.h \
+                $(OPIEDIR)/include/qpe/qpemenubar.h \
+                $(OPIEDIR)/include/qpe/qpemessagebox.h \
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/sound.h \
+                $(OPIEDIR)/include/qpe/timestring.h \
+                $(OPIEDIR)/include/qpe/qpetoolbar.h \
+                $(OPIEDIR)/include/qpe/tzselect.h \
+                $(OPIEDIR)/include/qpe/xmlreader.h
 
@@ -208,13 +214,14 @@ dateentryimpl.o: dateentryimpl.cpp \
                 dateentry.h \
-                $(QPEDIR)/include/qpe/event.h \
-                $(QPEDIR)/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/event.h \
+                $(OPIEDIR)/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/timeconversion.h \
+                $(OPIEDIR)/include/qpe/qpcglobal.h \
                 repeatentry.h \
                 repeatentrybase.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/categoryselect.h \
-                $(QPEDIR)/include/qpe/datebookmonth.h \
-                $(QPEDIR)/include/qpe/global.h \
-                $(QPEDIR)/include/qpe/timeconversion.h \
-                $(QPEDIR)/include/qpe/timestring.h \
-                $(QPEDIR)/include/qpe/tzselect.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/categoryselect.h \
+                $(OPIEDIR)/include/qpe/datebookmonth.h \
+                $(OPIEDIR)/include/qpe/global.h \
+                $(OPIEDIR)/include/qpe/timestring.h \
+                $(OPIEDIR)/include/qpe/tzselect.h
 
@@ -223,6 +230,8 @@ datebookdayheaderimpl.o: datebookdayheaderimpl.cpp \
                 datebookdayheader.h \
-                $(QPEDIR)/include/qpe/datebookmonth.h \
-                $(QPEDIR)/include/qpe/event.h \
-                $(QPEDIR)/include/qpe/palmtoprecord.h \
-                $(QPEDIR)/include/qpe/timestring.h
+                $(OPIEDIR)/include/qpe/datebookmonth.h \
+                $(OPIEDIR)/include/qpe/event.h \
+                $(OPIEDIR)/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/timeconversion.h \
+                $(OPIEDIR)/include/qpe/qpcglobal.h \
+                $(OPIEDIR)/include/qpe/timestring.h
 
@@ -231,3 +240,3 @@ datebooksettings.o: datebooksettings.cpp \
                 datebooksettingsbase.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
@@ -235,10 +244,12 @@ datebookweek.o: datebookweek.cpp \
                 datebookweek.h \
-                $(QPEDIR)/include/qpe/event.h \
-                $(QPEDIR)/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/event.h \
+                $(OPIEDIR)/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/timeconversion.h \
+                $(OPIEDIR)/include/qpe/qpcglobal.h \
                 datebookweekheaderimpl.h \
                 datebookweekheader.h \
-                $(QPEDIR)/include/qpe/calendar.h \
-                $(QPEDIR)/include/qpe/datebookdb.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/timestring.h
+                $(OPIEDIR)/include/qpe/calendar.h \
+                $(OPIEDIR)/include/qpe/datebookdb.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/timestring.h
 
@@ -251,7 +262,9 @@ repeatentry.o: repeatentry.cpp \
                 repeatentrybase.h \
-                $(QPEDIR)/include/qpe/event.h \
-                $(QPEDIR)/include/qpe/palmtoprecord.h \
-                $(QPEDIR)/include/qpe/datebookmonth.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/timestring.h
+                $(OPIEDIR)/include/qpe/event.h \
+                $(OPIEDIR)/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/timeconversion.h \
+                $(OPIEDIR)/include/qpe/qpcglobal.h \
+                $(OPIEDIR)/include/qpe/datebookmonth.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/timestring.h
 
@@ -299,4 +312,6 @@ moc_datebookday.o: moc_datebookday.cpp \
                 datebookday.h \
-                $(QPEDIR)/include/qpe/event.h \
-                $(QPEDIR)/include/qpe/palmtoprecord.h
+                $(OPIEDIR)/include/qpe/event.h \
+                $(OPIEDIR)/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/timeconversion.h \
+                $(OPIEDIR)/include/qpe/qpcglobal.h
 
@@ -304,5 +319,7 @@ moc_datebook.o: moc_datebook.cpp \
                 datebook.h \
-                $(QPEDIR)/include/qpe/datebookdb.h \
-                $(QPEDIR)/include/qpe/event.h \
-                $(QPEDIR)/include/qpe/palmtoprecord.h
+                $(OPIEDIR)/include/qpe/datebookdb.h \
+                $(OPIEDIR)/include/qpe/event.h \
+                $(OPIEDIR)/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/timeconversion.h \
+                $(OPIEDIR)/include/qpe/qpcglobal.h
 
@@ -311,4 +328,6 @@ moc_dateentryimpl.o: moc_dateentryimpl.cpp \
                 dateentry.h \
-                $(QPEDIR)/include/qpe/event.h \
-                $(QPEDIR)/include/qpe/palmtoprecord.h
+                $(OPIEDIR)/include/qpe/event.h \
+                $(OPIEDIR)/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/timeconversion.h \
+                $(OPIEDIR)/include/qpe/qpcglobal.h
 
@@ -320,4 +339,6 @@ moc_datebookweek.o: moc_datebookweek.cpp \
                 datebookweek.h \
-                $(QPEDIR)/include/qpe/event.h \
-                $(QPEDIR)/include/qpe/palmtoprecord.h
+                $(OPIEDIR)/include/qpe/event.h \
+                $(OPIEDIR)/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/timeconversion.h \
+                $(OPIEDIR)/include/qpe/qpcglobal.h
 
@@ -330,4 +351,6 @@ moc_repeatentry.o: moc_repeatentry.cpp \
                 repeatentrybase.h \
-                $(QPEDIR)/include/qpe/event.h \
-                $(QPEDIR)/include/qpe/palmtoprecord.h
+                $(OPIEDIR)/include/qpe/event.h \
+                $(OPIEDIR)/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/timeconversion.h \
+                $(OPIEDIR)/include/qpe/qpcglobal.h
 
diff --git a/core/pim/datebook/datebook.pro b/core/pim/datebook/datebook.pro
index 17c02ec..fae5d2b 100644
--- a/core/pim/datebook/datebook.pro
+++ b/core/pim/datebook/datebook.pro
@@ -2,3 +2,3 @@ TEMPLATE	= app
         CONFIG  += qt warn_on release
-        DESTDIR         = $(QPEDIR)/bin
+        DESTDIR         = $(OPIEDIR)/bin
 
@@ -29,4 +29,4 @@ INTERFACES	= dateentry.ui \
 
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/core/pim/todo/Makefile.in b/core/pim/todo/Makefile.in
index f3c5f0e..efe6a35 100644
--- a/core/pim/todo/Makefile.in
+++ b/core/pim/todo/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -16,3 +16,3 @@ UIC	=	$(SYSCONF_UIC)
 
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
@@ -115,3 +115,3 @@ main.o: main.cpp \
                 mainwindow.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
@@ -121,16 +121,16 @@ mainwindow.o: mainwindow.cpp \
                 todoentry.h \
-                $(QPEDIR)/include/qpe/task.h \
-                $(QPEDIR)/include/qpe/palmtoprecord.h \
-                $(QPEDIR)/include/qpe/stringutil.h \
+                $(OPIEDIR)/include/qpe/task.h \
+                $(OPIEDIR)/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/stringutil.h \
                 todotable.h \
-                $(QPEDIR)/include/qpe/categories.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/config.h \
-                $(QPEDIR)/include/qpe/finddialog.h \
-                $(QPEDIR)/include/qpe/global.h \
-                $(QPEDIR)/include/qpe/ir.h \
-                $(QPEDIR)/include/qpe/qpemenubar.h \
-                $(QPEDIR)/include/qpe/qpemessagebox.h \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/qpetoolbar.h
+                $(OPIEDIR)/include/qpe/categories.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/finddialog.h \
+                $(OPIEDIR)/include/qpe/global.h \
+                $(OPIEDIR)/include/qpe/ir.h \
+                $(OPIEDIR)/include/qpe/qpemenubar.h \
+                $(OPIEDIR)/include/qpe/qpemessagebox.h \
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/qpetoolbar.h
 
@@ -138,8 +138,8 @@ todotable.o: todotable.cpp \
                 todotable.h \
-                $(QPEDIR)/include/qpe/categories.h \
-                $(QPEDIR)/include/qpe/task.h \
-                $(QPEDIR)/include/qpe/palmtoprecord.h \
-                $(QPEDIR)/include/qpe/stringutil.h \
-                $(QPEDIR)/include/qpe/categoryselect.h \
-                $(QPEDIR)/include/qpe/xmlreader.h
+                $(OPIEDIR)/include/qpe/categories.h \
+                $(OPIEDIR)/include/qpe/stringutil.h \
+                $(OPIEDIR)/include/qpe/task.h \
+                $(OPIEDIR)/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/categoryselect.h \
+                $(OPIEDIR)/include/qpe/xmlreader.h
 
@@ -148,11 +148,13 @@ todoentryimpl.o: todoentryimpl.cpp \
                 todoentry.h \
-                $(QPEDIR)/include/qpe/task.h \
-                $(QPEDIR)/include/qpe/palmtoprecord.h \
-                $(QPEDIR)/include/qpe/stringutil.h \
-                $(QPEDIR)/include/qpe/categoryselect.h \
-                $(QPEDIR)/include/qpe/datebookmonth.h \
-                $(QPEDIR)/include/qpe/event.h \
-                $(QPEDIR)/include/qpe/global.h \
-                $(QPEDIR)/include/qpe/imageedit.h \
-                $(QPEDIR)/include/qpe/timestring.h
+                $(OPIEDIR)/include/qpe/task.h \
+                $(OPIEDIR)/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/stringutil.h \
+                $(OPIEDIR)/include/qpe/categoryselect.h \
+                $(OPIEDIR)/include/qpe/datebookmonth.h \
+                $(OPIEDIR)/include/qpe/event.h \
+                $(OPIEDIR)/include/qpe/timeconversion.h \
+                $(OPIEDIR)/include/qpe/qpcglobal.h \
+                $(OPIEDIR)/include/qpe/global.h \
+                $(OPIEDIR)/include/qpe/imageedit.h \
+                $(OPIEDIR)/include/qpe/timestring.h
 
@@ -173,6 +175,6 @@ moc_todotable.o: moc_todotable.cpp \
                 todotable.h \
-                $(QPEDIR)/include/qpe/categories.h \
-                $(QPEDIR)/include/qpe/task.h \
-                $(QPEDIR)/include/qpe/palmtoprecord.h \
-                $(QPEDIR)/include/qpe/stringutil.h
+                $(OPIEDIR)/include/qpe/categories.h \
+                $(OPIEDIR)/include/qpe/stringutil.h \
+                $(OPIEDIR)/include/qpe/task.h \
+                $(OPIEDIR)/include/qpe/palmtoprecord.h
 
@@ -181,5 +183,5 @@ moc_todoentryimpl.o: moc_todoentryimpl.cpp \
                 todoentry.h \
-                $(QPEDIR)/include/qpe/task.h \
-                $(QPEDIR)/include/qpe/palmtoprecord.h \
-                $(QPEDIR)/include/qpe/stringutil.h
+                $(OPIEDIR)/include/qpe/task.h \
+                $(OPIEDIR)/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/stringutil.h
 
diff --git a/core/pim/todo/todo.pro b/core/pim/todo/todo.pro
index e28ea1c..5eb02a2 100644
--- a/core/pim/todo/todo.pro
+++ b/core/pim/todo/todo.pro
@@ -2,3 +2,3 @@ TEMPLATE	= app
         CONFIG  = qt warn_on release
-        DESTDIR         = $(QPEDIR)/bin
+        DESTDIR         = $(OPIEDIR)/bin
         HEADERS= mainwindow.h \
@@ -14,4 +14,4 @@ INTERFACES	= todoentry.ui
         TARGET  = todolist
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/core/settings/citytime/Makefile.in b/core/settings/citytime/Makefile.in
index b058021..4112a68 100644
--- a/core/settings/citytime/Makefile.in
+++ b/core/settings/citytime/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -16,3 +16,3 @@ UIC	=	$(SYSCONF_UIC)
 
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
@@ -121,7 +121,7 @@ citytime.o: citytime.cpp \
                 citytimebase.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/config.h \
-                $(QPEDIR)/include/qpe/timestring.h \
-                $(QPEDIR)/include/qpe/tzselect.h \
-                $(QPEDIR)/include/qpe/qcopenvelope_qws.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/timestring.h \
+                $(OPIEDIR)/include/qpe/tzselect.h \
+                $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
 
@@ -131,5 +131,5 @@ zonemap.o: zonemap.cpp \
                 stylusnormalizer.h \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/timestring.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/timestring.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
@@ -138,3 +138,3 @@ main.o: main.cpp \
                 citytimebase.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
@@ -142,3 +142,3 @@ sun.o: sun.c \
                 sun.h \
-                $(QPEDIR)/include/qpe/qmath.h
+                $(OPIEDIR)/include/qpe/qmath.h
 
diff --git a/core/settings/citytime/citytime.pro b/core/settings/citytime/citytime.pro
index d988b48..3420499 100644
--- a/core/settings/citytime/citytime.pro
+++ b/core/settings/citytime/citytime.pro
@@ -3,3 +3,3 @@ CONFIG += qt warn_on release
 TEMPLATE = app
-DESTDIR         = $(QPEDIR)/bin
+DESTDIR         = $(OPIEDIR)/bin
 INTERFACES = citytimebase.ui
@@ -8,4 +8,4 @@ SOURCES = citytime.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp
 TARGET = citytime
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH      += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/core/settings/light-and-power/Makefile.in b/core/settings/light-and-power/Makefile.in
index 8236ed0..5caa249 100644
--- a/core/settings/light-and-power/Makefile.in
+++ b/core/settings/light-and-power/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
diff --git a/core/settings/light-and-power/light-and-power.pro b/core/settings/light-and-power/light-and-power.pro
index 87bb111..35b51a7 100644
--- a/core/settings/light-and-power/light-and-power.pro
+++ b/core/settings/light-and-power/light-and-power.pro
@@ -6,4 +6,4 @@ SOURCES		= light.cpp main.cpp
         INTERFACES= lightsettingsbase.ui
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= ../$(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= ../$(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/core/settings/security/Makefile.in b/core/settings/security/Makefile.in
index 803edc5..f190e79 100644
--- a/core/settings/security/Makefile.in
+++ b/core/settings/security/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
diff --git a/core/settings/security/security.pro b/core/settings/security/security.pro
index 282127e..f22e7a6 100644
--- a/core/settings/security/security.pro
+++ b/core/settings/security/security.pro
@@ -6,4 +6,4 @@ SOURCES		= security.cpp main.cpp
         INTERFACES= securitybase.ui
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= ../$(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= ../$(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/docs/qcop.doc b/docs/qcop.doc
index 6fe4c71..e62f91d 100644
--- a/docs/qcop.doc
+++ b/docs/qcop.doc
@@ -169,3 +169,3 @@ Such messages in the base Qtopia applications are:
         The <i>file</i> may be an absolute filename or relative
-        to the system HTML documentation directory ($QPEDIR/help/html).
+        to the system HTML documentation directory ($OPIEDIR/help/html).
   </ul>
diff --git a/docs/start.doc b/docs/start.doc
index 9745d9a..01b6ab1 100644
--- a/docs/start.doc
+++ b/docs/start.doc
@@ -60,3 +60,3 @@ To compile the example program for running on the Linux desktop:
 <pre>
-    export QPEDIR=/opt/Qtopia
+    export OPIEDIR=/opt/Qtopia
     export QTDIR=/opt/Qtopia
@@ -71,3 +71,3 @@ To compile the example program for running on the Linux desktop:
    cd somewhere
-   cp -r $QPEDIR/example .
+   cp -r $OPIEDIR/example .
    cd example
@@ -91,5 +91,5 @@ To compile the example program for running on the Linux desktop:
    su # root privileges required to install
-   cp example.desktop $QPEDIR/apps/Applications
-   cp Example.png $QPEDIR/pics
-   cp example $QPEDIR/bin
+   cp example.desktop $OPIEDIR/apps/Applications
+   cp Example.png $OPIEDIR/pics
+   cp example $OPIEDIR/bin
    exit # no need to be root anymore
@@ -137,3 +137,3 @@ on the desktop, the process is similar:
 <pre>
-    export QPEDIR=/opt/Qtopia/sharp
+    export OPIEDIR=/opt/Qtopia/sharp
     export QTDIR=/opt/Qtopia/sharp
diff --git a/etc/init.d/qpe b/etc/init.d/qpe
index 12bb1df..8791e73 100755
--- a/etc/init.d/qpe
+++ b/etc/init.d/qpe
@@ -7,6 +7,6 @@ export QWS_DISPLAY=Transformed:Rot270:0
 export QTDIR=/usr
-export QPEDIR=/opt/QtPalmtop
-if [ ! -x $QPEDIR/bin/qpe ] ; then exit 0 ; fi
+export OPIEDIR=/opt/QtPalmtop
+if [ ! -x $OPIEDIR/bin/qpe ] ; then exit 0 ; fi
 
-$QPEDIR/bin/qpe-reorgfiles
+$OPIEDIR/bin/qpe-reorgfiles
 
@@ -27,3 +27,3 @@ case $1 in
 
-        $QPEDIR/bin/qpe 2>/dev/null >/dev/null &
+        $OPIEDIR/bin/qpe 2>/dev/null >/dev/null &
 
diff --git a/example/example.pro b/example/example.pro
index 2d89311..d150b1c 100644
--- a/example/example.pro
+++ b/example/example.pro
@@ -5,4 +5,4 @@ HEADERS		= example.h
         SOURCES         = main.cpp example.cpp
-        INCLUDEPATH+= $(QPEDIR)/include
-        DEPENDPATH+= $(QPEDIR)/include
+        INCLUDEPATH+= $(OPIEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/freetype/freetype.pro b/freetype/freetype.pro
index 841f6d4..f63a087 100644
--- a/freetype/freetype.pro
+++ b/freetype/freetype.pro
@@ -7,5 +7,5 @@ TARGET		= freetypefactory
         DESTDIR         = ../plugins/fontfactories
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH      += $(QPEDIR)/include
-#INCLUDEPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH      += $(OPIEDIR)/include
+#INCLUDEPATH += $(OPIEDIR)/include
         #DEPENDPATH+= /usr/local/include/freetype2
diff --git a/inputmethods/handwriting/Makefile.in b/inputmethods/handwriting/Makefile.in
index aabb5aa..cd2b47c 100644
--- a/inputmethods/handwriting/Makefile.in
+++ b/inputmethods/handwriting/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
diff --git a/inputmethods/handwriting/handwriting.pro b/inputmethods/handwriting/handwriting.pro
index 999552b..9bccbb9 100644
--- a/inputmethods/handwriting/handwriting.pro
+++ b/inputmethods/handwriting/handwriting.pro
@@ -27,4 +27,4 @@ TARGET		= qhandwriting
         DESTDIR         = ../../plugins/inputmethods
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH      += ../$(QPEDIR)/include ../../taskbar
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH      += ../$(OPIEDIR)/include ../../taskbar
 LIBS            += -lqpe
diff --git a/inputmethods/keyboard/Makefile.in b/inputmethods/keyboard/Makefile.in
index 3631807..16fdcb7 100644
--- a/inputmethods/keyboard/Makefile.in
+++ b/inputmethods/keyboard/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
diff --git a/inputmethods/keyboard/keyboard.pro b/inputmethods/keyboard/keyboard.pro
index 87c838e..6e9df79 100644
--- a/inputmethods/keyboard/keyboard.pro
+++ b/inputmethods/keyboard/keyboard.pro
@@ -12,4 +12,4 @@ TARGET		= qkeyboard
         DESTDIR         = ../../plugins/inputmethods
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH      += ../$(QPEDIR)/include ../../taskbar
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH      += ../$(OPIEDIR)/include ../../taskbar
 LIBS            += -lqpe
diff --git a/inputmethods/pickboard/Makefile.in b/inputmethods/pickboard/Makefile.in
index d72e82d..44310a4 100644
--- a/inputmethods/pickboard/Makefile.in
+++ b/inputmethods/pickboard/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
diff --git a/inputmethods/pickboard/pickboard.pro b/inputmethods/pickboard/pickboard.pro
index 50bc342..ad86370 100644
--- a/inputmethods/pickboard/pickboard.pro
+++ b/inputmethods/pickboard/pickboard.pro
@@ -6,4 +6,4 @@ TARGET		= qpickboard
         DESTDIR         = ../../plugins/inputmethods
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH      += ../$(QPEDIR)/include ../../taskbar
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH      += ../$(OPIEDIR)/include ../../taskbar
 LIBS            += -lqpe
diff --git a/inputmethods/unikeyboard/Makefile.in b/inputmethods/unikeyboard/Makefile.in
index ebbab50..f64d6c8 100644
--- a/inputmethods/unikeyboard/Makefile.in
+++ b/inputmethods/unikeyboard/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
diff --git a/inputmethods/unikeyboard/unikeyboard.pro b/inputmethods/unikeyboard/unikeyboard.pro
index c0aad42..509db07 100644
--- a/inputmethods/unikeyboard/unikeyboard.pro
+++ b/inputmethods/unikeyboard/unikeyboard.pro
@@ -6,4 +6,4 @@ TARGET		= qunikeyboard
         DESTDIR         = ../../plugins/inputmethods
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH      += ../$(QPEDIR)/include ../../taskbar
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH      += ../$(OPIEDIR)/include ../../taskbar
 LIBS            += -lqpe
diff --git a/library/Makefile.in b/library/Makefile.in
index c89390f..b74b818 100644
--- a/library/Makefile.in
+++ b/library/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
-        INCPATH =-I$(QPEDIR)/include -Ibackend
+        INCPATH =-I$(OPIEDIR)/include -Ibackend
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -459,3 +459,4 @@ qpeapplication.o: qpeapplication.cpp \
                 alarmserver.h \
-                applnk.h
+                applnk.h \
+                qpemenubar.h
 
@@ -535,3 +536,4 @@ fontdatabase.o: fontdatabase.cpp \
 power.o: power.cpp \
-                power.h
+                power.h \
+                custom.h
 
@@ -612,3 +614,4 @@ ir.o: ir.cpp \
 backend/vcc_yacc.o: backend/vcc_yacc.cpp \
-                backend/vobject_p.h
+                backend/vobject_p.h \
+                backend/qfiledirect_p.h
 
@@ -681,16 +684,11 @@ lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.ui
 
-passwordbase_p.o: passwordbase_p.cpp \
-                passwordbase_p.h
+passwordbase_p.o: passwordbase_p.cpp
 
-proxiesbase_p.o: proxiesbase_p.cpp \
-                proxiesbase_p.h
+proxiesbase_p.o: proxiesbase_p.cpp
 
-categoryeditbase_p.o: categoryeditbase_p.cpp \
-                categoryeditbase_p.h
+categoryeditbase_p.o: categoryeditbase_p.cpp
 
-findwidgetbase_p.o: findwidgetbase_p.cpp \
-                findwidgetbase_p.h
+findwidgetbase_p.o: findwidgetbase_p.cpp
 
-lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp \
-                lnkpropertiesbase_p.h
+lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp
 
diff --git a/library/global.cpp b/library/global.cpp
index e1bbf3e..e5fc2b3 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -136,3 +136,3 @@ static QString qpeDir()
 {
-    QString dir = getenv("QPEDIR");
+    QString dir = getenv("OPIEDIR");
     if ( dir.isEmpty() ) dir = "..";
diff --git a/library/library.pro b/library/library.pro
index 06dfc8f..058d216 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -121,3 +121,3 @@ qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp qprocess.cpp \
 
-INCLUDEPATH += $(QPEDIR)/include backend
+INCLUDEPATH += $(OPIEDIR)/include backend
         LIBS    += -ldl -lcrypt -lm
@@ -128,3 +128,3 @@ TARGET		= qpe
         DESTDIR         = $(QTDIR)/lib$(PROJMAK)
-# This is set by configure$(QPEDIR).
+# This is set by configure$(OPIEDIR).
         VERSION         = 1.5.0
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index f0a68cf..70ffec1 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -792,3 +792,3 @@ QPEApplication::~QPEApplication()
 /*!
-  Returns <tt>$QPEDIR/</tt>.
+  Returns <tt>$OPIEDIR/</tt>.
 */
@@ -796,3 +796,3 @@ QString QPEApplication::qpeDir()
 {
-    const char *base = getenv( "QPEDIR" );
+    const char *base = getenv( "OPIEDIR" );
     if ( base )
diff --git a/mkipks b/mkipks
index 947b19e..45f2fb2 100755
--- a/mkipks
+++ b/mkipks
@@ -10,6 +10,6 @@ ln -s ../init.d/qpe etc/rc2.d/S98qpe
 
-VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$QPEDIR/include/qpe/version.h)
-VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$QPEDIR/include/qpe/version.h)
-VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$QPEDIR/include/qpe/version.h)
-if grep -q 'QPE_VERSION .*snapshot' $QPEDIR/include/qpe/version.h
+VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h)
+VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h)
+VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$OPIEDIR/include/qpe/version.h)
+if grep -q 'QPE_VERSION .*snapshot' $OPIEDIR/include/qpe/version.h
 then
@@ -49,5 +49,5 @@ do
     ;; -rpm)
-        if [ "$QPEDIR" != "/opt/Qtopia" ]
+        if [ "$OPIEDIR" != "/opt/Qtopia" ]
         then
-            echo >&2 '$QPEDIR is not the standard /usr/Qtopia directory.'
+            echo >&2 '$OPIEDIR is not the standard /usr/Qtopia directory.'
             sleep 1
@@ -72,3 +72,3 @@ if [ -z "$FILES" ]
 then
-    FILES=`find $QPEDIR -name "*.control" -print`
+    FILES=`find $OPIEDIR -name "*.control" -print`
 fi
@@ -76,3 +76,3 @@ fi
 RDIR=$PWD
-cd $QPEDIR
+cd $OPIEDIR
 
@@ -142,3 +142,3 @@ do
                          /*) RPMFILES="$RPMFILES $ff"
-                        ;; *) RPMFILES="$RPMFILES $QPEDIR/$ff"
+                        ;; *) RPMFILES="$RPMFILES $OPIEDIR/$ff"
                         esac
diff --git a/noncore/apps/dictionary/dictionary.pro b/noncore/apps/dictionary/dictionary.pro
index e829e68..fc89411 100644
--- a/noncore/apps/dictionary/dictionary.pro
+++ b/noncore/apps/dictionary/dictionary.pro
@@ -9,4 +9,4 @@ INTERFACES	= dicttoolbase.ui
 
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/noncore/apps/tableviewer/tableviewer.pro b/noncore/apps/tableviewer/tableviewer.pro
index edd41c5..c9d068e 100644
--- a/noncore/apps/tableviewer/tableviewer.pro
+++ b/noncore/apps/tableviewer/tableviewer.pro
@@ -33,4 +33,4 @@ INTERFACES	= ui/tvkeyedit_gen.ui
         TARGET  = tableviewer
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH     += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH     += $(OPIEDIR)/include
         LIBS       += -lqpe
diff --git a/noncore/comm/keypebble/Makefile.in b/noncore/comm/keypebble/Makefile.in
index 1dbd5d2..18c43e8 100644
--- a/noncore/comm/keypebble/Makefile.in
+++ b/noncore/comm/keypebble/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -167,3 +167,3 @@ krfbcanvas.o: krfbcanvas.cpp \
                 krfbbuffer.h \
-                $(QPEDIR)/include/qpe/config.h
+                $(OPIEDIR)/include/qpe/config.h
 
@@ -182,3 +182,3 @@ krfbdecoder.o: krfbdecoder.cpp \
                 krfbbuffer.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
@@ -190,4 +190,4 @@ krfblogin.o: krfblogin.cpp \
 krfboptions.o: krfboptions.cpp \
-                $(QPEDIR)/include/qpe/config.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
                 krfboptions.h
@@ -195,6 +195,6 @@ krfboptions.o: krfboptions.cpp \
 kvnc.o: kvnc.cpp \
-                $(QPEDIR)/include/qpe/qpemenubar.h \
-                $(QPEDIR)/include/qpe/qpetoolbar.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/global.h \
+                $(OPIEDIR)/include/qpe/qpemenubar.h \
+                $(OPIEDIR)/include/qpe/qpetoolbar.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/global.h \
                 kvnc.h \
@@ -217,3 +217,3 @@ kvncoptionsdlg.o: kvncoptionsdlg.cpp \
 main.o: main.cpp \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
                 kvnc.h
diff --git a/noncore/comm/keypebble/keypebble.pro b/noncore/comm/keypebble/keypebble.pro
index 6b11801..c0efc4f 100644
--- a/noncore/comm/keypebble/keypebble.pro
+++ b/noncore/comm/keypebble/keypebble.pro
@@ -34,4 +34,4 @@ TARGET          = keypebble
 
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH      += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/noncore/games/chess/chess.pro b/noncore/games/chess/chess.pro
index f6650a0..9053809 100644
--- a/noncore/games/chess/chess.pro
+++ b/noncore/games/chess/chess.pro
@@ -4,3 +4,3 @@ DESTDIR = ../bin
 TARGET = chess
-        DEPENDPATH+= $(QPEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 INTERFACES = mainwindow.ui 
@@ -9,3 +9,3 @@ TEMPLATE	=app
         CONFIG+= qt warn_on release
-INCLUDEPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
         LIBS+= -lqpe
diff --git a/noncore/games/fifteen/Makefile.in b/noncore/games/fifteen/Makefile.in
index 23c7334..1cae722 100644
--- a/noncore/games/fifteen/Makefile.in
+++ b/noncore/games/fifteen/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -102,6 +102,6 @@ fifteen.o: fifteen.cpp \
                 fifteen.h \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/config.h \
-                $(QPEDIR)/include/qpe/qpetoolbar.h \
-                $(QPEDIR)/include/qpe/qpemenubar.h
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/qpetoolbar.h \
+                $(OPIEDIR)/include/qpe/qpemenubar.h
 
@@ -109,3 +109,3 @@ main.o: main.cpp \
                 fifteen.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
diff --git a/noncore/games/fifteen/fifteen.pro b/noncore/games/fifteen/fifteen.pro
index 167f4f8..92072ab 100644
--- a/noncore/games/fifteen/fifteen.pro
+++ b/noncore/games/fifteen/fifteen.pro
@@ -6,4 +6,4 @@ SOURCES		= fifteen.cpp \
                 main.cpp
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/noncore/games/go/Makefile.in b/noncore/games/go/Makefile.in
index 27304f1..985eff0 100644
--- a/noncore/games/go/Makefile.in
+++ b/noncore/games/go/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -136,6 +136,6 @@ gowidget.o: gowidget.cpp \
                 goplayutils.h \
-                $(QPEDIR)/include/qpe/config.h \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/qpetoolbar.h \
-                $(QPEDIR)/include/qpe/qpemenubar.h
+                $(OPIEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/qpetoolbar.h \
+                $(OPIEDIR)/include/qpe/qpemenubar.h
 
@@ -146,3 +146,3 @@ main.o: main.cpp \
                 goplayutils.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
diff --git a/noncore/games/go/go.pro b/noncore/games/go/go.pro
index deb90c5..b39b5b4 100644
--- a/noncore/games/go/go.pro
+++ b/noncore/games/go/go.pro
@@ -13,4 +13,4 @@ SOURCES		= amigo.c \
                 main.cpp
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/noncore/games/mindbreaker/Makefile.in b/noncore/games/mindbreaker/Makefile.in
index 88f6fb1..ff29d19 100644
--- a/noncore/games/mindbreaker/Makefile.in
+++ b/noncore/games/mindbreaker/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -16,3 +16,3 @@ UIC	=	$(SYSCONF_UIC)
 
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
@@ -102,3 +102,3 @@ main.o: main.cpp \
                 mindbreaker.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
@@ -106,5 +106,5 @@ mindbreaker.o: mindbreaker.cpp \
                 mindbreaker.h \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/config.h \
-                $(QPEDIR)/include/qpe/qpetoolbar.h
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/qpetoolbar.h
 
diff --git a/noncore/games/mindbreaker/mindbreaker.pro b/noncore/games/mindbreaker/mindbreaker.pro
index 12944d1..fa7dc0c 100644
--- a/noncore/games/mindbreaker/mindbreaker.pro
+++ b/noncore/games/mindbreaker/mindbreaker.pro
@@ -2,3 +2,3 @@ TEMPLATE        = app
 CONFIG          += qt warn_on release
-DESTDIR         = $(QPEDIR)/bin
+DESTDIR         = $(OPIEDIR)/bin
         HEADERS         = mindbreaker.h
@@ -7,4 +7,4 @@ SOURCES		= main.cpp \
 TARGET          = mindbreaker
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH      += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/noncore/games/minesweep/Makefile.in b/noncore/games/minesweep/Makefile.in
index 9ed6234..67ea94c 100644
--- a/noncore/games/minesweep/Makefile.in
+++ b/noncore/games/minesweep/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -16,3 +16,3 @@ UIC	=	$(SYSCONF_UIC)
 
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
@@ -107,3 +107,3 @@ main.o: main.cpp \
                 minesweep.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
@@ -111,3 +111,3 @@ minefield.o: minefield.cpp \
                 minefield.h \
-                $(QPEDIR)/include/qpe/config.h
+                $(OPIEDIR)/include/qpe/config.h
 
@@ -116,6 +116,6 @@ minesweep.o: minesweep.cpp \
                 minefield.h \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/config.h \
-                $(QPEDIR)/include/qpe/qpetoolbar.h \
-                $(QPEDIR)/include/qpe/qpemenubar.h
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/qpetoolbar.h \
+                $(OPIEDIR)/include/qpe/qpemenubar.h
 
diff --git a/noncore/games/minesweep/minesweep.pro b/noncore/games/minesweep/minesweep.pro
index 87484bc..85f626a 100644
--- a/noncore/games/minesweep/minesweep.pro
+++ b/noncore/games/minesweep/minesweep.pro
@@ -2,3 +2,3 @@ TEMPLATE	= app
         CONFIG  = qt warn_on release
-        DESTDIR         = $(QPEDIR)/bin
+        DESTDIR         = $(OPIEDIR)/bin
         HEADERS         = minefield.h \
@@ -8,4 +8,4 @@ SOURCES		= main.cpp \
                   minesweep.cpp
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/noncore/games/parashoot/Makefile.in b/noncore/games/parashoot/Makefile.in
index ff7397e..254bcd2 100644
--- a/noncore/games/parashoot/Makefile.in
+++ b/noncore/games/parashoot/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -16,3 +16,3 @@ UIC	=	$(SYSCONF_UIC)
 
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
@@ -123,6 +123,6 @@ main.o: main.cpp \
                 bullet.h \
-                $(QPEDIR)/include/qpe/sound.h \
+                $(OPIEDIR)/include/qpe/sound.h \
                 base.h \
                 helicopter.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
@@ -132,3 +132,3 @@ interface.o: interface.cpp \
                 bullet.h \
-                $(QPEDIR)/include/qpe/sound.h \
+                $(OPIEDIR)/include/qpe/sound.h \
                 base.h \
@@ -136,4 +136,4 @@ interface.o: interface.cpp \
                 man.h \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/qpetoolbar.h
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/qpetoolbar.h
 
@@ -142,8 +142,8 @@ man.o: man.cpp \
                 man.h \
-                $(QPEDIR)/include/qpe/sound.h \
+                $(OPIEDIR)/include/qpe/sound.h \
                 base.h \
-                $(QPEDIR)/include/qpe/resource.h
+                $(OPIEDIR)/include/qpe/resource.h
 
 cannon.o: cannon.cpp \
-                $(QPEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/resource.h \
                 codes.h \
@@ -151,3 +151,3 @@ cannon.o: cannon.cpp \
                 bullet.h \
-                $(QPEDIR)/include/qpe/sound.h
+                $(OPIEDIR)/include/qpe/sound.h
 
@@ -156,5 +156,5 @@ base.o: base.cpp \
                 base.h \
-                $(QPEDIR)/include/qpe/sound.h \
+                $(OPIEDIR)/include/qpe/sound.h \
                 man.h \
-                $(QPEDIR)/include/qpe/resource.h
+                $(OPIEDIR)/include/qpe/resource.h
 
@@ -163,7 +163,7 @@ bullet.o: bullet.cpp \
                 bullet.h \
-                $(QPEDIR)/include/qpe/sound.h \
+                $(OPIEDIR)/include/qpe/sound.h \
                 man.h \
                 helicopter.h \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/qmath.h
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/qmath.h
 
@@ -171,6 +171,6 @@ helicopter.o: helicopter.cpp \
                 helicopter.h \
-                $(QPEDIR)/include/qpe/sound.h \
+                $(OPIEDIR)/include/qpe/sound.h \
                 man.h \
                 codes.h \
-                $(QPEDIR)/include/qpe/resource.h
+                $(OPIEDIR)/include/qpe/resource.h
 
@@ -180,3 +180,3 @@ moc_interface.o: moc_interface.cpp \
                 bullet.h \
-                $(QPEDIR)/include/qpe/sound.h \
+                $(OPIEDIR)/include/qpe/sound.h \
                 base.h \
@@ -187,3 +187,3 @@ moc_cannon.o: moc_cannon.cpp \
                 bullet.h \
-                $(QPEDIR)/include/qpe/sound.h
+                $(OPIEDIR)/include/qpe/sound.h
 
@@ -191,3 +191,3 @@ moc_bullet.o: moc_bullet.cpp \
                 bullet.h \
-                $(QPEDIR)/include/qpe/sound.h
+                $(OPIEDIR)/include/qpe/sound.h
 
diff --git a/noncore/games/parashoot/parashoot.pro b/noncore/games/parashoot/parashoot.pro
index 631560b..a7a01b2 100644
--- a/noncore/games/parashoot/parashoot.pro
+++ b/noncore/games/parashoot/parashoot.pro
@@ -2,3 +2,3 @@ TEMPLATE	= app
         CONFIG  += qt warn_on release
-        DESTDIR         = $(QPEDIR)/bin
+        DESTDIR         = $(OPIEDIR)/bin
         HEADERS         = interface.h man.h cannon.h base.h bullet.h helicopter.h
@@ -6,4 +6,4 @@ SOURCES		= main.cpp interface.cpp man.cpp cannon.cpp base.cpp bullet.cpp helicop
         TARGET  = parashoot 
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/noncore/games/qasteroids/Makefile.in b/noncore/games/qasteroids/Makefile.in
index 7312743..0dbd9bc 100644
--- a/noncore/games/qasteroids/Makefile.in
+++ b/noncore/games/qasteroids/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -16,3 +16,3 @@ UIC	=	$(SYSCONF_UIC)
 
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
@@ -119,4 +119,4 @@ toplevel.o: toplevel.cpp \
                 ledmeter.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/resource.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/resource.h
 
@@ -125,3 +125,3 @@ view.o: view.cpp \
                 sprites.h \
-                $(QPEDIR)/include/qpe/resource.h
+                $(OPIEDIR)/include/qpe/resource.h
 
@@ -131,3 +131,3 @@ main.o: main.cpp \
                 sprites.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
diff --git a/noncore/games/qasteroids/qasteroids.pro b/noncore/games/qasteroids/qasteroids.pro
index 14a0901..2f5b2e4 100644
--- a/noncore/games/qasteroids/qasteroids.pro
+++ b/noncore/games/qasteroids/qasteroids.pro
@@ -2,3 +2,3 @@ TEMPLATE	= app
         CONFIG  += qt warn_on release
-        DESTDIR         = $(QPEDIR)/bin
+        DESTDIR         = $(OPIEDIR)/bin
         HEADERS         = ledmeter.h  sprites.h  toplevel.h  view.h
@@ -6,4 +6,4 @@ SOURCES		= ledmeter.cpp  toplevel.cpp  view.cpp main.cpp
         TARGET  = qasteroids
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/noncore/games/snake/Makefile.in b/noncore/games/snake/Makefile.in
index 8179b6f..0801db3 100644
--- a/noncore/games/snake/Makefile.in
+++ b/noncore/games/snake/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -16,3 +16,3 @@ UIC	=	$(SYSCONF_UIC)
 
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
@@ -116,3 +116,3 @@ snake.o: snake.cpp \
                 codes.h \
-                $(QPEDIR)/include/qpe/resource.h
+                $(OPIEDIR)/include/qpe/resource.h
 
@@ -121,3 +121,3 @@ target.o: target.cpp \
                 codes.h \
-                $(QPEDIR)/include/qpe/resource.h
+                $(OPIEDIR)/include/qpe/resource.h
 
@@ -126,3 +126,3 @@ obstacle.o: obstacle.cpp \
                 codes.h \
-                $(QPEDIR)/include/qpe/resource.h
+                $(OPIEDIR)/include/qpe/resource.h
 
@@ -133,4 +133,4 @@ interface.o: interface.cpp \
                 obstacle.h \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/qpetoolbar.h
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/qpetoolbar.h
 
@@ -141,3 +141,3 @@ main.o: main.cpp \
                 obstacle.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
diff --git a/noncore/games/snake/snake.pro b/noncore/games/snake/snake.pro
index 6dacdbd..38b4023 100644
--- a/noncore/games/snake/snake.pro
+++ b/noncore/games/snake/snake.pro
@@ -2,3 +2,3 @@ TEMPLATE	= app
         CONFIG  += qt warn_on release
-        DESTDIR         = $(QPEDIR)/bin
+        DESTDIR         = $(OPIEDIR)/bin
         HEADERS         = snake.h target.h obstacle.h interface.h codes.h
@@ -6,4 +6,4 @@ SOURCES		= snake.cpp target.cpp obstacle.cpp interface.cpp main.cpp
         TARGET  = snake
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/noncore/games/solitaire/Makefile.in b/noncore/games/solitaire/Makefile.in
index 3c50345..a0a64fb 100644
--- a/noncore/games/solitaire/Makefile.in
+++ b/noncore/games/solitaire/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -16,3 +16,3 @@ UIC	=	$(SYSCONF_UIC)
 
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
@@ -137,3 +137,3 @@ canvascard.o: canvascard.cpp \
                 canvascard.h \
-                $(QPEDIR)/include/qpe/resource.h
+                $(OPIEDIR)/include/qpe/resource.h
 
@@ -156,3 +156,3 @@ cardpile.o: cardpile.cpp \
                 card.h \
-                $(QPEDIR)/include/qpe/config.h
+                $(OPIEDIR)/include/qpe/config.h
 
@@ -160,3 +160,3 @@ card.o: card.cpp \
                 card.h \
-                $(QPEDIR)/include/qpe/config.h
+                $(OPIEDIR)/include/qpe/config.h
 
@@ -175,5 +175,5 @@ canvascardgame.o: canvascardgame.cpp \
                 canvascardgame.h \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/config.h \
-                $(QPEDIR)/include/qpe/qpemenubar.h
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/qpemenubar.h
 
@@ -190,5 +190,5 @@ freecellcardgame.o: freecellcardgame.cpp \
                 canvascard.h \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/config.h \
-                $(QPEDIR)/include/qpe/qpemenubar.h
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/qpemenubar.h
 
@@ -204,5 +204,5 @@ patiencecardgame.o: patiencecardgame.cpp \
                 canvascard.h \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/config.h \
-                $(QPEDIR)/include/qpe/qpemenubar.h
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/qpemenubar.h
 
@@ -219,5 +219,5 @@ canvascardwindow.o: canvascardwindow.cpp \
                 canvascard.h \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/config.h \
-                $(QPEDIR)/include/qpe/qpemenubar.h \
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/qpemenubar.h \
                 freecellcardgame.h
@@ -226,3 +226,3 @@ main.o: main.cpp \
                 canvascardwindow.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
diff --git a/noncore/games/solitaire/solitaire.pro b/noncore/games/solitaire/solitaire.pro
index 8617cab..1c90c94 100755
--- a/noncore/games/solitaire/solitaire.pro
+++ b/noncore/games/solitaire/solitaire.pro
@@ -3,3 +3,3 @@ TEMPLATE	= app
         CONFIG  += qt warn_on release
-        DESTDIR         = $(QPEDIR)/bin
+        DESTDIR         = $(OPIEDIR)/bin
 
@@ -11,4 +11,4 @@ TARGET		= patience
 
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/noncore/games/tetrix/Makefile.in b/noncore/games/tetrix/Makefile.in
index 3a74fdc..59e172c 100644
--- a/noncore/games/tetrix/Makefile.in
+++ b/noncore/games/tetrix/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -117,3 +117,3 @@ main.o: main.cpp \
                 tpiece.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
@@ -128,3 +128,3 @@ qtetrix.o: qtetrix.cpp \
                 tpiece.h \
-                $(QPEDIR)/include/qpe/resource.h
+                $(OPIEDIR)/include/qpe/resource.h
 
diff --git a/noncore/games/tetrix/tetrix.pro b/noncore/games/tetrix/tetrix.pro
index 1160585..533fab0 100644
--- a/noncore/games/tetrix/tetrix.pro
+++ b/noncore/games/tetrix/tetrix.pro
@@ -13,4 +13,4 @@ SOURCES		= main.cpp \
                     tpiece.cpp
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/noncore/games/wordgame/Makefile.in b/noncore/games/wordgame/Makefile.in
index 5627414..2e0a47c 100644
--- a/noncore/games/wordgame/Makefile.in
+++ b/noncore/games/wordgame/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -16,3 +16,3 @@ UIC	=	$(SYSCONF_UIC)
 
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
@@ -113,5 +113,5 @@ main.o: main.cpp \
                 rulesbase.h \
-                $(QPEDIR)/include/qpe/qdawg.h \
-                $(QPEDIR)/include/qpe/applnk.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qdawg.h \
+                $(OPIEDIR)/include/qpe/applnk.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
@@ -121,9 +121,9 @@ wordgame.o: wordgame.cpp \
                 rulesbase.h \
-                $(QPEDIR)/include/qpe/qdawg.h \
-                $(QPEDIR)/include/qpe/applnk.h \
-                $(QPEDIR)/include/qpe/global.h \
-                $(QPEDIR)/include/qpe/filemanager.h \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/config.h \
-                $(QPEDIR)/include/qpe/qpetoolbar.h
+                $(OPIEDIR)/include/qpe/qdawg.h \
+                $(OPIEDIR)/include/qpe/applnk.h \
+                $(OPIEDIR)/include/qpe/global.h \
+                $(OPIEDIR)/include/qpe/filemanager.h \
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/qpetoolbar.h
 
@@ -149,4 +149,4 @@ moc_wordgame.o: moc_wordgame.cpp \
                 rulesbase.h \
-                $(QPEDIR)/include/qpe/qdawg.h \
-                $(QPEDIR)/include/qpe/applnk.h
+                $(OPIEDIR)/include/qpe/qdawg.h \
+                $(OPIEDIR)/include/qpe/applnk.h
 
diff --git a/noncore/games/wordgame/wordgame.pro b/noncore/games/wordgame/wordgame.pro
index 7feacf9..64f4832 100644
--- a/noncore/games/wordgame/wordgame.pro
+++ b/noncore/games/wordgame/wordgame.pro
@@ -2,3 +2,3 @@ TEMPLATE	= app
         CONFIG  = qt warn_on release
-        DESTDIR         = $(QPEDIR)/bin
+        DESTDIR         = $(OPIEDIR)/bin
         HEADERS         = wordgame.h
@@ -8,4 +8,4 @@ INTERFACES	= newgamebase.ui rulesbase.ui
         TARGET  = wordgame
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/noncore/multimedia/showimg/Makefile.in b/noncore/multimedia/showimg/Makefile.in
index 9255b2d..7c58da1 100644
--- a/noncore/multimedia/showimg/Makefile.in
+++ b/noncore/multimedia/showimg/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -16,3 +16,3 @@ UIC	=	$(SYSCONF_UIC)
 
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
@@ -102,3 +102,3 @@ main.o: main.cpp \
                 showimg.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
@@ -106,7 +106,7 @@ showimg.o: showimg.cpp \
                 showimg.h \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/fileselector.h \
-                $(QPEDIR)/include/qpe/applnk.h \
-                $(QPEDIR)/include/qpe/qpemenubar.h \
-                $(QPEDIR)/include/qpe/qpetoolbar.h
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/fileselector.h \
+                $(OPIEDIR)/include/qpe/applnk.h \
+                $(OPIEDIR)/include/qpe/qpemenubar.h \
+                $(OPIEDIR)/include/qpe/qpetoolbar.h
 
diff --git a/noncore/multimedia/showimg/showimg.pro b/noncore/multimedia/showimg/showimg.pro
index a372f62..29da458 100644
--- a/noncore/multimedia/showimg/showimg.pro
+++ b/noncore/multimedia/showimg/showimg.pro
@@ -3,3 +3,3 @@ TEMPLATE        = app
 CONFIG          += qt warn_on release
-DESTDIR         = $(QPEDIR)/bin
+DESTDIR         = $(OPIEDIR)/bin
 
@@ -12,4 +12,4 @@ TARGET          = showimg
 
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH      += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/noncore/settings/language/Makefile.in b/noncore/settings/language/Makefile.in
index 2babf6e..d1a602d 100644
--- a/noncore/settings/language/Makefile.in
+++ b/noncore/settings/language/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
diff --git a/noncore/settings/language/language.pro b/noncore/settings/language/language.pro
index d1f1bf0..c01ffc8 100644
--- a/noncore/settings/language/language.pro
+++ b/noncore/settings/language/language.pro
@@ -6,4 +6,4 @@ SOURCES		= language.cpp main.cpp
         INTERFACES= languagesettingsbase.ui
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= ../$(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= ../$(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/noncore/settings/sound/Makefile.in b/noncore/settings/sound/Makefile.in
index 1772e12..b42f2e9 100644
--- a/noncore/settings/sound/Makefile.in
+++ b/noncore/settings/sound/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
diff --git a/noncore/settings/sound/sound.pro b/noncore/settings/sound/sound.pro
index 9028a44..44eff44 100644
--- a/noncore/settings/sound/sound.pro
+++ b/noncore/settings/sound/sound.pro
@@ -6,4 +6,4 @@ SOURCES		= soundsettings.cpp main.cpp
         INTERFACES= soundsettingsbase.ui
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= ../$(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= ../$(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/noncore/settings/sysinfo/Makefile.in b/noncore/settings/sysinfo/Makefile.in
index 1149304..fb9d15e 100644
--- a/noncore/settings/sysinfo/Makefile.in
+++ b/noncore/settings/sysinfo/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -16,3 +16,3 @@ UIC	=	$(SYSCONF_UIC)
 
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
@@ -127,3 +127,3 @@ main.o: main.cpp \
                 sysinfo.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
@@ -144,4 +144,4 @@ storage.o: storage.cpp \
 versioninfo.o: versioninfo.cpp \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/version.h \
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/version.h \
                 versioninfo.h
@@ -154,3 +154,3 @@ sysinfo.o: sysinfo.cpp \
                 sysinfo.h \
-                $(QPEDIR)/include/qpe/resource.h
+                $(OPIEDIR)/include/qpe/resource.h
 
diff --git a/noncore/settings/sysinfo/sysinfo.pro b/noncore/settings/sysinfo/sysinfo.pro
index 0c7d907..3393a12 100644
--- a/noncore/settings/sysinfo/sysinfo.pro
+++ b/noncore/settings/sysinfo/sysinfo.pro
@@ -2,3 +2,3 @@ TEMPLATE	= app
         CONFIG  = qt warn_on release
-        DESTDIR         = $(QPEDIR)/bin
+        DESTDIR         = $(OPIEDIR)/bin
         HEADERS         = memory.h \
@@ -18,4 +18,4 @@ INTERFACES	=
 
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/noncore/tools/calc2/binary/binary.pro b/noncore/tools/calc2/binary/binary.pro
index 01ba6a4..2e9ed78 100644
--- a/noncore/tools/calc2/binary/binary.pro
+++ b/noncore/tools/calc2/binary/binary.pro
@@ -11,6 +11,6 @@ SOURCES = binaryimpl.cpp \
 
-INCLUDEPATH     += $(QPEDIR)/include \
-                    $(QPEDIR)/calc2
-DEPENDPATH      += $(QPEDIR)/include 
+INCLUDEPATH     += $(OPIEDIR)/include \
+                    $(OPIEDIR)/calc2
+DEPENDPATH      += $(OPIEDIR)/include 
 
-DESTDIR = $(QPEDIR)/plugins/calculator
+DESTDIR = $(OPIEDIR)/plugins/calculator
diff --git a/noncore/tools/calc2/calc.pro b/noncore/tools/calc2/calc.pro
index c10232a..00e13b7 100644
--- a/noncore/tools/calc2/calc.pro
+++ b/noncore/tools/calc2/calc.pro
@@ -7,4 +7,4 @@ SOURCES += calc.cpp main.cpp engine.cpp
 
-INCLUDEPATH     += $(QPEDIR)/include 
-DEPENDPATH      += $(QPEDIR)/include 
+INCLUDEPATH     += $(OPIEDIR)/include 
+DEPENDPATH      += $(OPIEDIR)/include 
 LIBS += -lqpe -Wl,-export-dynamic 
diff --git a/noncore/tools/calc2/simple/simple.pro b/noncore/tools/calc2/simple/simple.pro
index 92378a6..9e5d4e0 100644
--- a/noncore/tools/calc2/simple/simple.pro
+++ b/noncore/tools/calc2/simple/simple.pro
@@ -9,6 +9,6 @@ SOURCES = simpleimpl.cpp simplefactory.cpp
 
-INCLUDEPATH     += $(QPEDIR)/include \
-                    $(QPEDIR)/calc2
-DEPENDPATH      += $(QPEDIR)/include 
+INCLUDEPATH     += $(OPIEDIR)/include \
+                    $(OPIEDIR)/calc2
+DEPENDPATH      += $(OPIEDIR)/include 
 
-DESTDIR = $(QPEDIR)/plugins/calculator
+DESTDIR = $(OPIEDIR)/plugins/calculator
diff --git a/noncore/tools/calculator/Makefile.in b/noncore/tools/calculator/Makefile.in
index d62b046..ba78df5 100644
--- a/noncore/tools/calculator/Makefile.in
+++ b/noncore/tools/calculator/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -16,3 +16,3 @@ UIC	=	$(SYSCONF_UIC)
 
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
@@ -106,5 +106,5 @@ calculatorimpl.o: calculatorimpl.cpp \
                 calculator.h \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/qmath.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/qmath.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
@@ -113,6 +113,6 @@ main.o: main.cpp \
                 calculator.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
 calculator.h: calculator.ui
-        $(UIC) calculator.ui -o calculator.h
+        $(UIC) calculator.ui -o $(INTERFACE_DECL_PATH)/calculator.h
 
diff --git a/noncore/tools/calculator/calculator.pro b/noncore/tools/calculator/calculator.pro
index 1281fd5..9554d2a 100644
--- a/noncore/tools/calculator/calculator.pro
+++ b/noncore/tools/calculator/calculator.pro
@@ -1,2 +1,2 @@
-        DESTDIR         = $(QPEDIR)/bin
+        DESTDIR         = $(OPIEDIR)/bin
         TEMPLATE= app
@@ -6,4 +6,4 @@ SOURCES		= calculatorimpl.cpp \
                   main.cpp
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/noncore/tools/clock/Makefile.in b/noncore/tools/clock/Makefile.in
index adda9e6..efa7808 100644
--- a/noncore/tools/clock/Makefile.in
+++ b/noncore/tools/clock/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -16,3 +16,3 @@ UIC	=	$(SYSCONF_UIC)
 
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
@@ -102,6 +102,6 @@ clock.o: clock.cpp \
                 clock.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/qcopenvelope_qws.h \
-                $(QPEDIR)/include/qpe/config.h \
-                $(QPEDIR)/include/qpe/timestring.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
+                $(OPIEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/timestring.h
 
@@ -109,3 +109,3 @@ main.o: main.cpp \
                 clock.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
diff --git a/noncore/tools/clock/clock.pro b/noncore/tools/clock/clock.pro
index 97f4d2c..ec27adc 100644
--- a/noncore/tools/clock/clock.pro
+++ b/noncore/tools/clock/clock.pro
@@ -2,3 +2,3 @@ TEMPLATE	= app
         CONFIG  = qt warn_on release
-        DESTDIR         = $(QPEDIR)/bin
+        DESTDIR         = $(OPIEDIR)/bin
         HEADERS         = clock.h
@@ -6,4 +6,4 @@ SOURCES		= clock.cpp \
                   main.cpp
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/noncore/unsupported/filebrowser/Makefile.in b/noncore/unsupported/filebrowser/Makefile.in
index c7238ea..c00d0f5 100644
--- a/noncore/unsupported/filebrowser/Makefile.in
+++ b/noncore/unsupported/filebrowser/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -16,3 +16,3 @@ UIC	=	$(SYSCONF_UIC)
 
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
@@ -108,8 +108,8 @@ filebrowser.o: filebrowser.cpp \
                 filebrowser.h \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/global.h \
-                $(QPEDIR)/include/qpe/mimetype.h \
-                $(QPEDIR)/include/qpe/applnk.h \
-                $(QPEDIR)/include/qpe/qpetoolbar.h \
-                $(QPEDIR)/include/qpe/qpemenubar.h
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/global.h \
+                $(OPIEDIR)/include/qpe/mimetype.h \
+                $(OPIEDIR)/include/qpe/applnk.h \
+                $(OPIEDIR)/include/qpe/qpetoolbar.h \
+                $(OPIEDIR)/include/qpe/qpemenubar.h
 
@@ -120,4 +120,4 @@ main.o: main.cpp \
                 filebrowser.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/mimetype.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/mimetype.h
 
diff --git a/noncore/unsupported/filebrowser/filebrowser.pro b/noncore/unsupported/filebrowser/filebrowser.pro
index 34df79a..5d8f140 100644
--- a/noncore/unsupported/filebrowser/filebrowser.pro
+++ b/noncore/unsupported/filebrowser/filebrowser.pro
@@ -2,3 +2,3 @@ TEMPLATE	= app
         CONFIG  = qt warn_on release
-        DESTDIR         = $(QPEDIR)/bin
+        DESTDIR         = $(OPIEDIR)/bin
         HEADERS         = inlineedit.h \
@@ -8,4 +8,4 @@ SOURCES		= filebrowser.cpp \
                   main.cpp
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/noncore/unsupported/oipkg/Makefile.in b/noncore/unsupported/oipkg/Makefile.in
index 8dd7edb..a7e22ef 100644
--- a/noncore/unsupported/oipkg/Makefile.in
+++ b/noncore/unsupported/oipkg/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -16,3 +16,3 @@ UIC	=	$(SYSCONF_UIC)
 
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
@@ -127,8 +127,8 @@ packagemanager.o: packagemanager.cpp \
                 pksettings.h \
-                $(QPEDIR)/include/qpe/process.h \
-                $(QPEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/stringutil.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/qcopenvelope_qws.h \
-                $(QPEDIR)/include/qpe/applnk.h
+                $(OPIEDIR)/include/qpe/process.h \
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/stringutil.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
+                $(OPIEDIR)/include/qpe/applnk.h
 
@@ -137,3 +137,3 @@ main.o: main.cpp \
                 packagemanagerbase.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
diff --git a/noncore/unsupported/oipkg/qipkg.pro b/noncore/unsupported/oipkg/qipkg.pro
index 90d8703..22a37ee 100644
--- a/noncore/unsupported/oipkg/qipkg.pro
+++ b/noncore/unsupported/oipkg/qipkg.pro
@@ -1,2 +1,2 @@
-        DESTDIR         = $(QPEDIR)/bin
+        DESTDIR         = $(OPIEDIR)/bin
         TEMPLATE= app
@@ -6,4 +6,4 @@ SOURCES		= packagemanager.cpp \
                   main.cpp
-INCLUDEPATH += $(QPEDIR)/include
-        DEPENDPATH+= $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/scripts/q_functions b/scripts/q_functions
index cf2c2e1..0705cc2 100755
--- a/scripts/q_functions
+++ b/scripts/q_functions
@@ -141,12 +141,12 @@ cat << END
 #!/bin/sh
-if [ a\$QPEDIR = a ]
+if [ a\$OPIEDIR = a ]
 then
-echo QPEDIR must be set
+echo OPIEDIR must be set
 exit
 fi
-[ -f \$QPEDIR/pics/$NEW_APP_ICON_FILE ] || cp $NEW_APP_ICON_FILE \$QPEDIR/pics/
-[ -f \$QPEDIR/apps/$NEW_APP_DESKTOP_FILE ] || cp $NEW_APP_DESKTOP_FILE \$QPEDIR/apps/
-mv \$QPEDIR/Makefile \$QPEDIR/Makefile.orig
+[ -f \$OPIEDIR/pics/$NEW_APP_ICON_FILE ] || cp $NEW_APP_ICON_FILE \$OPIEDIR/pics/
+[ -f \$OPIEDIR/apps/$NEW_APP_DESKTOP_FILE ] || cp $NEW_APP_DESKTOP_FILE \$OPIEDIR/apps/
+mv \$OPIEDIR/Makefile \$OPIEDIR/Makefile.orig
 sed "s/APPS=/&$NEW_APP_NAME \\\\\\\\ \\\\
-    /" \$QPEDIR/Makefile.orig >> \$QPEDIR/Makefile
+    /" \$OPIEDIR/Makefile.orig >> \$OPIEDIR/Makefile
 echo You may wish to move the desktop file in to