diff --git a/src/Makefile_Ecore_Audio_Cxx.am b/src/Makefile_Ecore_Audio_Cxx.am
index d6ae59e80d..3135120632 100644
--- a/src/Makefile_Ecore_Audio_Cxx.am
+++ b/src/Makefile_Ecore_Audio_Cxx.am
@@ -18,14 +18,14 @@ lib/ecore_audio/Ecore_Audio.hh: $(generated_ecore_audio_cxx_bindings)
 	@for i in $(generated_ecore_audio_cxx_bindings); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/ecore_audio/Ecore_Audio.hh; done
 	@echo -e "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/ecore_audio/Ecore_Audio.hh
 
-CLEANFILES += \
+generated_ecore_audio_cxx_all = \
 	$(generated_ecore_audio_cxx_bindings) \
 	lib/ecore_audio/Ecore_Audio.hh
 
+CLEANFILES += $(generated_ecore_audio_cxx_all)
+
 installed_ecoreaudiocxxmainheadersdir = $(includedir)/ecore-audio-cxx-@VMAJ@
-nodist_installed_ecoreaudiocxxmainheaders_DATA = \
-lib/ecore_audio/Ecore_Audio.hh \
-$(generated_ecore_audio_cxx_bindings)
+nodist_installed_ecoreaudiocxxmainheaders_DATA = $(generated_ecore_audio_cxx_all)
 
 ### Unit tests
 
diff --git a/src/Makefile_Ecore_Cxx.am b/src/Makefile_Ecore_Cxx.am
index 042900546a..16816aa848 100644
--- a/src/Makefile_Ecore_Cxx.am
+++ b/src/Makefile_Ecore_Cxx.am
@@ -20,14 +20,14 @@ lib/ecore/Ecore.eo.hh: $(generated_ecore_cxx_bindings)
 	@for i in $(generated_ecore_cxx_bindings); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/ecore/Ecore.eo.hh; done
 	@echo -e "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/ecore/Ecore.eo.hh
 
-CLEANFILES += \
-$(generated_ecore_cxx_bindings) \
-lib/ecore/Ecore.eo.hh
+generated_ecore_cxx_all = \
+	$(generated_ecore_cxx_bindings) \
+	lib/ecore/Ecore.eo.hh
+
+CLEANFILES += $(generated_ecore_cxx_all)
 
 installed_ecorecxxheadersdir = $(includedir)/ecore-cxx-@VMAJ@
-nodist_installed_ecorecxxheaders_DATA = \
-lib/ecore/Ecore.eo.hh \
-$(generated_ecore_cxx_bindings)
+nodist_installed_ecorecxxheaders_DATA = $(generated_ecore_cxx_all)
 
 ### Unit tests
 
diff --git a/src/Makefile_Edje_Cxx.am b/src/Makefile_Edje_Cxx.am
index 79bd3e1929..74c05d648a 100644
--- a/src/Makefile_Edje_Cxx.am
+++ b/src/Makefile_Edje_Cxx.am
@@ -13,14 +13,14 @@ lib/edje/Edje.hh: $(generated_edje_cxx_bindings)
 	@for i in $(generated_edje_cxx_bindings); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/edje/Edje.hh; done
 	@echo -e "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/edje/Edje.hh
 
-CLEANFILES += \
-$(generated_edje_cxx_bindings) \
-lib/edje/Edje.hh
+generated_edje_cxx_all = \
+	$(generated_edje_cxx_bindings) \
+	lib/edje/Edje.hh
+
+CLEANFILES += $(generated_edje_cxx_all)
 
 installed_edjecxxmainheadersdir = $(includedir)/edje-cxx-@VMAJ@/
-nodist_installed_edjecxxmainheaders_DATA = \
-lib/edje/Edje.hh \
-$(generated_edje_cxx_bindings)
+nodist_installed_edjecxxmainheaders_DATA = $(generated_edje_cxx_all)
 
 ### Unit tests