diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 34a48c249..1483eea7d 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = e_fm
 MAINTAINERCLEANFILES = Makefile.in
 DISTCLEANFILES = e_fm_shared_types.h
 
-INCLUDES = \
+AM_CPPFLAGS = \
 -I$(top_builddir) \
 -I$(top_builddir)/src/bin \
 -I$(top_srcdir) \
@@ -357,7 +357,7 @@ e_xsettings.c \
 e_zone.c \
 $(ENLIGHTENMENTHEADERS)
 
-enlightenment_CPPFLAGS = -DE_LOGGING=1
+enlightenment_CPPFLAGS = $(AM_CPPFLAGS) -DE_LOGGING=1
 enlightenment_SOURCES = \
 e_main.c \
 $(enlightenment_src)
@@ -375,7 +375,7 @@ enlightenment_imc_LDADD = @E_IMC_LIBS@
 
 enlightenment_start_SOURCES = \
 e_start_main.c
-enlightenment_start_CFLAGS = $(INCLUDES) @E_START_CFLAGS@
+enlightenment_start_CFLAGS = $(AM_CPPFLAGS) @E_START_CFLAGS@
 enlightenment_start_LDADD = @dlopen_libs@ @E_START_LIBS@
 
 enlightenment_thumb_SOURCES = \
@@ -389,7 +389,6 @@ enlightenment_fm_op_SOURCES = \
 e_fm_op.c
 
 enlightenment_fm_op_LDADD = @E_FM_OP_LIBS@
-enlightenment_fm_op_CFLAGS = $(INCLUDES)
 
 enlightenment_sys_SOURCES = \
 e_sys_main.c
diff --git a/src/modules/access/Makefile.am b/src/modules/access/Makefile.am
index 82fa73d04..2c1ce3289 100644
--- a/src/modules/access/Makefile.am
+++ b/src/modules/access/Makefile.am
@@ -8,7 +8,7 @@ files_DATA = module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/backlight/Makefile.am b/src/modules/backlight/Makefile.am
index 6c994b88b..d7f9dbc43 100644
--- a/src/modules/backlight/Makefile.am
+++ b/src/modules/backlight/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/battery/Makefile.am b/src/modules/battery/Makefile.am
index 488cb1574..45c3546ee 100644
--- a/src/modules/battery/Makefile.am
+++ b/src/modules/battery/Makefile.am
@@ -19,7 +19,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
@@ -28,7 +28,7 @@ INCLUDES               = -I. \
                          @e_cflags@ \
                          @cf_cflags@
 if HAVE_ENOTIFY
-INCLUDES              += @ENOTIFY_CFLAGS@
+AM_CPPFLAGS              += @ENOTIFY_CFLAGS@
 endif
 
 pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
diff --git a/src/modules/clock/Makefile.am b/src/modules/clock/Makefile.am
index 927de8526..f4cc83257 100644
--- a/src/modules/clock/Makefile.am
+++ b/src/modules/clock/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/comp/Makefile.am b/src/modules/comp/Makefile.am
index b2768b0eb..3af451cfe 100644
--- a/src/modules/comp/Makefile.am
+++ b/src/modules/comp/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/conf/Makefile.am b/src/modules/conf/Makefile.am
index 46761fffb..8e4c8d17c 100644
--- a/src/modules/conf/Makefile.am
+++ b/src/modules/conf/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/conf_applications/Makefile.am b/src/modules/conf_applications/Makefile.am
index a5f200675..80fa48b7b 100644
--- a/src/modules/conf_applications/Makefile.am
+++ b/src/modules/conf_applications/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/conf_dialogs/Makefile.am b/src/modules/conf_dialogs/Makefile.am
index e70381000..ee6397438 100644
--- a/src/modules/conf_dialogs/Makefile.am
+++ b/src/modules/conf_dialogs/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/conf_display/Makefile.am b/src/modules/conf_display/Makefile.am
index 93cd4e331..636bcf8cf 100644
--- a/src/modules/conf_display/Makefile.am
+++ b/src/modules/conf_display/Makefile.am
@@ -9,7 +9,7 @@ module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/conf_edgebindings/Makefile.am b/src/modules/conf_edgebindings/Makefile.am
index 7efcf71f9..8cfe80479 100644
--- a/src/modules/conf_edgebindings/Makefile.am
+++ b/src/modules/conf_edgebindings/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/conf_interaction/Makefile.am b/src/modules/conf_interaction/Makefile.am
index 338c6b87e..4a05789ee 100644
--- a/src/modules/conf_interaction/Makefile.am
+++ b/src/modules/conf_interaction/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/conf_intl/Makefile.am b/src/modules/conf_intl/Makefile.am
index 0d26b002b..da9f778cc 100644
--- a/src/modules/conf_intl/Makefile.am
+++ b/src/modules/conf_intl/Makefile.am
@@ -8,7 +8,7 @@ files_DATA = module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/conf_keybindings/Makefile.am b/src/modules/conf_keybindings/Makefile.am
index 47a7165ab..b4a535f28 100644
--- a/src/modules/conf_keybindings/Makefile.am
+++ b/src/modules/conf_keybindings/Makefile.am
@@ -9,7 +9,7 @@ module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/conf_menus/Makefile.am b/src/modules/conf_menus/Makefile.am
index f5b9747b7..e826e35ae 100644
--- a/src/modules/conf_menus/Makefile.am
+++ b/src/modules/conf_menus/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/conf_paths/Makefile.am b/src/modules/conf_paths/Makefile.am
index 4df1daeb9..8565818db 100644
--- a/src/modules/conf_paths/Makefile.am
+++ b/src/modules/conf_paths/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/conf_performance/Makefile.am b/src/modules/conf_performance/Makefile.am
index a6c688cc2..cd72c8b25 100644
--- a/src/modules/conf_performance/Makefile.am
+++ b/src/modules/conf_performance/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/conf_randr/Makefile.am b/src/modules/conf_randr/Makefile.am
index 09f9f2ba6..dcc48e07e 100644
--- a/src/modules/conf_randr/Makefile.am
+++ b/src/modules/conf_randr/Makefile.am
@@ -10,7 +10,7 @@ files_DATA = \
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/conf_shelves/Makefile.am b/src/modules/conf_shelves/Makefile.am
index 21987642e..aded02ec1 100644
--- a/src/modules/conf_shelves/Makefile.am
+++ b/src/modules/conf_shelves/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/conf_theme/Makefile.am b/src/modules/conf_theme/Makefile.am
index 38addfb9b..ed8c4a733 100644
--- a/src/modules/conf_theme/Makefile.am
+++ b/src/modules/conf_theme/Makefile.am
@@ -9,7 +9,7 @@ module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/conf_wallpaper2/Makefile.am b/src/modules/conf_wallpaper2/Makefile.am
index 3e6c7a38a..3c3a38e3a 100644
--- a/src/modules/conf_wallpaper2/Makefile.am
+++ b/src/modules/conf_wallpaper2/Makefile.am
@@ -9,7 +9,7 @@ module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/conf_window_manipulation/Makefile.am b/src/modules/conf_window_manipulation/Makefile.am
index 8c410c133..fc32e7452 100644
--- a/src/modules/conf_window_manipulation/Makefile.am
+++ b/src/modules/conf_window_manipulation/Makefile.am
@@ -9,7 +9,7 @@ e-module-conf_winmanip.edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/conf_window_remembers/Makefile.am b/src/modules/conf_window_remembers/Makefile.am
index c14d7ddf0..b7bfa72ae 100644
--- a/src/modules/conf_window_remembers/Makefile.am
+++ b/src/modules/conf_window_remembers/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/connman/Makefile.am b/src/modules/connman/Makefile.am
index b4767228c..08f3dd2af 100644
--- a/src/modules/connman/Makefile.am
+++ b/src/modules/connman/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES          = -I. \
+AM_CPPFLAGS          = -I. \
                     -I$(top_srcdir) \
                     -I$(top_srcdir)/src/modules/$(MODULE) \
                     -I$(top_srcdir)/src/bin \
diff --git a/src/modules/cpufreq/Makefile.am b/src/modules/cpufreq/Makefile.am
index 5d0a6fc53..f8bc65f79 100644
--- a/src/modules/cpufreq/Makefile.am
+++ b/src/modules/cpufreq/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/dropshadow/Makefile.am b/src/modules/dropshadow/Makefile.am
index f96f9a584..16b780378 100644
--- a/src/modules/dropshadow/Makefile.am
+++ b/src/modules/dropshadow/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/everything/Makefile.am b/src/modules/everything/Makefile.am
index cd977b4ed..414c9ca90 100644
--- a/src/modules/everything/Makefile.am
+++ b/src/modules/everything/Makefile.am
@@ -11,7 +11,7 @@ module.desktop
 EXTRA_DIST = $(files_DATA) everything.pc.in module.desktop.in
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/fileman/Makefile.am b/src/modules/fileman/Makefile.am
index 796d6ceca..0f31ac2d8 100644
--- a/src/modules/fileman/Makefile.am
+++ b/src/modules/fileman/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/fileman_opinfo/Makefile.am b/src/modules/fileman_opinfo/Makefile.am
index c857dfbcc..2484eebb0 100644
--- a/src/modules/fileman_opinfo/Makefile.am
+++ b/src/modules/fileman_opinfo/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/gadman/Makefile.am b/src/modules/gadman/Makefile.am
index 73d126714..e8266bd19 100644
--- a/src/modules/gadman/Makefile.am
+++ b/src/modules/gadman/Makefile.am
@@ -8,7 +8,7 @@ files_DATA = e-module-gadman.edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/ibar/Makefile.am b/src/modules/ibar/Makefile.am
index 7243b9215..c67b0346c 100644
--- a/src/modules/ibar/Makefile.am
+++ b/src/modules/ibar/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/ibox/Makefile.am b/src/modules/ibox/Makefile.am
index 6d30fda81..4f69943b3 100644
--- a/src/modules/ibox/Makefile.am
+++ b/src/modules/ibox/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/illume-bluetooth/Makefile.am b/src/modules/illume-bluetooth/Makefile.am
index 7b8225d80..b17459cae 100644
--- a/src/modules/illume-bluetooth/Makefile.am
+++ b/src/modules/illume-bluetooth/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/illume-home-toggle/Makefile.am b/src/modules/illume-home-toggle/Makefile.am
index 5b725bd03..798118ca5 100644
--- a/src/modules/illume-home-toggle/Makefile.am
+++ b/src/modules/illume-home-toggle/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/illume-home/Makefile.am b/src/modules/illume-home/Makefile.am
index 04db0cd1b..1e6a9e4ee 100644
--- a/src/modules/illume-home/Makefile.am
+++ b/src/modules/illume-home/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/illume-indicator/Makefile.am b/src/modules/illume-indicator/Makefile.am
index 7188dcfad..541df75ec 100644
--- a/src/modules/illume-indicator/Makefile.am
+++ b/src/modules/illume-indicator/Makefile.am
@@ -21,7 +21,7 @@ EXTRA_DIST = \
            module.desktop.in
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/illume-kbd-toggle/Makefile.am b/src/modules/illume-kbd-toggle/Makefile.am
index c4bd16713..ed4566bd8 100644
--- a/src/modules/illume-kbd-toggle/Makefile.am
+++ b/src/modules/illume-kbd-toggle/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/illume-keyboard/Makefile.am b/src/modules/illume-keyboard/Makefile.am
index e8ee4e497..68fd79c86 100644
--- a/src/modules/illume-keyboard/Makefile.am
+++ b/src/modules/illume-keyboard/Makefile.am
@@ -22,7 +22,7 @@ EXTRA_DIST = \
              module.desktop.in
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/illume-mode-toggle/Makefile.am b/src/modules/illume-mode-toggle/Makefile.am
index 564b33229..1b5a98fd2 100644
--- a/src/modules/illume-mode-toggle/Makefile.am
+++ b/src/modules/illume-mode-toggle/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/illume-softkey/Makefile.am b/src/modules/illume-softkey/Makefile.am
index df230e1bc..c0e1f5602 100644
--- a/src/modules/illume-softkey/Makefile.am
+++ b/src/modules/illume-softkey/Makefile.am
@@ -21,7 +21,7 @@ EXTRA_DIST = \
            module.desktop.in
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/illume2/Makefile.am b/src/modules/illume2/Makefile.am
index 84df15440..254193684 100644
--- a/src/modules/illume2/Makefile.am
+++ b/src/modules/illume2/Makefile.am
@@ -21,7 +21,7 @@ EXTRA_DIST = \
            module.desktop.in
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/illume2/policies/illume/Makefile.am b/src/modules/illume2/policies/illume/Makefile.am
index ff5d5ddeb..899abadf1 100644
--- a/src/modules/illume2/policies/illume/Makefile.am
+++ b/src/modules/illume2/policies/illume/Makefile.am
@@ -3,7 +3,7 @@ MODULE = illume2
 POLICY = illume
 
 # the module .so file
-INCLUDES = -I.. \
+AM_CPPFLAGS = -I.. \
            -I$(top_srcdir) \
            -I$(top_srcdir)/src/modules/$(MODULE) \
            -I$(top_srcdir)/src/modules/$(MODULE)/policies/$(POLICY) \
diff --git a/src/modules/illume2/policies/tablet/Makefile.am b/src/modules/illume2/policies/tablet/Makefile.am
index a7cd5c103..7f2a64090 100644
--- a/src/modules/illume2/policies/tablet/Makefile.am
+++ b/src/modules/illume2/policies/tablet/Makefile.am
@@ -3,7 +3,7 @@ MODULE = illume2
 POLICY = tablet
 
 # the module .so file
-INCLUDES = -I.. \
+AM_CPPFLAGS = -I.. \
            -I$(top_srcdir) \
            -I$(top_srcdir)/src/modules/$(MODULE) \
            -I$(top_srcdir)/src/modules/$(MODULE)/policies/$(POLICY) \
diff --git a/src/modules/layout/Makefile.am b/src/modules/layout/Makefile.am
index f27026296..d412d4d39 100644
--- a/src/modules/layout/Makefile.am
+++ b/src/modules/layout/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/mixer/Makefile.am b/src/modules/mixer/Makefile.am
index 98dfb2b3f..afa1edc92 100644
--- a/src/modules/mixer/Makefile.am
+++ b/src/modules/mixer/Makefile.am
@@ -8,7 +8,7 @@ files_DATA = e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES          = -I. \
+AM_CPPFLAGS          = -I. \
                     -I$(top_srcdir) \
                     -I$(top_srcdir)/src/modules/$(MODULE) \
                     -I$(top_srcdir)/src/bin \
@@ -16,7 +16,7 @@ INCLUDES          = -I. \
                     -I$(top_srcdir)/src/modules \
                     @e_cflags@ @SOUND_CFLAGS@
 if HAVE_ENOTIFY
-INCLUDES          += @ENOTIFY_CFLAGS@
+AM_CPPFLAGS          += @ENOTIFY_CFLAGS@
 endif
 
 pkgdir            = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
diff --git a/src/modules/msgbus/Makefile.am b/src/modules/msgbus/Makefile.am
index a75f3b972..8cfbc0c3d 100644
--- a/src/modules/msgbus/Makefile.am
+++ b/src/modules/msgbus/Makefile.am
@@ -5,7 +5,7 @@ MODULE = msgbus
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/notification/Makefile.am b/src/modules/notification/Makefile.am
index e976d1f57..f00443853 100644
--- a/src/modules/notification/Makefile.am
+++ b/src/modules/notification/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES          = -I. \
+AM_CPPFLAGS          = -I. \
                     -I$(top_srcdir) \
                     -I$(top_srcdir)/src/modules/$(MODULE) \
                     -I$(top_srcdir)/src/bin \
diff --git a/src/modules/pager/Makefile.am b/src/modules/pager/Makefile.am
index 850c2cec6..a99187bcc 100644
--- a/src/modules/pager/Makefile.am
+++ b/src/modules/pager/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/physics/Makefile.am b/src/modules/physics/Makefile.am
index d1279f53c..174907480 100644
--- a/src/modules/physics/Makefile.am
+++ b/src/modules/physics/Makefile.am
@@ -8,7 +8,7 @@ files_DATA = e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/quickaccess/Makefile.am b/src/modules/quickaccess/Makefile.am
index 3e5bde20e..8cb2ea540 100644
--- a/src/modules/quickaccess/Makefile.am
+++ b/src/modules/quickaccess/Makefile.am
@@ -8,7 +8,7 @@ files_DATA = e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/shot/Makefile.am b/src/modules/shot/Makefile.am
index 3bf6d9448..17e070d7c 100644
--- a/src/modules/shot/Makefile.am
+++ b/src/modules/shot/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/start/Makefile.am b/src/modules/start/Makefile.am
index ba3e60823..b6134ee16 100644
--- a/src/modules/start/Makefile.am
+++ b/src/modules/start/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/syscon/Makefile.am b/src/modules/syscon/Makefile.am
index dc1953e19..cd95dc1ae 100644
--- a/src/modules/syscon/Makefile.am
+++ b/src/modules/syscon/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/systray/Makefile.am b/src/modules/systray/Makefile.am
index 90bdc8f7e..bcf18e475 100644
--- a/src/modules/systray/Makefile.am
+++ b/src/modules/systray/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/tasks/Makefile.am b/src/modules/tasks/Makefile.am
index ac61e1628..7bf013718 100644
--- a/src/modules/tasks/Makefile.am
+++ b/src/modules/tasks/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/temperature/Makefile.am b/src/modules/temperature/Makefile.am
index 809f71b36..c821de3fd 100644
--- a/src/modules/temperature/Makefile.am
+++ b/src/modules/temperature/Makefile.am
@@ -15,7 +15,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/tiling/Makefile.am b/src/modules/tiling/Makefile.am
index b3a561359..c88adb832 100644
--- a/src/modules/tiling/Makefile.am
+++ b/src/modules/tiling/Makefile.am
@@ -19,7 +19,7 @@ e-module-$(MODULE).edj:  e-module-$(MODULE).edc
 	$(top_builddir)/src/modules/$(MODULE)/e-module-$(MODULE).edj
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/winlist/Makefile.am b/src/modules/winlist/Makefile.am
index b5c9c1879..8cb085c3d 100644
--- a/src/modules/winlist/Makefile.am
+++ b/src/modules/winlist/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/wizard/Makefile.am b/src/modules/wizard/Makefile.am
index cd0f50a2a..bfb0d29b9 100644
--- a/src/modules/wizard/Makefile.am
+++ b/src/modules/wizard/Makefile.am
@@ -26,7 +26,7 @@ data/desktop/tmp.desktop
 EXTRA_DIST = $(files_DATA) $(desks_DATA) $(favs_DATA) $(desktop_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
diff --git a/src/modules/wl_drm/Makefile.am b/src/modules/wl_drm/Makefile.am
index 54adf4d1e..d097de0f0 100644
--- a/src/modules/wl_drm/Makefile.am
+++ b/src/modules/wl_drm/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin/e_wayland \
diff --git a/src/modules/wl_screenshot/Makefile.am b/src/modules/wl_screenshot/Makefile.am
index a83ce8d67..27972ce0f 100644
--- a/src/modules/wl_screenshot/Makefile.am
+++ b/src/modules/wl_screenshot/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin/e_wayland \
diff --git a/src/modules/wl_shell/Makefile.am b/src/modules/wl_shell/Makefile.am
index a37d418f4..c9fc13334 100644
--- a/src/modules/wl_shell/Makefile.am
+++ b/src/modules/wl_shell/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin/e_wayland \
diff --git a/src/modules/xkbswitch/Makefile.am b/src/modules/xkbswitch/Makefile.am
index 8de7de3f4..e804076fa 100644
--- a/src/modules/xkbswitch/Makefile.am
+++ b/src/modules/xkbswitch/Makefile.am
@@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                          -I$(top_srcdir) \
                          -I$(top_srcdir)/src/modules/$(MODULE) \
                          -I$(top_srcdir)/src/bin \