diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 1badc41bea..a625ec67e8 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -505,10 +505,8 @@ modules_evas_engines_software_generic_module_la_LDFLAGS = -module @EFL_LTMODULE_
 modules_evas_engines_software_generic_module_la_LIBTOOLFLAGS = --tag=disable-static
 endif
 
-dist_noinst_DATA =
-
 if BUILD_ENGINE_BUFFER
-dist_noinst_DATA += modules/evas/engines/buffer/Evas_Engine_Buffer.h
+dist_installed_evasmainheaders_DATA += modules/evas/engines/buffer/Evas_Engine_Buffer.h
 BUFFER_SOURCES = \
 modules/evas/engines/buffer/evas_engine.c \
 modules/evas/engines/buffer/evas_outbuf.c \
@@ -531,7 +529,7 @@ endif
 endif
 
 if BUILD_ENGINE_FB
-dist_noinst_DATA += modules/evas/engines/fb/Evas_Engine_FB.h
+dist_installed_evasmainheaders_DATA += modules/evas/engines/fb/Evas_Engine_FB.h
 FB_SOURCES = \
 modules/evas/engines/fb/evas_engine.c \
 modules/evas/engines/fb/evas_fb_main.c \
@@ -742,7 +740,7 @@ endif
 endif
 
 if BUILD_ENGINE_GL_COCOA
-dist_noinst_DATA += modules/evas/engines/gl_cocoa/Evas_Engine_GL_Cocoa.h
+dist_installed_evasmainheaders_DATA += modules/evas/engines/gl_cocoa/Evas_Engine_GL_Cocoa.h
 GL_COCOA_SOURCES = \
 modules/evas/engines/gl_cocoa/evas_engine.c \
 modules/evas/engines/gl_cocoa/evas_gl_cocoa_main.m \
@@ -780,7 +778,7 @@ endif
 endif
 
 if BUILD_ENGINE_GL_SDL
-dist_noinst_DATA += modules/evas/engines/gl_sdl/Evas_Engine_GL_SDL.h
+dist_installed_evasmainheaders_DATA += modules/evas/engines/gl_sdl/Evas_Engine_GL_SDL.h
 GL_SDL_SOURCES = \
 modules/evas/engines/gl_sdl/evas_engine.c \
 modules/evas/engines/gl_sdl/evas_engine.h
@@ -811,7 +809,7 @@ endif
 endif
 
 if BUILD_ENGINE_GL_X11
-dist_noinst_DATA += modules/evas/engines/gl_x11/Evas_Engine_GL_X11.h
+dist_installed_evasmainheaders_DATA += modules/evas/engines/gl_x11/Evas_Engine_GL_X11.h
 GL_X11_SOURCES = \
 modules/evas/engines/gl_x11/evas_engine.c \
 modules/evas/engines/gl_x11/evas_x_main.c \
@@ -844,7 +842,7 @@ endif
 endif
 
 if BUILD_ENGINE_PSL1GHT
-dist_noinst_DATA += modules/evas/engines/psl1ght/Evas_Engine_PSL1GHT.h
+dist_installed_evasmainheaders_DATA += modules/evas/engines/psl1ght/Evas_Engine_PSL1GHT.h
 PSL1GHT_SOURCES = \
 modules/evas/engines/psl1ght/evas_engine.c \
 modules/evas/engines/psl1ght/rsxutil.c \
@@ -873,7 +871,7 @@ endif
 endif
 
 if BUILD_ENGINE_SOFTWARE_DDRAW
-dist_noinst_DATA += modules/evas/engines/software_ddraw/Evas_Engine_Software_DDraw.h
+dist_installed_evasmainheaders_DATA += modules/evas/engines/software_ddraw/Evas_Engine_Software_DDraw.h
 SOFTWARE_DDRAW_SOURCES = \
 modules/evas/engines/software_ddraw/evas_engine.c \
 modules/evas/engines/software_ddraw/evas_outbuf.c \
@@ -905,7 +903,7 @@ endif
 endif
 
 if BUILD_ENGINE_SOFTWARE_GDI
-dist_noinst_DATA += modules/evas/engines/software_gdi/Evas_Engine_Software_Gdi.h
+dist_installed_evasmainheaders_DATA += modules/evas/engines/software_gdi/Evas_Engine_Software_Gdi.h
 SOFTWARE_GDI_SOURCES = \
 modules/evas/engines/software_gdi/evas_engine.c \
 modules/evas/engines/software_gdi/evas_outbuf.c \
@@ -935,7 +933,7 @@ endif
 endif
 
 if BUILD_ENGINE_SOFTWARE_X11
-dist_noinst_DATA += modules/evas/engines/software_x11/Evas_Engine_Software_X11.h
+dist_installed_evasmainheaders_DATA += modules/evas/engines/software_x11/Evas_Engine_Software_X11.h
 SOFTWARE_X11_SOURCES = \
 modules/evas/engines/software_x11/evas_engine.c \
 modules/evas/engines/software_x11/evas_engine.h \
@@ -993,7 +991,7 @@ endif
 endif
 
 if BUILD_ENGINE_WAYLAND_EGL
-dist_noinst_DATA += modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
+dist_installed_evasmainheaders_DATA += modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
 WAYLAND_EGL_SOURCES = \
 modules/evas/engines/wayland_egl/evas_engine.c \
 modules/evas/engines/wayland_egl/evas_wl_main.c \
@@ -1022,7 +1020,7 @@ endif
 endif
 
 if BUILD_ENGINE_WAYLAND_SHM
-dist_noinst_DATA += modules/evas/engines/wayland_shm/Evas_Engine_Wayland_Shm.h
+dist_installed_evasmainheaders_DATA += modules/evas/engines/wayland_shm/Evas_Engine_Wayland_Shm.h
 WAYLAND_SHM_SOURCES = \
 modules/evas/engines/wayland_shm/Evas_Engine_Wayland_Shm.h \
 modules/evas/engines/wayland_shm/evas_engine.c \
@@ -1054,7 +1052,7 @@ endif
 endif
 
 if BUILD_ENGINE_DRM
-dist_noinst_DATA += modules/evas/engines/drm/Evas_Engine_Drm.h
+dist_installed_evasmainheaders_DATA += modules/evas/engines/drm/Evas_Engine_Drm.h
 DRM_SOURCES = \
 modules/evas/engines/drm/evas_drm.c \
 modules/evas/engines/drm/evas_bufmgr.c \
@@ -1089,7 +1087,7 @@ endif
 endif
 
 if BUILD_ENGINE_GL_DRM
-dist_noinst_DATA += modules/evas/engines/gl_drm/Evas_Engine_GL_Drm.h
+dist_installed_evasmainheaders_DATA += modules/evas/engines/gl_drm/Evas_Engine_GL_Drm.h
 GL_DRM_SOURCES = \
 modules/evas/engines/gl_drm/evas_drm.c \
 modules/evas/engines/gl_drm/evas_drm_main.c \