diff --git a/src/atlas/redistribution/detail/RedistributionInterface.cc b/src/atlas/redistribution/detail/RedistributionInterface.cc
index 0b66e2304..6f461967f 100644
--- a/src/atlas/redistribution/detail/RedistributionInterface.cc
+++ b/src/atlas/redistribution/detail/RedistributionInterface.cc
@@ -10,9 +10,10 @@
 
 #include <cstring>
 
+#include "RedistributionInterface.h"
+
 #include "RedistributeGeneric.h"
 #include "RedistributionImpl.h"
-#include "RedistributionInterface.h"
 
 #include "atlas/functionspace/FunctionSpace.h"
 #include "atlas/redistribution/detail/RedistributionImplFactory.h"
diff --git a/src/atlas/redistribution/detail/RedistributionInterface.h b/src/atlas/redistribution/detail/RedistributionInterface.h
index 500e32c79..2d6cb3bd8 100644
--- a/src/atlas/redistribution/detail/RedistributionInterface.h
+++ b/src/atlas/redistribution/detail/RedistributionInterface.h
@@ -15,11 +15,10 @@ class Configuration;
 
 namespace atlas {
 namespace functionspace {
-class FunctionSpace;
+class FunctionSpaceImpl;
 }
 namespace field {
-class Field;
-class FieldSet;
+class FieldImpl;
 }
 }  // namespace atlas