diff --git a/MAC/APL/PIC/MIS/configure.in b/MAC/APL/PIC/MIS/configure.in
index acd53a7926c5c45c03dbf7cf998e986fd3735d08..84f4416dbb674ab65fb5e64112dccacea524e7fc 100644
--- a/MAC/APL/PIC/MIS/configure.in
+++ b/MAC/APL/PIC/MIS/configure.in
@@ -40,7 +40,7 @@ lofar_COMPILETOOLS
 lofar_PVSS(1)
 lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
 lofar_INTERNAL(LCS/ACC/APS, aps, , 1, APS/ParameterSet.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, , 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,,)
 lofar_INTERNAL(MAC/GCF/TM, gcftm, , 1, GCF/TM/GCF_Task.h,,)
 dnl lofar_INTERNAL(MAC/GCF/PAL, gcfpal, , 1, GCF/PAL/GCF_PVSSInfo.h,,)
 dnl lofar_INTERNAL(MAC/GCF/LogSys, gcfkvlc, , 1, GCF/LogSys/GCF_KeyValueLogger.h,,)
diff --git a/MAC/APL/PIC/MIS/src/MISDaemon.h b/MAC/APL/PIC/MIS/src/MISDaemon.h
index d50914c20209d47ed58787d314fe38b77f9fbe72..11b2f5ba9d1c78ba4d01ecc4334e382bf3334e8b 100644
--- a/MAC/APL/PIC/MIS/src/MISDaemon.h
+++ b/MAC/APL/PIC/MIS/src/MISDaemon.h
@@ -23,9 +23,8 @@
 #ifndef MISDAEMON_H
 #define MISDAEMON_H
 
-#include <GCF/TM/GCF_Task.h>
-#include <GCF/TM/GCF_Port.h>
-#include <GCF/TM/GCF_TCPPort.h>
+#include <MACIO/GCF_Event.h>
+#include <GCF/TM/GCF_Control.h>
 #include <MISPolicyHandler.h>
 
 namespace LOFAR 
@@ -50,8 +49,8 @@ class MISDaemon : public GCF::TM::GCFTask
     void clientClosed(MISSession& client);
   
   private: // state methods
-    GCF::TM::GCFEvent::TResult initial   (GCF::TM::GCFEvent& e, GCF::TM::GCFPortInterface& p);
-    GCF::TM::GCFEvent::TResult accepting (GCF::TM::GCFEvent& e, GCF::TM::GCFPortInterface& p);
+    MACIO::GCFEvent::TResult initial   (MACIO::GCFEvent& e, GCF::TM::GCFPortInterface& p);
+    MACIO::GCFEvent::TResult accepting (MACIO::GCFEvent& e, GCF::TM::GCFPortInterface& p);
         
   private: // helper methods
     
diff --git a/MAC/APL/PIC/MIS/src/MISDefines.h b/MAC/APL/PIC/MIS/src/MISDefines.h
index 4258edcce78e2d51d0a5c752e3d5e46d275f0f6c..d3fd97f0801d5a465532f50a62bc37da9802acff 100644
--- a/MAC/APL/PIC/MIS/src/MISDefines.h
+++ b/MAC/APL/PIC/MIS/src/MISDefines.h
@@ -23,7 +23,7 @@
 #ifndef MISDEFINES_H
 #define MISDEFINES_H
 
-#include <GCF/GCF_Defines.h>
+//#include <GCF/GCF_Defines.h>
 
 namespace LOFAR 
 {
diff --git a/MAC/APL/PIC/MIS/src/MISMain.cc b/MAC/APL/PIC/MIS/src/MISMain.cc
index 8d69a879796c4bc348727955b85083e42b70d20a..d4396439d07866ff83deddfab68ae04094851d0a 100644
--- a/MAC/APL/PIC/MIS/src/MISMain.cc
+++ b/MAC/APL/PIC/MIS/src/MISMain.cc
@@ -21,6 +21,7 @@
 //#  $Id$
 
 #include <lofar_config.h>
+#include <Common/LofarLogger.h>
 
 #include <MISDaemon.h>
 #include <GCF/TM/GCF_Control.h>
diff --git a/MAC/APL/PIC/MIS/src/MISPolicyHandler.cc b/MAC/APL/PIC/MIS/src/MISPolicyHandler.cc
index b9ac056daade10feb42688f87a3f8b8d537d2263..ceffd1d68583e2a6387debe7fe07cb1650462020 100644
--- a/MAC/APL/PIC/MIS/src/MISPolicyHandler.cc
+++ b/MAC/APL/PIC/MIS/src/MISPolicyHandler.cc
@@ -22,6 +22,7 @@
 
 #include <lofar_config.h>
 #include <Common/lofar_fstream.h>
+#include <Common/LofarLogger.h>
 #include <Common/LofarLocators.h>
 
 //#include <GCF/LogSys/GCF_KeyValueLogger.h>
diff --git a/MAC/APL/PIC/MIS/src/MISPolicyHandler.h b/MAC/APL/PIC/MIS/src/MISPolicyHandler.h
index 703b09ce91ce77ea54cc85228e1b7969efbacf4e..dd90ecd42669df4e54a8cf796cb1303e6fb1a04c 100644
--- a/MAC/APL/PIC/MIS/src/MISPolicyHandler.h
+++ b/MAC/APL/PIC/MIS/src/MISPolicyHandler.h
@@ -23,6 +23,7 @@
 #ifndef MISPOLICYHANDLER_H
 #define MISPOLICYHANDLER_H
 
+#include <Common/lofar_list.h>
 #include <MIS_Protocol.ph>
 
 namespace LOFAR {
diff --git a/MAC/APL/PIC/MIS/src/MISSession.h b/MAC/APL/PIC/MIS/src/MISSession.h
index 44e4c52c91b633e899067d5a0ca91265ece7b227..033516552cdd27f2afe0bef378054d3a6c42e8f9 100644
--- a/MAC/APL/PIC/MIS/src/MISSession.h
+++ b/MAC/APL/PIC/MIS/src/MISSession.h
@@ -24,11 +24,8 @@
 #define NODEMANAGERCLIENT_H
 
 #include <Common/lofar_bitset.h>
-#include <GCF/TM/GCF_Task.h>
-#include <GCF/TM/GCF_Port.h>
-#include <GCF/TM/GCF_TCPPort.h>
-//MAXMOD
-#include <GCF/GCF_ServiceInfo.h>
+#include <GCF/TM/GCF_Control.h>
+#include <MACIO/MACServiceInfo.h>
 
 //#include <PropertyProxy.h>
 //#include <MISSubscription.h>
@@ -42,6 +39,7 @@ namespace blitz
 }
 namespace LOFAR 
 {
+ using MACIO::GCFEvent;
  namespace AMI
  {  
 
@@ -63,26 +61,26 @@ class MISSession : public GCF::TM::GCFTask
     static void setCurrentTime(int64& sec, uint32& nsec);
   
   private: // state methods
-    GCF::TM::GCFEvent::TResult initial_state (GCF::TM::GCFEvent& e, GCF::TM::GCFPortInterface& p);
-    GCF::TM::GCFEvent::TResult waiting_state (GCF::TM::GCFEvent& e, GCF::TM::GCFPortInterface& p);
-    GCF::TM::GCFEvent::TResult setDiagnosis_state (GCF::TM::GCFEvent& e, GCF::TM::GCFPortInterface& p);
-    GCF::TM::GCFEvent::TResult reconfigure_state (GCF::TM::GCFEvent& e, GCF::TM::GCFPortInterface& p);
-    GCF::TM::GCFEvent::TResult getPICStructure_state (GCF::TM::GCFEvent& e, GCF::TM::GCFPortInterface& p);
-    GCF::TM::GCFEvent::TResult subscribe_state (GCF::TM::GCFEvent& e, GCF::TM::GCFPortInterface& p);
-    GCF::TM::GCFEvent::TResult getSubbandStatistics_state (GCF::TM::GCFEvent& e, GCF::TM::GCFPortInterface& p);
-    GCF::TM::GCFEvent::TResult getAntennaCorrelation_state (GCF::TM::GCFEvent& e, GCF::TM::GCFPortInterface& p);
-    GCF::TM::GCFEvent::TResult closing_state (GCF::TM::GCFEvent& e, GCF::TM::GCFPortInterface& p);
+    GCFEvent::TResult initial_state (GCFEvent& e, GCF::TM::GCFPortInterface& p);
+    GCFEvent::TResult waiting_state (GCFEvent& e, GCF::TM::GCFPortInterface& p);
+    GCFEvent::TResult setDiagnosis_state (GCFEvent& e, GCF::TM::GCFPortInterface& p);
+    GCFEvent::TResult reconfigure_state (GCFEvent& e, GCF::TM::GCFPortInterface& p);
+    GCFEvent::TResult getPICStructure_state (GCFEvent& e, GCF::TM::GCFPortInterface& p);
+    GCFEvent::TResult subscribe_state (GCFEvent& e, GCF::TM::GCFPortInterface& p);
+    GCFEvent::TResult getSubbandStatistics_state (GCFEvent& e, GCF::TM::GCFPortInterface& p);
+    GCFEvent::TResult getAntennaCorrelation_state (GCFEvent& e, GCF::TM::GCFPortInterface& p);
+    GCFEvent::TResult closing_state (GCFEvent& e, GCF::TM::GCFPortInterface& p);
         
-    GCF::TM::GCFEvent::TResult defaultHandling (GCF::TM::GCFEvent& e, GCF::TM::GCFPortInterface& p);
+    GCFEvent::TResult defaultHandling (GCFEvent& e, GCF::TM::GCFPortInterface& p);
 
   private: // helper methods
-    void genericPingpong      (GCF::TM::GCFEvent& e);
-    void getGenericIdentity   (GCF::TM::GCFEvent& e);
-    void setDiagnosis         (GCF::TM::GCFEvent& e);
-    void subscribe            (GCF::TM::GCFEvent& e);
-    void getSubbandStatistics (GCF::TM::GCFEvent& e);
+    void genericPingpong      (GCFEvent& e);
+    void getGenericIdentity   (GCFEvent& e);
+    void setDiagnosis         (GCFEvent& e);
+    void subscribe            (GCFEvent& e);
+    void getSubbandStatistics (GCFEvent& e);
     //MAXMOD
-    void getAntennaCorrelation(GCF::TM::GCFEvent& e);
+    void getAntennaCorrelation(GCFEvent& e);
     
   private: // data members      
 //    typedef map<string /*resource name*/, MISSubscription*> TSubscriptions;
@@ -98,7 +96,7 @@ class MISSession : public GCF::TM::GCFTask
     uint64                  _curReplyNr;
     bool                    _busy;
 //    list<MISSubscription*>  _subscriptionsGarbage;
-    GCF::TM::GCFEvent*      _pRememberedEvent;
+    GCFEvent*      _pRememberedEvent;
     uint16                  _nrOfRCUs;
     bitset<MEPHeader::MAX_N_RCUS> _allRCUSMask;    
     bitset<MAX_N_RSPBOARDS> _allRSPSMask;    
diff --git a/MAC/APL/PIC/MIS/src/MISSubscription.cc b/MAC/APL/PIC/MIS/src/MISSubscription.cc
index 1132446d995a0956f087c0111ad5eef2c7a7072b..f2de7433b604c11e4f6730c64e84fcd3e845ab2c 100644
--- a/MAC/APL/PIC/MIS/src/MISSubscription.cc
+++ b/MAC/APL/PIC/MIS/src/MISSubscription.cc
@@ -25,8 +25,8 @@
 #include "MISSubscription.h"
 #include "MISSession.h"
 #include <MIS_Protocol.ph>
-#include <GCF/PAL/GCF_PVSSInfo.h>
-#include <GCF/GCF_PValue.h>
+#include <GCF/PVSS/PVSSInfo.h>
+#include <GCF/PVSS/GCF_PValue.h>
 
 namespace LOFAR
 {
diff --git a/MAC/APL/PIC/MIS/src/MIS_Protocol.prot b/MAC/APL/PIC/MIS/src/MIS_Protocol.prot
index 0d858adc3236ed8b0007130b136df753b1801f90..e30d6e8e1b96eab341be2be87b10bec2e1d89792 100644
--- a/MAC/APL/PIC/MIS/src/MIS_Protocol.prot
+++ b/MAC/APL/PIC/MIS/src/MIS_Protocol.prot
@@ -5,7 +5,7 @@ autogen definitions protocol;
 
 description = "Protocol for MAC Information Exchange";
 prefix = "MIS"; // for the signal names
-id = "(LOFAR::GCF::TM::F_APL_PROTOCOL+5)"; 
+id = "(LOFAR::MACIO::F_APL_PROTOCOL+5)"; 
 include = '<Common/LofarTypes.h>';
 
 //MAXMOD
diff --git a/MAC/APL/PIC/MIS/src/Makefile.am b/MAC/APL/PIC/MIS/src/Makefile.am
index 82702f7ced21096adfef01bbd013d14c4bb06ccc..6e327a123b5132c15e5608becedbcc69c7ecbe11 100644
--- a/MAC/APL/PIC/MIS/src/Makefile.am
+++ b/MAC/APL/PIC/MIS/src/Makefile.am
@@ -2,7 +2,7 @@ AUTOGEN = autogen
 SUFFIXES = .ph
 
 %.ph: %.prot
-	$(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
+	$(AUTOGEN) --writable -L $(datadir)/MACIO $<
 
 DOCHDRS	=	 $(BUILT_SOURCES) \
 	MISDaemon.h \