diff --git a/plugin.c b/plugin.c
index 8935317..3227b06 100644
--- a/plugin.c
+++ b/plugin.c
@@ -112,10 +112,10 @@ init(void)
     REGISTER_CORE_MODULE(mpd, mpd);
     REGISTER_CORE_MODULE(network, network);
     REGISTER_CORE_MODULE(removables, removables);
-#if defined(HAVE_MODULE_xkb)
+#if defined(HAVE_PLUGIN_xkb)
     REGISTER_CORE_MODULE(xkb, xkb);
 #endif
-#if defined(HAVE_MODULE_xwindow)
+#if defined(HAVE_PLUGIN_xwindow)
     REGISTER_CORE_MODULE(xwindow, xwindow);
 #endif