Index: trunk/FACT++/src/fadctrl.cc
===================================================================
--- trunk/FACT++/src/fadctrl.cc	(revision 18987)
+++ trunk/FACT++/src/fadctrl.cc	(revision 18988)
@@ -18,5 +18,5 @@
 #include "EventBuilderWrapper.h"
 
-#include "../externals/zofits.h"
+#include "zofits.h"
 
 namespace ba = boost::asio;
@@ -31,7 +31,4 @@
 class ConnectionFAD : public Connection
 {
-    uint16_t fSlot;
-//    tcp::endpoint fEndpoint;
-
     vector<uint16_t> fBuffer;
 
@@ -217,5 +214,6 @@
             }
 
-            fChannelHeader[i] = vector<uint16_t>((uint16_t*)ptr, (uint16_t*)ptr+sizeof(FAD::ChannelHeader)/2);
+            fChannelHeader[i] = vector<uint16_t>(reinterpret_cast<uint16_t*>(ptr),
+                                                 reinterpret_cast<uint16_t*>(ptr)+sizeof(FAD::ChannelHeader)/2);
             ptr += sizeof(FAD::ChannelHeader);
 
@@ -356,5 +354,5 @@
 public:
     ConnectionFAD(ba::io_service& ioservice, MessageImp &imp, uint16_t slot) :
-        Connection(ioservice, imp()), fSlot(slot),
+        Connection(ioservice, imp()),
         fIsVerbose(false), fIsHexOutput(false), fIsDataOutput(false),
         fBlockTransmission(false), fCounter(0),