diff --git a/fontprogress.cpp b/fontprogress.cpp
index ea4814e0a..71cde109f 100644
--- a/fontprogress.cpp
+++ b/fontprogress.cpp
@@ -9,6 +9,7 @@
 #include <klocale.h>
 #include <kprocio.h>
 #include <kprogress.h>
+#include <kvbox.h>
 #include <qapplication.h>
 #include <q3frame.h>
 #include <qlabel.h>
@@ -37,7 +38,7 @@ fontProgressDialog::fontProgressDialog(const QString& helpIndex, const QString&
   } else
     enableLinkedHelp(false);
 
-  Q3VBox *page = makeVBoxMainWidget();
+  KVBox *page = makeVBoxMainWidget();
 
   TextLabel1   = new QLabel( label, page, "TextLabel2" );
   TextLabel1->setAlignment( int( Qt::AlignCenter ) );
diff --git a/kdvi_multipage.h b/kdvi_multipage.h
index fe71b63db..de9e476d7 100644
--- a/kdvi_multipage.h
+++ b/kdvi_multipage.h
@@ -7,6 +7,7 @@
 
 #include <QStringList>
 
+class KAboutData;
 class KPrinter;
 
 
diff --git a/optionDialogSpecialWidget.cpp b/optionDialogSpecialWidget.cpp
index c02c2cdff..36c4ace0f 100644
--- a/optionDialogSpecialWidget.cpp
+++ b/optionDialogSpecialWidget.cpp
@@ -9,10 +9,10 @@
 
 #include <kdebug.h>
 
-#include <kapplication.h>
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <klocale.h>
+#include <ktoolinvocation.h>
 #include <kurllabel.h>
 #include <qcheckbox.h>
 #include <qlabel.h>
@@ -121,7 +121,7 @@ void optionDialogSpecialWidget::slotComboBox(int item)
 
 void optionDialogSpecialWidget::slotExtraHelpButton( const QString & )
 {
-  kapp->invokeHelp( "inv-search", "kdvi" );
+  KToolInvocation::invokeHelp("inv-search", "kdvi");
 }
 
 void optionDialogSpecialWidget::apply()