17 files changed, 159 insertions, 359 deletions
diff --git a/configure b/configure
index 7824e36..3b474c6 100755
--- a/configure
+++ b/configure
@@ -1,61 +1,58 @@
 #!/bin/sh
 #
 # 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. ];
 then
    rm .test.qpe.
    echo
    echo
    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 $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.'
    echo
    echo
    exit 1
 fi
 rm .test.qpe.
-mkdir -p include/qpe
+VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\.[0-9]*\.[0-9]*.*".*/\1/p' <library/version.h)
-( cd include/qpe &&  rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.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)
-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)
 TOMAKE=
 if grep -q 'VERSION_STR.*"3' $QTDIR/include/qglobal.h
 then
    QT3=yes
 else
    QT3=no
 fi
 # Parse the arguments, setting things to "yes" or "no".
 while [ -n "$1" ]; do
   case $1 in
   -platform|-xplatform) # No difference since we don't need to build moc, etc.
        shift; PLATFORM=$1
        ;;
   -release)
       DEBUG=
        ;;
   -debug)
       DEBUG=-debug
        ;;
   -shared)
@@ -96,48 +93,56 @@ then
 fi
 # Next, emit a usage message if something failed.
 if [ "$HELP" = "yes" ]; then
    cat <<EOF
 Usage: $0 [-debug] [-release] [-shared] [-static] [-qt3] [-platform ...]
 The defaults (*) are usually acceptable.  Here is a short explanation of
 each option:
 *  -release ........... Compile and link Qt with debugging turned off.
    -debug ............. Compile and link Qt with debugging turned on.
 *  -shared ............ Create and use a shared Qt library (libqt.so)
    -static ............ Create and use a static Qt library (libqt.a)
    -qt3 ............... Configure for use with Qt 3.x
    -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
 if [ "$QT3" = yes ]
 then
    VCONFIG="CONFIG+=qt3"
 else
    VCONFIG="CONFIG+=qt2"
 fi
 if [ -f $TMAKEPATH/tmake.conf ]
 then
    # You have tmake. We'll regenerate the file for you...
    echo "Makefiles will be regenerated."
 fi
 H=`pwd`
 if [ -z "$TOMAKE" ]
 then
    TOMAKE=`make showcomponents`
 fi
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
@@ -1,33 +1,33 @@
 #############################################################################
 ####### 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
 DESTDIR = ../../plugins/applets/
 VER_MAJ = 1
 VER_MIN = 0
 VER_PATCH = 0
        TARGET= clipboardapplet
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 ####### Files
        HEADERS =clipboard.h \
                clipboardappletimpl.h
        SOURCES =clipboard.cpp \
                clipboardappletimpl.cpp
        OBJECTS =clipboard.o \
                clipboardappletimpl.o
 INTERFACES =    
 UICDECLS =      
@@ -44,50 +44,52 @@ OBJMOC	=	moc_clipboard.o
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .cxx.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .cc.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .C.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .c.o:
        $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 ####### Build rules
 all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
 $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
        $(SYSCONF_LINK_LIB)
 moc: $(SRCMOC)
-tmake:
+tmake: Makefile.in
-        tmake clipboardapplet.pro
+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
 ####### Extension Modules
 listpromodules:
        @echo 
 listallmodules:
        @echo 
 listaddonpromodules:
        @echo 
 listaddonentmodules:
        @echo 
 REQUIRES=
 ####### Sub-libraries
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
@@ -78,50 +78,52 @@ OBJMOC	=	moc_TEWidget.o \
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .cxx.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .cc.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .C.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .c.o:
        $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 ####### Build rules
 all: $(DESTDIR)$(TARGET)
 $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
        $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
 moc: $(SRCMOC)
-tmake:
+tmake: Makefile.in
-        tmake embeddedkonsole.pro
+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
 ####### Extension Modules
 listpromodules:
        @echo 
 listallmodules:
        @echo 
 listaddonpromodules:
        @echo 
 listaddonentmodules:
        @echo 
 REQUIRES=embeddedkonsole
 ####### Sub-libraries
@@ -162,79 +164,73 @@ TEmulation.o: TEmulation.cpp \
                keytrans.h
 TEmuVt102.o: TEmuVt102.cpp \
                TEmuVt102.h \
                TEWidget.h \
                TECommon.h \
                TEScreen.h \
                TEHistory.h \
                TEmulation.h \
                keytrans.h
 session.o: session.cpp \
                session.h \
                MyPty.h \
                TEWidget.h \
                TECommon.h \
                TEmuVt102.h \
                TEScreen.h \
                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 \
                TEHistory.h \
                TEmulation.h \
                keytrans.h \
                session.h
 main.o: main.cpp \
                konsole.h \
                MyPty.h \
                TEWidget.h \
                TECommon.h \
                TEmuVt102.h \
                TEScreen.h \
                TEHistory.h \
                TEmulation.h \
                keytrans.h \
-                session.h \
+                session.h
-                $(OPIEDIR)/include/qpe/qpeapplication.h
 MyPty.o: MyPty.cpp \
                MyPty.h
 moc_TEWidget.o: moc_TEWidget.cpp \
                TEWidget.h \
                TECommon.h
 moc_TEmulation.o: moc_TEmulation.cpp \
                TEmulation.h \
                TEWidget.h \
                TECommon.h \
                TEScreen.h \
                TEHistory.h \
                keytrans.h
 moc_TEmuVt102.o: moc_TEmuVt102.cpp \
                TEmuVt102.h \
                TEWidget.h \
                TECommon.h \
                TEScreen.h \
                TEHistory.h \
                TEmulation.h \
                keytrans.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
@@ -1,72 +1,74 @@
        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 \
                  inputmethods.h \
                  systray.h \
                  wait.h \
                  shutdownimpl.h \
                  launcher.h \
                  launcherview.h \
                  ../calibrate/calibrate.h \
                  startmenu.h \
                  transferserver.h \
                  qcopbridge.h \
                  packageslave.h \
                irserver.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 \
        SOURCES         = background.cpp \
                  desktop.cpp \
+                  qprocess.cpp qprocess_unix.cpp \
                  info.cpp \
                  appicons.cpp \
                  taskbar.cpp \
                  sidething.cpp \
                  mrulist.cpp \
                  stabmon.cpp \
                  inputmethods.cpp \
                  systray.cpp \
                  wait.cpp \
                  shutdownimpl.cpp \
                  launcher.cpp \
                  launcherview.cpp \
                  $(OPIEDIR)/calibrate/calibrate.cpp \
                  transferserver.cpp \
                  packageslave.cpp \
                irserver.cpp \
                  qcopbridge.cpp \
                  startmenu.cpp \
                  main.cpp \
        $(OPIEDIR)/rsync/base64.c \
        $(OPIEDIR)/rsync/buf.c \
        $(OPIEDIR)/rsync/checksum.c \
        $(OPIEDIR)/rsync/command.c \
        $(OPIEDIR)/rsync/delta.c \
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
@@ -191,52 +191,50 @@ public:
        QString str;
        if ( catfilter == -2 )
            cf = 0;
        else
            cf = catfilter;
        hideOrShowItems(resort);
    }
    enum SortMethod { Name, Date, Type };
    void setSortMethod( SortMethod m )
    {
        if ( sortmeth != m ) {
            sortmeth = m;
            sort();
        }
    }
    int compare(const AppLnk* a, const AppLnk* b)
    {
        switch (sortmeth) {
        case Name:
            return a->name().compare(b->name());
        case Date: {
-            QFileInfo fa(a->linkFile());
+            QFileInfo fa(a->linkFileKnown() ? a->linkFile() : a->file());
-            if ( !fa.exists() ) fa.setFile(a->file());
+            QFileInfo fb(b->linkFileKnown() ? b->linkFile() : b->file());
-            QFileInfo fb(b->linkFile());
-            if ( !fb.exists() ) fb.setFile(b->file());
            return fa.lastModified().secsTo(fb.lastModified());
        }
        case Type:
            return a->type().compare(b->type());
        }
        return 0;
    }
 protected:
    void styleChange( QStyle &old )
    {
        QIconView::styleChange( old );
        //### duplicated code from LauncherView constructor
        int dw = QApplication::desktop()->width();
        setGridX( (dw-13-style().scrollBarExtent().width())/3 ); // tweaked for 8pt+dw=176 and 10pt+dw=240
    }
 private:
    QList<AppLnk> hidden;
    QDict<void> mimes;
    QDict<void> cats;
    SortMethod sortmeth;
    QRegExp tf;
@@ -341,79 +339,88 @@ void LauncherIconView::updateCategoriesAndMimeTypes()
    LauncherItem* item = (LauncherItem*)firstItem();
    while (item) {
        addCatsAndMimes(item->appLnk());
        item = (LauncherItem*)item->nextItem();
    }
    QListIterator<AppLnk> it(hidden);
    AppLnk* l;
    while ((l=it.current())) {
        addCatsAndMimes(l);
        ++it;
    }
 }
 void LauncherIconView::hideOrShowItems(bool resort)
 {
    hidden.setAutoDelete(FALSE);
    QList<AppLnk> links=hidden;
    hidden.clear();
    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 );
    setFocusProxy(icons);
    QPEApplication::setStylusOperation( icons->viewport(), QPEApplication::RightOnHold );
    int dw = QApplication::desktop()->width();
    icons->setItemsMovable( FALSE );
    icons->setAutoArrange( TRUE );
    icons->setSorting( TRUE );
    icons->setGridX( (dw-13-style().scrollBarExtent().width())/3 ); // tweaked for 8pt+dw=176 and 10pt+dw=240
    icons->setGridY( fontMetrics().height()*2+24 );
    icons->setFrameStyle( QFrame::NoFrame );
    icons->setSpacing( 4 );
    icons->setMargin( 0 );
    icons->setSelectionMode( QIconView::Multi );
    icons->setBackgroundMode( PaletteBase );
    connect( icons, SIGNAL(mouseButtonClicked(int, QIconViewItem *, const QPoint&)),
                   SLOT(itemClicked(int, QIconViewItem *)) );
    connect( icons, SIGNAL(selectionChanged()),
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
@@ -79,197 +79,151 @@ OBJMOC	=	moc_loopcontrol.o \
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .cxx.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .cc.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .C.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .c.o:
        $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 ####### Build rules
 all: $(DESTDIR)$(TARGET)
 $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
        $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
 moc: $(SRCMOC)
-tmake:
+tmake: Makefile.in
-        tmake mpegplayer.pro
+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
 ####### Extension Modules
 listpromodules:
        @echo 
 listallmodules:
        @echo 
 listaddonpromodules:
        @echo 
 listaddonentmodules:
        @echo 
 REQUIRES=
 ####### Sub-libraries
 ###### Combined headers
 ####### 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 \
+                mediaplayer.h
-                $(OPIEDIR)/include/qpe/qlibrary.h \
-                $(OPIEDIR)/include/qpe/qcom.h \
-                $(OPIEDIR)/include/qpe/quuid.h \
-                mediaplayerplugininterface.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 \
+                audiodevice.h
-                $(OPIEDIR)/include/qpe/config.h \
-                audiodevice.h \
-                $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
 moc_loopcontrol.o: moc_loopcontrol.cpp \
                loopcontrol.h
 moc_playlistselection.o: moc_playlistselection.cpp \
-                playlistselection.h \
+                playlistselection.h
-                $(OPIEDIR)/include/qpe/applnk.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 \
+                playlistwidget.h
-                $(OPIEDIR)/include/qpe/applnk.h
 moc_mediaplayer.o: moc_mediaplayer.cpp \
-                mediaplayer.h \
+                mediaplayer.h
-                $(OPIEDIR)/include/qpe/qlibrary.h \
-                $(OPIEDIR)/include/qpe/qcom.h \
-                $(OPIEDIR)/include/qpe/quuid.h \
-                mediaplayerplugininterface.h
 moc_audiodevice.o: moc_audiodevice.cpp \
                audiodevice.h
 moc_loopcontrol.cpp: loopcontrol.h
        $(MOC) loopcontrol.h -o moc_loopcontrol.cpp
 moc_playlistselection.cpp: playlistselection.h
        $(MOC) playlistselection.h -o moc_playlistselection.cpp
 moc_mediaplayerstate.cpp: mediaplayerstate.h
        $(MOC) mediaplayerstate.h -o moc_mediaplayerstate.cpp
 moc_videowidget.cpp: videowidget.h
        $(MOC) videowidget.h -o moc_videowidget.cpp
 moc_audiowidget.cpp: audiowidget.h
        $(MOC) audiowidget.h -o moc_audiowidget.cpp
 moc_playlistwidget.cpp: playlistwidget.h
        $(MOC) playlistwidget.h -o moc_playlistwidget.cpp
 moc_mediaplayer.cpp: mediaplayer.h
        $(MOC) mediaplayer.h -o moc_mediaplayer.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
@@ -1,33 +1,33 @@
 #############################################################################
 ####### 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
 DESTDIR = ../../plugins/codecs/
 VER_MAJ = 1
 VER_MIN = 0
 VER_PATCH = 0
        TARGET= flashplugin
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 ####### Files
        HEADERS =libflashplugin.h \
                libflashpluginimpl.h
        SOURCES =libflashplugin.cpp \
                libflashpluginimpl.cpp \
                adpcm.cc \
                character.cc \
                flash.cc \
                graphic16.cc \
@@ -124,57 +124,54 @@ listpromodules:
 listallmodules:
        @echo 
 listaddonpromodules:
        @echo 
 listaddonentmodules:
        @echo 
 REQUIRES=
 ####### Sub-libraries
 ###### Combined headers
 ####### Compile
 libflashplugin.o: libflashplugin.cpp \
                libflashplugin.h \
-                flash.h \
+                flash.h
-                ../mediaplayerplugininterface.h
 libflashpluginimpl.o: libflashpluginimpl.cpp \
                libflashplugin.h \
                flash.h \
-                ../mediaplayerplugininterface.h \
+                libflashpluginimpl.h
-                libflashpluginimpl.h \
-                ../mediaplayerplugininterface.h
 adpcm.o: adpcm.cc \
                swf.h \
                flash.h \
                matrix.h \
                cxform.h \
                rect.h \
                jpeglib.h \
                jconfig.h \
                jmorecfg.h \
                jerror.h \
                graphic.h \
                character.h \
                bitmap.h \
                shape.h \
                displaylist.h \
                sound.h \
                button.h \
                font.h \
                text.h \
                adpcm.h \
                program.h \
                sprite.h \
                script.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
@@ -79,50 +79,52 @@ OBJMOC	=
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .cxx.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .cc.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .C.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .c.o:
        $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 ####### Build rules
 all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
 $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
        $(SYSCONF_LINK_LIB)
 moc: $(SRCMOC)
-tmake:
+tmake: Makefile.in
-        tmake libmad.pro
+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
 ####### Extension Modules
 listpromodules:
        @echo 
 listallmodules:
        @echo 
 listaddonpromodules:
        @echo 
 listaddonentmodules:
        @echo 
 REQUIRES=
 ####### Sub-libraries
@@ -193,34 +195,31 @@ layer12.o: layer12.c \
                frame.h \
                timer.h \
                layer12.h \
                sf_table.dat \
                qc_table.dat
 layer3.o: layer3.c \
                libmad_global.h \
                fixed.h \
                bit.h \
                stream.h \
                frame.h \
                timer.h \
                huffman.h \
                layer3.h \
                rq_table.dat \
                imdct_s.dat
 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
-                libmadpluginimpl.h \
-                ../mediaplayerplugininterface.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
@@ -108,115 +108,114 @@ OBJMOC	=
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .cxx.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .cc.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .C.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .c.o:
        $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 ####### Build rules
 all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
 $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
        $(SYSCONF_LINK_LIB)
 moc: $(SRCMOC)
-tmake:
+tmake: Makefile.in
-        tmake libmpeg3.pro
+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
 ####### Extension Modules
 listpromodules:
        @echo 
 listallmodules:
        @echo 
 listaddonpromodules:
        @echo 
 listaddonentmodules:
        @echo 
 REQUIRES=
 ####### Sub-libraries
 ###### Combined headers
 ####### Compile
 libmpeg3plugin.o: libmpeg3plugin.cpp \
                libmpeg3plugin.h \
                libmpeg3.h \
                mpeg3private.h \
                mpeg3atrack.h \
                mpeg3demux.h \
                mpeg3title.h \
                mpeg3io.h \
                mpeg3css.h \
                mpeg3private.inc \
                audio/mpeg3audio.h \
                mpeg3vtrack.h \
                video/mpeg3video.h \
-                mpeg3protos.h \
+                mpeg3protos.h
-                ../mediaplayerplugininterface.h
 libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \
                libmpeg3plugin.h \
                libmpeg3.h \
                mpeg3private.h \
                mpeg3atrack.h \
                mpeg3demux.h \
                mpeg3title.h \
                mpeg3io.h \
                mpeg3css.h \
                mpeg3private.inc \
                audio/mpeg3audio.h \
                mpeg3vtrack.h \
                video/mpeg3video.h \
                mpeg3protos.h \
-                ../mediaplayerplugininterface.h \
+                libmpeg3pluginimpl.h
-                libmpeg3pluginimpl.h \
-                ../mediaplayerplugininterface.h
 bitstream.o: bitstream.c \
                mpeg3private.h \
                mpeg3atrack.h \
                mpeg3demux.h \
                mpeg3title.h \
                mpeg3io.h \
                mpeg3css.h \
                mpeg3private.inc \
                audio/mpeg3audio.h \
                mpeg3vtrack.h \
                video/mpeg3video.h \
                mpeg3protos.h
 libmpeg3.o: libmpeg3.c \
                libmpeg3.h \
                mpeg3private.h \
                mpeg3atrack.h \
                mpeg3demux.h \
                mpeg3title.h \
                mpeg3io.h \
                mpeg3css.h \
                mpeg3private.inc \
                audio/mpeg3audio.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
@@ -44,69 +44,68 @@ OBJMOC	=
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .cxx.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .cc.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .C.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .c.o:
        $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 ####### Build rules
 all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
 $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
        $(SYSCONF_LINK_LIB)
 moc: $(SRCMOC)
-tmake:
+tmake: Makefile.in
-        tmake wavplugin.pro
+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
 ####### Extension Modules
 listpromodules:
        @echo 
 listallmodules:
        @echo 
 listaddonpromodules:
        @echo 
 listaddonentmodules:
        @echo 
 REQUIRES=
 ####### Sub-libraries
 ###### Combined headers
 ####### Compile
 wavplugin.o: wavplugin.cpp \
-                wavplugin.h \
+                wavplugin.h
-                ../mediaplayerplugininterface.h
 wavpluginimpl.o: wavpluginimpl.cpp \
                wavplugin.h \
-                ../mediaplayerplugininterface.h \
+                wavpluginimpl.h
-                wavpluginimpl.h \
-                ../mediaplayerplugininterface.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
@@ -103,277 +103,192 @@ OBJMOC	=	moc_datebookday.o \
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .cxx.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .cc.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .C.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .c.o:
        $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 ####### Build rules
 all: $(DESTDIR)$(TARGET)
 $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
        $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
 moc: $(SRCMOC)
-tmake:
+tmake: Makefile.in
-        tmake datebook.pro
+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
 ####### Extension Modules
 listpromodules:
        @echo 
 listallmodules:
        @echo 
 listaddonpromodules:
        @echo 
 listaddonentmodules:
        @echo 
 REQUIRES=
 ####### Sub-libraries
 ###### Combined headers
 ####### Compile
 main.o: main.cpp \
-                datebook.h \
+                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
 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 \
+                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
 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 \
+                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
 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 \
+                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
 datebookdayheaderimpl.o: datebookdayheaderimpl.cpp \
                datebookdayheaderimpl.h \
-                datebookdayheader.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
 datebooksettings.o: datebooksettings.cpp \
                datebooksettings.h \
-                datebooksettingsbase.h \
+                datebooksettingsbase.h
-                $(OPIEDIR)/include/qpe/qpeapplication.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 \
+                datebookweekheader.h
-                $(OPIEDIR)/include/qpe/calendar.h \
-                $(OPIEDIR)/include/qpe/datebookdb.h \
-                $(OPIEDIR)/include/qpe/qpeapplication.h \
-                $(OPIEDIR)/include/qpe/timestring.h
 datebookweekheaderimpl.o: datebookweekheaderimpl.cpp \
                datebookweekheaderimpl.h \
                datebookweekheader.h
 repeatentry.o: repeatentry.cpp \
                repeatentry.h \
-                repeatentrybase.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
 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
 datebookdayheader.h: datebookdayheader.ui
        $(UIC) datebookdayheader.ui -o $(INTERFACE_DECL_PATH)/datebookdayheader.h
 datebookdayheader.cpp: datebookdayheader.ui
        $(UIC) datebookdayheader.ui -i datebookdayheader.h -o datebookdayheader.cpp
 datebooksettingsbase.h: datebooksettingsbase.ui
        $(UIC) datebooksettingsbase.ui -o $(INTERFACE_DECL_PATH)/datebooksettingsbase.h
 datebooksettingsbase.cpp: datebooksettingsbase.ui
        $(UIC) datebooksettingsbase.ui -i datebooksettingsbase.h -o datebooksettingsbase.cpp
 datebookweekheader.h: datebookweekheader.ui
        $(UIC) datebookweekheader.ui -o $(INTERFACE_DECL_PATH)/datebookweekheader.h
 datebookweekheader.cpp: datebookweekheader.ui
        $(UIC) datebookweekheader.ui -i datebookweekheader.h -o datebookweekheader.cpp
 repeatentrybase.h: repeatentrybase.ui
        $(UIC) repeatentrybase.ui -o $(INTERFACE_DECL_PATH)/repeatentrybase.h
 repeatentrybase.cpp: repeatentrybase.ui
        $(UIC) repeatentrybase.ui -i repeatentrybase.h -o repeatentrybase.cpp
 dateentry.o: dateentry.cpp
 datebookdayheader.o: datebookdayheader.cpp
 datebooksettingsbase.o: datebooksettingsbase.cpp
 datebookweekheader.o: datebookweekheader.cpp
 repeatentrybase.o: repeatentrybase.cpp
 moc_datebookday.o: moc_datebookday.cpp \
-                datebookday.h \
+                datebookday.h
-                $(OPIEDIR)/include/qpe/event.h \
-                $(OPIEDIR)/include/qpe/palmtoprecord.h \
-                $(OPIEDIR)/include/qpe/timeconversion.h \
-                $(OPIEDIR)/include/qpe/qpcglobal.h
 moc_datebook.o: moc_datebook.cpp \
-                datebook.h \
+                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
 moc_dateentryimpl.o: moc_dateentryimpl.cpp \
                dateentryimpl.h \
-                dateentry.h \
+                dateentry.h
-                $(OPIEDIR)/include/qpe/event.h \
-                $(OPIEDIR)/include/qpe/palmtoprecord.h \
-                $(OPIEDIR)/include/qpe/timeconversion.h \
-                $(OPIEDIR)/include/qpe/qpcglobal.h
 moc_datebookdayheaderimpl.o: moc_datebookdayheaderimpl.cpp \
                datebookdayheaderimpl.h \
                datebookdayheader.h
 moc_datebookweek.o: moc_datebookweek.cpp \
-                datebookweek.h \
+                datebookweek.h
-                $(OPIEDIR)/include/qpe/event.h \
-                $(OPIEDIR)/include/qpe/palmtoprecord.h \
-                $(OPIEDIR)/include/qpe/timeconversion.h \
-                $(OPIEDIR)/include/qpe/qpcglobal.h
 moc_datebookweekheaderimpl.o: moc_datebookweekheaderimpl.cpp \
                datebookweekheaderimpl.h \
                datebookweekheader.h
 moc_repeatentry.o: moc_repeatentry.cpp \
                repeatentry.h \
-                repeatentrybase.h \
+                repeatentrybase.h
-                $(OPIEDIR)/include/qpe/event.h \
-                $(OPIEDIR)/include/qpe/palmtoprecord.h \
-                $(OPIEDIR)/include/qpe/timeconversion.h \
-                $(OPIEDIR)/include/qpe/qpcglobal.h
 moc_dateentry.o: moc_dateentry.cpp \
                dateentry.h
 moc_datebookdayheader.o: moc_datebookdayheader.cpp \
                datebookdayheader.h
 moc_datebooksettingsbase.o: moc_datebooksettingsbase.cpp \
                datebooksettingsbase.h
 moc_datebookweekheader.o: moc_datebookweekheader.cpp \
                datebookweekheader.h
 moc_repeatentrybase.o: moc_repeatentrybase.cpp \
                repeatentrybase.h
 moc_datebookday.cpp: datebookday.h
        $(MOC) datebookday.h -o moc_datebookday.cpp
 moc_datebook.cpp: datebook.h
        $(MOC) datebook.h -o moc_datebook.cpp
 moc_dateentryimpl.cpp: dateentryimpl.h
        $(MOC) dateentryimpl.h -o moc_dateentryimpl.cpp
diff --git a/docs/start.doc b/docs/start.doc
index 01b6ab1..53a4e36 100644
--- a/docs/start.doc
+++ b/docs/start.doc
@@ -37,143 +37,158 @@ environment. It also includes cross-compiler software so that you can
 compile your application to run on the target handheld device.
 If you do not already have the Qtopia SDK (this document is normally
 part of the SDK), contact info@trolltech.com, or see the
 <a href=http://www.trolltech.com>Trolltech</a> web site.
 <p>To build applications for the SHARP SL5000 or similar StrongARM-based devices,
 you will also need a StrongARM cross compiler. Entrants in the programming
 contest for this device will have received both the SDK and a cross-compiler.
 <p>
 The SDK includes an example program. We recommend that you compile and
 run this example to learn how things work, before tackling your own
 projects.
 <p>
 To compile the example program for running on the Linux desktop:
 <ol>
 <li>
    <p>
    Check the environment is correct:
    <p>
 <pre>
-    export OPIEDIR=/opt/Qtopia
+   export QPEDIR=/opt/Qtopia
-    export QTDIR=/opt/Qtopia
+   export QTDIR=/opt/Qtopia
-    export PATH=$QTDIR/bin:$PATH
+   export PATH=$QTDIR/bin:$PATH
-    export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-generic-g++
+   export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-generic-g++
-    export LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH
+   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>
   tmake -o Makefile example.pro
 </pre>
 <li> Build the example:
 <pre>
   make
 </pre>
 <li> Install it:
 <pre>
   su # root privileges required to install
-   cp example.desktop $OPIEDIR/apps/Applications
+   cp example.desktop $QPEDIR/apps/Applications
-   cp Example.png $OPIEDIR/pics
+   cp Example.png $QPEDIR/pics
-   cp example $OPIEDIR/bin
+   cp example $QPEDIR/bin
   exit # no need to be root anymore
 </pre>
 <li> To run it, first run the Qt Virtual Framebuffer:
 <pre>
   qvfb &amp;
 </pre>
 <li> Then run the <i>Qtopia</i> environment:
 <pre>
   qpe
 </pre>
 <p>
 Your application should be available in the Applications tab visible
 inside the Qt Virtual Framebuffer window.
 </p>
 <li> If you want to distribute your applications to others, build an RPM package, e.g.:
 <pre>
   mkipks -rpm -arch i386 example.control
 </pre>
 </ol>
 <p>
 To make your own application, use the example program as a model. Make sure that
 when you add files to your project, you also add them
 to your project file (e.g. <tt>example.pro</tt>) and rerun the
 <tt>tmake</tt> command to update the <tt>Makefile</tt>.
 <p>
 To build you application for the SHARP SL5000 rather than just running
 on the desktop, the process is similar:
 <ol>
 <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 QTDIR=/opt/Qtopia/sharp
-    export PATH=$QTDIR/bin:/usr/local/arm/bin:$PATH
+   export PATH=$QTDIR/bin:/usr/local/arm/bin:$PATH
-    export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-sharp-g++
+   export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-sharp-g++
 </pre>
- <li> Build and install exactly the same as you did for the desktop
+ <li> Rebuild the makefile ($TMAKEPATH has changed) above:
-    (note that the generated Makefile is different):
 <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
+ <li> Build it:
-        to do this, since then it will strip the executable for you):
 <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>
 </ol>
 <h3>Building Your Own Applications</h3>
 Once you have built the example, you can proceed with writing
 your own applicatons. If you are not familiar with Qt, you should
 consult the Qt documentation by pointing your web browser at
 <a href=file:/opt/Qtopia/doc/html/index.html><tt>/opt/Qtopia/doc/html/index.html</tt></a>
 when you have installed the SDK, or use the online
 <a href=http://doc.trolltech.com/>Trolltech Documentation Site</a>.
 The <a href="http://www.trolltech.com/products/qt/whitepaper.html">Qt
 Whitepaper</a> provides a good overview of, and introduction to, the
 Qt API.
 <p>
 When you add more files to your application, just edit the project
 file (e.g. <tt>example.pro</tt>) and rerun the <tt>tmake</tt>
diff --git a/library/Makefile.in b/library/Makefile.in
index b74b818..b8fc1f6 100644
--- a/library/Makefile.in
+++ b/library/Makefile.in
@@ -10,338 +10,312 @@ INCPATH =	-I$(OPIEDIR)/include -Ibackend
        LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
        LIBS    =$(SUBLIBS) -ldl -lcrypt -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
        MOC     =$(SYSCONF_MOC)
        UIC     =$(SYSCONF_UIC)
 ####### Target
 DESTDIR = $(QTDIR)/lib$(PROJMAK)/
 VER_MAJ = 1
 VER_MIN = 5
 VER_PATCH = 0
        TARGET= qpe
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 ####### Files
        HEADERS =calendar.h \
                global.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 \
                lightstyle.h \
                config.h \
                applnk.h \
                sound.h \
                tzselect.h \
                qmath.h \
                datebookdb.h \
                alarmserver.h \
                process.h \
                password.h \
                timestring.h \
                fontfactoryinterface.h \
                fontdatabase.h \
                power.h \
                storage.h \
                qpemessagebox.h \
                backend/timeconversion.h \
                qpedebug.h \
                qpemenubar.h \
                qpetoolbar.h \
                backend/categories.h \
                backend/stringutil.h \
                backend/palmtopuid.h \
                backend/palmtoprecord.h \
                backend/task.h \
                backend/event.h \
                backend/contact.h \
                categorymenu.h \
                categoryedit_p.h \
                categoryselect.h \
                categorywidget.h \
                ir.h \
                backend/vobject_p.h \
                findwidget_p.h \
                finddialog.h \
-                lnkproperties.h \
+                lnkproperties.h
-                quuid.h \
-                qcom.h \
-                qlibrary.h \
-                qlibrary_p.h \
-                qprocess.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 \
                resource.cpp \
                qpedecoration_qws.cpp \
                qcopenvelope_qws.cpp \
                qpeapplication.cpp \
                qpestyle.cpp \
                qpedialog.cpp \
                lightstyle.cpp \
                config.cpp \
                applnk.cpp \
                sound.cpp \
                tzselect.cpp \
                qmath.c \
                datebookdb.cpp \
                alarmserver.cpp \
                password.cpp \
                process.cpp \
                process_unix.cpp \
                timestring.cpp \
                fontdatabase.cpp \
                power.cpp \
                storage.cpp \
                qpemessagebox.cpp \
                backend/timeconversion.cpp \
                qpedebug.cpp \
                qpemenubar.cpp \
                qpetoolbar.cpp \
                backend/categories.cpp \
                backend/stringutil.cpp \
                backend/palmtoprecord.cpp \
                backend/task.cpp \
                backend/event.cpp \
                backend/contact.cpp \
                categorymenu.cpp \
                categoryedit_p.cpp \
                categoryselect.cpp \
                categorywidget.cpp \
                ir.cpp \
                backend/vcc_yacc.cpp \
                backend/vobject.cpp \
                findwidget_p.cpp \
                finddialog.cpp \
-                lnkproperties.cpp \
+                lnkproperties.cpp
-                quuid.cpp \
-                qlibrary.cpp \
-                qlibrary_unix.cpp \
-                qprocess.cpp \
-                qprocess_unix.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 \
                resource.o \
                qpedecoration_qws.o \
                qcopenvelope_qws.o \
                qpeapplication.o \
                qpestyle.o \
                qpedialog.o \
                lightstyle.o \
                config.o \
                applnk.o \
                sound.o \
                tzselect.o \
                qmath.o \
                datebookdb.o \
                alarmserver.o \
                password.o \
                process.o \
                process_unix.o \
                timestring.o \
                fontdatabase.o \
                power.o \
                storage.o \
                qpemessagebox.o \
                backend/timeconversion.o \
                qpedebug.o \
                qpemenubar.o \
                qpetoolbar.o \
                backend/categories.o \
                backend/stringutil.o \
                backend/palmtoprecord.o \
                backend/task.o \
                backend/event.o \
                backend/contact.o \
                categorymenu.o \
                categoryedit_p.o \
                categoryselect.o \
                categorywidget.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 \
                moc_storage.cpp \
                moc_qpemenubar.cpp \
                moc_qpetoolbar.cpp \
                backend/moc_categories.cpp \
                moc_categorymenu.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 \
                moc_storage.o \
                moc_qpemenubar.o \
                moc_qpetoolbar.o \
                backend/moc_categories.o \
                moc_categorymenu.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
 .SUFFIXES: .cpp .cxx .cc .C .c
 .cpp.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .cxx.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .cc.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .C.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .c.o:
        $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 ####### Build rules
 all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
 $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
        $(SYSCONF_LINK_LIB)
 moc: $(SRCMOC)
-tmake:
+tmake: Makefile.in
-        tmake library.pro
+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
 ####### Extension Modules
 listpromodules:
        @echo 
 listallmodules:
        @echo 
 listaddonpromodules:
        @echo 
 listaddonentmodules:
        @echo 
 REQUIRES=
 ####### Sub-libraries
@@ -360,77 +334,73 @@ global.o: global.cpp \
                global.moc
 xmlreader.o: xmlreader.cpp \
                xmlreader.h
 mimetype.o: mimetype.cpp \
                mimetype.h \
                applnk.h \
                resource.h \
                qpeapplication.h \
                qpedecoration_qws.h \
                timestring.h
 menubutton.o: menubutton.cpp \
                menubutton.h
 network.o: network.cpp \
                network.moc
 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
 qdawg.o: qdawg.cpp \
                qdawg.h
 datebookmonth.o: datebookmonth.cpp \
                config.h \
                datebookmonth.h \
                calendar.h \
                timestring.h \
                datebookdb.h \
                resource.h \
                qpeapplication.h \
                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 \
                qpeapplication.h \
                qpedecoration_qws.h \
                timestring.h \
                categorymenu.h
 imageedit.o: imageedit.cpp \
                imageedit.h
 resource.o: resource.cpp \
                qpeapplication.h \
                qpedecoration_qws.h \
                timestring.h \
                resource.h \
                inlinepics_p.h
 qpedecoration_qws.o: qpedecoration_qws.cpp \
                qcopenvelope_qws.h \
                qpedecoration_qws.h \
@@ -513,50 +483,49 @@ password.o: password.cpp \
                passwordbase_p.h
 process.o: process.cpp \
                process.h
 process_unix.o: process_unix.cpp \
                process_unix.moc \
                process.h
 timestring.o: timestring.cpp \
                timestring.moc \
                timestring.h \
                qpeapplication.h \
                qpedecoration_qws.h \
                config.h
 fontdatabase.o: fontdatabase.cpp \
                qpeapplication.h \
                qpedecoration_qws.h \
                timestring.h \
                fontfactoryinterface.h \
                fontdatabase.h
 power.o: power.cpp \
-                power.h \
+                power.h
-                custom.h
 storage.o: storage.cpp
 qpemessagebox.o: qpemessagebox.cpp \
                qpemessagebox.h
 backend/timeconversion.o: backend/timeconversion.cpp \
                backend/timeconversion.h
 qpedebug.o: qpedebug.cpp \
                qpedebug.h
 qpemenubar.o: qpemenubar.cpp \
                qpemenubar.h
 qpetoolbar.o: qpetoolbar.cpp \
                qpetoolbar.h \
                qpemenubar.h
 backend/categories.o: backend/categories.cpp \
                backend/categories.h \
                backend/qpcglobal.h \
                backend/palmtopuidgen.h \
                backend/stringutil.h
@@ -612,124 +581,96 @@ ir.o: ir.cpp \
                applnk.h
 backend/vcc_yacc.o: backend/vcc_yacc.cpp \
                backend/vobject_p.h \
                backend/qfiledirect_p.h
 backend/vobject.o: backend/vobject.cpp \
                backend/vobject_p.h \
                backend/qfiledirect_p.h
 findwidget_p.o: findwidget_p.cpp \
                findwidget_p.h \
                findwidgetbase_p.h
 finddialog.o: finddialog.cpp \
                finddialog.h \
                findwidget_p.h \
                findwidgetbase_p.h
 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
 findwidgetbase_p.h: findwidgetbase_p.ui
        $(UIC) findwidgetbase_p.ui -o $(INTERFACE_DECL_PATH)/findwidgetbase_p.h
 findwidgetbase_p.cpp: findwidgetbase_p.ui
        $(UIC) findwidgetbase_p.ui -i findwidgetbase_p.h -o findwidgetbase_p.cpp
 lnkpropertiesbase_p.h: lnkpropertiesbase_p.ui
        $(UIC) lnkpropertiesbase_p.ui -o $(INTERFACE_DECL_PATH)/lnkpropertiesbase_p.h
 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
 moc_qpeapplication.o: moc_qpeapplication.cpp \
                qpeapplication.h \
                qpedecoration_qws.h \
                timestring.h
 moc_qpedialog.o: moc_qpedialog.cpp \
                qpedialog.h
 moc_tzselect.o: moc_tzselect.cpp \
                tzselect.h
 moc_process.o: moc_process.cpp \
                process.h
 moc_storage.o: moc_storage.cpp \
                storage.h
 moc_qpemenubar.o: moc_qpemenubar.cpp \
@@ -745,92 +686,78 @@ backend/moc_categories.o: backend/moc_categories.cpp \
 moc_categorymenu.o: moc_categorymenu.cpp \
                categorymenu.h
 moc_categoryedit_p.o: moc_categoryedit_p.cpp \
                categoryedit_p.h \
                categoryeditbase_p.h
 moc_categoryselect.o: moc_categoryselect.cpp \
                categoryselect.h
 moc_ir.o: moc_ir.cpp \
                ir.h
 moc_findwidget_p.o: moc_findwidget_p.cpp \
                findwidget_p.h \
                findwidgetbase_p.h
 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
 moc_qpeapplication.cpp: qpeapplication.h
        $(MOC) qpeapplication.h -o moc_qpeapplication.cpp
 moc_qpedialog.cpp: qpedialog.h
        $(MOC) qpedialog.h -o moc_qpedialog.cpp
 moc_tzselect.cpp: tzselect.h
        $(MOC) tzselect.h -o moc_tzselect.cpp
 moc_process.cpp: process.h
        $(MOC) process.h -o moc_process.cpp
 moc_storage.cpp: storage.h
        $(MOC) storage.h -o moc_storage.cpp
 moc_qpemenubar.cpp: qpemenubar.h
        $(MOC) qpemenubar.h -o moc_qpemenubar.cpp
@@ -840,64 +767,52 @@ moc_qpetoolbar.cpp: qpetoolbar.h
 backend/moc_categories.cpp: backend/categories.h
        $(MOC) backend/categories.h -o backend/moc_categories.cpp
 moc_categorymenu.cpp: categorymenu.h
        $(MOC) categorymenu.h -o moc_categorymenu.cpp
 moc_categoryedit_p.cpp: categoryedit_p.h
        $(MOC) categoryedit_p.h -o moc_categoryedit_p.cpp
 moc_categoryselect.cpp: categoryselect.h
        $(MOC) categoryselect.h -o moc_categoryselect.cpp
 moc_ir.cpp: ir.h
        $(MOC) ir.h -o moc_ir.cpp
 moc_findwidget_p.cpp: findwidget_p.h
        $(MOC) findwidget_p.h -o moc_findwidget_p.cpp
 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
 password.moc: password.cpp
        $(MOC) password.cpp -o password.moc
 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
 moc_lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.h
        $(MOC) lnkpropertiesbase_p.h -o moc_lnkpropertiesbase_p.cpp
diff --git a/library/global.cpp b/library/global.cpp
index e5fc2b3..fd7579a 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -484,49 +484,49 @@ void Global::invoke(const QString &c)
    args[j] = NULL;
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
    // an attempt to show a wait...
    // more logic should be used, but this will be fine for the moment...
    QCopEnvelope ( "QPE/System", "busy()" );
 #endif
 #ifdef HAVE_QUICKEXEC
    QString libexe = qpeDir()+"/binlib/lib"+args[0] + ".so";
    qDebug("libfile = %s", libexe.latin1() );
    if ( QFile::exists( libexe ) ) {
        qDebug("calling quickexec %s", libexe.latin1() );
        quickexecv( libexe.utf8().data(), (const char **)args );
    } else 
 #endif
    {
        if ( !::vfork() ) {
            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
 }
 /*!
  Executes application identfied by \a c, passing \a document.
  Note that you might be better off sending a QCop message to
  the application's QPE/Application/<i>appname</i> channel.
 */
 void Global::execute( const QString &c, const QString& document )
 {
    if ( qApp->type() != QApplication::GuiServer ) {
        // ask the server to do the work
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
        if ( document.isNull() ) {
            QCopEnvelope e( "QPE/System", "execute(QString)" );
            e << c;
        } else {
            QCopEnvelope e( "QPE/System", "execute(QString,QString)" );
            e << c << document;
        }
diff --git a/library/library.pro b/library/library.pro
index 058d216..e71e5a0 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -1,40 +1,40 @@
        TEMPLATE= lib
        CONFIG  += qt warn_on release
        HEADERS=   calendar.h \
            global.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 \
            lightstyle.h \
            config.h \
            applnk.h \
            sound.h \
            tzselect.h \
            qmath.h \
            datebookdb.h \
            alarmserver.h \
            process.h \
            password.h \
            timestring.h \
            fontfactoryinterface.h \
            fontdatabase.h \
            power.h \
            storage.h \
            qpemessagebox.h \
        backend/timeconversion.h \
            qpedebug.h \
@@ -43,49 +43,48 @@ HEADERS	=   calendar.h \
            backend/categories.h \
            backend/stringutil.h \
            backend/palmtopuid.h \
            backend/palmtoprecord.h \
            backend/task.h \
            backend/event.h \
            backend/contact.h\
            categorymenu.h \
            categoryedit_p.h \
            categoryselect.h \
            categorywidget.h \
        ir.h \
        backend/vobject_p.h \
        findwidget_p.h \
        finddialog.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 \
            resource.cpp \
            qpedecoration_qws.cpp \
            qcopenvelope_qws.cpp \
            qpeapplication.cpp \
            qpestyle.cpp \
            qpedialog.cpp \
            lightstyle.cpp \
            config.cpp \
            applnk.cpp \
            sound.cpp \
            tzselect.cpp \
            qmath.c \
            datebookdb.cpp \
            alarmserver.cpp \
            password.cpp \
            process.cpp \
            process_unix.cpp \
            timestring.cpp \
@@ -94,39 +93,38 @@ SOURCES	=   calendar.cpp \
            storage.cpp \
            qpemessagebox.cpp \
            backend/timeconversion.cpp \
            qpedebug.cpp \
            qpemenubar.cpp \
            qpetoolbar.cpp \
            backend/categories.cpp \
            backend/stringutil.cpp \
            backend/palmtoprecord.cpp \
            backend/task.cpp \
            backend/event.cpp \
            backend/contact.cpp \
            categorymenu.cpp \
        categoryedit_p.cpp \
        categoryselect.cpp \
        categorywidget.cpp \
        ir.cpp \
        backend/vcc_yacc.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:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h
-qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp qprocess.cpp \
+qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp
-               qprocess_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
 TRANSLATIONS = ../i18n/de/libqpe.ts
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,33 +1,33 @@
 #############################################################################
 ####### 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\"
+        CFLAGS  =$(SYSCONF_CFLAGS)
-        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) $(SYSCONF_LIBS_QTAPP)
        MOC     =$(SYSCONF_MOC)
        UIC     =$(SYSCONF_UIC)
 ####### Target
 DESTDIR = ../bin/
 VER_MAJ = 1
 VER_MIN = 0
 VER_PATCH = 0
        TARGET= chess
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 ####### Files
        HEADERS =chess.h
        SOURCES =chess.cpp \
                main.cpp
        OBJECTS =chess.o \
                main.o \
                mainwindow.o
 INTERFACES =    mainwindow.ui
 UICDECLS =      mainwindow.h
@@ -46,89 +46,89 @@ OBJMOC	=	moc_chess.o \
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .cxx.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .cc.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .C.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .c.o:
        $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 ####### Build rules
 all: $(DESTDIR)$(TARGET)
 $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
        $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
 moc: $(SRCMOC)
-tmake:
+tmake: Makefile.in
-        tmake chess.pro
+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
 ####### Extension Modules
 listpromodules:
        @echo 
 listallmodules:
        @echo 
 listaddonpromodules:
        @echo 
 listaddonentmodules:
        @echo 
 REQUIRES=
 ####### Sub-libraries
 ###### Combined headers
 ####### 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
 mainwindow.o: mainwindow.cpp \
                mainwindow.h \
                mainwindow.ui
 moc_chess.o: moc_chess.cpp \
                chess.h
 moc_mainwindow.o: moc_mainwindow.cpp \
                mainwindow.h
 moc_chess.cpp: chess.h
        $(MOC) chess.h -o moc_chess.cpp
 moc_mainwindow.cpp: mainwindow.h
        $(MOC) mainwindow.h -o moc_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
@@ -54,50 +54,52 @@ OBJMOC	=	moc_gowidget.o
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .cxx.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .cc.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .C.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .c.o:
        $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 ####### Build rules
 all: $(DESTDIR)$(TARGET)
 $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
        $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
 moc: $(SRCMOC)
-tmake:
+tmake: Makefile.in
-        tmake go.pro
+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
 ####### Extension Modules
 listpromodules:
        @echo 
 listallmodules:
        @echo 
 listaddonpromodules:
        @echo 
 listaddonentmodules:
        @echo 
 REQUIRES=
 ####### Sub-libraries
@@ -112,47 +114,42 @@ REQUIRES=
 amigo.o: amigo.c \
                go.h \
                goplayutils.h \
                amigo.h
 goplayer.o: goplayer.c \
                go.h \
                goplayutils.h \
                amigo.h
 goplayutils.o: goplayutils.c \
                goplayutils.h \
                amigo.h \
                go.h
 killable.o: killable.c \
                go.h \
                goplayutils.h \
                amigo.h
 gowidget.o: gowidget.cpp \
                gowidget.h \
                amigo.h \
                go.h \
-                goplayutils.h \
+                goplayutils.h
-                $(OPIEDIR)/include/qpe/config.h \
-                $(OPIEDIR)/include/qpe/resource.h \
-                $(OPIEDIR)/include/qpe/qpetoolbar.h \
-                $(OPIEDIR)/include/qpe/qpemenubar.h
 main.o: main.cpp \
                gowidget.h \
                amigo.h \
                go.h \
-                goplayutils.h \
+                goplayutils.h
-                $(OPIEDIR)/include/qpe/qpeapplication.h
 moc_gowidget.o: moc_gowidget.cpp \
                gowidget.h \
                amigo.h \
                go.h \
                goplayutils.h
 moc_gowidget.cpp: gowidget.h
        $(MOC) gowidget.h -o moc_gowidget.cpp