diff --git a/generators/ghostview/internaldocument.cpp b/generators/ghostview/internaldocument.cpp
index 56d5dbaf4..228398edc 100644
--- a/generators/ghostview/internaldocument.cpp
+++ b/generators/ghostview/internaldocument.cpp
@@ -20,6 +20,8 @@ extern "C" {
 #include "ps.h"
 }
 
+#include <errno.h>
+
 #include "core/document.h"
 #include "internaldocument.h"
 
diff --git a/generators/ghostview/internaldocument.h b/generators/ghostview/internaldocument.h
index f0493f37a..4d6283944 100644
--- a/generators/ghostview/internaldocument.h
+++ b/generators/ghostview/internaldocument.h
@@ -13,8 +13,6 @@
 #ifndef _OKULAR_GSINTERNALDOC_H_
 #define _OKULAR_GSINTERNALDOC_H_
 
-#include <errno.h>
-
 #include <qlist.h>
 #include <qmap.h>
 #include <qprinter.h>
diff --git a/generators/ghostview/interpreter_cmd.cpp b/generators/ghostview/interpreter_cmd.cpp
index 82760f821..9b689cf64 100644
--- a/generators/ghostview/interpreter_cmd.cpp
+++ b/generators/ghostview/interpreter_cmd.cpp
@@ -7,8 +7,6 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <math.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <string.h>
 #include <sys/ipc.h>
@@ -17,11 +15,10 @@
 #include <unistd.h>
 
 #include <qfile.h>
+#include <qpixmap.h>
 
-#include <qapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kmessagebox.h>
 #include <kprocess.h>
 #include <k3tempfile.h>
 
diff --git a/generators/ghostview/interpreter_cmd.h b/generators/ghostview/interpreter_cmd.h
index b688f19a5..9a99babf1 100644
--- a/generators/ghostview/interpreter_cmd.h
+++ b/generators/ghostview/interpreter_cmd.h
@@ -18,17 +18,18 @@
 
 #include <kdebug.h>
 
-#include "core/generator.h"
-
 #include "okulargsasyncgenerator.h"
 #include "internaldocument.h"
 
 #define GS_DATAREADY_ID 6989
 
-class QCustomEvent;
+class QPixmap;
 class QString;
 class QStringList;
 class KProcess;
+namespace Okular {
+    class PixmapRequest;
+}
 
 struct ProcessData
 {
diff --git a/generators/ghostview/okulargsasyncgenerator.cpp b/generators/ghostview/okulargsasyncgenerator.cpp
index a37adcb62..533d39ea6 100644
--- a/generators/ghostview/okulargsasyncgenerator.cpp
+++ b/generators/ghostview/okulargsasyncgenerator.cpp
@@ -7,11 +7,8 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-
 #include "okulargsasyncgenerator.h"
 
-#include <qgs.h>
-
 #include <qapplication.h>
 #include <qpainter.h>
 #include <qpixmap.h>
@@ -25,7 +22,6 @@
 #include <X11/Xlib.h>
 #include <fixx11h.h>
 
-// #include <qdialog.h>
 #include <QX11Info>
 
 extern GC kde_xget_temp_gc( int scrn, bool monochrome );                // get temporary GC
diff --git a/generators/ghostview/okulargsasyncgenerator.h b/generators/ghostview/okulargsasyncgenerator.h
index 167433590..3618099e9 100644
--- a/generators/ghostview/okulargsasyncgenerator.h
+++ b/generators/ghostview/okulargsasyncgenerator.h
@@ -10,10 +10,10 @@
 #ifndef _LIBGS_ASYNC_GENERATOR_
 #define _LIBGS_ASYNC_GENERATOR_
 
-#include <qpixmap.h>
-#include <interpreter.h>
-#include <core/generator.h>
+#include <qgs.h>
+
 class QImage;
+
 class PixHandler : public QObject
 {
     Q_OBJECT