diff --git a/src/modules/meson.build b/src/modules/meson.build
index 4e79305c8..bc10d5b03 100644
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -9,9 +9,6 @@ subdir('mixer')
 subdir('everything')
 subdir('teamwork')
 
-# disabled for now
-####subdir('wl_fb')
-
 mods = [
 # standard run of the mill modules with cion and desktop
   'battery',
@@ -72,6 +69,8 @@ mods = [
   'wl_text_input',
   'wl_desktop_shell',
   'wl_weekeyboard',
+### XXX: disabled for now
+#  'wl_fb',
   'xwayland'
 ]
 
diff --git a/src/modules/wl_buffer/meson.build b/src/modules/wl_buffer/meson.build
index 7662ca991..a76f3be31 100644
--- a/src/modules/wl_buffer/meson.build
+++ b/src/modules/wl_buffer/meson.build
@@ -1,9 +1,9 @@
-src = files(
-  'e_mod_main.c'
- )
-
-no_icon = true
-
 if get_option('wayland') != true
   disable = true
+else
+  src = files(
+    'e_mod_main.c'
+  )
+
+  no_icon = true
 endif
diff --git a/src/modules/wl_desktop_shell/meson.build b/src/modules/wl_desktop_shell/meson.build
index dec319e3d..3ab4915ac 100644
--- a/src/modules/wl_desktop_shell/meson.build
+++ b/src/modules/wl_desktop_shell/meson.build
@@ -8,7 +8,8 @@ else
     'xdg5.c',
     'xdg6.c',
     'e_mod_main.h'
-  )
+   )
+
   foreach p: [
     '@0@/unstable/xdg-shell/xdg-shell-unstable-v5.xml'.format(dir_wayland_protocols),
     '@0@/unstable/xdg-shell/xdg-shell-unstable-v6.xml'.format(dir_wayland_protocols),
diff --git a/src/modules/wl_drm/meson.build b/src/modules/wl_drm/meson.build
index 1d9fdede7..e5044a9d1 100644
--- a/src/modules/wl_drm/meson.build
+++ b/src/modules/wl_drm/meson.build
@@ -1,11 +1,11 @@
-src = files(
-  'e_mod_main.c'
- )
-
-no_icon = true
-
 if get_option('wayland') != true
   disable = true
 else
+  src = files(
+    'e_mod_main.c'
+  )
+
+  no_icon = true
+
   config_h.set('HAVE_WL_DRM', '1')
 endif
diff --git a/src/modules/wl_fb/meson.build b/src/modules/wl_fb/meson.build
index 4406e85f4..93ef98eb2 100644
--- a/src/modules/wl_fb/meson.build
+++ b/src/modules/wl_fb/meson.build
@@ -1,19 +1,10 @@
-wl_fb_src = [
-	'e_mod_main.c',
-]
+if get_option('wayland') != true
+  disable = true
+else
+  src = files(
+    'e_mod_main.c',
+  )
 
-wl_fb_dir = join_paths(dir_module_e, 'wl_fb', module_arch)
-if get_option('wl-fb') == true and get_option('wayland') == true
-	config_h.set('USE_MODULE_WL_FB', '1')
-
-        module_files += join_paths(wl_fb_dir, 'wl_fb.so')
-	shared_module('wl_fb',
-                wl_fb_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: wl_fb_dir,
-                install: true
-        )
+  no_icon = true
 endif
 
diff --git a/src/modules/wl_text_input/meson.build b/src/modules/wl_text_input/meson.build
index c349e114c..c2adb3326 100644
--- a/src/modules/wl_text_input/meson.build
+++ b/src/modules/wl_text_input/meson.build
@@ -1,8 +1,6 @@
 if get_option('wayland') != true
   disable = true
 else
-  config_h.set('HAVE_WL_DRM', '1')
-
   src = files(
     'e_mod_main.c'
   )
diff --git a/src/modules/wl_weekeyboard/meson.build b/src/modules/wl_weekeyboard/meson.build
index 6475b8ef6..fc17e4672 100644
--- a/src/modules/wl_weekeyboard/meson.build
+++ b/src/modules/wl_weekeyboard/meson.build
@@ -1,7 +1,6 @@
 if get_option('wayland') != true
   disable = true
 else
-  config_h.set('HAVE_WL_DRM', '1')
   src = files(
     'e_mod_main.c',
     'wkb-log.c',
diff --git a/src/modules/wl_wl/meson.build b/src/modules/wl_wl/meson.build
index 7662ca991..a76f3be31 100644
--- a/src/modules/wl_wl/meson.build
+++ b/src/modules/wl_wl/meson.build
@@ -1,9 +1,9 @@
-src = files(
-  'e_mod_main.c'
- )
-
-no_icon = true
-
 if get_option('wayland') != true
   disable = true
+else
+  src = files(
+    'e_mod_main.c'
+  )
+
+  no_icon = true
 endif
diff --git a/src/modules/wl_x11/meson.build b/src/modules/wl_x11/meson.build
index 7662ca991..a76f3be31 100644
--- a/src/modules/wl_x11/meson.build
+++ b/src/modules/wl_x11/meson.build
@@ -1,9 +1,9 @@
-src = files(
-  'e_mod_main.c'
- )
-
-no_icon = true
-
 if get_option('wayland') != true
   disable = true
+else
+  src = files(
+    'e_mod_main.c'
+  )
+
+  no_icon = true
 endif