*** empty log message ***

10 files changed, 75 insertions, 205 deletions

diff --git a/core/applets/clipboardapplet/Makefile.in b/core/applets/clipboardapplet/Makefile.in
index 2ddeb42..c42404e 100644
--- a/core/applets/clipboardapplet/Makefile.in
+++ b/core/applets/clipboardapplet/Makefile.in
@@ -6,7 +6,7 @@ CXX	=	$(SYSCONF_CXX) $(QT_CXX_MT)
 CXXFLAGS=	$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
 CC	=	$(SYSCONF_CC) $(QT_C_MT)
 CFLAGS	=	$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
-INCPATH =	-I$(QPEDIR)/include
+INCPATH =	-I$(OPIEDIR)/include
 LFLAGS	=	$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
 LIBS	=	$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
 MOC	=	$(SYSCONF_MOC)
@@ -65,8 +65,10 @@ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 
 moc: $(SRCMOC)
 
-tmake:
-	tmake clipboardapplet.pro
+tmake: Makefile.in
+
+Makefile.in: clipboardapplet.pro
+	tmake clipboardapplet.pro -o Makefile.in
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
diff --git a/core/apps/embeddedkonsole/Makefile.in b/core/apps/embeddedkonsole/Makefile.in
index 8a69557..0da49d7 100644
--- a/core/apps/embeddedkonsole/Makefile.in
+++ b/core/apps/embeddedkonsole/Makefile.in
@@ -99,8 +99,10 @@ $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 
 moc: $(SRCMOC)
 
-tmake:
-	tmake embeddedkonsole.pro
+tmake: Makefile.in
+
+Makefile.in: embeddedkonsole.pro
+	tmake embeddedkonsole.pro -o Makefile.in
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
@@ -183,14 +185,9 @@ session.o: session.cpp \
 
 keytrans.o: keytrans.cpp \
 		keytrans.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
 		default.keytab.h
 
 konsole.o: konsole.cpp \
-		$(OPIEDIR)/include/qpe/resource.h \
-		$(OPIEDIR)/include/qpe/qpetoolbar.h \
-		$(OPIEDIR)/include/qpe/qpemenubar.h \
-		$(OPIEDIR)/include/qpe/config.h \
 		konsole.h \
 		MyPty.h \
 		TEWidget.h \
@@ -212,8 +209,7 @@ main.o: main.cpp \
 		TEHistory.h \
 		TEmulation.h \
 		keytrans.h \
-		session.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h
+		session.h
 
 MyPty.o: MyPty.cpp \
 		MyPty.h
diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro
index 0078faf..32cb95f 100644
--- a/core/launcher/launcher.pro
+++ b/core/launcher/launcher.pro
@@ -6,6 +6,7 @@ DESTDIR		= $(OPIEDIR)/bin
 
 HEADERS		= background.h \
 		  desktop.h \
+		  qprocess.h \
 		  info.h \
 		  appicons.h \
 		  taskbar.h \
@@ -46,6 +47,7 @@ HEADERS		= background.h \
 
 SOURCES		= background.cpp \
 		  desktop.cpp \
+		  qprocess.cpp qprocess_unix.cpp \
 		  info.cpp \
 		  appicons.cpp \
 		  taskbar.cpp \
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index ed39720..e8741a2 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -212,10 +212,8 @@ public:
 	case Name:
 	    return a->name().compare(b->name());
 	case Date: {
-	    QFileInfo fa(a->linkFile());
-	    if ( !fa.exists() ) fa.setFile(a->file());
-	    QFileInfo fb(b->linkFile());
-	    if ( !fb.exists() ) fb.setFile(b->file());
+	    QFileInfo fa(a->linkFileKnown() ? a->linkFile() : a->file());
+	    QFileInfo fb(b->linkFileKnown() ? b->linkFile() : b->file());
 	    return fa.lastModified().secsTo(fb.lastModified());
 	}
 	case Type:
@@ -362,6 +360,8 @@ void LauncherIconView::hideOrShowItems(bool resort)
 	links.append(item->takeAppLnk());
 	item = (LauncherItem*)item->nextItem();
     }
+    bool oldAutoArrange = autoArrange();
+    setAutoArrange( FALSE );
     clear();
     QListIterator<AppLnk> it(links);
     AppLnk* l;
@@ -371,28 +371,35 @@ void LauncherIconView::hideOrShowItems(bool resort)
     }
     if ( resort )
 	sort();
+    setAutoArrange( oldAutoArrange );
 }
 
 bool LauncherIconView::removeLink(const QString& linkfile)
 {
     LauncherItem* item = (LauncherItem*)firstItem();
+    AppLnk* l;
+    bool did = FALSE;
+    DocLnk dl(linkfile);
     while (item) {
-	if ( item->appLnk()->linkFile() == linkfile ) {
+	l = item->appLnk();
+	if (  l->linkFileKnown() && l->linkFile() == linkfile || l->file() == linkfile
+		|| dl.isValid() && dl.file() == l->file() ) {
 	    delete item;
-	    return TRUE;
+	    did = TRUE;
 	}
 	item = (LauncherItem*)item->nextItem();
     }
     QListIterator<AppLnk> it(hidden);
-    AppLnk* l;
     while ((l=it.current())) {
 	++it;
-	if ( l->linkFile() == linkfile ) {
+	if ( l->linkFileKnown() && l->linkFile() == linkfile
+		|| l->file() == linkfile
+		|| dl.isValid() && dl.file() == l->file() ) {
 	    hidden.removeRef(l);
-	    return TRUE;
+	   did = TRUE;
 	}
     }
-    return FALSE;
+    return did;
 }
 
 LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl )
diff --git a/core/multimedia/opieplayer/Makefile.in b/core/multimedia/opieplayer/Makefile.in
index 6e007ec..3e1f9fc 100644
--- a/core/multimedia/opieplayer/Makefile.in
+++ b/core/multimedia/opieplayer/Makefile.in
@@ -100,8 +100,10 @@ $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 
 moc: $(SRCMOC)
 
-tmake:
-	tmake mpegplayer.pro
+tmake: Makefile.in
+
+Makefile.in: mpegplayer.pro
+	tmake mpegplayer.pro -o Makefile.in
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
@@ -135,100 +137,57 @@ REQUIRES=
 ####### Compile
 
 main.o: main.cpp \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
 		mediaplayerstate.h \
 		playlistwidget.h \
-		$(OPIEDIR)/include/qpe/applnk.h \
 		audiowidget.h \
 		videowidget.h \
 		loopcontrol.h \
-		mediaplayer.h \
-		$(OPIEDIR)/include/qpe/qlibrary.h \
-		$(OPIEDIR)/include/qpe/qcom.h \
-		$(OPIEDIR)/include/qpe/quuid.h \
-		mediaplayerplugininterface.h
+		mediaplayer.h
 
 loopcontrol.o: loopcontrol.cpp \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
 		loopcontrol.h \
 		videowidget.h \
 		audiodevice.h \
-		mediaplayerplugininterface.h \
-		$(OPIEDIR)/include/qpe/qcom.h \
-		$(OPIEDIR)/include/qpe/quuid.h \
 		mediaplayerstate.h
 
 playlistselection.o: playlistselection.cpp \
-		$(OPIEDIR)/include/qpe/applnk.h \
-		$(OPIEDIR)/include/qpe/resource.h \
 		playlistselection.h
 
 mediaplayerstate.o: mediaplayerstate.cpp \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpe/qlibrary.h \
-		$(OPIEDIR)/include/qpe/qcom.h \
-		$(OPIEDIR)/include/qpe/quuid.h \
-		$(OPIEDIR)/include/qpe/config.h \
-		mediaplayerplugininterface.h \
 		mediaplayerstate.h \
 		libmad/libmadpluginimpl.h \
 		libmpeg3/libmpeg3pluginimpl.h \
 		wavplugin/wavpluginimpl.h
 
 videowidget.o: videowidget.cpp \
-		$(OPIEDIR)/include/qpe/resource.h \
 		videowidget.h \
-		mediaplayerplugininterface.h \
-		$(OPIEDIR)/include/qpe/qcom.h \
-		$(OPIEDIR)/include/qpe/quuid.h \
 		mediaplayerstate.h
 
 audiowidget.o: audiowidget.cpp \
-		$(OPIEDIR)/include/qpe/resource.h \
 		audiowidget.h \
 		mediaplayerstate.h
 
 playlistwidget.o: playlistwidget.cpp \
-		$(OPIEDIR)/include/qpe/qpemenubar.h \
-		$(OPIEDIR)/include/qpe/qpetoolbar.h \
-		$(OPIEDIR)/include/qpe/fileselector.h \
-		$(OPIEDIR)/include/qpe/applnk.h \
-		$(OPIEDIR)/include/qpe/config.h \
-		$(OPIEDIR)/include/qpe/global.h \
-		$(OPIEDIR)/include/qpe/resource.h \
 		playlistselection.h \
 		playlistwidget.h \
 		mediaplayerstate.h
 
 mediaplayer.o: mediaplayer.cpp \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpe/qlibrary.h \
-		$(OPIEDIR)/include/qpe/qcom.h \
-		$(OPIEDIR)/include/qpe/quuid.h \
-		$(OPIEDIR)/include/qpe/resource.h \
-		$(OPIEDIR)/include/qpe/config.h \
 		mediaplayer.h \
-		mediaplayerplugininterface.h \
 		playlistwidget.h \
-		$(OPIEDIR)/include/qpe/applnk.h \
 		audiowidget.h \
 		loopcontrol.h \
 		audiodevice.h \
 		mediaplayerstate.h
 
 audiodevice.o: audiodevice.cpp \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpe/config.h \
-		audiodevice.h \
-		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h
+		audiodevice.h
 
 moc_loopcontrol.o: moc_loopcontrol.cpp \
 		loopcontrol.h
 
 moc_playlistselection.o: moc_playlistselection.cpp \
-		playlistselection.h \
-		$(OPIEDIR)/include/qpe/applnk.h
+		playlistselection.h
 
 moc_mediaplayerstate.o: moc_mediaplayerstate.cpp \
 		mediaplayerstate.h
@@ -240,15 +199,10 @@ moc_audiowidget.o: moc_audiowidget.cpp \
 		audiowidget.h
 
 moc_playlistwidget.o: moc_playlistwidget.cpp \
-		playlistwidget.h \
-		$(OPIEDIR)/include/qpe/applnk.h
+		playlistwidget.h
 
 moc_mediaplayer.o: moc_mediaplayer.cpp \
-		mediaplayer.h \
-		$(OPIEDIR)/include/qpe/qlibrary.h \
-		$(OPIEDIR)/include/qpe/qcom.h \
-		$(OPIEDIR)/include/qpe/quuid.h \
-		mediaplayerplugininterface.h
+		mediaplayer.h
 
 moc_audiodevice.o: moc_audiodevice.cpp \
 		audiodevice.h
diff --git a/core/multimedia/opieplayer/libflash/Makefile.in b/core/multimedia/opieplayer/libflash/Makefile.in
index 52c8557..0947454 100644
--- a/core/multimedia/opieplayer/libflash/Makefile.in
+++ b/core/multimedia/opieplayer/libflash/Makefile.in
@@ -6,7 +6,7 @@ CXX	=	$(SYSCONF_CXX) $(QT_CXX_MT)
 CXXFLAGS=	$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
 CC	=	$(SYSCONF_CC) $(QT_C_MT)
 CFLAGS	=	$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
-INCPATH =	-I$(QPEDIR)/include
+INCPATH =	-I$(OPIEDIR)/include -I..
 LFLAGS	=	$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
 LIBS	=	$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
 MOC	=	$(SYSCONF_MOC)
@@ -145,15 +145,12 @@ REQUIRES=
 
 libflashplugin.o: libflashplugin.cpp \
 		libflashplugin.h \
-		flash.h \
-		../mediaplayerplugininterface.h
+		flash.h
 
 libflashpluginimpl.o: libflashpluginimpl.cpp \
 		libflashplugin.h \
 		flash.h \
-		../mediaplayerplugininterface.h \
-		libflashpluginimpl.h \
-		../mediaplayerplugininterface.h
+		libflashpluginimpl.h
 
 adpcm.o: adpcm.cc \
 		swf.h \
diff --git a/core/multimedia/opieplayer/libmad/Makefile.in b/core/multimedia/opieplayer/libmad/Makefile.in
index 19ded26..d2e1cda 100644
--- a/core/multimedia/opieplayer/libmad/Makefile.in
+++ b/core/multimedia/opieplayer/libmad/Makefile.in
@@ -100,8 +100,10 @@ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 
 moc: $(SRCMOC)
 
-tmake:
-	tmake libmad.pro
+tmake: Makefile.in
+
+Makefile.in: libmad.pro
+	tmake libmad.pro -o Makefile.in
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
@@ -214,13 +216,10 @@ huffman.o: huffman.c \
 
 libmadplugin.o: libmadplugin.cpp \
 		libmadplugin.h \
-		../mediaplayerplugininterface.h \
 		mad.h
 
 libmadpluginimpl.o: libmadpluginimpl.cpp \
 		libmadplugin.h \
-		../mediaplayerplugininterface.h \
-		libmadpluginimpl.h \
-		../mediaplayerplugininterface.h
+		libmadpluginimpl.h
 
 
diff --git a/core/multimedia/opieplayer/libmpeg3/Makefile.in b/core/multimedia/opieplayer/libmpeg3/Makefile.in
index 9881815..4ccdb8c 100644
--- a/core/multimedia/opieplayer/libmpeg3/Makefile.in
+++ b/core/multimedia/opieplayer/libmpeg3/Makefile.in
@@ -129,8 +129,10 @@ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 
 moc: $(SRCMOC)
 
-tmake:
-	tmake libmpeg3.pro
+tmake: Makefile.in
+
+Makefile.in: libmpeg3.pro
+	tmake libmpeg3.pro -o Makefile.in
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
@@ -176,8 +178,7 @@ libmpeg3plugin.o: libmpeg3plugin.cpp \
 		audio/mpeg3audio.h \
 		mpeg3vtrack.h \
 		video/mpeg3video.h \
-		mpeg3protos.h \
-		../mediaplayerplugininterface.h
+		mpeg3protos.h
 
 libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \
 		libmpeg3plugin.h \
@@ -193,9 +194,7 @@ libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \
 		mpeg3vtrack.h \
 		video/mpeg3video.h \
 		mpeg3protos.h \
-		../mediaplayerplugininterface.h \
-		libmpeg3pluginimpl.h \
-		../mediaplayerplugininterface.h
+		libmpeg3pluginimpl.h
 
 bitstream.o: bitstream.c \
 		mpeg3private.h \
diff --git a/core/multimedia/opieplayer/wavplugin/Makefile.in b/core/multimedia/opieplayer/wavplugin/Makefile.in
index e9fec6c..560534e 100644
--- a/core/multimedia/opieplayer/wavplugin/Makefile.in
+++ b/core/multimedia/opieplayer/wavplugin/Makefile.in
@@ -65,8 +65,10 @@ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 
 moc: $(SRCMOC)
 
-tmake:
-	tmake wavplugin.pro
+tmake: Makefile.in
+
+Makefile.in: wavplugin.pro
+	tmake wavplugin.pro -o Makefile.in
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
@@ -100,13 +102,10 @@ REQUIRES=
 ####### Compile
 
 wavplugin.o: wavplugin.cpp \
-		wavplugin.h \
-		../mediaplayerplugininterface.h
+		wavplugin.h
 
 wavpluginimpl.o: wavpluginimpl.cpp \
 		wavplugin.h \
-		../mediaplayerplugininterface.h \
-		wavpluginimpl.h \
-		../mediaplayerplugininterface.h
+		wavpluginimpl.h
 
 
diff --git a/core/pim/datebook/Makefile.in b/core/pim/datebook/Makefile.in
index 0c3282e..cc31efe 100644
--- a/core/pim/datebook/Makefile.in
+++ b/core/pim/datebook/Makefile.in
@@ -124,8 +124,10 @@ $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 
 moc: $(SRCMOC)
 
-tmake:
-	tmake datebook.pro
+tmake: Makefile.in
+
+Makefile.in: datebook.pro
+	tmake datebook.pro -o Makefile.in
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
@@ -159,99 +161,40 @@ REQUIRES=
 ####### Compile
 
 main.o: main.cpp \
-		datebook.h \
-		$(OPIEDIR)/include/qpe/datebookdb.h \
-		$(OPIEDIR)/include/qpe/event.h \
-		$(OPIEDIR)/include/qpe/palmtoprecord.h \
-		$(OPIEDIR)/include/qpe/timeconversion.h \
-		$(OPIEDIR)/include/qpe/qpcglobal.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h
+		datebook.h
 
 datebookday.o: datebookday.cpp \
 		datebookday.h \
-		$(OPIEDIR)/include/qpe/event.h \
-		$(OPIEDIR)/include/qpe/palmtoprecord.h \
-		$(OPIEDIR)/include/qpe/timeconversion.h \
-		$(OPIEDIR)/include/qpe/qpcglobal.h \
 		datebookdayheaderimpl.h \
-		datebookdayheader.h \
-		$(OPIEDIR)/include/qpe/datebookdb.h \
-		$(OPIEDIR)/include/qpe/resource.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpe/timestring.h \
-		$(OPIEDIR)/include/qpe/qpedebug.h
+		datebookdayheader.h
 
 datebook.o: datebook.cpp \
 		datebook.h \
-		$(OPIEDIR)/include/qpe/datebookdb.h \
-		$(OPIEDIR)/include/qpe/event.h \
-		$(OPIEDIR)/include/qpe/palmtoprecord.h \
-		$(OPIEDIR)/include/qpe/timeconversion.h \
-		$(OPIEDIR)/include/qpe/qpcglobal.h \
 		datebookday.h \
 		datebooksettings.h \
 		datebooksettingsbase.h \
 		datebookweek.h \
 		dateentryimpl.h \
-		dateentry.h \
-		$(OPIEDIR)/include/qpe/datebookmonth.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpe/config.h \
-		$(OPIEDIR)/include/qpe/qpedebug.h \
-		$(OPIEDIR)/include/qpe/finddialog.h \
-		$(OPIEDIR)/include/qpe/ir.h \
-		$(OPIEDIR)/include/qpe/qpemenubar.h \
-		$(OPIEDIR)/include/qpe/qpemessagebox.h \
-		$(OPIEDIR)/include/qpe/resource.h \
-		$(OPIEDIR)/include/qpe/sound.h \
-		$(OPIEDIR)/include/qpe/timestring.h \
-		$(OPIEDIR)/include/qpe/qpetoolbar.h \
-		$(OPIEDIR)/include/qpe/tzselect.h \
-		$(OPIEDIR)/include/qpe/xmlreader.h
+		dateentry.h
 
 dateentryimpl.o: dateentryimpl.cpp \
 		dateentryimpl.h \
 		dateentry.h \
-		$(OPIEDIR)/include/qpe/event.h \
-		$(OPIEDIR)/include/qpe/palmtoprecord.h \
-		$(OPIEDIR)/include/qpe/timeconversion.h \
-		$(OPIEDIR)/include/qpe/qpcglobal.h \
 		repeatentry.h \
-		repeatentrybase.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpe/categoryselect.h \
-		$(OPIEDIR)/include/qpe/datebookmonth.h \
-		$(OPIEDIR)/include/qpe/global.h \
-		$(OPIEDIR)/include/qpe/timestring.h \
-		$(OPIEDIR)/include/qpe/tzselect.h
+		repeatentrybase.h
 
 datebookdayheaderimpl.o: datebookdayheaderimpl.cpp \
 		datebookdayheaderimpl.h \
-		datebookdayheader.h \
-		$(OPIEDIR)/include/qpe/datebookmonth.h \
-		$(OPIEDIR)/include/qpe/event.h \
-		$(OPIEDIR)/include/qpe/palmtoprecord.h \
-		$(OPIEDIR)/include/qpe/timeconversion.h \
-		$(OPIEDIR)/include/qpe/qpcglobal.h \
-		$(OPIEDIR)/include/qpe/timestring.h
+		datebookdayheader.h
 
 datebooksettings.o: datebooksettings.cpp \
 		datebooksettings.h \
-		datebooksettingsbase.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h
+		datebooksettingsbase.h
 
 datebookweek.o: datebookweek.cpp \
 		datebookweek.h \
-		$(OPIEDIR)/include/qpe/event.h \
-		$(OPIEDIR)/include/qpe/palmtoprecord.h \
-		$(OPIEDIR)/include/qpe/timeconversion.h \
-		$(OPIEDIR)/include/qpe/qpcglobal.h \
 		datebookweekheaderimpl.h \
-		datebookweekheader.h \
-		$(OPIEDIR)/include/qpe/calendar.h \
-		$(OPIEDIR)/include/qpe/datebookdb.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpe/timestring.h
+		datebookweekheader.h
 
 datebookweekheaderimpl.o: datebookweekheaderimpl.cpp \
 		datebookweekheaderimpl.h \
@@ -259,14 +202,7 @@ datebookweekheaderimpl.o: datebookweekheaderimpl.cpp \
 
 repeatentry.o: repeatentry.cpp \
 		repeatentry.h \
-		repeatentrybase.h \
-		$(OPIEDIR)/include/qpe/event.h \
-		$(OPIEDIR)/include/qpe/palmtoprecord.h \
-		$(OPIEDIR)/include/qpe/timeconversion.h \
-		$(OPIEDIR)/include/qpe/qpcglobal.h \
-		$(OPIEDIR)/include/qpe/datebookmonth.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpe/timestring.h
+		repeatentrybase.h
 
 dateentry.h: dateentry.ui
 	$(UIC) dateentry.ui -o $(INTERFACE_DECL_PATH)/dateentry.h
@@ -309,38 +245,21 @@ datebookweekheader.o: datebookweekheader.cpp
 repeatentrybase.o: repeatentrybase.cpp
 
 moc_datebookday.o: moc_datebookday.cpp \
-		datebookday.h \
-		$(OPIEDIR)/include/qpe/event.h \
-		$(OPIEDIR)/include/qpe/palmtoprecord.h \
-		$(OPIEDIR)/include/qpe/timeconversion.h \
-		$(OPIEDIR)/include/qpe/qpcglobal.h
+		datebookday.h
 
 moc_datebook.o: moc_datebook.cpp \
-		datebook.h \
-		$(OPIEDIR)/include/qpe/datebookdb.h \
-		$(OPIEDIR)/include/qpe/event.h \
-		$(OPIEDIR)/include/qpe/palmtoprecord.h \
-		$(OPIEDIR)/include/qpe/timeconversion.h \
-		$(OPIEDIR)/include/qpe/qpcglobal.h
+		datebook.h
 
 moc_dateentryimpl.o: moc_dateentryimpl.cpp \
 		dateentryimpl.h \
-		dateentry.h \
-		$(OPIEDIR)/include/qpe/event.h \
-		$(OPIEDIR)/include/qpe/palmtoprecord.h \
-		$(OPIEDIR)/include/qpe/timeconversion.h \
-		$(OPIEDIR)/include/qpe/qpcglobal.h
+		dateentry.h
 
 moc_datebookdayheaderimpl.o: moc_datebookdayheaderimpl.cpp \
 		datebookdayheaderimpl.h \
 		datebookdayheader.h
 
 moc_datebookweek.o: moc_datebookweek.cpp \
-		datebookweek.h \
-		$(OPIEDIR)/include/qpe/event.h \
-		$(OPIEDIR)/include/qpe/palmtoprecord.h \
-		$(OPIEDIR)/include/qpe/timeconversion.h \
-		$(OPIEDIR)/include/qpe/qpcglobal.h
+		datebookweek.h
 
 moc_datebookweekheaderimpl.o: moc_datebookweekheaderimpl.cpp \
 		datebookweekheaderimpl.h \
@@ -348,11 +267,7 @@ moc_datebookweekheaderimpl.o: moc_datebookweekheaderimpl.cpp \
 
 moc_repeatentry.o: moc_repeatentry.cpp \
 		repeatentry.h \
-		repeatentrybase.h \
-		$(OPIEDIR)/include/qpe/event.h \
-		$(OPIEDIR)/include/qpe/palmtoprecord.h \
-		$(OPIEDIR)/include/qpe/timeconversion.h \
-		$(OPIEDIR)/include/qpe/qpcglobal.h
+		repeatentrybase.h
 
 moc_dateentry.o: moc_dateentry.cpp \
 		dateentry.h