17 files changed, 152 insertions, 352 deletions

diff --git a/configure b/configure
index 7824e36..3b474c6 100755
--- a/configure
+++ b/configure
@@ -2,13 +2,13 @@
 #
 # Configures to build the Qtopia Environment
 #
 # Copyright 1999-2000 Trolltech AS.  All rights reserved.
 #
 
-PLATFORM=linux-generic-g++
+PLATFORM=generic
 SHARING=shared
 DEBUG=
 QCONFIGARG=
 
 touch .test.qpe.
 if [ '!' -f ${OPIEDIR}/.test.qpe. ];
@@ -26,18 +26,15 @@ then
     echo
     echo
     exit 1
 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=
 
 if grep -q 'VERSION_STR.*"3' $QTDIR/include/qglobal.h
 then
     QT3=yes
@@ -114,12 +111,20 @@ each option:
 
     -platform target ... The platform you are building on ($PLATFORM)
 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...
 
 sed -e 's/^\(VERSION.*= \).*/\1'$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT/ <library/library.pro >library/library.pro-v
 mv library/library.pro-v library/library.pro
 
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
@@ -3,13 +3,13 @@
 ####### Compiler, tools and options
 
         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)
         UIC     =$(SYSCONF_UIC)
 
 ####### Target
@@ -62,14 +62,16 @@ all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
 
 $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
         $(SYSCONF_LINK_LIB)
 
 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)
         -rm -f *~ core
         -rm -f allmoc.cpp
 
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
@@ -96,14 +96,16 @@ all: $(DESTDIR)$(TARGET)
 
 $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
         $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
 
 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)
         -rm -f *~ core
         -rm -f allmoc.cpp
 
@@ -180,20 +182,15 @@ session.o: session.cpp \
                 TEHistory.h \
                 TEmulation.h \
                 keytrans.h
 
 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 \
                 TECommon.h \
                 TEmuVt102.h \
                 TEScreen.h \
@@ -209,14 +206,13 @@ main.o: main.cpp \
                 TECommon.h \
                 TEmuVt102.h \
                 TEScreen.h \
                 TEHistory.h \
                 TEmulation.h \
                 keytrans.h \
-                session.h \
-                $(OPIEDIR)/include/qpe/qpeapplication.h
+                session.h
 
 MyPty.o: MyPty.cpp \
                 MyPty.h
 
 moc_TEWidget.o: moc_TEWidget.cpp \
                 TEWidget.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
@@ -3,12 +3,13 @@ TEMPLATE	= app
         CONFIG  = qt warn_on release
 
         DESTDIR         = $(OPIEDIR)/bin
 
         HEADERS         = background.h \
                   desktop.h \
+                  qprocess.h \
                   info.h \
                   appicons.h \
                   taskbar.h \
                   sidething.h \
                   mrulist.h \
                   stabmon.h \
@@ -43,12 +44,13 @@ HEADERS		= background.h \
         $(OPIEDIR)/rsync/config_rsync.h \
         $(OPIEDIR)/rsync/qrsync.h
         #         quicklauncher.h \
 
         SOURCES         = background.cpp \
                   desktop.cpp \
+                  qprocess.cpp qprocess_unix.cpp \
                   info.cpp \
                   appicons.cpp \
                   taskbar.cpp \
                   sidething.cpp \
                   mrulist.cpp \
                   stabmon.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
@@ -209,16 +209,14 @@ public:
     int compare(const AppLnk* a, const AppLnk* b)
     {
         switch (sortmeth) {
         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:
             return a->type().compare(b->type());
         }
         return 0;
@@ -359,43 +357,52 @@ void LauncherIconView::hideOrShowItems(bool resort)
     hidden.setAutoDelete(TRUE);
     LauncherItem* item = (LauncherItem*)firstItem();
     while (item) {
         links.append(item->takeAppLnk());
         item = (LauncherItem*)item->nextItem();
     }
+    bool oldAutoArrange = autoArrange();
+    setAutoArrange( FALSE );
     clear();
     QListIterator<AppLnk> it(links);
     AppLnk* l;
     while ((l=it.current())) {
         addItem(l,FALSE);
         ++it;
     }
     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 )
     : QVBox( parent, name, fl )
 {
     icons = new LauncherIconView( this );
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
@@ -97,14 +97,16 @@ all: $(DESTDIR)$(TARGET)
 
 $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
         $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
 
 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)
         -rm -f *~ core
         -rm -f allmoc.cpp
 
@@ -132,126 +134,78 @@ 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
 
 moc_videowidget.o: moc_videowidget.cpp \
                 videowidget.h
 
 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
 
 moc_loopcontrol.cpp: loopcontrol.h
         $(MOC) loopcontrol.h -o moc_loopcontrol.cpp
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
@@ -3,13 +3,13 @@
 ####### Compiler, tools and options
 
         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)
         UIC     =$(SYSCONF_UIC)
 
 ####### Target
@@ -142,21 +142,18 @@ REQUIRES=
 
 
 ####### Compile
 
 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 \
                 flash.h \
                 matrix.h \
                 cxform.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
@@ -97,14 +97,16 @@ all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
 
 $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
         $(SYSCONF_LINK_LIB)
 
 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)
         -rm -f *~ core
         -rm -f allmoc.cpp
 
@@ -211,16 +213,13 @@ layer3.o: layer3.c \
 huffman.o: huffman.c \
                 libmad_global.h \
                 huffman.h
 
 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
@@ -126,14 +126,16 @@ all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
 
 $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
         $(SYSCONF_LINK_LIB)
 
 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)
         -rm -f *~ core
         -rm -f allmoc.cpp
 
@@ -173,14 +175,13 @@ libmpeg3plugin.o: libmpeg3plugin.cpp \
                 mpeg3io.h \
                 mpeg3css.h \
                 mpeg3private.inc \
                 audio/mpeg3audio.h \
                 mpeg3vtrack.h \
                 video/mpeg3video.h \
-                mpeg3protos.h \
-                ../mediaplayerplugininterface.h
+                mpeg3protos.h
 
 libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \
                 libmpeg3plugin.h \
                 libmpeg3.h \
                 mpeg3private.h \
                 mpeg3atrack.h \
@@ -190,15 +191,13 @@ libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \
                 mpeg3css.h \
                 mpeg3private.inc \
                 audio/mpeg3audio.h \
                 mpeg3vtrack.h \
                 video/mpeg3video.h \
                 mpeg3protos.h \
-                ../mediaplayerplugininterface.h \
-                libmpeg3pluginimpl.h \
-                ../mediaplayerplugininterface.h
+                libmpeg3pluginimpl.h
 
 bitstream.o: bitstream.c \
                 mpeg3private.h \
                 mpeg3atrack.h \
                 mpeg3demux.h \
                 mpeg3title.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
@@ -62,14 +62,16 @@ all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
 
 $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
         $(SYSCONF_LINK_LIB)
 
 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)
         -rm -f *~ core
         -rm -f allmoc.cpp
 
@@ -97,16 +99,13 @@ 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
@@ -121,14 +121,16 @@ all: $(DESTDIR)$(TARGET)
 
 $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
         $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
 
 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)
         -rm -f *~ core
         -rm -f allmoc.cpp
 
@@ -156,120 +158,54 @@ 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 \
                 datebookweekheader.h
 
 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
 
 dateentry.cpp: dateentry.ui
         $(UIC) dateentry.ui -i dateentry.h -o dateentry.cpp
@@ -306,56 +242,35 @@ datebooksettingsbase.o: datebooksettingsbase.cpp
 
 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 \
                 datebookweekheader.h
 
 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
 
 moc_datebookdayheader.o: moc_datebookdayheader.cpp \
                 datebookdayheader.h
diff --git a/docs/start.doc b/docs/start.doc
index 01b6ab1..53a4e36 100644
--- a/docs/start.doc
+++ b/docs/start.doc
@@ -55,24 +55,24 @@ To compile the example program for running on the Linux desktop:
  <li>
     <p>
     Check the environment is correct:
 
     <p>
 <pre>
-    export OPIEDIR=/opt/Qtopia
+   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>
 
  <li> Generate a Makefile:
 
 <pre>
@@ -86,15 +86,15 @@ To compile the example program for running on the Linux desktop:
 </pre>
 
  <li> Install it:
 
 <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>
 
  <li> To run it, first run the Qt Virtual Framebuffer:
 
 <pre>
@@ -132,30 +132,45 @@ on the desktop, the process is similar:
  <li>
     <p>
     Check the environment is correctly set for the SHARP SL5000:
 
     <p>
 <pre>
-    export OPIEDIR=/opt/Qtopia/sharp
+   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>
   The resulting <tt>example-1.0.0.ipk</tt> can be installed on the
 SL5000 by using <i>Qtopia Desktop</i>.
 </p>
diff --git a/library/Makefile.in b/library/Makefile.in
index b74b818..b8fc1f6 100644
--- a/library/Makefile.in
+++ b/library/Makefile.in
@@ -28,18 +28,18 @@ HEADERS =	calendar.h \
                 resource.h \
                 xmlreader.h \
                 mimetype.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 \
                 qpeapplication.h \
                 qpestyle.h \
                 qpedialog.h \
@@ -75,26 +75,20 @@ HEADERS =	calendar.h \
                 categoryselect.h \
                 categorywidget.h \
                 ir.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 \
                 mimetype.cpp \
                 menubutton.cpp \
                 network.cpp \
                 networkinterface.cpp \
-                proxies.cpp \
                 filemanager.cpp \
                 fontmanager.cpp \
                 qdawg.cpp \
                 datebookmonth.cpp \
                 fileselector.cpp \
                 imageedit.cpp \
@@ -136,26 +130,20 @@ SOURCES =	calendar.cpp \
                 categorywidget.cpp \
                 ir.cpp \
                 backend/vcc_yacc.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 \
                 mimetype.o \
                 menubutton.o \
                 network.o \
                 networkinterface.o \
-                proxies.o \
                 filemanager.o \
                 fontmanager.o \
                 qdawg.o \
                 datebookmonth.o \
                 fileselector.o \
                 imageedit.o \
@@ -198,41 +186,32 @@ OBJECTS =	calendar.o \
                 ir.o \
                 backend/vcc_yacc.o \
                 backend/vobject.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 \
                 moc_qpedialog.cpp \
                 moc_tzselect.cpp \
                 moc_process.cpp \
@@ -244,29 +223,25 @@ SRCMOC	=	moc_menubutton.cpp \
                 moc_categoryedit_p.cpp \
                 moc_categoryselect.cpp \
                 moc_ir.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 \
                 moc_qpedialog.o \
                 moc_tzselect.o \
                 moc_process.o \
@@ -278,16 +253,13 @@ OBJMOC	=	moc_menubutton.o \
                 moc_categoryedit_p.o \
                 moc_categoryselect.o \
                 moc_ir.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
 
 
 ####### Implicit rules
@@ -316,14 +288,16 @@ all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
 
 $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
         $(SYSCONF_LINK_LIB)
 
 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)
         -rm -f *~ core
         -rm -f allmoc.cpp
 
@@ -378,17 +352,12 @@ network.o: network.cpp \
 
 networkinterface.o: networkinterface.cpp \
                 networkinterface.h \
                 network.h \
                 config.h
 
-proxies.o: proxies.cpp \
-                proxies.h \
-                config.h \
-                proxiesbase_p.h
-
 filemanager.o: filemanager.cpp \
                 filemanager.h \
                 applnk.h
 
 fontmanager.o: fontmanager.cpp \
                 fontmanager.h
@@ -407,12 +376,13 @@ datebookmonth.o: datebookmonth.cpp \
                 qpedecoration_qws.h
 
 fileselector.o: fileselector.cpp \
                 fileselector.h \
                 filemanager.h \
                 applnk.h \
+                fileselector_p.h \
                 global.h \
                 resource.h \
                 config.h \
                 storage.h \
                 qpemenubar.h \
                 lnkproperties.h \
@@ -531,14 +501,13 @@ fontdatabase.o: fontdatabase.cpp \
                 qpedecoration_qws.h \
                 timestring.h \
                 fontfactoryinterface.h \
                 fontdatabase.h
 
 power.o: power.cpp \
-                power.h \
-                custom.h
+                power.h
 
 storage.o: storage.cpp
 
 qpemessagebox.o: qpemessagebox.cpp \
                 qpemessagebox.h
 
@@ -630,43 +599,18 @@ finddialog.o: finddialog.cpp \
 
 lnkproperties.o: lnkproperties.cpp \
                 lnkproperties.h \
                 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
 
 categoryeditbase_p.cpp: categoryeditbase_p.ui
         $(UIC) categoryeditbase_p.ui -i categoryeditbase_p.h -o categoryeditbase_p.cpp
 
@@ -681,37 +625,34 @@ lnkpropertiesbase_p.h: lnkpropertiesbase_p.ui
 
 lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.ui
         $(UIC) lnkpropertiesbase_p.ui -i lnkpropertiesbase_p.h -o lnkpropertiesbase_p.cpp
 
 passwordbase_p.o: passwordbase_p.cpp
 
-proxiesbase_p.o: proxiesbase_p.cpp
-
 categoryeditbase_p.o: categoryeditbase_p.cpp
 
 findwidgetbase_p.o: findwidgetbase_p.cpp
 
 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 \
                 timestring.h
 
 moc_fileselector.o: moc_fileselector.cpp \
                 fileselector.h \
                 filemanager.h \
                 applnk.h
 
+moc_fileselector_p.o: moc_fileselector_p.cpp \
+                fileselector_p.h
+
 moc_imageedit.o: moc_imageedit.cpp \
                 imageedit.h
 
 moc_qpedecoration_qws.o: moc_qpedecoration_qws.cpp \
                 qpedecoration_qws.h
 
@@ -763,56 +704,42 @@ moc_findwidget_p.o: moc_findwidget_p.cpp \
 moc_finddialog.o: moc_finddialog.cpp \
                 finddialog.h
 
 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 \
                 global.h \
                 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
 
 moc_qpedecoration_qws.cpp: qpedecoration_qws.h
         $(MOC) qpedecoration_qws.h -o moc_qpedecoration_qws.cpp
 
@@ -858,18 +785,12 @@ moc_findwidget_p.cpp: findwidget_p.h
 moc_finddialog.cpp: finddialog.h
         $(MOC) finddialog.h -o moc_finddialog.cpp
 
 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
 
 network.moc: network.cpp
         $(MOC) network.cpp -o network.moc
 
@@ -879,21 +800,15 @@ password.moc: password.cpp
 process_unix.moc: process_unix.cpp
         $(MOC) process_unix.cpp -o process_unix.moc
 
 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
 
 moc_findwidgetbase_p.cpp: findwidgetbase_p.h
         $(MOC) findwidgetbase_p.h -o moc_findwidgetbase_p.cpp
 
diff --git a/library/global.cpp b/library/global.cpp
index e5fc2b3..fd7579a 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -502,13 +502,13 @@ void Global::invoke(const QString &c)
             for ( int fd = 3; fd < 100; fd++ )
                 ::close( fd );
             ::setpgid( ::getpid(), ::getppid() );
             // 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] );
 #endif //QT_NO_QWS_MULTIPROCESS
 }
 
diff --git a/library/library.pro b/library/library.pro
index 058d216..e71e5a0 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -5,18 +5,18 @@ HEADERS	=   calendar.h \
             resource.h \
             xmlreader.h \
             mimetype.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 \
             qpeapplication.h \
             qpestyle.h \
             qpedialog.h \
@@ -61,13 +61,12 @@ SOURCES	=   calendar.cpp \
             global.cpp \
             xmlreader.cpp \
             mimetype.cpp \
             menubutton.cpp \
             network.cpp \
             networkinterface.cpp \
-            proxies.cpp \
             filemanager.cpp \
             fontmanager.cpp \
             qdawg.cpp \
             datebookmonth.cpp \
             fileselector.cpp \
             imageedit.cpp \
@@ -112,20 +111,19 @@ SOURCES	=   calendar.cpp \
         backend/vobject.cpp \
         findwidget_p.cpp \
         finddialog.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)
 # This is set by configure$(OPIEDIR).
         VERSION         = 1.5.0
 
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
@@ -1,15 +1,15 @@
 #############################################################################
 
 ####### 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)
         UIC     =$(SYSCONF_UIC)
 
 ####### Target
@@ -64,14 +64,16 @@ all: $(DESTDIR)$(TARGET)
 
 $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
         $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
 
 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)
         -rm -f *~ core
         -rm -f allmoc.cpp
 
@@ -99,18 +101,16 @@ 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
 
 mainwindow.cpp: mainwindow.ui
         $(UIC) mainwindow.ui -i mainwindow.h -o mainwindow.cpp
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
@@ -72,14 +72,16 @@ all: $(DESTDIR)$(TARGET)
 
 $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
         $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
 
 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)
         -rm -f *~ core
         -rm -f allmoc.cpp
 
@@ -130,24 +132,19 @@ killable.o: killable.c \
                 amigo.h
 
 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 \
                 amigo.h \
                 go.h \
                 goplayutils.h