Index: trunk/FACT++/gui/BasicGlCamera.cc
===================================================================
--- trunk/FACT++/gui/BasicGlCamera.cc	(revision 15014)
+++ trunk/FACT++/gui/BasicGlCamera.cc	(revision 15015)
@@ -8,4 +8,8 @@
 #include <sstream>
 #include <algorithm>
+
+#include <QLabel>
+#include <QRadioButton>
+#include <QButtonGroup>
 
 #include <GL/glu.h>
Index: trunk/FACT++/gui/BasicGlCamera.h
===================================================================
--- trunk/FACT++/gui/BasicGlCamera.h	(revision 15014)
+++ trunk/FACT++/gui/BasicGlCamera.h	(revision 15015)
@@ -9,17 +9,15 @@
 #define ACTUAL_NUM_PIXELS 1440
 
-#include <set>
 #include <vector>
 
 #include <QtOpenGL/QGLWidget>
-#include <QtGui/QMouseEvent>
-
-#include <QtGui/QRadioButton>
-#include <QtGui/QLabel>
-#include <QtGui/QButtonGroup>
 
 #include "src/PixelMap.h"
 
-//#include <QtGui/QMouseEvent>
+class QMouseEvent;
+class QRadioButton;
+class QLabel;
+class QButtonGroup;
+
 ///structure for storing edges of hexagons (for blurry display)
 struct edge
Index: trunk/FACT++/gui/Q3DCameraWidget.cc
===================================================================
--- trunk/FACT++/gui/Q3DCameraWidget.cc	(revision 15014)
+++ trunk/FACT++/gui/Q3DCameraWidget.cc	(revision 15015)
@@ -6,8 +6,11 @@
  */
 #include "Q3DCameraWidget.h"
+
 #include <math.h>
 #include <sstream>
 
 #include <GL/glu.h>
+
+#include <QMouseEvent>
 
     Q3DCameraWidget::Q3DCameraWidget(QWidget* pparent) : BasicGlCamera(pparent),
Index: trunk/FACT++/gui/QCameraWidget.cc
===================================================================
--- trunk/FACT++/gui/QCameraWidget.cc	(revision 15014)
+++ trunk/FACT++/gui/QCameraWidget.cc	(revision 15015)
@@ -1,5 +1,8 @@
 #include "QCameraWidget.h"
+
 #include <sstream>
 #include <iostream>
+
+#include <QMouseEvent>
 
 using namespace std;
Index: trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc
===================================================================
--- trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc	(revision 15014)
+++ trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc	(revision 15015)
@@ -5,16 +5,18 @@
  *      Author: lyard
  */
-//FIXME replace with FACT++ Time class
+#include <math.h>
+#include <fstream>
+
 #include <boost/date_time/local_time/local_time.hpp>
-
 
 #include "RawEventsViewer.h"
 #include "viewer.h"
-#include <math.h>
-#include <fstream>
 
 #include <QFileDialog>
+#include <QMouseEvent>
 
 #include <qwt_symbol.h>
+#include <qwt_plot_grid.h>
+#include <qwt_plot_zoomer.h>
 
 #include "src/Configuration.h"
Index: trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.h
===================================================================
--- trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.h	(revision 15014)
+++ trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.h	(revision 15015)
@@ -15,28 +15,13 @@
 #include <string>
 #include <valarray>
-#include <iostream>
 
 #include <QObject>
-//#include <QTimer>
-#include <QLabel>
-#include <QListWidget>
-#include <QMainWindow>
-#include <QPushButton>
-#include <QMouseEvent>
-#include <QColorDialog>
-#include <QApplication>
-#include <QSpinBox>
-#include <QDoubleSpinBox>
-#include <QRadioButton>
-#include <QCheckBox>
 
 #include "../BasicGlCamera.h"
 
-#include <GL/gl.h>
-
-#include <qwt_plot.h>
 #include <qwt_plot_curve.h>
-#include <qwt_plot_grid.h>
-#include <qwt_plot_zoomer.h>
+
+class QwtPlotZoomer;
+class QwtPlotGrid;
 
 #include "../../src/DataCalib.h"