Index: trunk/FACT++/src/Fits.cc
===================================================================
--- trunk/FACT++/src/Fits.cc	(revision 10693)
+++ trunk/FACT++/src/Fits.cc	(revision 10694)
@@ -18,4 +18,5 @@
 #include "Time.h"
 #include "Converter.h"
+#include "MessageImp.h"
 
 //for file stats
@@ -23,4 +24,5 @@
 
 using namespace std;
+using namespace CCfits;
 
 // --------------------------------------------------------------------------
Index: trunk/FACT++/src/Fits.h
===================================================================
--- trunk/FACT++/src/Fits.h	(revision 10693)
+++ trunk/FACT++/src/Fits.h	(revision 10694)
@@ -6,8 +6,7 @@
 
 #include "Description.h"
-#include "MessageImp.h"
-using namespace CCfits;
 
 class Converter;
+class MessageImp;
 
 class Fits
@@ -15,9 +14,9 @@
 	private:
 		///The CCfits object to the FITS file
-		FITS* fFile;
+                CCfits::FITS* fFile;
 		///Flag indicating whether the FITS object should be managed internally or not.
 		bool fOwner;
 		///The CCfits Table
-		Table* fTable;
+		CCfits::Table* fTable;
 		///The current number of Rows in the table
 		int fNumRows;
@@ -90,5 +89,5 @@
 
 		///Opens a FITS file
-		void Open(const std::string& fileName, const std::string& tableName, FITS* file, int* fitsCounter, std::ostream& out);
+                void Open(const std::string& fileName, const std::string& tableName, CCfits::FITS* file, int* fitsCounter, std::ostream& out);
 
 		///Write one line of data. Use the given converter.