diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3423e26c7526..aa37071a62ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,10 +9,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Fix issue where ACG was called when no file had changed
+
 ### Added
 
 ### Changed
 
+- Cleaned up a bit of old CMake
+
 ### Removed
 
 ### Deprecated
diff --git a/cmake/mapl_acg.cmake b/cmake/mapl_acg.cmake
index b55364233a70..d37f08eafc59 100644
--- a/cmake/mapl_acg.cmake
+++ b/cmake/mapl_acg.cmake
@@ -28,12 +28,12 @@ function (mapl_acg target specs_file)
   string (REPLACE "_GridComp" "" component_name ${target})
 
   if (ARGS_UNPARSED_ARGUMENTS)
-    ecbuild_error ("maple_acg() - unparsed arguments: ${ARGS_UNPARSED_ARGUMENTS}")
+    ecbuild_error ("mapl_acg() - unparsed arguments: ${ARGS_UNPARSED_ARGUMENTS}")
   endif ()
 
   set (generated) # empty unless
   set (options "")
-
+  set (suffix_for_generated_include_files "___.h")
 
   # Handle oneValueArgs with no value (Python provides default)
   foreach (opt flag default IN ZIP_LISTS oneValueArgs flags defaults)
@@ -44,7 +44,7 @@ function (mapl_acg target specs_file)
       list (APPEND options ${flag} ${ARGS_${opt}})
     elseif (${opt} IN_LIST ARGS_KEYWORDS_MISSING_VALUES)
       string (REPLACE "{component}" component_name fname ${default})
-      list (APPEND generated ${fname})
+      list (APPEND generated "${component_name}_${fname}${suffix_for_generated_include_files}")
       list (APPEND options ${flag})
     endif ()
 
@@ -60,7 +60,7 @@ function (mapl_acg target specs_file)
   add_custom_command (
     OUTPUT ${generated}
     COMMAND ${generator} ${CMAKE_CURRENT_SOURCE_DIR}/${specs_file} ${options}
-    MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/${specs_file} 
+    MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/${specs_file}
     DEPENDS ${generator} ${specs_file}
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Generating automatic code for ${specs_file}"
diff --git a/gridcomps/ExtData2G/CMakeLists.txt b/gridcomps/ExtData2G/CMakeLists.txt
index 6efdc8a2d362..e36dd802d311 100644
--- a/gridcomps/ExtData2G/CMakeLists.txt
+++ b/gridcomps/ExtData2G/CMakeLists.txt
@@ -26,7 +26,6 @@ set (srcs
 esma_add_library (${this} SRCS ${srcs} DEPENDENCIES MAPL.shared MAPL.base MAPL.generic MAPL.griddedio TYPE SHARED)
 target_link_libraries (${this} PUBLIC GFTL::gftl GFTL_SHARED::gftl-shared YAFYAML::yafyaml esmf NetCDF::NetCDF_Fortran
                                PRIVATE MPI::MPI_Fortran)
-target_include_directories (${this} PUBLIC ${INC_ESMF} ${INC_NETCDF}
-          $<BUILD_INTERFACE:${MAPL_SOURCE_DIR}/include>)
+target_include_directories (${this} PUBLIC $<BUILD_INTERFACE:${MAPL_SOURCE_DIR}/include>)
 
 set_target_properties (${this} PROPERTIES Fortran_MODULE_DIRECTORY ${include_${this}})