diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index ad637161b4..02b06f0353 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -65,6 +65,7 @@ lib/ecore/Ecore_Common.h \
 lib/ecore/Ecore_Legacy.h \
 lib/ecore/Ecore_Eo.h \
 lib/ecore/Efl_Core.h \
+lib/ecore/efl_general.h \
 lib/ecore/Ecore_Getopt.h
 
 nodist_installed_ecoremainheaders_DATA = \
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 4101360d7b..1c41f580f7 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -415,7 +415,6 @@ includesub_HEADERS = \
 	lib/elementary/efl_ui_frame_legacy.h \
 	lib/elementary/elm_gen.h \
 	lib/elementary/elm_general.h \
-	lib/elementary/efl_general.h \
 	lib/elementary/elm_gengrid.h \
 	lib/elementary/elm_gengrid_common.h \
 	lib/elementary/elm_gengrid_legacy.h \
diff --git a/src/lib/ecore/Efl_Core.h b/src/lib/ecore/Efl_Core.h
index a88e5412ed..585f847b55 100644
--- a/src/lib/ecore/Efl_Core.h
+++ b/src/lib/ecore/Efl_Core.h
@@ -76,3 +76,7 @@ extern EAPI double _efl_startup_time;
 #define EAPI
 
 #endif
+
+// We are including efl_general.h again, just in case Efl_Core.h was already included before this
+// and the __EFL_*_IS_REQUIRED changed since then.
+#include "efl_general.h"
diff --git a/src/lib/elementary/efl_general.h b/src/lib/ecore/efl_general.h
similarity index 100%
rename from src/lib/elementary/efl_general.h
rename to src/lib/ecore/efl_general.h
diff --git a/src/lib/elementary/elm_general.h b/src/lib/elementary/elm_general.h
index be657e1660..d718594f8a 100644
--- a/src/lib/elementary/elm_general.h
+++ b/src/lib/elementary/elm_general.h
@@ -99,7 +99,6 @@ extern EAPI double _elm_startup_time;
 #define __EFL_UI_IS_REQUIRED
 
 #include "Efl_Core.h"
-#include "efl_general.h"
 
 /**************************************************************************/
 /* General calls */