diff --git a/CEP/Calibration/BBSControl/src/bbs-reducer.cc b/CEP/Calibration/BBSControl/src/bbs-reducer.cc
index 09b65500f66ab79b9b36fe0960ed6d13dcb4496a..4a621d6e120a8b33b4c508fe61610bf77b35f9c9 100644
--- a/CEP/Calibration/BBSControl/src/bbs-reducer.cc
+++ b/CEP/Calibration/BBSControl/src/bbs-reducer.cc
@@ -37,6 +37,7 @@
 #include <Common/LofarLogger.h>
 #include <Common/StreamUtil.h>
 #include <Common/SystemUtil.h>
+#include <Common/Exception.h>
 
 #ifdef HAVE_PQXX
 #include <BBSControl/CalSession.h>
diff --git a/CEP/Calibration/BBSControl/src/bbs-shared-estimator.cc b/CEP/Calibration/BBSControl/src/bbs-shared-estimator.cc
index bb45bf4be430bf6aed819a30bdc9e3f2281b6a32..e26c8834d688643029ece18f863eb052c12547e3 100644
--- a/CEP/Calibration/BBSControl/src/bbs-shared-estimator.cc
+++ b/CEP/Calibration/BBSControl/src/bbs-shared-estimator.cc
@@ -23,6 +23,7 @@
 
 #include <lofar_config.h>
 #include <Common/SystemUtil.h>
+#include <Common/Exception.h>
 #include <BBSControl/Package__Version.h>
 #include <BBSControl/CalSession.h>
 #include <BBSControl/CommandHandlerEstimator.h>
diff --git a/CEP/DP3/DPPP/src/NDPPP.cc b/CEP/DP3/DPPP/src/NDPPP.cc
index 5d33756d992d1759caa315e43819a712dc8918e0..6c0fe65ae66554ded17669a6427f344837cd666a 100644
--- a/CEP/DP3/DPPP/src/NDPPP.cc
+++ b/CEP/DP3/DPPP/src/NDPPP.cc
@@ -26,6 +26,7 @@
 #include <DPPP/Package__Version.h>
 #include <Common/LofarLogger.h>
 #include <Common/SystemUtil.h>
+#include <Common/Exception.h>
 #include <iostream>
 #include <stdexcept>
 
diff --git a/CEP/MS/src/combinevds.cc b/CEP/MS/src/combinevds.cc
index 7ac57bda2fe5713ce6489a5c16957266f0880b98..7ed34f336559d515ed491862fc3ffc75a6927cc5 100644
--- a/CEP/MS/src/combinevds.cc
+++ b/CEP/MS/src/combinevds.cc
@@ -26,6 +26,7 @@
 #include <Common/LofarLogger.h>
 #include <Common/StringUtil.h>
 #include <Common/SystemUtil.h>
+#include <Common/Exception.h>
 #include <stdexcept>
 #include <iostream>
 
diff --git a/CEP/MS/src/makevds.cc b/CEP/MS/src/makevds.cc
index 12355a47bd9af76c1eae2d47bc85cd85f0edcebd..18841c8a94b798f9ec1acf560f1b4cd0c9c56a35 100644
--- a/CEP/MS/src/makevds.cc
+++ b/CEP/MS/src/makevds.cc
@@ -25,6 +25,7 @@
 #include <MS/Package__Version.h>
 #include <Common/LofarLogger.h>
 #include <Common/SystemUtil.h>
+#include <Common/Exception.h>
 #include <stdexcept>
 #include <iostream>
 
diff --git a/CEP/ParmDB/src/parmexportcal.cc b/CEP/ParmDB/src/parmexportcal.cc
index d9b594257d6f787c49f1cecc5da96bf1a4dbf763..7bd43ce0d76455e93fd4fa00edbc75f771eb288c 100644
--- a/CEP/ParmDB/src/parmexportcal.cc
+++ b/CEP/ParmDB/src/parmexportcal.cc
@@ -34,6 +34,7 @@
 #include <Common/InputParSet.h>
 #include <Common/LofarLogger.h>
 #include <Common/SystemUtil.h>
+#include <Common/Exception.h>
 
 #include <casa/Quanta/MVTime.h>
 #include <casa/Utilities/MUString.h>
diff --git a/LCS/AMC/AMCImpl/src/WGS84toITRF.cc b/LCS/AMC/AMCImpl/src/WGS84toITRF.cc
index 7de23ee1d21aa85c79802d63691d125b98675fe5..4f99e9bb3f43495999009df8fceeaf0bda967902 100644
--- a/LCS/AMC/AMCImpl/src/WGS84toITRF.cc
+++ b/LCS/AMC/AMCImpl/src/WGS84toITRF.cc
@@ -75,9 +75,6 @@ int main()
       pos = conv(pos);
       showPos(pos);
     }
-  } catch (Exception& e) {
-    cerr << "LOFAR Exception: " << e << endl;
-    return 1;
   } catch (exception& e) {
     cerr << "Exception: " << e.what() << endl;
     return 1;
diff --git a/MAC/APL/CEPCU/src/OnlineControl/OnlineControlMain.cc b/MAC/APL/CEPCU/src/OnlineControl/OnlineControlMain.cc
index df9cc9d495ec230db03a9cd210a245f3412f70f5..1a0dadbfb119ca7d17b1862b81eb7be052a8122b 100644
--- a/MAC/APL/CEPCU/src/OnlineControl/OnlineControlMain.cc
+++ b/MAC/APL/CEPCU/src/OnlineControl/OnlineControlMain.cc
@@ -28,6 +28,7 @@
 
 using namespace LOFAR::GCF::TM;
 using namespace LOFAR::CEPCU;
+using namespace LOFAR;
 
 // Use a terminate handler that can produce a backtrace.
 Exception::TerminateHandler t(Exception::terminate);
diff --git a/MAC/APL/CEPCU/src/PythonControl/PythonControlMain.cc b/MAC/APL/CEPCU/src/PythonControl/PythonControlMain.cc
index 16c67c5d9ec0a8a31e1dfd97c9b8e8d0f28f832a..38bee7485f3e8e150128a8a402bd6bd1ae0b74ba 100644
--- a/MAC/APL/CEPCU/src/PythonControl/PythonControlMain.cc
+++ b/MAC/APL/CEPCU/src/PythonControl/PythonControlMain.cc
@@ -28,6 +28,7 @@
 
 using namespace LOFAR::GCF::TM;
 using namespace LOFAR::CEPCU;
+using namespace LOFAR;
 
 // Use a terminate handler that can produce a backtrace.
 Exception::TerminateHandler t(Exception::terminate);
diff --git a/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLoggerMain.cc b/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLoggerMain.cc
index 8bc5fdcbe7cef831021d138ac7552ee555cd9764..bfb6138b975dd939d9e8e3cb7cd5b02b6bec2bb0 100644
--- a/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLoggerMain.cc
+++ b/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLoggerMain.cc
@@ -26,6 +26,7 @@
 #include <Common/Exception.h>
 #include "KeyValueLogger.h"
 
+using namespace LOFAR;
 using namespace LOFAR::GCF::TM;
 using namespace LOFAR::GCF::RTDBDaemons;
 
diff --git a/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessorMain.cc b/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessorMain.cc
index 7c9e2a7dfb1d6e01e2425955ff0ba2f51ee9c5ac..65cd3c3ceddb4333eda0613478c95cc015df3471 100644
--- a/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessorMain.cc
+++ b/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessorMain.cc
@@ -26,6 +26,7 @@
 #include <Common/Exception.h>
 #include "LogProcessor.h"
 
+using namespace LOFAR;
 using namespace LOFAR::GCF::TM;
 using namespace LOFAR::GCF::RTDBDaemons;
 
diff --git a/MAC/APL/CURTDBDaemons/src/SASGateway/SASGatewayMain.cc b/MAC/APL/CURTDBDaemons/src/SASGateway/SASGatewayMain.cc
index 57bf6d58a8cc95c7f570ba62729745879fa872cc..e7c3000739a1cd3acc7befd7d4740cca83226a40 100644
--- a/MAC/APL/CURTDBDaemons/src/SASGateway/SASGatewayMain.cc
+++ b/MAC/APL/CURTDBDaemons/src/SASGateway/SASGatewayMain.cc
@@ -26,6 +26,7 @@
 #include <Common/Exception.h>
 #include "SASGateway.h"
 
+using namespace LOFAR;
 using namespace LOFAR::GCF::TM;
 using namespace LOFAR::GCF::RTDBDaemons;
 
diff --git a/MAC/APL/MainCU/src/CRTriggerControl/TriggerControlMain.cc b/MAC/APL/MainCU/src/CRTriggerControl/TriggerControlMain.cc
index 1158c2e0eb1d3ad1e8803a3a57631a20622068f4..7fd6086d47c292ecdd95fd09da16a1cee8d4df23 100644
--- a/MAC/APL/MainCU/src/CRTriggerControl/TriggerControlMain.cc
+++ b/MAC/APL/MainCU/src/CRTriggerControl/TriggerControlMain.cc
@@ -28,6 +28,7 @@
 
 using namespace LOFAR::GCF::TM;
 using namespace LOFAR::MainCU;
+using namespace LOFAR;
 
 // Use a terminate handler that can produce a backtrace.
 Exception::TerminateHandler t(Exception::terminate);
diff --git a/MAC/APL/MainCU/src/MACScheduler/MACSchedulerMain.cc b/MAC/APL/MainCU/src/MACScheduler/MACSchedulerMain.cc
index 5c481059babb317ccb95492af15e58140ff0316e..5f6b5ab611740cd6d905fcf605ffe06a88305c9b 100644
--- a/MAC/APL/MainCU/src/MACScheduler/MACSchedulerMain.cc
+++ b/MAC/APL/MainCU/src/MACScheduler/MACSchedulerMain.cc
@@ -29,6 +29,7 @@
 using namespace LOFAR::GCF::TM;
 using namespace LOFAR::MainCU;
 using namespace LOFAR::APLCommon;
+using namespace LOFAR;
 
 // Use a terminate handler that can produce a backtrace.
 Exception::TerminateHandler t(Exception::terminate);
diff --git a/MAC/APL/MainCU/src/ObservationControl/ObservationControlMain.cc b/MAC/APL/MainCU/src/ObservationControl/ObservationControlMain.cc
index 9191d0b3f1c6d7f72d351f28717ebe3448c0b6ba..7c52a1dce68ffbf319b2daf6e4837b9f902396f3 100644
--- a/MAC/APL/MainCU/src/ObservationControl/ObservationControlMain.cc
+++ b/MAC/APL/MainCU/src/ObservationControl/ObservationControlMain.cc
@@ -29,6 +29,7 @@
 using namespace LOFAR::GCF::TM;
 using namespace LOFAR::MainCU;
 using namespace LOFAR::APLCommon;
+using namespace LOFAR;
 
 // Use a terminate handler that can produce a backtrace.
 Exception::TerminateHandler t(Exception::terminate);
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServerMain.cc b/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServerMain.cc
index cae1cb0d0b87c30444c8d39f1f766c2e3e51d8f9..9ebfdd718c80fef45c773e5ab94c9c31bf14c259 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServerMain.cc
+++ b/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServerMain.cc
@@ -29,6 +29,7 @@
 
 using namespace LOFAR::GCF::TM;
 using namespace LOFAR::AMI;
+using namespace LOFAR;
 
 // Use a terminate handler that can produce a backtrace.
 Exception::TerminateHandler t(Exception::terminate);
diff --git a/MAC/APL/StationCU/src/BeamControl/BeamControlMain.cc b/MAC/APL/StationCU/src/BeamControl/BeamControlMain.cc
index c842e8ec9bf8cdd7ffa5dda12e8247ee3711152a..b6eab6f10ce6c4614fec117fd03e0d1546945448 100644
--- a/MAC/APL/StationCU/src/BeamControl/BeamControlMain.cc
+++ b/MAC/APL/StationCU/src/BeamControl/BeamControlMain.cc
@@ -25,6 +25,7 @@
 #include <Common/Exception.h>
 #include "BeamControl.h"
 
+using namespace LOFAR;
 using namespace LOFAR::GCF::TM;
 using namespace LOFAR::StationCU;
 
diff --git a/MAC/APL/StationCU/src/CalibrationControl/CalibrationControlMain.cc b/MAC/APL/StationCU/src/CalibrationControl/CalibrationControlMain.cc
index 0d2db57278011f636084d976c0daa6dc450d3be9..d6f05db5fba6edbc54b9fd47394b87275b09edf7 100644
--- a/MAC/APL/StationCU/src/CalibrationControl/CalibrationControlMain.cc
+++ b/MAC/APL/StationCU/src/CalibrationControl/CalibrationControlMain.cc
@@ -25,6 +25,7 @@
 #include <Common/Exception.h>
 #include "CalibrationControl.h"
 
+using namespace LOFAR;
 using namespace LOFAR::GCF::TM;
 using namespace LOFAR::StationCU;
 
diff --git a/MAC/APL/StationCU/src/ClockControl/ClockControlMain.cc b/MAC/APL/StationCU/src/ClockControl/ClockControlMain.cc
index 8c0d8722719efd2d2c657cf68a964a03eee1020b..23e3a6158a5e16f9e97c05c35a80e2b56f708055 100644
--- a/MAC/APL/StationCU/src/ClockControl/ClockControlMain.cc
+++ b/MAC/APL/StationCU/src/ClockControl/ClockControlMain.cc
@@ -26,6 +26,7 @@
 
 #include "ClockControl.h"
 
+using namespace LOFAR;
 using namespace LOFAR::GCF::TM;
 using namespace LOFAR::StationCU;
 
diff --git a/MAC/APL/StationCU/src/TBBControl/TBBControlMain.cc b/MAC/APL/StationCU/src/TBBControl/TBBControlMain.cc
index e1efb83bb13a2ad7adff122e00a7ab34d8ec70d5..8b99850b0e7775ca5bca42d05dc256d5cc65d467 100644
--- a/MAC/APL/StationCU/src/TBBControl/TBBControlMain.cc
+++ b/MAC/APL/StationCU/src/TBBControl/TBBControlMain.cc
@@ -25,6 +25,7 @@
 #include <Common/Exception.h>
 #include "TBBControl.h"
 
+using namespace LOFAR;
 using namespace LOFAR::GCF::TM;
 using namespace LOFAR::StationCU;
 
diff --git a/RTCP/Storage/test/tMeasurementSetFormat.cc b/RTCP/Storage/test/tMeasurementSetFormat.cc
index 2180a6423f5af8baf870b33876d18433e85a2ff9..12438c7b36e24afea5f4a7e329ef6b96249a7076 100644
--- a/RTCP/Storage/test/tMeasurementSetFormat.cc
+++ b/RTCP/Storage/test/tMeasurementSetFormat.cc
@@ -9,6 +9,7 @@
 #include <lofar_config.h>
 #include <Storage/MeasurementSetFormat.h>
 #include <Common/LofarLogger.h>
+#include <Common/Exception.h>
 
 #include <casa/IO/RegularFileIO.h>