*** empty log message ***

17 files changed, 159 insertions, 359 deletions

diff --git a/configure b/configure
index 7824e36..3b474c6 100755
--- a/configure
+++ b/configure
@@ -5,7 +5,7 @@
 # Copyright 1999-2000 Trolltech AS.  All rights reserved.
 #
 
-PLATFORM=linux-generic-g++
+PLATFORM=generic
 SHARING=shared
 DEBUG=
 QCONFIGARG=
@@ -29,12 +29,9 @@ then
 fi
 rm .test.qpe.
 
-mkdir -p include/qpe
-( cd include/qpe &&  rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; )
-
-VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\.[0-9]*\.[0-9]*.*".*/\1/p' <include/qpe/version.h)
-VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.\([0-9]\)\.[0-9]*.*".*/\1/p' <include/qpe/version.h)
-VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.[0-9]*\.\([0-9]*\).*".*/\1/p' <include/qpe/version.h)
+VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\.[0-9]*\.[0-9]*.*".*/\1/p' <library/version.h)
+VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.\([0-9]\)\.[0-9]*.*".*/\1/p' <library/version.h)
+VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.[0-9]*\.\([0-9]*\).*".*/\1/p' <library/version.h)
 
 TOMAKE=
 
@@ -117,6 +114,14 @@ EOF
    exit 0;
 fi
 
+if [ -f library/custom-$PLATFORM.h ]
+then
+    rm -f library/custom.h
+    ln -s custom-$PLATFORM.h library/custom.h
+fi
+
+mkdir -p include/qpe
+( cd include/qpe &&  rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; )
 
 echo Creating makefiles...
 
diff --git a/core/applets/clipboardapplet/Makefile.in b/core/applets/clipboardapplet/Makefile.in
index 2ddeb42..c42404e 100644
--- a/core/applets/clipboardapplet/Makefile.in
+++ b/core/applets/clipboardapplet/Makefile.in
@@ -6,7 +6,7 @@ CXX	=	$(SYSCONF_CXX) $(QT_CXX_MT)
 CXXFLAGS=	$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
 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)
 LIBS	=	$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
 MOC	=	$(SYSCONF_MOC)
@@ -65,8 +65,10 @@ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 
 moc: $(SRCMOC)
 
-tmake:
-	tmake clipboardapplet.pro
+tmake: Makefile.in
+
+Makefile.in: clipboardapplet.pro
+	tmake clipboardapplet.pro -o Makefile.in
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
diff --git a/core/apps/embeddedkonsole/Makefile.in b/core/apps/embeddedkonsole/Makefile.in
index 8a69557..0da49d7 100644
--- a/core/apps/embeddedkonsole/Makefile.in
+++ b/core/apps/embeddedkonsole/Makefile.in
@@ -99,8 +99,10 @@ $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 
 moc: $(SRCMOC)
 
-tmake:
-	tmake embeddedkonsole.pro
+tmake: Makefile.in
+
+Makefile.in: embeddedkonsole.pro
+	tmake embeddedkonsole.pro -o Makefile.in
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
@@ -183,14 +185,9 @@ session.o: session.cpp \
 
 keytrans.o: keytrans.cpp \
 		keytrans.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
 		default.keytab.h
 
 konsole.o: konsole.cpp \
-		$(OPIEDIR)/include/qpe/resource.h \
-		$(OPIEDIR)/include/qpe/qpetoolbar.h \
-		$(OPIEDIR)/include/qpe/qpemenubar.h \
-		$(OPIEDIR)/include/qpe/config.h \
 		konsole.h \
 		MyPty.h \
 		TEWidget.h \
@@ -212,8 +209,7 @@ main.o: main.cpp \
 		TEHistory.h \
 		TEmulation.h \
 		keytrans.h \
-		session.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h
+		session.h
 
 MyPty.o: MyPty.cpp \
 		MyPty.h
diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro
index 0078faf..32cb95f 100644
--- a/core/launcher/launcher.pro
+++ b/core/launcher/launcher.pro
@@ -6,6 +6,7 @@ DESTDIR		= $(OPIEDIR)/bin
 
 HEADERS		= background.h \
 		  desktop.h \
+		  qprocess.h \
 		  info.h \
 		  appicons.h \
 		  taskbar.h \
@@ -46,6 +47,7 @@ HEADERS		= background.h \
 
 SOURCES		= background.cpp \
 		  desktop.cpp \
+		  qprocess.cpp qprocess_unix.cpp \
 		  info.cpp \
 		  appicons.cpp \
 		  taskbar.cpp \
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index ed39720..e8741a2 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -212,10 +212,8 @@ public:
 	case Name:
 	    return a->name().compare(b->name());
 	case Date: {
-	    QFileInfo fa(a->linkFile());
-	    if ( !fa.exists() ) fa.setFile(a->file());
-	    QFileInfo fb(b->linkFile());
-	    if ( !fb.exists() ) fb.setFile(b->file());
+	    QFileInfo fa(a->linkFileKnown() ? a->linkFile() : a->file());
+	    QFileInfo fb(b->linkFileKnown() ? b->linkFile() : b->file());
 	    return fa.lastModified().secsTo(fb.lastModified());
 	}
 	case Type:
@@ -362,6 +360,8 @@ void LauncherIconView::hideOrShowItems(bool resort)
 	links.append(item->takeAppLnk());
 	item = (LauncherItem*)item->nextItem();
     }
+    bool oldAutoArrange = autoArrange();
+    setAutoArrange( FALSE );
     clear();
     QListIterator<AppLnk> it(links);
     AppLnk* l;
@@ -371,28 +371,35 @@ void LauncherIconView::hideOrShowItems(bool resort)
     }
     if ( resort )
 	sort();
+    setAutoArrange( oldAutoArrange );
 }
 
 bool LauncherIconView::removeLink(const QString& linkfile)
 {
     LauncherItem* item = (LauncherItem*)firstItem();
+    AppLnk* l;
+    bool did = FALSE;
+    DocLnk dl(linkfile);
     while (item) {
-	if ( item->appLnk()->linkFile() == linkfile ) {
+	l = item->appLnk();
+	if (  l->linkFileKnown() && l->linkFile() == linkfile || l->file() == linkfile
+		|| dl.isValid() && dl.file() == l->file() ) {
 	    delete item;
-	    return TRUE;
+	    did = TRUE;
 	}
 	item = (LauncherItem*)item->nextItem();
     }
     QListIterator<AppLnk> it(hidden);
-    AppLnk* l;
     while ((l=it.current())) {
 	++it;
-	if ( l->linkFile() == linkfile ) {
+	if ( l->linkFileKnown() && l->linkFile() == linkfile
+		|| l->file() == linkfile
+		|| dl.isValid() && dl.file() == l->file() ) {
 	    hidden.removeRef(l);
-	    return TRUE;
+	   did = TRUE;
 	}
     }
-    return FALSE;
+    return did;
 }
 
 LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl )
diff --git a/core/multimedia/opieplayer/Makefile.in b/core/multimedia/opieplayer/Makefile.in
index 6e007ec..3e1f9fc 100644
--- a/core/multimedia/opieplayer/Makefile.in
+++ b/core/multimedia/opieplayer/Makefile.in
@@ -100,8 +100,10 @@ $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 
 moc: $(SRCMOC)
 
-tmake:
-	tmake mpegplayer.pro
+tmake: Makefile.in
+
+Makefile.in: mpegplayer.pro
+	tmake mpegplayer.pro -o Makefile.in
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
@@ -135,100 +137,57 @@ REQUIRES=
 ####### Compile
 
 main.o: main.cpp \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
 		mediaplayerstate.h \
 		playlistwidget.h \
-		$(OPIEDIR)/include/qpe/applnk.h \
 		audiowidget.h \
 		videowidget.h \
 		loopcontrol.h \
-		mediaplayer.h \
-		$(OPIEDIR)/include/qpe/qlibrary.h \
-		$(OPIEDIR)/include/qpe/qcom.h \
-		$(OPIEDIR)/include/qpe/quuid.h \
-		mediaplayerplugininterface.h
+		mediaplayer.h
 
 loopcontrol.o: loopcontrol.cpp \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
 		loopcontrol.h \
 		videowidget.h \
 		audiodevice.h \
-		mediaplayerplugininterface.h \
-		$(OPIEDIR)/include/qpe/qcom.h \
-		$(OPIEDIR)/include/qpe/quuid.h \
 		mediaplayerstate.h
 
 playlistselection.o: playlistselection.cpp \
-		$(OPIEDIR)/include/qpe/applnk.h \
-		$(OPIEDIR)/include/qpe/resource.h \
 		playlistselection.h
 
 mediaplayerstate.o: mediaplayerstate.cpp \
-		$(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 \
 		mediaplayerstate.h \
 		libmad/libmadpluginimpl.h \
 		libmpeg3/libmpeg3pluginimpl.h \
 		wavplugin/wavpluginimpl.h
 
 videowidget.o: videowidget.cpp \
-		$(OPIEDIR)/include/qpe/resource.h \
 		videowidget.h \
-		mediaplayerplugininterface.h \
-		$(OPIEDIR)/include/qpe/qcom.h \
-		$(OPIEDIR)/include/qpe/quuid.h \
 		mediaplayerstate.h
 
 audiowidget.o: audiowidget.cpp \
-		$(OPIEDIR)/include/qpe/resource.h \
 		audiowidget.h \
 		mediaplayerstate.h
 
 playlistwidget.o: playlistwidget.cpp \
-		$(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 \
 		playlistwidget.h \
 		mediaplayerstate.h
 
 mediaplayer.o: mediaplayer.cpp \
-		$(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 \
-		mediaplayerplugininterface.h \
 		playlistwidget.h \
-		$(OPIEDIR)/include/qpe/applnk.h \
 		audiowidget.h \
 		loopcontrol.h \
 		audiodevice.h \
 		mediaplayerstate.h
 
 audiodevice.o: audiodevice.cpp \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpe/config.h \
-		audiodevice.h \
-		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h
+		audiodevice.h
 
 moc_loopcontrol.o: moc_loopcontrol.cpp \
 		loopcontrol.h
 
 moc_playlistselection.o: moc_playlistselection.cpp \
-		playlistselection.h \
-		$(OPIEDIR)/include/qpe/applnk.h
+		playlistselection.h
 
 moc_mediaplayerstate.o: moc_mediaplayerstate.cpp \
 		mediaplayerstate.h
@@ -240,15 +199,10 @@ moc_audiowidget.o: moc_audiowidget.cpp \
 		audiowidget.h
 
 moc_playlistwidget.o: moc_playlistwidget.cpp \
-		playlistwidget.h \
-		$(OPIEDIR)/include/qpe/applnk.h
+		playlistwidget.h
 
 moc_mediaplayer.o: moc_mediaplayer.cpp \
-		mediaplayer.h \
-		$(OPIEDIR)/include/qpe/qlibrary.h \
-		$(OPIEDIR)/include/qpe/qcom.h \
-		$(OPIEDIR)/include/qpe/quuid.h \
-		mediaplayerplugininterface.h
+		mediaplayer.h
 
 moc_audiodevice.o: moc_audiodevice.cpp \
 		audiodevice.h
diff --git a/core/multimedia/opieplayer/libflash/Makefile.in b/core/multimedia/opieplayer/libflash/Makefile.in
index 52c8557..0947454 100644
--- a/core/multimedia/opieplayer/libflash/Makefile.in
+++ b/core/multimedia/opieplayer/libflash/Makefile.in
@@ -6,7 +6,7 @@ CXX	=	$(SYSCONF_CXX) $(QT_CXX_MT)
 CXXFLAGS=	$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
 CC	=	$(SYSCONF_CC) $(QT_C_MT)
 CFLAGS	=	$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
-INCPATH =	-I$(QPEDIR)/include
+INCPATH =	-I$(OPIEDIR)/include -I..
 LFLAGS	=	$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
 LIBS	=	$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
 MOC	=	$(SYSCONF_MOC)
@@ -145,15 +145,12 @@ REQUIRES=
 
 libflashplugin.o: libflashplugin.cpp \
 		libflashplugin.h \
-		flash.h \
-		../mediaplayerplugininterface.h
+		flash.h
 
 libflashpluginimpl.o: libflashpluginimpl.cpp \
 		libflashplugin.h \
 		flash.h \
-		../mediaplayerplugininterface.h \
-		libflashpluginimpl.h \
-		../mediaplayerplugininterface.h
+		libflashpluginimpl.h
 
 adpcm.o: adpcm.cc \
 		swf.h \
diff --git a/core/multimedia/opieplayer/libmad/Makefile.in b/core/multimedia/opieplayer/libmad/Makefile.in
index 19ded26..d2e1cda 100644
--- a/core/multimedia/opieplayer/libmad/Makefile.in
+++ b/core/multimedia/opieplayer/libmad/Makefile.in
@@ -100,8 +100,10 @@ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 
 moc: $(SRCMOC)
 
-tmake:
-	tmake libmad.pro
+tmake: Makefile.in
+
+Makefile.in: libmad.pro
+	tmake libmad.pro -o Makefile.in
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
@@ -214,13 +216,10 @@ huffman.o: huffman.c \
 
 libmadplugin.o: libmadplugin.cpp \
 		libmadplugin.h \
-		../mediaplayerplugininterface.h \
 		mad.h
 
 libmadpluginimpl.o: libmadpluginimpl.cpp \
 		libmadplugin.h \
-		../mediaplayerplugininterface.h \
-		libmadpluginimpl.h \
-		../mediaplayerplugininterface.h
+		libmadpluginimpl.h
 
 
diff --git a/core/multimedia/opieplayer/libmpeg3/Makefile.in b/core/multimedia/opieplayer/libmpeg3/Makefile.in
index 9881815..4ccdb8c 100644
--- a/core/multimedia/opieplayer/libmpeg3/Makefile.in
+++ b/core/multimedia/opieplayer/libmpeg3/Makefile.in
@@ -129,8 +129,10 @@ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 
 moc: $(SRCMOC)
 
-tmake:
-	tmake libmpeg3.pro
+tmake: Makefile.in
+
+Makefile.in: libmpeg3.pro
+	tmake libmpeg3.pro -o Makefile.in
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
@@ -176,8 +178,7 @@ libmpeg3plugin.o: libmpeg3plugin.cpp \
 		audio/mpeg3audio.h \
 		mpeg3vtrack.h \
 		video/mpeg3video.h \
-		mpeg3protos.h \
-		../mediaplayerplugininterface.h
+		mpeg3protos.h
 
 libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \
 		libmpeg3plugin.h \
@@ -193,9 +194,7 @@ libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \
 		mpeg3vtrack.h \
 		video/mpeg3video.h \
 		mpeg3protos.h \
-		../mediaplayerplugininterface.h \
-		libmpeg3pluginimpl.h \
-		../mediaplayerplugininterface.h
+		libmpeg3pluginimpl.h
 
 bitstream.o: bitstream.c \
 		mpeg3private.h \
diff --git a/core/multimedia/opieplayer/wavplugin/Makefile.in b/core/multimedia/opieplayer/wavplugin/Makefile.in
index e9fec6c..560534e 100644
--- a/core/multimedia/opieplayer/wavplugin/Makefile.in
+++ b/core/multimedia/opieplayer/wavplugin/Makefile.in
@@ -65,8 +65,10 @@ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 
 moc: $(SRCMOC)
 
-tmake:
-	tmake wavplugin.pro
+tmake: Makefile.in
+
+Makefile.in: wavplugin.pro
+	tmake wavplugin.pro -o Makefile.in
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
@@ -100,13 +102,10 @@ REQUIRES=
 ####### Compile
 
 wavplugin.o: wavplugin.cpp \
-		wavplugin.h \
-		../mediaplayerplugininterface.h
+		wavplugin.h
 
 wavpluginimpl.o: wavpluginimpl.cpp \
 		wavplugin.h \
-		../mediaplayerplugininterface.h \
-		wavpluginimpl.h \
-		../mediaplayerplugininterface.h
+		wavpluginimpl.h
 
 
diff --git a/core/pim/datebook/Makefile.in b/core/pim/datebook/Makefile.in
index 0c3282e..cc31efe 100644
--- a/core/pim/datebook/Makefile.in
+++ b/core/pim/datebook/Makefile.in
@@ -124,8 +124,10 @@ $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 
 moc: $(SRCMOC)
 
-tmake:
-	tmake datebook.pro
+tmake: Makefile.in
+
+Makefile.in: datebook.pro
+	tmake datebook.pro -o Makefile.in
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
@@ -159,99 +161,40 @@ REQUIRES=
 ####### Compile
 
 main.o: main.cpp \
-		datebook.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
+		datebook.h
 
 datebookday.o: datebookday.cpp \
 		datebookday.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 \
-		$(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
+		datebookdayheader.h
 
 datebook.o: datebook.cpp \
 		datebook.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 \
 		datebooksettings.h \
 		datebooksettingsbase.h \
 		datebookweek.h \
 		dateentryimpl.h \
-		dateentry.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
+		dateentry.h
 
 dateentryimpl.o: dateentryimpl.cpp \
 		dateentryimpl.h \
 		dateentry.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 \
-		$(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
+		repeatentrybase.h
 
 datebookdayheaderimpl.o: datebookdayheaderimpl.cpp \
 		datebookdayheaderimpl.h \
-		datebookdayheader.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
+		datebookdayheader.h
 
 datebooksettings.o: datebooksettings.cpp \
 		datebooksettings.h \
-		datebooksettingsbase.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h
+		datebooksettingsbase.h
 
 datebookweek.o: datebookweek.cpp \
 		datebookweek.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 \
-		$(OPIEDIR)/include/qpe/calendar.h \
-		$(OPIEDIR)/include/qpe/datebookdb.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpe/timestring.h
+		datebookweekheader.h
 
 datebookweekheaderimpl.o: datebookweekheaderimpl.cpp \
 		datebookweekheaderimpl.h \
@@ -259,14 +202,7 @@ datebookweekheaderimpl.o: datebookweekheaderimpl.cpp \
 
 repeatentry.o: repeatentry.cpp \
 		repeatentry.h \
-		repeatentrybase.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
+		repeatentrybase.h
 
 dateentry.h: dateentry.ui
 	$(UIC) dateentry.ui -o $(INTERFACE_DECL_PATH)/dateentry.h
@@ -309,38 +245,21 @@ datebookweekheader.o: datebookweekheader.cpp
 repeatentrybase.o: repeatentrybase.cpp
 
 moc_datebookday.o: moc_datebookday.cpp \
-		datebookday.h \
-		$(OPIEDIR)/include/qpe/event.h \
-		$(OPIEDIR)/include/qpe/palmtoprecord.h \
-		$(OPIEDIR)/include/qpe/timeconversion.h \
-		$(OPIEDIR)/include/qpe/qpcglobal.h
+		datebookday.h
 
 moc_datebook.o: moc_datebook.cpp \
-		datebook.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
+		datebook.h
 
 moc_dateentryimpl.o: moc_dateentryimpl.cpp \
 		dateentryimpl.h \
-		dateentry.h \
-		$(OPIEDIR)/include/qpe/event.h \
-		$(OPIEDIR)/include/qpe/palmtoprecord.h \
-		$(OPIEDIR)/include/qpe/timeconversion.h \
-		$(OPIEDIR)/include/qpe/qpcglobal.h
+		dateentry.h
 
 moc_datebookdayheaderimpl.o: moc_datebookdayheaderimpl.cpp \
 		datebookdayheaderimpl.h \
 		datebookdayheader.h
 
 moc_datebookweek.o: moc_datebookweek.cpp \
-		datebookweek.h \
-		$(OPIEDIR)/include/qpe/event.h \
-		$(OPIEDIR)/include/qpe/palmtoprecord.h \
-		$(OPIEDIR)/include/qpe/timeconversion.h \
-		$(OPIEDIR)/include/qpe/qpcglobal.h
+		datebookweek.h
 
 moc_datebookweekheaderimpl.o: moc_datebookweekheaderimpl.cpp \
 		datebookweekheaderimpl.h \
@@ -348,11 +267,7 @@ moc_datebookweekheaderimpl.o: moc_datebookweekheaderimpl.cpp \
 
 moc_repeatentry.o: moc_repeatentry.cpp \
 		repeatentry.h \
-		repeatentrybase.h \
-		$(OPIEDIR)/include/qpe/event.h \
-		$(OPIEDIR)/include/qpe/palmtoprecord.h \
-		$(OPIEDIR)/include/qpe/timeconversion.h \
-		$(OPIEDIR)/include/qpe/qpcglobal.h
+		repeatentrybase.h
 
 moc_dateentry.o: moc_dateentry.cpp \
 		dateentry.h
diff --git a/docs/start.doc b/docs/start.doc
index 01b6ab1..53a4e36 100644
--- a/docs/start.doc
+++ b/docs/start.doc
@@ -58,18 +58,18 @@ To compile the example program for running on the Linux desktop:
 
     <p>
 <pre>
-    export OPIEDIR=/opt/Qtopia
-    export QTDIR=/opt/Qtopia
-    export PATH=$QTDIR/bin:$PATH
-    export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-generic-g++
-    export LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH
+   export QPEDIR=/opt/Qtopia
+   export QTDIR=/opt/Qtopia
+   export PATH=$QTDIR/bin:$PATH
+   export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-generic-g++
+   export LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH
 </pre>
 
  <li> Take a copy of the example:
 
 <pre>
    cd somewhere
-   cp -r $OPIEDIR/example .
+   cp -r $QPEDIR/example .
    cd example
 </pre>
 
@@ -89,9 +89,9 @@ To compile the example program for running on the Linux desktop:
 
 <pre>
    su # root privileges required to install
-   cp example.desktop $OPIEDIR/apps/Applications
-   cp Example.png $OPIEDIR/pics
-   cp example $OPIEDIR/bin
+   cp example.desktop $QPEDIR/apps/Applications
+   cp Example.png $QPEDIR/pics
+   cp example $QPEDIR/bin
    exit # no need to be root anymore
 </pre>
 
@@ -135,24 +135,39 @@ on the desktop, the process is similar:
 
     <p>
 <pre>
-    export OPIEDIR=/opt/Qtopia/sharp
-    export QTDIR=/opt/Qtopia/sharp
-    export PATH=$QTDIR/bin:/usr/local/arm/bin:$PATH
-    export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-sharp-g++
+   export QPEDIR=/opt/Qtopia/sharp
+   export QTDIR=/opt/Qtopia/sharp
+   export PATH=$QTDIR/bin:/usr/local/arm/bin:$PATH
+   export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-sharp-g++
 </pre>
 
- <li> Build and install exactly the same as you did for the desktop
-    (note that the generated Makefile is different):
+ <li> Rebuild the makefile ($TMAKEPATH has changed) above:
 <pre>
    make clean
    tmake -o Makefile example.pro
-   ... <i>etc.</i>
 </pre>
 
- <li> To install it on a device, build an ipk package file (you should be root
-	to do this, since then it will strip the executable for you):
+ <li> Build it:
 <pre>
+   make
+</pre>
+
+ <li> Install it (note that this is now going into the /opt/Qtopia/sharp/ directory):
+<pre>
+   su # root privileges required to install
+   cp example.desktop $QPEDIR/apps/Applications
+   cp Example.png $QPEDIR/pics
+   cp example $QPEDIR/bin
+   exit # no need to be root anymore
+</pre>
+
+</pre>
+
+ <li> To install it on a device, build an ipk package file:
+<pre>
+   su # root privileges required to strip the executable
    mkipks example.control
+   exit # no need to be root anymore
 </pre>
 
 <p>
diff --git a/library/Makefile.in b/library/Makefile.in
index b74b818..b8fc1f6 100644
--- a/library/Makefile.in
+++ b/library/Makefile.in
@@ -31,12 +31,12 @@ HEADERS =	calendar.h \
 		menubutton.h \
 		network.h \
 		networkinterface.h \
-		proxies.h \
 		filemanager.h \
 		fontmanager.h \
 		qdawg.h \
 		datebookmonth.h \
 		fileselector.h \
+		fileselector_p.h \
 		imageedit.h \
 		qcopenvelope_qws.h \
 		qpedecoration_qws.h \
@@ -78,12 +78,7 @@ HEADERS =	calendar.h \
 		backend/vobject_p.h \
 		findwidget_p.h \
 		finddialog.h \
-		lnkproperties.h \
-		quuid.h \
-		qcom.h \
-		qlibrary.h \
-		qlibrary_p.h \
-		qprocess.h
+		lnkproperties.h
 SOURCES =	calendar.cpp \
 		global.cpp \
 		xmlreader.cpp \
@@ -91,7 +86,6 @@ SOURCES =	calendar.cpp \
 		menubutton.cpp \
 		network.cpp \
 		networkinterface.cpp \
-		proxies.cpp \
 		filemanager.cpp \
 		fontmanager.cpp \
 		qdawg.cpp \
@@ -139,12 +133,7 @@ SOURCES =	calendar.cpp \
 		backend/vobject.cpp \
 		findwidget_p.cpp \
 		finddialog.cpp \
-		lnkproperties.cpp \
-		quuid.cpp \
-		qlibrary.cpp \
-		qlibrary_unix.cpp \
-		qprocess.cpp \
-		qprocess_unix.cpp
+		lnkproperties.cpp
 OBJECTS =	calendar.o \
 		global.o \
 		xmlreader.o \
@@ -152,7 +141,6 @@ OBJECTS =	calendar.o \
 		menubutton.o \
 		network.o \
 		networkinterface.o \
-		proxies.o \
 		filemanager.o \
 		fontmanager.o \
 		qdawg.o \
@@ -201,35 +189,26 @@ OBJECTS =	calendar.o \
 		findwidget_p.o \
 		finddialog.o \
 		lnkproperties.o \
-		quuid.o \
-		qlibrary.o \
-		qlibrary_unix.o \
-		qprocess.o \
-		qprocess_unix.o \
 		passwordbase_p.o \
-		proxiesbase_p.o \
 		categoryeditbase_p.o \
 		findwidgetbase_p.o \
 		lnkpropertiesbase_p.o
 INTERFACES =    passwordbase_p.ui \
-		proxiesbase_p.ui \
 		categoryeditbase_p.ui \
 		findwidgetbase_p.ui \
 		lnkpropertiesbase_p.ui
 UICDECLS =      passwordbase_p.h \
-		proxiesbase_p.h \
 		categoryeditbase_p.h \
 		findwidgetbase_p.h \
 		lnkpropertiesbase_p.h
 UICIMPLS =      passwordbase_p.cpp \
-		proxiesbase_p.cpp \
 		categoryeditbase_p.cpp \
 		findwidgetbase_p.cpp \
 		lnkpropertiesbase_p.cpp
 SRCMOC	=	moc_menubutton.cpp \
-		moc_proxies.cpp \
 		moc_datebookmonth.cpp \
 		moc_fileselector.cpp \
+		moc_fileselector_p.cpp \
 		moc_imageedit.cpp \
 		moc_qpedecoration_qws.cpp \
 		moc_qpeapplication.cpp \
@@ -247,23 +226,19 @@ SRCMOC	=	moc_menubutton.cpp \
 		moc_findwidget_p.cpp \
 		moc_finddialog.cpp \
 		moc_lnkproperties.cpp \
-		moc_qlibrary_p.cpp \
-		moc_qprocess.cpp \
 		global.moc \
 		network.moc \
 		password.moc \
 		process_unix.moc \
 		timestring.moc \
-		qprocess_unix.moc \
 		moc_passwordbase_p.cpp \
-		moc_proxiesbase_p.cpp \
 		moc_categoryeditbase_p.cpp \
 		moc_findwidgetbase_p.cpp \
 		moc_lnkpropertiesbase_p.cpp
 OBJMOC	=	moc_menubutton.o \
-		moc_proxies.o \
 		moc_datebookmonth.o \
 		moc_fileselector.o \
+		moc_fileselector_p.o \
 		moc_imageedit.o \
 		moc_qpedecoration_qws.o \
 		moc_qpeapplication.o \
@@ -281,10 +256,7 @@ OBJMOC	=	moc_menubutton.o \
 		moc_findwidget_p.o \
 		moc_finddialog.o \
 		moc_lnkproperties.o \
-		moc_qlibrary_p.o \
-		moc_qprocess.o \
 		moc_passwordbase_p.o \
-		moc_proxiesbase_p.o \
 		moc_categoryeditbase_p.o \
 		moc_findwidgetbase_p.o \
 		moc_lnkpropertiesbase_p.o
@@ -319,8 +291,10 @@ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 
 moc: $(SRCMOC)
 
-tmake:
-	tmake library.pro
+tmake: Makefile.in
+
+Makefile.in: library.pro
+	tmake library.pro -o Makefile.in
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
@@ -381,11 +355,6 @@ networkinterface.o: networkinterface.cpp \
 		network.h \
 		config.h
 
-proxies.o: proxies.cpp \
-		proxies.h \
-		config.h \
-		proxiesbase_p.h
-
 filemanager.o: filemanager.cpp \
 		filemanager.h \
 		applnk.h
@@ -410,6 +379,7 @@ fileselector.o: fileselector.cpp \
 		fileselector.h \
 		filemanager.h \
 		applnk.h \
+		fileselector_p.h \
 		global.h \
 		resource.h \
 		config.h \
@@ -534,8 +504,7 @@ fontdatabase.o: fontdatabase.cpp \
 		fontdatabase.h
 
 power.o: power.cpp \
-		power.h \
-		custom.h
+		power.h
 
 storage.o: storage.cpp
 
@@ -633,37 +602,12 @@ lnkproperties.o: lnkproperties.cpp \
 		lnkpropertiesbase_p.h \
 		ir.h
 
-quuid.o: quuid.cpp \
-		quuid.h
-
-qlibrary.o: qlibrary.cpp \
-		qlibrary_p.h \
-		qlibrary.h
-
-qlibrary_unix.o: qlibrary_unix.cpp \
-		qlibrary_p.h \
-		qlibrary.h
-
-qprocess.o: qprocess.cpp \
-		qprocess.h
-
-qprocess_unix.o: qprocess_unix.cpp \
-		qprocess_unix.moc \
-		qprocess.h \
-		qcleanuphandler_p.h
-
 passwordbase_p.h: passwordbase_p.ui
 	$(UIC) passwordbase_p.ui -o $(INTERFACE_DECL_PATH)/passwordbase_p.h
 
 passwordbase_p.cpp: passwordbase_p.ui
 	$(UIC) passwordbase_p.ui -i passwordbase_p.h -o passwordbase_p.cpp
 
-proxiesbase_p.h: proxiesbase_p.ui
-	$(UIC) proxiesbase_p.ui -o $(INTERFACE_DECL_PATH)/proxiesbase_p.h
-
-proxiesbase_p.cpp: proxiesbase_p.ui
-	$(UIC) proxiesbase_p.ui -i proxiesbase_p.h -o proxiesbase_p.cpp
-
 categoryeditbase_p.h: categoryeditbase_p.ui
 	$(UIC) categoryeditbase_p.ui -o $(INTERFACE_DECL_PATH)/categoryeditbase_p.h
 
@@ -684,8 +628,6 @@ lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.ui
 
 passwordbase_p.o: passwordbase_p.cpp
 
-proxiesbase_p.o: proxiesbase_p.cpp
-
 categoryeditbase_p.o: categoryeditbase_p.cpp
 
 findwidgetbase_p.o: findwidgetbase_p.cpp
@@ -695,10 +637,6 @@ lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp
 moc_menubutton.o: moc_menubutton.cpp \
 		menubutton.h
 
-moc_proxies.o: moc_proxies.cpp \
-		proxies.h \
-		config.h
-
 moc_datebookmonth.o: moc_datebookmonth.cpp \
 		datebookmonth.h \
 		calendar.h \
@@ -709,6 +647,9 @@ moc_fileselector.o: moc_fileselector.cpp \
 		filemanager.h \
 		applnk.h
 
+moc_fileselector_p.o: moc_fileselector_p.cpp \
+		fileselector_p.h
+
 moc_imageedit.o: moc_imageedit.cpp \
 		imageedit.h
 
@@ -766,20 +707,13 @@ moc_finddialog.o: moc_finddialog.cpp \
 moc_lnkproperties.o: moc_lnkproperties.cpp \
 		lnkproperties.h
 
-moc_qlibrary_p.o: moc_qlibrary_p.cpp \
-		qlibrary_p.h \
-		qlibrary.h
-
-moc_qprocess.o: moc_qprocess.cpp \
-		qprocess.h
-
 moc_passwordbase_p.o: global.moc \
 		global.cpp
 
-moc_proxiesbase_p.o: network.moc \
+moc_categoryeditbase_p.o: network.moc \
 		network.cpp
 
-moc_categoryeditbase_p.o: password.moc \
+moc_findwidgetbase_p.o: password.moc \
 		password.cpp \
 		password.h \
 		config.h \
@@ -787,29 +721,22 @@ moc_categoryeditbase_p.o: password.moc \
 		backend/contact.h \
 		passwordbase_p.h
 
-moc_findwidgetbase_p.o: process_unix.moc \
+moc_lnkpropertiesbase_p.o: process_unix.moc \
 		process_unix.cpp \
 		process.h
 
-moc_lnkpropertiesbase_p.o: timestring.moc \
-		timestring.cpp \
-		timestring.h \
-		qpeapplication.h \
-		qpedecoration_qws.h \
-		config.h
-
 moc_menubutton.cpp: menubutton.h
 	$(MOC) menubutton.h -o moc_menubutton.cpp
 
-moc_proxies.cpp: proxies.h
-	$(MOC) proxies.h -o moc_proxies.cpp
-
 moc_datebookmonth.cpp: datebookmonth.h
 	$(MOC) datebookmonth.h -o moc_datebookmonth.cpp
 
 moc_fileselector.cpp: fileselector.h
 	$(MOC) fileselector.h -o moc_fileselector.cpp
 
+moc_fileselector_p.cpp: fileselector_p.h
+	$(MOC) fileselector_p.h -o moc_fileselector_p.cpp
+
 moc_imageedit.cpp: imageedit.h
 	$(MOC) imageedit.h -o moc_imageedit.cpp
 
@@ -861,12 +788,6 @@ moc_finddialog.cpp: finddialog.h
 moc_lnkproperties.cpp: lnkproperties.h
 	$(MOC) lnkproperties.h -o moc_lnkproperties.cpp
 
-moc_qlibrary_p.cpp: qlibrary_p.h
-	$(MOC) qlibrary_p.h -o moc_qlibrary_p.cpp
-
-moc_qprocess.cpp: qprocess.h
-	$(MOC) qprocess.h -o moc_qprocess.cpp
-
 global.moc: global.cpp
 	$(MOC) global.cpp -o global.moc
 
@@ -882,15 +803,9 @@ process_unix.moc: process_unix.cpp
 timestring.moc: timestring.cpp
 	$(MOC) timestring.cpp -o timestring.moc
 
-qprocess_unix.moc: qprocess_unix.cpp
-	$(MOC) qprocess_unix.cpp -o qprocess_unix.moc
-
 moc_passwordbase_p.cpp: passwordbase_p.h
 	$(MOC) passwordbase_p.h -o moc_passwordbase_p.cpp
 
-moc_proxiesbase_p.cpp: proxiesbase_p.h
-	$(MOC) proxiesbase_p.h -o moc_proxiesbase_p.cpp
-
 moc_categoryeditbase_p.cpp: categoryeditbase_p.h
 	$(MOC) categoryeditbase_p.h -o moc_categoryeditbase_p.cpp
 
diff --git a/library/global.cpp b/library/global.cpp
index e5fc2b3..fd7579a 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -505,7 +505,7 @@ void Global::invoke(const QString &c)
 	    // Try bindir first, so that foo/bar works too
 	    ::execv( qpeDir()+"/bin/"+args[0], (char * const *)args );
 	    ::execvp( args[0], (char * const *)args );
-	    exit( -1 );
+	    _exit( -1 );
 	}
     }
     StartingAppList::add( list[0] );
diff --git a/library/library.pro b/library/library.pro
index 058d216..e71e5a0 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -8,12 +8,12 @@ HEADERS	=   calendar.h \
 	    menubutton.h \
 	    network.h \
 	    networkinterface.h \
-	    proxies.h \
 	    filemanager.h \
 	    fontmanager.h \
 	    qdawg.h \
 	    datebookmonth.h \
 	    fileselector.h \
+	    fileselector_p.h \
 	    imageedit.h \
 	    qcopenvelope_qws.h \
 	    qpedecoration_qws.h \
@@ -64,7 +64,6 @@ SOURCES	=   calendar.cpp \
 	    menubutton.cpp \
 	    network.cpp \
 	    networkinterface.cpp \
-	    proxies.cpp \
 	    filemanager.cpp \
 	    fontmanager.cpp \
 	    qdawg.cpp \
@@ -115,14 +114,13 @@ SOURCES	=   calendar.cpp \
 	lnkproperties.cpp
 
 # Qt 3 compatibility
-qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h qprocess.h
-qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp qprocess.cpp \
-	       qprocess_unix.cpp
+qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h
+qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp
 
 INCLUDEPATH += $(OPIEDIR)/include backend
 LIBS		+= -ldl -lcrypt -lm
 
-INTERFACES = passwordbase_p.ui proxiesbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui
+INTERFACES = passwordbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui
 
 TARGET		= qpe
 DESTDIR		= $(QTDIR)/lib$(PROJMAK)
diff --git a/noncore/games/chess/Makefile.in b/noncore/games/chess/Makefile.in
index 7354d76..a1f2cd7 100644
--- a/noncore/games/chess/Makefile.in
+++ b/noncore/games/chess/Makefile.in
@@ -3,10 +3,10 @@
 ####### Compiler, tools and options
 
 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)
 LIBS	=	$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
 MOC	=	$(SYSCONF_MOC)
@@ -67,8 +67,10 @@ $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 
 moc: $(SRCMOC)
 
-tmake:
-	tmake chess.pro
+tmake: Makefile.in
+
+Makefile.in: chess.pro
+	tmake chess.pro -o Makefile.in
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
@@ -102,12 +104,10 @@ REQUIRES=
 ####### Compile
 
 chess.o: chess.cpp \
-		$(QPEDIR)/include/qpe/config.h \
-		$(QPEDIR)/include/qpe/resource.h \
 		chess.h
 
 main.o: main.cpp \
-		mainwindow.h
+		chess.h
 
 mainwindow.h: mainwindow.ui
 	$(UIC) mainwindow.ui -o $(INTERFACE_DECL_PATH)/mainwindow.h
diff --git a/noncore/games/go/Makefile.in b/noncore/games/go/Makefile.in
index 985eff0..0395dff 100644
--- a/noncore/games/go/Makefile.in
+++ b/noncore/games/go/Makefile.in
@@ -75,8 +75,10 @@ $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 
 moc: $(SRCMOC)
 
-tmake:
-	tmake go.pro
+tmake: Makefile.in
+
+Makefile.in: go.pro
+	tmake go.pro -o Makefile.in
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
@@ -133,18 +135,13 @@ gowidget.o: gowidget.cpp \
 		gowidget.h \
 		amigo.h \
 		go.h \
-		goplayutils.h \
-		$(OPIEDIR)/include/qpe/config.h \
-		$(OPIEDIR)/include/qpe/resource.h \
-		$(OPIEDIR)/include/qpe/qpetoolbar.h \
-		$(OPIEDIR)/include/qpe/qpemenubar.h
+		goplayutils.h
 
 main.o: main.cpp \
 		gowidget.h \
 		amigo.h \
 		go.h \
-		goplayutils.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h
+		goplayutils.h
 
 moc_gowidget.o: moc_gowidget.cpp \
 		gowidget.h \