diff --git a/meson.build b/meson.build
index 6c6c0fe95..85b84baf9 100644
--- a/meson.build
+++ b/meson.build
@@ -400,10 +400,12 @@ subdir('src/bin')
 module_files = []
 module_ldflags = '-module -avoid-version'
 module_includes = ['../../..', '../../bin', '../../bin/efx']
+module_includes2 = [ '../..', '../bin', '../bin/efx' ]
 module_deps = [deps_e, dep_dl]
 
-subdir('src/modules/ibar')
-subdir('src/modules/clock')
+subdir('src/modules')
+#subdir('src/modules/ibar')
+#subdir('src/modules/clock')
 subdir('src/modules/pager')
 subdir('src/modules/pager_plain')
 subdir('src/modules/battery')
diff --git a/src/modules/clock/meson.build b/src/modules/clock/meson.build
index 7d475d491..9d426f36f 100644
--- a/src/modules/clock/meson.build
+++ b/src/modules/clock/meson.build
@@ -1,32 +1,5 @@
-module = 'clock'
-opt    = 'clock'
-conf   = 'USE_MODULE_CLOCK'
-
 src = [
   'e_mod_main.c',
   'e_mod_config.c',
   'e_mod_main.h'
 ]
-
-icon = [
-  'e-module-' + module + '.edj',
-  'module.desktop'
-]
-
-dir_mod     = join_paths(dir_module_e, module)
-dir_mod_bin = join_paths(dir_mod, module_arch)
-
-if get_option(opt) == true
-  config_h.set(conf, '1')
-  module_files += join_paths(dir_mod_bin, module + '.so')
-
-  install_data(icon, install_dir: dir_mod)
-
-  shared_module(module, src,
-                include_directories: include_directories(module_includes),
-                name_prefix        : '',
-                dependencies       : module_deps,
-                install_dir        : dir_mod_bin,
-                install            : true
-               )
-endif
diff --git a/src/modules/ibar/meson.build b/src/modules/ibar/meson.build
index eac5d8942..9d426f36f 100644
--- a/src/modules/ibar/meson.build
+++ b/src/modules/ibar/meson.build
@@ -1,32 +1,5 @@
-module = 'ibar'
-opt    = 'ibar'
-conf   = 'USE_MODULE_IBAR'
-
 src = [
   'e_mod_main.c',
   'e_mod_config.c',
   'e_mod_main.h'
 ]
-
-icon = [
-  'e-module-' + module + '.edj',
-  'module.desktop'
-]
-
-dir_mod     = join_paths(dir_module_e, module)
-dir_mod_bin = join_paths(dir_mod, module_arch)
-
-if get_option(opt) == true
-  config_h.set(conf, '1')
-  module_files += join_paths(dir_mod_bin, module + '.so')
-
-  install_data(icon, install_dir: dir_mod)
-
-  shared_module(module, src,
-                include_directories: include_directories(module_includes),
-                name_prefix        : '',
-                dependencies       : module_deps,
-                install_dir        : dir_mod_bin,
-                install            : true
-               )
-endif