Making opie compile again.

14 files changed, 274 insertions, 489 deletions

diff --git a/core/apps/embeddedkonsole/Makefile.in b/core/apps/embeddedkonsole/Makefile.in
index 0da49d7..1c24ded 100644
--- a/core/apps/embeddedkonsole/Makefile.in
+++ b/core/apps/embeddedkonsole/Makefile.in
@@ -94,20 +94,18 @@ OBJMOC	=	moc_TEWidget.o \
 
 all: $(DESTDIR)$(TARGET)
 
 $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 	$(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
 
 moc: $(SRCMOC)
 
-tmake: Makefile.in
-
-Makefile.in: embeddedkonsole.pro
-	tmake embeddedkonsole.pro -o Makefile.in
+tmake:
+	tmake embeddedkonsole.pro
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
 	-rm -f *~ core
 	-rm -f allmoc.cpp
 
 ####### Extension Modules
 
@@ -180,41 +178,48 @@ session.o: session.cpp \
 		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 \
+		$(OPIEDIR)/include/qpe/qpetoolbar.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
 
@@ -243,16 +248,17 @@ moc_session.o: moc_session.cpp \
 		TEmuVt102.h \
 		TEScreen.h \
 		TEHistory.h \
 		TEmulation.h \
 		keytrans.h
 
 moc_konsole.o: moc_konsole.cpp \
 		konsole.h \
+		$(OPIEDIR)/include/qpe/qpetoolbar.h \
 		MyPty.h \
 		TEWidget.h \
 		TECommon.h \
 		TEmuVt102.h \
 		TEScreen.h \
 		TEHistory.h \
 		TEmulation.h \
 		keytrans.h \
diff --git a/core/launcher/Makefile.in b/core/launcher/Makefile.in
index 5e2dbe5..91a5a9b 100644
--- a/core/launcher/Makefile.in
+++ b/core/launcher/Makefile.in
@@ -20,16 +20,17 @@ VER_MIN = 0
 VER_PATCH = 0
 TARGET	= qpe
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 
 ####### Files
 
 HEADERS =	background.h \
 		desktop.h \
+		qprocess.h \
 		info.h \
 		appicons.h \
 		taskbar.h \
 		sidething.h \
 		mrulist.h \
 		stabmon.h \
 		inputmethods.h \
 		systray.h \
@@ -58,16 +59,18 @@ HEADERS =	background.h \
 		$(OPIEDIR)/rsync/trace.h \
 		$(OPIEDIR)/rsync/types.h \
 		$(OPIEDIR)/rsync/util.h \
 		$(OPIEDIR)/rsync/whole.h \
 		$(OPIEDIR)/rsync/config_rsync.h \
 		$(OPIEDIR)/rsync/qrsync.h
 SOURCES =	background.cpp \
 		desktop.cpp \
+		qprocess.cpp \
+		qprocess_unix.cpp \
 		info.cpp \
 		appicons.cpp \
 		taskbar.cpp \
 		sidething.cpp \
 		mrulist.cpp \
 		stabmon.cpp \
 		inputmethods.cpp \
 		systray.cpp \
@@ -105,16 +108,18 @@ SOURCES =	background.cpp \
 		$(OPIEDIR)/rsync/trace.c \
 		$(OPIEDIR)/rsync/tube.c \
 		$(OPIEDIR)/rsync/util.c \
 		$(OPIEDIR)/rsync/version.c \
 		$(OPIEDIR)/rsync/whole.c \
 		$(OPIEDIR)/rsync/qrsync.cpp
 OBJECTS =	background.o \
 		desktop.o \
+		qprocess.o \
+		qprocess_unix.o \
 		info.o \
 		appicons.o \
 		taskbar.o \
 		sidething.o \
 		mrulist.o \
 		stabmon.o \
 		inputmethods.o \
 		systray.o \
@@ -160,36 +165,39 @@ OBJECTS =	background.o \
 INTERFACES =    shutdown.ui \
 		syncdialog.ui
 UICDECLS =      shutdown.h \
 		syncdialog.h
 UICIMPLS =      shutdown.cpp \
 		syncdialog.cpp
 SRCMOC	=	moc_background.cpp \
 		moc_desktop.cpp \
+		moc_qprocess.cpp \
 		moc_info.cpp \
 		moc_appicons.cpp \
 		moc_taskbar.cpp \
 		moc_sidething.cpp \
 		moc_inputmethods.cpp \
 		moc_systray.cpp \
 		moc_shutdownimpl.cpp \
 		moc_launcher.cpp \
 		moc_launcherview.cpp \
 		../calibrate/moc_calibrate.cpp \
 		moc_startmenu.cpp \
 		moc_transferserver.cpp \
 		moc_qcopbridge.cpp \
 		moc_packageslave.cpp \
 		moc_irserver.cpp \
+		qprocess_unix.moc \
 		appicons.moc \
 		moc_shutdown.cpp \
 		moc_syncdialog.cpp
 OBJMOC	=	moc_background.o \
 		moc_desktop.o \
+		moc_qprocess.o \
 		moc_info.o \
 		moc_appicons.o \
 		moc_taskbar.o \
 		moc_sidething.o \
 		moc_inputmethods.o \
 		moc_systray.o \
 		moc_shutdownimpl.o \
 		moc_launcher.o \
@@ -285,27 +293,34 @@ desktop.o: desktop.cpp \
 		launcher.h \
 		launcherview.h \
 		$(OPIEDIR)/include/qpe/storage.h \
 		mrulist.h \
 		$(OPIEDIR)/include/qpe/applnk.h \
 		qcopbridge.h \
 		startmenu.h \
 		taskbar.h \
-		$(OPIEDIR)/include/qpe/custom.h \
 		transferserver.h \
 		irserver.h \
 		packageslave.h \
 		$(OPIEDIR)/include/qpe/mimetype.h \
 		$(OPIEDIR)/include/qpe/password.h \
 		$(OPIEDIR)/include/qpe/config.h \
 		$(OPIEDIR)/include/qpe/power.h \
 		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
 		$(OPIEDIR)/include/qpe/global.h
 
+qprocess.o: qprocess.cpp \
+		qprocess.h
+
+qprocess_unix.o: qprocess_unix.cpp \
+		qprocess_unix.moc \
+		qprocess.h \
+		qcleanuphandler_p.h
+
 info.o: info.cpp \
 		info.h \
 		background.h \
 		desktop.h \
 		shutdownimpl.h \
 		shutdown.h \
 		$(OPIEDIR)/include/qpe/qpeapplication.h \
 		$(OPIEDIR)/include/qpe/resource.h \
@@ -326,17 +341,16 @@ taskbar.o: taskbar.cpp \
 		$(OPIEDIR)/include/qpe/applnk.h \
 		systray.h \
 		$(OPIEDIR)/include/qpe/taskbarappletinterface.h \
 		$(OPIEDIR)/calibrate/calibrate.h \
 		wait.h \
 		$(OPIEDIR)/include/qpe/resource.h \
 		appicons.h \
 		taskbar.h \
-		$(OPIEDIR)/include/qpe/custom.h \
 		desktop.h \
 		shutdownimpl.h \
 		shutdown.h \
 		$(OPIEDIR)/include/qpe/qpeapplication.h \
 		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
 		$(OPIEDIR)/include/qpe/global.h \
 		../taskbar/apps.h \
 		../addressbook/addressbook.h \
@@ -360,17 +374,19 @@ taskbar.o: taskbar.cpp \
 		$(OPIEDIR)/include/qpe/timestring.h \
 		../filebrowser/filebrowser.h \
 		../solitaire/canvascardwindow.h \
 		../snake/interface.h \
 		../parashoot/interface.h \
 		$(OPIEDIR)/include/qpe/sound.h \
 		../mpegplayer/mediaplayer.h \
 		$(OPIEDIR)/include/qpe/qlibrary.h \
+		$(OPIEDIR)/include/qpe/mediaplayerplugininterface.h \
 		../embeddedkonsole/konsole.h \
+		$(OPIEDIR)/include/qpe/qpetoolbar.h \
 		../wordgame/wordgame.h \
 		$(OPIEDIR)/include/qpe/qdawg.h
 
 sidething.o: sidething.cpp \
 		sidething.h \
 		startmenu.h \
 		$(OPIEDIR)/include/qpe/resource.h
 
@@ -444,21 +460,21 @@ launcherview.o: launcherview.cpp \
 		$(OPIEDIR)/include/qpe/resource.h \
 		$(OPIEDIR)/include/qpe/qpetoolbar.h
 
 $(OPIEDIR)/calibrate/calibrate.o: $(OPIEDIR)/calibrate/calibrate.cpp \
 		$(OPIEDIR)/calibrate/calibrate.h \
 		$(OPIEDIR)/include/qpe/resource.h
 
 transferserver.o: transferserver.cpp \
-		$(OPIEDIR)/include/qpe/qprocess.h \
 		$(OPIEDIR)/include/qpe/process.h \
 		$(OPIEDIR)/include/qpe/config.h \
 		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
-		transferserver.h
+		transferserver.h \
+		qprocess.h
 
 packageslave.o: packageslave.cpp \
 		packageslave.h \
 		$(OPIEDIR)/include/qpe/process.h \
 		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h
 
 irserver.o: irserver.cpp \
 		irserver.h \
@@ -487,17 +503,16 @@ startmenu.o: startmenu.cpp \
 		$(OPIEDIR)/include/qpe/resource.h
 
 main.o: main.cpp \
 		desktop.h \
 		shutdownimpl.h \
 		shutdown.h \
 		$(OPIEDIR)/include/qpe/qpeapplication.h \
 		taskbar.h \
-		$(OPIEDIR)/include/qpe/custom.h \
 		stabmon.h \
 		$(OPIEDIR)/include/qpe/network.h \
 		$(OPIEDIR)/include/qpe/config.h \
 		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
 		$(OPIEDIR)/include/qpe/alarmserver.h \
 		../calibrate/calibrate.h \
 		../login/qdmdialogimpl.h \
 		$(OPIEDIR)/include/qpe/global.h
@@ -742,26 +757,28 @@ moc_background.o: moc_background.cpp \
 		background.h
 
 moc_desktop.o: moc_desktop.cpp \
 		desktop.h \
 		shutdownimpl.h \
 		shutdown.h \
 		$(OPIEDIR)/include/qpe/qpeapplication.h
 
+moc_qprocess.o: moc_qprocess.cpp \
+		qprocess.h
+
 moc_info.o: moc_info.cpp \
 		info.h \
 		background.h
 
 moc_appicons.o: moc_appicons.cpp \
 		appicons.h
 
 moc_taskbar.o: moc_taskbar.cpp \
-		taskbar.h \
-		$(OPIEDIR)/include/qpe/custom.h
+		taskbar.h
 
 moc_sidething.o: moc_sidething.cpp \
 		sidething.h \
 		startmenu.h
 
 moc_inputmethods.o: moc_inputmethods.cpp \
 		inputmethods.h \
 		$(OPIEDIR)/include/qpe/inputmethodinterface.h \
@@ -800,30 +817,35 @@ moc_qcopbridge.o: moc_qcopbridge.cpp \
 		qcopbridge.h
 
 moc_packageslave.o: moc_packageslave.cpp \
 		packageslave.h
 
 moc_irserver.o: moc_irserver.cpp \
 		irserver.h
 
-moc_shutdown.o: appicons.moc \
+moc_shutdown.o: qprocess_unix.moc \
+		qprocess_unix.cpp \
+		qprocess.h \
+		qcleanuphandler_p.h
+
+moc_syncdialog.o: appicons.moc \
 		appicons.cpp \
 		appicons.h \
 		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h
 
-moc_syncdialog.o: moc_shutdown.cpp \
-		shutdown.h
-
 moc_background.cpp: background.h
 	$(MOC) background.h -o moc_background.cpp
 
 moc_desktop.cpp: desktop.h
 	$(MOC) desktop.h -o moc_desktop.cpp
 
+moc_qprocess.cpp: qprocess.h
+	$(MOC) qprocess.h -o moc_qprocess.cpp
+
 moc_info.cpp: info.h
 	$(MOC) info.h -o moc_info.cpp
 
 moc_appicons.cpp: appicons.h
 	$(MOC) appicons.h -o moc_appicons.cpp
 
 moc_taskbar.cpp: taskbar.h
 	$(MOC) taskbar.h -o moc_taskbar.cpp
@@ -859,16 +881,19 @@ moc_qcopbridge.cpp: qcopbridge.h
 	$(MOC) qcopbridge.h -o moc_qcopbridge.cpp
 
 moc_packageslave.cpp: packageslave.h
 	$(MOC) packageslave.h -o moc_packageslave.cpp
 
 moc_irserver.cpp: irserver.h
 	$(MOC) irserver.h -o moc_irserver.cpp
 
+qprocess_unix.moc: qprocess_unix.cpp
+	$(MOC) qprocess_unix.cpp -o qprocess_unix.moc
+
 appicons.moc: appicons.cpp
 	$(MOC) appicons.cpp -o appicons.moc
 
 moc_shutdown.cpp: shutdown.h
 	$(MOC) shutdown.h -o moc_shutdown.cpp
 
 moc_syncdialog.cpp: syncdialog.h
 	$(MOC) syncdialog.h -o moc_syncdialog.cpp
diff --git a/core/multimedia/opieplayer/Makefile.in b/core/multimedia/opieplayer/Makefile.in
index 3e1f9fc..1b0307a 100644
--- a/core/multimedia/opieplayer/Makefile.in
+++ b/core/multimedia/opieplayer/Makefile.in
@@ -95,20 +95,18 @@ OBJMOC	=	moc_loopcontrol.o \
 
 all: $(DESTDIR)$(TARGET)
 
 $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 	$(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
 
 moc: $(SRCMOC)
 
-tmake: Makefile.in
-
-Makefile.in: mpegplayer.pro
-	tmake mpegplayer.pro -o Makefile.in
+tmake:
+	tmake mpegplayer.pro
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
 	-rm -f *~ core
 	-rm -f allmoc.cpp
 
 ####### Extension Modules
 
@@ -132,82 +130,130 @@ REQUIRES=
 
 ###### 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 \
+		$(OPIEDIR)/include/qpe/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/mediaplayerplugininterface.h \
+		$(OPIEDIR)/include/qpe/config.h \
 		mediaplayerstate.h \
 		libmad/libmadpluginimpl.h \
 		libmpeg3/libmpeg3pluginimpl.h \
 		wavplugin/wavpluginimpl.h
 
 videowidget.o: videowidget.cpp \
+		$(OPIEDIR)/include/qpe/resource.h \
+		$(OPIEDIR)/include/qpe/mediaplayerplugininterface.h \
+		$(OPIEDIR)/include/qpe/qcom.h \
+		$(OPIEDIR)/include/qpe/quuid.h \
 		videowidget.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 \
+		$(OPIEDIR)/include/qpe/mediaplayerplugininterface.h \
 		playlistwidget.h \
+		$(OPIEDIR)/include/qpe/applnk.h \
 		audiowidget.h \
 		loopcontrol.h \
 		audiodevice.h \
 		mediaplayerstate.h
 
 audiodevice.o: audiodevice.cpp \
-		audiodevice.h
+		$(OPIEDIR)/include/qpe/qpeapplication.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 \
+		$(OPIEDIR)/include/qpe/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
diff --git a/core/multimedia/opieplayer/libmad/Makefile.in b/core/multimedia/opieplayer/libmad/Makefile.in
index d2e1cda..e9f74e7 100644
--- a/core/multimedia/opieplayer/libmad/Makefile.in
+++ b/core/multimedia/opieplayer/libmad/Makefile.in
@@ -95,20 +95,18 @@ OBJMOC	=
 
 all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
 
 $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 	$(SYSCONF_LINK_LIB)
 
 moc: $(SRCMOC)
 
-tmake: Makefile.in
-
-Makefile.in: libmad.pro
-	tmake libmad.pro -o Makefile.in
+tmake:
+	tmake libmad.pro
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
 	-rm -f *~ core
 	-rm -f allmoc.cpp
 
 ####### Extension Modules
 
diff --git a/core/multimedia/opieplayer/libmpeg3/Makefile.in b/core/multimedia/opieplayer/libmpeg3/Makefile.in
index 4ccdb8c..154f85d 100644
--- a/core/multimedia/opieplayer/libmpeg3/Makefile.in
+++ b/core/multimedia/opieplayer/libmpeg3/Makefile.in
@@ -124,20 +124,18 @@ OBJMOC	=
 
 all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
 
 $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 	$(SYSCONF_LINK_LIB)
 
 moc: $(SRCMOC)
 
-tmake: Makefile.in
-
-Makefile.in: libmpeg3.pro
-	tmake libmpeg3.pro -o Makefile.in
+tmake:
+	tmake libmpeg3.pro
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
 	-rm -f *~ core
 	-rm -f allmoc.cpp
 
 ####### Extension Modules
 
diff --git a/core/multimedia/opieplayer/wavplugin/Makefile.in b/core/multimedia/opieplayer/wavplugin/Makefile.in
index 560534e..bcbe7f2 100644
--- a/core/multimedia/opieplayer/wavplugin/Makefile.in
+++ b/core/multimedia/opieplayer/wavplugin/Makefile.in
@@ -60,20 +60,18 @@ OBJMOC	=
 
 all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
 
 $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 	$(SYSCONF_LINK_LIB)
 
 moc: $(SRCMOC)
 
-tmake: Makefile.in
-
-Makefile.in: wavplugin.pro
-	tmake wavplugin.pro -o Makefile.in
+tmake:
+	tmake wavplugin.pro
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
 	-rm -f *~ core
 	-rm -f allmoc.cpp
 
 ####### Extension Modules
 
diff --git a/core/pim/datebook/Makefile.in b/core/pim/datebook/Makefile.in
index cc31efe..0c3282e 100644
--- a/core/pim/datebook/Makefile.in
+++ b/core/pim/datebook/Makefile.in
@@ -119,20 +119,18 @@ OBJMOC	=	moc_datebookday.o \
 
 all: $(DESTDIR)$(TARGET)
 
 $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 	$(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
 
 moc: $(SRCMOC)
 
-tmake: Makefile.in
-
-Makefile.in: datebook.pro
-	tmake datebook.pro -o Makefile.in
+tmake:
+	tmake datebook.pro
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
 	-rm -f *~ core
 	-rm -f allmoc.cpp
 
 ####### Extension Modules
 
@@ -156,58 +154,124 @@ REQUIRES=
 
 ###### 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
@@ -240,39 +304,60 @@ 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 \
diff --git a/freetype/Makefile.in b/freetype/Makefile.in
index ba4c829..cdc6fa4 100644
--- a/freetype/Makefile.in
+++ b/freetype/Makefile.in
@@ -1,17 +1,17 @@
 #############################################################################
 
 ####### 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../library
+INCPATH =	-I$(OPIEDIR)/include
 LFLAGS	=	$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
 LIBS	=	$(SUBLIBS) -lqpe -lfreetype $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
 MOC	=	$(SYSCONF_MOC)
 UIC	=	$(SYSCONF_UIC)
 
 ####### Target
 
 DESTDIR = ../plugins/fontfactories/
@@ -19,18 +19,17 @@ VER_MAJ = 1
 VER_MIN = 0
 VER_PATCH = 0
 TARGET	= freetypefactory
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 
 ####### Files
 
 HEADERS =	fontfactoryttf_qws.h \
-		freetypefactoryimpl.h \
-		qfontdata_p.h
+		freetypefactoryimpl.h
 SOURCES =	fontfactoryttf_qws.cpp \
 		freetypefactoryimpl.cpp
 OBJECTS =	fontfactoryttf_qws.o \
 		freetypefactoryimpl.o
 INTERFACES =    
 UICDECLS =      
 UICIMPLS =      
 SRCMOC	=	
@@ -104,14 +103,11 @@ REQUIRES=
 
 fontfactoryttf_qws.o: fontfactoryttf_qws.cpp \
 		fontfactoryttf_qws.h \
 		qfontdata_p.h
 
 freetypefactoryimpl.o: freetypefactoryimpl.cpp \
 		fontfactoryttf_qws.h \
 		qfontdata_p.h \
-		freetypefactoryimpl.h \
-		../library/fontfactoryinterface.h \
-		../library/qcom.h \
-		../library/quuid.h
+		freetypefactoryimpl.h
 
 
diff --git a/library/Makefile.in b/library/Makefile.in
index b8fc1f6..dcea4b8 100644
--- a/library/Makefile.in
+++ b/library/Makefile.in
@@ -73,17 +73,21 @@ HEADERS =	calendar.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
 SOURCES =	calendar.cpp \
 		global.cpp \
 		xmlreader.cpp \
 		mimetype.cpp \
 		menubutton.cpp \
 		network.cpp \
 		networkinterface.cpp \
 		filemanager.cpp \
@@ -128,17 +132,20 @@ SOURCES =	calendar.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
 OBJECTS =	calendar.o \
 		global.o \
 		xmlreader.o \
 		mimetype.o \
 		menubutton.o \
 		network.o \
 		networkinterface.o \
 		filemanager.o \
@@ -184,16 +191,19 @@ OBJECTS =	calendar.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 \
 		passwordbase_p.o \
 		categoryeditbase_p.o \
 		findwidgetbase_p.o \
 		lnkpropertiesbase_p.o
 INTERFACES =    passwordbase_p.ui \
 		categoryeditbase_p.ui \
 		findwidgetbase_p.ui \
 		lnkpropertiesbase_p.ui
@@ -221,16 +231,17 @@ SRCMOC	=	moc_menubutton.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 \
 		global.moc \
 		network.moc \
 		password.moc \
 		process_unix.moc \
 		timestring.moc \
 		moc_passwordbase_p.cpp \
 		moc_categoryeditbase_p.cpp \
 		moc_findwidgetbase_p.cpp \
@@ -251,16 +262,17 @@ OBJMOC	=	moc_menubutton.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_passwordbase_p.o \
 		moc_categoryeditbase_p.o \
 		moc_findwidgetbase_p.o \
 		moc_lnkpropertiesbase_p.o
 
 
 ####### Implicit rules
 
@@ -286,20 +298,18 @@ OBJMOC	=	moc_menubutton.o \
 
 all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
 
 $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 	$(SYSCONF_LINK_LIB)
 
 moc: $(SRCMOC)
 
-tmake: Makefile.in
-
-Makefile.in: library.pro
-	tmake library.pro -o Makefile.in
+tmake:
+	tmake library.pro
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
 	-rm -f *~ core
 	-rm -f allmoc.cpp
 
 ####### Extension Modules
 
@@ -597,16 +607,27 @@ finddialog.o: finddialog.cpp \
 		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
+
 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
 
 categoryeditbase_p.h: categoryeditbase_p.ui
 	$(UIC) categoryeditbase_p.ui -o $(INTERFACE_DECL_PATH)/categoryeditbase_p.h
@@ -702,16 +723,20 @@ moc_findwidget_p.o: moc_findwidget_p.cpp \
 		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_passwordbase_p.o: global.moc \
 		global.cpp
 
 moc_categoryeditbase_p.o: network.moc \
 		network.cpp
 
 moc_findwidgetbase_p.o: password.moc \
 		password.cpp \
@@ -783,16 +808,19 @@ 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
+
 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
diff --git a/noncore/apps/tableviewer/Makefile.in b/noncore/apps/tableviewer/Makefile.in
index 8c5dc26..e135d82 100644
--- a/noncore/apps/tableviewer/Makefile.in
+++ b/noncore/apps/tableviewer/Makefile.in
@@ -1,17 +1,17 @@
 #############################################################################
 
 ####### Compiler, tools and options
 
 CXX	=	$(SYSCONF_CXX) $(QT_CXX_MT)
 CXXFLAGS=	$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
 CC	=	$(SYSCONF_CC) $(QT_C_MT)
 CFLAGS	=	$(SYSCONF_CFLAGS)
-INCPATH =	-I../library
+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/
@@ -152,43 +152,31 @@ REQUIRES=
 ###### Combined headers
 
 
 
 ####### Compile
 
 main.o: main.cpp \
 		tableviewer.h \
-		db/common.h \
-		../library/fileselector.h \
-		../library/filemanager.h \
-		../library/applnk.h \
-		../library/qpeapplication.h \
-		../library/qpedecoration_qws.h
+		db/common.h
 
 tableviewer.o: tableviewer.cpp \
 		tableviewer.h \
 		db/common.h \
-		../library/fileselector.h \
-		../library/filemanager.h \
-		../library/applnk.h \
 		ui/tvbrowseview.h \
 		ui/tvfilterview.h \
 		ui/tvlistview.h \
 		ui/tveditview.h \
 		ui/tvkeyedit.h \
 		tvkeyedit_gen.h \
 		db/datacache.h \
-		../library/resource.h
+		/home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/qpemenubar.h
 
 ui/commonwidgets.o: ui/commonwidgets.cpp \
-		../library/datebookmonth.h \
-		../library/organizer.h \
-		../library/xmlreader.h \
-		../library/calendar.h \
 		ui/commonwidgets.h
 
 ui/tvbrowseview.o: ui/tvbrowseview.cpp \
 		ui/tvbrowseview.h \
 		ui/../db/common.h \
 		ui/browsekeyentry.h
 
 ui/tvfilterview.o: ui/tvfilterview.cpp \
@@ -232,17 +220,16 @@ db/xmlsource.o: db/xmlsource.cpp \
 		db/common.h
 
 db/csvsource.o: db/csvsource.cpp \
 		db/csvsource.h \
 		db/datacache.h \
 		db/common.h
 
 db/common.o: db/common.cpp \
-		../library/timestring.h \
 		db/common.h \
 		db/datacache.h
 
 ui/tvkeyedit_gen.h: ui/tvkeyedit_gen.ui
 	$(UIC) ui/tvkeyedit_gen.ui -o $(INTERFACE_DECL_PATH)/ui/tvkeyedit_gen.h
 
 tvkeyedit_gen.h: ui/tvkeyedit_gen.ui
 	$(UIC) ui/tvkeyedit_gen.ui -o tvkeyedit_gen.h
@@ -251,20 +238,17 @@ ui/tvkeyedit_gen.cpp: ui/tvkeyedit_gen.ui
 	$(UIC) ui/tvkeyedit_gen.ui -i tvkeyedit_gen.h -o ui/tvkeyedit_gen.cpp
 
 ui/tvkeyedit_gen.o: ui/tvkeyedit_gen.cpp \
 		ui/tvkeyedit_gen.h \
 		ui/tvkeyedit_gen.ui
 
 moc_tableviewer.o: moc_tableviewer.cpp \
 		tableviewer.h \
-		db/common.h \
-		../library/fileselector.h \
-		../library/filemanager.h \
-		../library/applnk.h
+		db/common.h
 
 ui/moc_commonwidgets.o: ui/moc_commonwidgets.cpp \
 		ui/commonwidgets.h
 
 ui/moc_tvbrowseview.o: ui/moc_tvbrowseview.cpp \
 		ui/tvbrowseview.h \
 		ui/../db/common.h
 
diff --git a/noncore/games/chess/Makefile.in b/noncore/games/chess/Makefile.in
index a1f2cd7..0987d58 100644
--- a/noncore/games/chess/Makefile.in
+++ b/noncore/games/chess/Makefile.in
@@ -99,33 +99,40 @@ REQUIRES=
 
 ###### Combined headers
 
 
 
 ####### Compile
 
 chess.o: chess.cpp \
-		chess.h
+		/home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/config.h \
+		/home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/resource.h \
+		chess.h \
+		/home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/process.h
 
 main.o: main.cpp \
-		chess.h
+		/home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/qpeapplication.h \
+		/home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/qpetoolbar.h \
+		chess.h \
+		/home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/process.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
+		chess.h \
+		/home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/process.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
diff --git a/noncore/games/go/Makefile.in b/noncore/games/go/Makefile.in
index 0395dff..985eff0 100644
--- a/noncore/games/go/Makefile.in
+++ b/noncore/games/go/Makefile.in
@@ -70,20 +70,18 @@ OBJMOC	=	moc_gowidget.o
 
 all: $(DESTDIR)$(TARGET)
 
 $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 	$(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
 
 moc: $(SRCMOC)
 
-tmake: Makefile.in
-
-Makefile.in: go.pro
-	tmake go.pro -o Makefile.in
+tmake:
+	tmake go.pro
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
 	-rm -f *~ core
 	-rm -f allmoc.cpp
 
 ####### Extension Modules
 
@@ -130,23 +128,28 @@ 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
diff --git a/quickexec/Makefile.in b/quickexec/Makefile.in
index 514e6cc..d3ac9dc 100644
--- a/quickexec/Makefile.in
+++ b/quickexec/Makefile.in
@@ -57,18 +57,20 @@ OBJMOC	=
 
 all: $(DESTDIR)$(TARGET)
 
 $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 	$(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
 
 moc: $(SRCMOC)
 
-tmake:
-	tmake quickexec.pro
+tmake: Makefile.in
+
+Makefile.in: quickexec.pro
+	tmake quickexec.pro -o Makefile.in
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
 	-rm -f *~ core
 	-rm -f allmoc.cpp
 
 ####### Extension Modules
 
diff --git a/rsync/Makefile.in b/rsync/Makefile.in
index 50e7b3d..e69de29 100644
--- a/rsync/Makefile.in
+++ b/rsync/Makefile.in
@@ -1,391 +0,0 @@
-#############################################################################
-
-####### 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.
-LFLAGS	=	$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
-LIBS	=	$(SUBLIBS) $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
-MOC	=	$(SYSCONF_MOC)
-UIC	=	$(SYSCONF_UIC)
-
-####### Target
-
-DESTDIR = $(QTDIR)/lib$(PROJMAK)/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= rsync
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	buf.h \
-		checksum.h \
-		command.h \
-		emit.h \
-		fileutil.h \
-		job.h \
-		netint.h \
-		protocol.h \
-		prototab.h \
-		rsync.h \
-		search.h \
-		stream.h \
-		sumset.h \
-		trace.h \
-		types.h \
-		util.h \
-		whole.h \
-		config.h
-SOURCES =	base64.c \
-		buf.c \
-		checksum.c \
-		command.c \
-		delta.c \
-		emit.c \
-		fileutil.c \
-		hex.c \
-		job.c \
-		mdfour.c \
-		mksum.c \
-		msg.c \
-		netint.c \
-		patch.c \
-		prototab.c \
-		readsums.c \
-		scoop.c \
-		search.c \
-		stats.c \
-		stream.c \
-		sumset.c \
-		trace.c \
-		tube.c \
-		util.c \
-		version.c \
-		whole.c
-OBJECTS =	base64.o \
-		buf.o \
-		checksum.o \
-		command.o \
-		delta.o \
-		emit.o \
-		fileutil.o \
-		hex.o \
-		job.o \
-		mdfour.o \
-		mksum.o \
-		msg.o \
-		netint.o \
-		patch.o \
-		prototab.o \
-		readsums.o \
-		scoop.o \
-		search.o \
-		stats.o \
-		stream.o \
-		sumset.o \
-		trace.o \
-		tube.o \
-		util.o \
-		version.o \
-		whole.o
-INTERFACES =    
-UICDECLS =      
-UICIMPLS =      
-SRCMOC	=	
-OBJMOC	=	
-
-
-####### 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: Makefile.in
-
-Makefile.in: rsync.pro
-	tmake rsync.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
-
-base64.o: base64.c \
-		config.h \
-		config_linux.h \
-		rsync.h
-
-buf.o: buf.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		trace.h \
-		buf.h \
-		util.h
-
-checksum.o: checksum.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		checksum.h
-
-command.o: command.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		command.h
-
-delta.o: delta.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		emit.h \
-		stream.h \
-		util.h \
-		sumset.h \
-		job.h \
-		trace.h \
-		checksum.h \
-		search.h \
-		types.h
-
-emit.o: emit.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		command.h \
-		protocol.h \
-		trace.h \
-		emit.h \
-		prototab.h \
-		netint.h \
-		sumset.h \
-		job.h
-
-fileutil.o: fileutil.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		fileutil.h \
-		trace.h
-
-hex.o: hex.c \
-		config.h \
-		config_linux.h \
-		rsync.h
-
-job.o: job.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		stream.h \
-		util.h \
-		sumset.h \
-		job.h \
-		trace.h
-
-mdfour.o: mdfour.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		trace.h \
-		types.h
-
-mksum.o: mksum.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		stream.h \
-		util.h \
-		sumset.h \
-		job.h \
-		protocol.h \
-		netint.h \
-		trace.h \
-		checksum.h
-
-msg.o: msg.c \
-		config.h \
-		config_linux.h \
-		rsync.h
-
-netint.o: netint.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		job.h \
-		netint.h \
-		trace.h \
-		stream.h
-
-patch.o: patch.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		util.h \
-		trace.h \
-		protocol.h \
-		netint.h \
-		command.h \
-		sumset.h \
-		prototab.h \
-		stream.h \
-		job.h
-
-prototab.o: prototab.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		protocol.h \
-		command.h \
-		prototab.h
-
-readsums.o: readsums.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		sumset.h \
-		job.h \
-		trace.h \
-		netint.h \
-		protocol.h \
-		util.h \
-		stream.h
-
-scoop.o: scoop.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		job.h \
-		stream.h \
-		trace.h \
-		util.h
-
-search.o: search.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		trace.h \
-		util.h \
-		sumset.h \
-		search.h \
-		checksum.h
-
-stats.o: stats.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		trace.h
-
-stream.o: stream.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		stream.h \
-		util.h \
-		trace.h
-
-sumset.o: sumset.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		sumset.h \
-		util.h \
-		trace.h
-
-trace.o: trace.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		util.h \
-		trace.h
-
-tube.o: tube.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		trace.h \
-		util.h \
-		job.h \
-		stream.h
-
-util.o: util.c \
-		config.h \
-		config_linux.h \
-		util.h \
-		rsync.h \
-		trace.h
-
-version.o: version.c \
-		config.h \
-		config_linux.h \
-		rsync.h
-
-whole.o: whole.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		trace.h \
-		fileutil.h \
-		sumset.h \
-		job.h \
-		buf.h \
-		whole.h \
-		util.h
-
-