diff --git a/src/accessor/grib_accessor_class_iterator.h b/src/accessor/grib_accessor_class_iterator.h
index da0a8d964..aa3a4017f 100644
--- a/src/accessor/grib_accessor_class_iterator.h
+++ b/src/accessor/grib_accessor_class_iterator.h
@@ -11,6 +11,7 @@
 #pragma once
 
 #include "grib_accessor_class_gen.h"
+#include "geo_iterator/grib_iterator.h"
 
 class grib_accessor_iterator_t : public grib_accessor_gen_t
 {
diff --git a/src/geo_iterator/grib_iterator.cc b/src/geo_iterator/grib_iterator.cc
index 5e4026943..56e34c251 100644
--- a/src/geo_iterator/grib_iterator.cc
+++ b/src/geo_iterator/grib_iterator.cc
@@ -11,7 +11,9 @@
 /***************************************************************************
  *   Jean Baptiste Filippi - 01.11.2005                                    *
  ***************************************************************************/
+
 #include "grib_iterator.h"
+#include "grib_iterator_factory.h"
 #include "accessor/grib_accessor_class_iterator.h"
 
 namespace eccodes::geo_iterator {
@@ -55,7 +57,6 @@ int gribIteratorDelete(eccodes::geo_iterator::Iterator* i)
     return GRIB_SUCCESS;
 }
 
-
 }  // namespace eccodes::geo_iterator
 
 
diff --git a/src/grib_iterator_factory.cc b/src/grib_iterator_factory.cc
index 578926889..a670df6d1 100644
--- a/src/grib_iterator_factory.cc
+++ b/src/grib_iterator_factory.cc
@@ -8,8 +8,7 @@
  * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
  */
 
-#include "grib_api_internal.h"
-#include "geo_iterator/grib_iterator.h"
+#include "grib_iterator_factory.h"
 #include "accessor/grib_accessor_class_iterator.h"
 
 #if GRIB_PTHREADS
diff --git a/src/grib_iterator_factory.h b/src/grib_iterator_factory.h
index 094df5d58..0c0e288fa 100644
--- a/src/grib_iterator_factory.h
+++ b/src/grib_iterator_factory.h
@@ -1,3 +1,16 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
 #pragma once
 
+#include "grib_api_internal.h"
+#include "geo_iterator/grib_iterator.h"
+
 eccodes::geo_iterator::Iterator* grib_iterator_factory(grib_handle* h, grib_arguments* args, unsigned long flags, int* error);