Index: /trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.h
===================================================================
--- /trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.h	(revision 15013)
+++ /trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.h	(revision 15014)
@@ -13,39 +13,14 @@
 #define NTMARK      160      // max. number of timeMarker signals
 
-//get rid of the ofits.h inclusion and various other messy items in DrsCalib.h
-//It has nothing to do here, and it creates compilation errors
-//the proper way would be to re-design the inclusion scheme,
-//but that's beyond the time I can allocate to this fix.
-#define MARS_ofits
-namespace std
-{
- class ofits
- {
-     public:
-         ofits(){};
-         ofits(const char*){};
-         ~ofits(){};
-         bool operator !(){return false;}
-         void AddColumnInt(const char* ){};
-         void AddColumnFloat(int, const char*, const char*){};
-         void SetInt(const char*, int, const char*){};
-         void WriteTableHeader(const char*){};
-         bool WriteRow(const void*, long unsigned int ){return false;};
- };
-};
-typedef int Int_t;
-
-//#define LOAD_RAW
+#include <string>
+#include <valarray>
+#include <iostream>
 
 #include <QObject>
-#include <QTimer>
+//#include <QTimer>
 #include <QLabel>
 #include <QListWidget>
 #include <QMainWindow>
 #include <QPushButton>
-
-//#include <QtOpenGL/QGLWidget>
-#include "../BasicGlCamera.h"
-
 #include <QMouseEvent>
 #include <QColorDialog>
@@ -55,24 +30,16 @@
 #include <QRadioButton>
 #include <QCheckBox>
-#include <iostream>
+
+#include "../BasicGlCamera.h"
+
 #include <GL/gl.h>
 
 #include <qwt_plot.h>
-//#include "qwt_plot_histogram.h"
 #include <qwt_plot_curve.h>
 #include <qwt_plot_grid.h>
 #include <qwt_plot_zoomer.h>
 
-#include <valarray>
-
-#include <string>
-
 #include "../../src/DataCalib.h"
-
-
-namespace std
-{
-    class fits;
-}
+#include "../../externals/ofits.h"
 
 /*************************************************