diff --git a/include/StationResponse/ITRFDirection.h b/include/StationResponse/ITRFDirection.h
index 1247be6c5e239f2282efd999cd305d8b0cedc6ba..280a6111a99443ddbe180c8eb45bdd5a72906d45 100644
--- a/include/StationResponse/ITRFDirection.h
+++ b/include/StationResponse/ITRFDirection.h
@@ -29,9 +29,9 @@
 #include <StationResponse/Types.h>
 #include <Common/lofar_smartptr.h>
 
-#include <measures/Measures/MeasFrame.h>
-#include <measures/Measures/MeasConvert.h>
-#include <measures/Measures/MCDirection.h>
+#include <casacore/measures/Measures/MeasFrame.h>
+#include <casacore/measures/Measures/MeasConvert.h>
+#include <casacore/measures/Measures/MCDirection.h>
 
 namespace LOFAR
 {
@@ -53,8 +53,8 @@ public:
     vector3r_t at(real_t time) const;
 
 private:
-    mutable casa::MeasFrame             itsFrame;
-    mutable casa::MDirection::Convert   itsConverter;
+    mutable casacore::MeasFrame             itsFrame;
+    mutable casacore::MDirection::Convert   itsConverter;
 };
 
 // @}
diff --git a/include/StationResponse/LofarMetaDataUtil.h b/include/StationResponse/LofarMetaDataUtil.h
index 72793b3f92f8ec4c1d839a40c5290d159a8e2749..57327b0ed0eb3c0bfbdd7857ef71b4335822a401 100644
--- a/include/StationResponse/LofarMetaDataUtil.h
+++ b/include/StationResponse/LofarMetaDataUtil.h
@@ -29,9 +29,9 @@
 // LOFAR observations stored in MS format.
 
 #include <StationResponse/Station.h>
-#include <ms/MeasurementSets/MeasurementSet.h>
-#include <ms/MeasurementSets/MSAntennaColumns.h>
-#include <measures/Measures/MDirection.h>
+#include <casacore/ms/MeasurementSets/MeasurementSet.h>
+#include <casacore/ms/MeasurementSets/MSAntennaColumns.h>
+#include <casacore/measures/Measures/MDirection.h>
 
 namespace LOFAR
 {
@@ -41,12 +41,12 @@ namespace StationResponse
 // \addtogroup StationResponse
 // @{
 
-Station::Ptr readStation(const casa::MeasurementSet &ms, unsigned int id);
+Station::Ptr readStation(const casacore::MeasurementSet &ms, unsigned int id);
 
 template <typename T>
-void readStations(const casa::MeasurementSet &ms, T out_it)
+void readStations(const casacore::MeasurementSet &ms, T out_it)
 {
-    casa::ROMSAntennaColumns antenna(ms.antenna());
+    casacore::ROMSAntennaColumns antenna(ms.antenna());
     for(unsigned int i = 0; i < antenna.nrow(); ++i)
     {
         *out_it++ = readStation(ms, i);
@@ -55,7 +55,7 @@ void readStations(const casa::MeasurementSet &ms, T out_it)
 
 // Read the tile beam direction from a LOFAR MS. If it is not defined,
 // this function returns the delay center.
-casa::MDirection readTileBeamDirection(const casa::MeasurementSet &ms);
+casacore::MDirection readTileBeamDirection(const casacore::MeasurementSet &ms);
 
 // @}
 
diff --git a/src/AntennaField.cc b/src/AntennaField.cc
index 864749d83740a67af94bfab99f9c022aa1b40df0..d3ca5879353d523a70109c631d1046055f08b713 100644
--- a/src/AntennaField.cc
+++ b/src/AntennaField.cc
@@ -26,7 +26,7 @@
 #include <StationResponse/Constants.h>
 #include <StationResponse/MathUtil.h>
 #include <ElementResponse/ElementResponse.h>
-#include <measures/Measures/MeasFrame.h>
+#include <casacore/measures/Measures/MeasFrame.h>
 
 namespace LOFAR
 {
diff --git a/src/ITRFDirection.cc b/src/ITRFDirection.cc
index 7d2e774f56aef51e8c80fecdfdf7301c7a64eed0..f7f9c49e02551bfac1b6afbdeb0c14acbeaa449d 100644
--- a/src/ITRFDirection.cc
+++ b/src/ITRFDirection.cc
@@ -23,9 +23,9 @@
 #include <lofar_config.h>
 #include <StationResponse/ITRFDirection.h>
 
-#include <measures/Measures/MPosition.h>
-#include <measures/Measures/MDirection.h>
-#include <measures/Measures/MEpoch.h>
+#include <casacore/measures/Measures/MPosition.h>
+#include <casacore/measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MEpoch.h>
 
 namespace LOFAR
 {
@@ -35,39 +35,39 @@ namespace StationResponse
 ITRFDirection::ITRFDirection(const vector3r_t &position,
     const vector2r_t &direction)
 {
-    casa::MVPosition mvPosition(position[0], position[1], position[2]);
-    casa::MPosition mPosition(mvPosition, casa::MPosition::ITRF);
-    itsFrame = casa::MeasFrame(casa::MEpoch(), mPosition);
+    casacore::MVPosition mvPosition(position[0], position[1], position[2]);
+    casacore::MPosition mPosition(mvPosition, casacore::MPosition::ITRF);
+    itsFrame = casacore::MeasFrame(casacore::MEpoch(), mPosition);
 
     // Order of angles seems to be longitude (along the equator), lattitude
     // (towards the pole).
-    casa::MVDirection mvDirection(direction[0], direction[1]);
-    casa::MDirection mDirection(mvDirection, casa::MDirection::J2000);
-    itsConverter = casa::MDirection::Convert(mDirection,
-        casa::MDirection::Ref(casa::MDirection::ITRF, itsFrame));
+    casacore::MVDirection mvDirection(direction[0], direction[1]);
+    casacore::MDirection mDirection(mvDirection, casacore::MDirection::J2000);
+    itsConverter = casacore::MDirection::Convert(mDirection,
+        casacore::MDirection::Ref(casacore::MDirection::ITRF, itsFrame));
 }
 
 ITRFDirection::ITRFDirection(const vector3r_t &position,
     const vector3r_t &direction)
 {
-    casa::MVPosition mvPosition(position[0], position[1], position[2]);
-    casa::MPosition mPosition(mvPosition, casa::MPosition::ITRF);
-    itsFrame = casa::MeasFrame(casa::MEpoch(), mPosition);
+    casacore::MVPosition mvPosition(position[0], position[1], position[2]);
+    casacore::MPosition mPosition(mvPosition, casacore::MPosition::ITRF);
+    itsFrame = casacore::MeasFrame(casacore::MEpoch(), mPosition);
 
-    casa::MVDirection mvDirection(direction[0], direction[1], direction[2]);
-    casa::MDirection mDirection(mvDirection, casa::MDirection::J2000);
-    itsConverter = casa::MDirection::Convert(mDirection,
-        casa::MDirection::Ref(casa::MDirection::ITRF, itsFrame));
+    casacore::MVDirection mvDirection(direction[0], direction[1], direction[2]);
+    casacore::MDirection mDirection(mvDirection, casacore::MDirection::J2000);
+    itsConverter = casacore::MDirection::Convert(mDirection,
+        casacore::MDirection::Ref(casacore::MDirection::ITRF, itsFrame));
 }
 
 vector3r_t ITRFDirection::at(real_t time) const
 {
     // Cannot use MeasFrame::resetEpoch(Double), because that assumes the
     // argument is UTC in (fractional) days (MJD).
-    itsFrame.resetEpoch(casa::Quantity(time, "s"));
+    itsFrame.resetEpoch(casacore::Quantity(time, "s"));
 
-    const casa::MDirection &mITRF = itsConverter();
-    const casa::MVDirection &mvITRF = mITRF.getValue();
+    const casacore::MDirection &mITRF = itsConverter();
+    const casacore::MVDirection &mvITRF = mITRF.getValue();
 
     vector3r_t itrf = {{mvITRF(0), mvITRF(1), mvITRF(2)}};
     return itrf;
diff --git a/src/LofarMetaDataUtil.cc b/src/LofarMetaDataUtil.cc
index c9bb0e2d0d7032501352d64d78ed515114cc9e58..4d96af8dfe4f3f0c1b7b945d625e66bc5d977282 100644
--- a/src/LofarMetaDataUtil.cc
+++ b/src/LofarMetaDataUtil.cc
@@ -29,42 +29,37 @@
 #include <StationResponse/TileAntenna.h>
 #include <StationResponse/DualDipoleAntenna.h>
 
-#include <measures/Measures/MDirection.h>
-#include <measures/Measures/MPosition.h>
-#include <measures/Measures/MCDirection.h>
-#include <measures/Measures/MCPosition.h>
-#include <measures/Measures/MeasTable.h>
-#include <measures/Measures/MeasConvert.h>
-#include <measures/TableMeasures/ScalarMeasColumn.h>
+#include <casacore/measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MPosition.h>
+#include <casacore/measures/Measures/MCDirection.h>
+#include <casacore/measures/Measures/MCPosition.h>
+#include <casacore/measures/Measures/MeasTable.h>
+#include <casacore/measures/Measures/MeasConvert.h>
+#include <casacore/measures/TableMeasures/ScalarMeasColumn.h>
 
 #include <stdexcept>
 
-#include <ms/MeasurementSets/MSAntenna.h>
-#if defined(casacore)
-#include <ms/MSSel/MSSelection.h>
-#include <ms/MSSel/MSAntennaParse.h>
-#else
-#include <ms/MeasurementSets/MSSelection.h>
-#include <ms/MeasurementSets/MSAntennaParse.h>
-#endif
-#include <ms/MeasurementSets/MSAntennaColumns.h>
-#include <ms/MeasurementSets/MSDataDescription.h>
-#include <ms/MeasurementSets/MSDataDescColumns.h>
-#include <ms/MeasurementSets/MSField.h>
-#include <ms/MeasurementSets/MSFieldColumns.h>
-#include <ms/MeasurementSets/MSObservation.h>
-#include <ms/MeasurementSets/MSObsColumns.h>
-#include <ms/MeasurementSets/MSPolarization.h>
-#include <ms/MeasurementSets/MSPolColumns.h>
-#include <ms/MeasurementSets/MSSpectralWindow.h>
-#include <ms/MeasurementSets/MSSpWindowColumns.h>
+#include <casacore/ms/MeasurementSets/MSAntenna.h>
+#include <casacore/ms/MSSel/MSSelection.h>
+#include <casacore/ms/MSSel/MSAntennaParse.h>
+#include <casacore/ms/MeasurementSets/MSAntennaColumns.h>
+#include <casacore/ms/MeasurementSets/MSDataDescription.h>
+#include <casacore/ms/MeasurementSets/MSDataDescColumns.h>
+#include <casacore/ms/MeasurementSets/MSField.h>
+#include <casacore/ms/MeasurementSets/MSFieldColumns.h>
+#include <casacore/ms/MeasurementSets/MSObservation.h>
+#include <casacore/ms/MeasurementSets/MSObsColumns.h>
+#include <casacore/ms/MeasurementSets/MSPolarization.h>
+#include <casacore/ms/MeasurementSets/MSPolColumns.h>
+#include <casacore/ms/MeasurementSets/MSSpectralWindow.h>
+#include <casacore/ms/MeasurementSets/MSSpWindowColumns.h>
 
 namespace LOFAR
 {
 namespace StationResponse
 {
 
-using namespace casa;
+using namespace casacore;
 
 bool hasColumn(const Table &table, const string &column)
 {
@@ -311,7 +306,7 @@ Station::Ptr readStation(const MeasurementSet &ms, unsigned int id)
     return station;
 }
 
-MDirection readTileBeamDirection(const casa::MeasurementSet &ms) {
+MDirection readTileBeamDirection(const casacore::MeasurementSet &ms) {
     MDirection tileBeamDir;
 
     Table fieldTable = getSubTable(ms, "FIELD");
diff --git a/src/makeresponseimage.cc b/src/makeresponseimage.cc
index 91cf2e4789eb58ffe524628a1faba2fa364a4081..aa545ed0ca194e826fd40a80e320758ca6855a62 100644
--- a/src/makeresponseimage.cc
+++ b/src/makeresponseimage.cc
@@ -30,33 +30,33 @@
 #include <Common/LofarLogger.h>
 #include <Common/SystemUtil.h>
 #include <Common/Version.h>
-#include <coordinates/Coordinates/CoordinateSystem.h>
-#include <coordinates/Coordinates/SpectralCoordinate.h>
-#include <coordinates/Coordinates/StokesCoordinate.h>
-#include <coordinates/Coordinates/DirectionCoordinate.h>
-#include <images/Images/PagedImage.h>
-#include <measures/Measures/MCDirection.h>
-#include <measures/Measures/MCPosition.h>
-#include <measures/Measures/MDirection.h>
-#include <measures/Measures/MeasConvert.h>
-#include <measures/Measures/MeasTable.h>
-#include <measures/Measures/MEpoch.h>
-#include <measures/Measures/MPosition.h>
-#include <ms/MeasurementSets/MeasurementSet.h>
-#include <ms/MeasurementSets/MSDataDescription.h>
-#include <ms/MeasurementSets/MSDataDescColumns.h>
-#include <ms/MeasurementSets/MSField.h>
-#include <ms/MeasurementSets/MSFieldColumns.h>
-#include <ms/MeasurementSets/MSObservation.h>
-#include <ms/MeasurementSets/MSObsColumns.h>
-#include <ms/MeasurementSets/MSSpectralWindow.h>
-#include <ms/MeasurementSets/MSSpWindowColumns.h>
-#include <tables/Tables/ExprNode.h>
+#include <casacore/coordinates/Coordinates/CoordinateSystem.h>
+#include <casacore/coordinates/Coordinates/SpectralCoordinate.h>
+#include <casacore/coordinates/Coordinates/StokesCoordinate.h>
+#include <casacore/coordinates/Coordinates/DirectionCoordinate.h>
+#include <casacore/images/Images/PagedImage.h>
+#include <casacore/measures/Measures/MCDirection.h>
+#include <casacore/measures/Measures/MCPosition.h>
+#include <casacore/measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MeasConvert.h>
+#include <casacore/measures/Measures/MeasTable.h>
+#include <casacore/measures/Measures/MEpoch.h>
+#include <casacore/measures/Measures/MPosition.h>
+#include <casacore/ms/MeasurementSets/MeasurementSet.h>
+#include <casacore/ms/MeasurementSets/MSDataDescription.h>
+#include <casacore/ms/MeasurementSets/MSDataDescColumns.h>
+#include <casacore/ms/MeasurementSets/MSField.h>
+#include <casacore/ms/MeasurementSets/MSFieldColumns.h>
+#include <casacore/ms/MeasurementSets/MSObservation.h>
+#include <casacore/ms/MeasurementSets/MSObsColumns.h>
+#include <casacore/ms/MeasurementSets/MSSpectralWindow.h>
+#include <casacore/ms/MeasurementSets/MSSpWindowColumns.h>
+#include <casacore/tables/Tables/ExprNode.h>
 
 // There is no wrapped include file lofar_iterator.h.
 #include <iterator>
 
-using namespace casa;
+using namespace casacore;
 using namespace LOFAR;
 using namespace LOFAR::StationResponse;
 using LOFAR::operator<<;
@@ -131,18 +131,18 @@ namespace
 
     /*!
      *  \brief Convert an ITRF position given as a StationResponse::vector3r_t
-     *  instance to a casa::MPosition.
+     *  instance to a casacore::MPosition.
      */
     MPosition toMPositionITRF(const vector3r_t &position);
 
     /*!
-     *  \brief Convert a casa::MPosition instance to a
+     *  \brief Convert a casacore::MPosition instance to a
      *  StationResponse::vector3r_t instance.
      */
     vector3r_t fromMPosition(const MPosition &position);
 
     /*!
-     *  \brief Convert a casa::MDirection instance to a
+     *  \brief Convert a casacore::MDirection instance to a
      *  StationResponse::vector3r_t instance.
      */
     vector3r_t fromMDirection(const MDirection &direction);