diff --git a/Framework/Algorithms/src/CalculateCountRate.cpp b/Framework/Algorithms/src/CalculateCountRate.cpp
index 94a67999e1e1acbe3f5abc4164b343dfafede31c..129cf2f368ff8a1564453bb2cf619e8678464d71 100644
--- a/Framework/Algorithms/src/CalculateCountRate.cpp
+++ b/Framework/Algorithms/src/CalculateCountRate.cpp
@@ -269,8 +269,8 @@ void CalculateCountRate::calcRateLog(
   double dt = (dTRangeMax - dTRangeMin) / static_cast<double>(m_numLogSteps);
   auto t0 = m_TRangeMin.totalNanoseconds();
   for (auto i = 0; i < m_numLogSteps; i++) {
-    times[i] =
-        Mantid::Types::DateAndTime(t0 + static_cast<int64_t>((0.5 + double(i)) * dt));
+    times[i] = Mantid::Types::DateAndTime(
+        t0 + static_cast<int64_t>((0.5 + double(i)) * dt));
   }
   // store calculated values within the target log.
   targLog->replaceValues(times, countRate);
diff --git a/Framework/DataObjects/inc/MantidDataObjects/Events.h b/Framework/DataObjects/inc/MantidDataObjects/Events.h
index 30f7b805a4e80f9eaa94c77c5d334038a38696cc..d6d04faa74c41c2e5d67a34b50cad26ae1f5f0d5 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/Events.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/Events.h
@@ -6,7 +6,6 @@
 #endif
 #include "MantidAPI/MatrixWorkspace_fwd.h" // get MantidVec declaration
 #include "MantidKernel/System.h"
-#include "MantidTypes/DateAndTime.h"
 #include "MantidKernel/TimeSplitter.h"
 #include "MantidKernel/cow_ptr.h"
 #include "MantidTypes/DateAndTime.h"
@@ -182,7 +181,9 @@ inline double WeightedEventNoTime::tof() const { return m_tof; }
 /** Return the pulse time; this returns 0 since this
  *  type of Event has no time associated.
  */
-inline Mantid::Types::DateAndTime WeightedEventNoTime::pulseTime() const { return 0; }
+inline Mantid::Types::DateAndTime WeightedEventNoTime::pulseTime() const {
+  return 0;
+}
 
 /// Return the weight of the neutron, as a double (it is saved as a float).
 inline double WeightedEventNoTime::weight() const { return m_weight; }
diff --git a/Framework/Types/inc/MantidTypes/TofEvent.h b/Framework/Types/inc/MantidTypes/TofEvent.h
index 864be7ba7a0f157885fc5d93b2ddcc89edd0a7cb..fc23fcafbd9187a8023912024057c94f510cf79e 100644
--- a/Framework/Types/inc/MantidTypes/TofEvent.h
+++ b/Framework/Types/inc/MantidTypes/TofEvent.h
@@ -4,6 +4,17 @@
 #include "MantidTypes/DateAndTime.h"
 
 namespace Mantid {
+namespace DataObjects {
+class EventList;
+class WeightedEvent;
+class WeightedEventNoTime;
+class tofGreaterOrEqual;
+class tofGreater;
+} // namespace DataObjects
+
+namespace DataHandling {
+class LoadEventNexus;
+}
 namespace Types {
 //==========================================================================================
 /** Info about a single neutron detection event:
@@ -15,14 +26,14 @@ namespace Types {
 class _declspec(dllexport) TofEvent {
 
   /// EventList has the right to mess with TofEvent.
-  friend class EventList;
-  friend class WeightedEvent;
-  friend class WeightedEventNoTime;
-  friend class tofGreaterOrEqual;
-  friend class tofGreater;
-  friend class DataHandling::LoadEventNexus; // Needed while the ISIS hack of
-                                             // spreading events out in a bin
-                                             // remains
+  friend class Mantid::DataObjects::EventList;
+  friend class Mantid::DataObjects::WeightedEvent;
+  friend class Mantid::DataObjects::WeightedEventNoTime;
+  friend class Mantid::DataObjects::tofGreaterOrEqual;
+  friend class Mantid::DataObjects::tofGreater;
+  friend class Mantid::DataHandling::LoadEventNexus; // Needed while the ISIS
+                                                     // hack of spreading events
+                                                     // out in a bin remains
 
 protected:
   /** The 'x value' of the event. This will be in a unit available from the