diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt
index 6a38147d29..89e8f8977f 100644
--- a/effects/CMakeLists.txt
+++ b/effects/CMakeLists.txt
@@ -178,5 +178,5 @@ endif()
 # Add the builtins plugin
 KWIN4_ADD_EFFECT( builtins ${kwin4_effect_builtins_sources} )
 if( NOT KWIN_MOBILE_EFFECTS )
-#    KWIN4_ADD_EFFECT_CONFIG( builtins ${kwin4_effect_builtins_config_sources} )
+    KWIN4_ADD_EFFECT_CONFIG( builtins ${kwin4_effect_builtins_config_sources} )
 endif()
diff --git a/effects/configs_builtins.cpp b/effects/configs_builtins.cpp
index 4c1dbb2413..5614f4aa55 100644
--- a/effects/configs_builtins.cpp
+++ b/effects/configs_builtins.cpp
@@ -82,3 +82,5 @@ KWIN_EFFECT_CONFIG_MULTIPLE(builtins,
                            )
 
 } // namespace
+
+#include "configs_builtins.moc"
diff --git a/kcmkwin/kwincompositing/main.cpp b/kcmkwin/kwincompositing/main.cpp
index 6161f42643..c922121101 100644
--- a/kcmkwin/kwincompositing/main.cpp
+++ b/kcmkwin/kwincompositing/main.cpp
@@ -52,7 +52,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 K_PLUGIN_FACTORY(KWinCompositingConfigFactory,
                  registerPlugin<KWin::KWinCompositingConfig>();
                 )
-K_EXPORT_PLUGIN(KWinCompositingConfigFactory("kcmkwincompositing"))
 
 namespace KWin
 {
diff --git a/kcmkwin/kwindecoration/kwindecoration.cpp b/kcmkwin/kwindecoration/kwindecoration.cpp
index 9b1697d5ec..f402d0ae7b 100644
--- a/kcmkwin/kwindecoration/kwindecoration.cpp
+++ b/kcmkwin/kwindecoration/kwindecoration.cpp
@@ -61,7 +61,6 @@
 K_PLUGIN_FACTORY(KWinDecoFactory,
                  registerPlugin<KWin::KWinDecorationModule>();
                 )
-K_EXPORT_PLUGIN(KWinDecoFactory("kcmkwindecoration"))
 
 namespace KWin
 {
diff --git a/kcmkwin/kwindesktop/main.cpp b/kcmkwin/kwindesktop/main.cpp
index aa87556528..1f85427ec5 100644
--- a/kcmkwin/kwindesktop/main.cpp
+++ b/kcmkwin/kwindesktop/main.cpp
@@ -41,7 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <netwm.h>
 
 K_PLUGIN_FACTORY(KWinDesktopConfigFactory, registerPlugin<KWin::KWinDesktopConfig>();)
-K_EXPORT_PLUGIN(KWinDesktopConfigFactory("kcm_kwindesktop"))
 
 namespace KWin
 {
diff --git a/kcmkwin/kwinoptions/main.cpp b/kcmkwin/kwinoptions/main.cpp
index 0a9b6ede6f..fd84a65347 100644
--- a/kcmkwin/kwinoptions/main.cpp
+++ b/kcmkwin/kwinoptions/main.cpp
@@ -247,7 +247,6 @@ K_PLUGIN_FACTORY_DEFINITION(KWinOptionsFactory,
                             registerPlugin<KAdvancedConfigStandalone>("kwinadvanced");
                             registerPlugin<KWinOptions>("kwinoptions");
                            )
-K_EXPORT_PLUGIN(KWinOptionsFactory("kcmkwm"))
 
 #include "main.moc"
 #include "moc_main.cpp"
diff --git a/kcmkwin/kwinrules/kcm.cpp b/kcmkwin/kwinrules/kcm.cpp
index b67b8ac967..dd48af0239 100644
--- a/kcmkwin/kwinrules/kcm.cpp
+++ b/kcmkwin/kwinrules/kcm.cpp
@@ -34,7 +34,6 @@
 K_PLUGIN_FACTORY(KCMRulesFactory,
                  registerPlugin<KWin::KCMRules>();
                 )
-K_EXPORT_PLUGIN(KCMRulesFactory("kcmkwinrules"))
 
 namespace KWin
 {
diff --git a/kcmkwin/kwinscreenedges/main.cpp b/kcmkwin/kwinscreenedges/main.cpp
index 9de436a813..99c4365a4c 100644
--- a/kcmkwin/kwinscreenedges/main.cpp
+++ b/kcmkwin/kwinscreenedges/main.cpp
@@ -30,7 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QtDBus/QtDBus>
 
 K_PLUGIN_FACTORY(KWinScreenEdgesConfigFactory, registerPlugin<KWin::KWinScreenEdgesConfig>();)
-K_EXPORT_PLUGIN(KWinScreenEdgesConfigFactory("kcmkwinscreenedges"))
 
 namespace KWin
 {
diff --git a/kcmkwin/kwinscripts/main.cpp b/kcmkwin/kwinscripts/main.cpp
index e0f88cb79f..bcac0d8ff9 100644
--- a/kcmkwin/kwinscripts/main.cpp
+++ b/kcmkwin/kwinscripts/main.cpp
@@ -23,4 +23,3 @@
 
 K_PLUGIN_FACTORY(KcmKWinScriptsFactory,
                  registerPlugin<Module>("kwin-scripts");)
-K_EXPORT_PLUGIN(KcmKWinScriptsFactory("kwin-scripts", "kcm-kwin-scripts"))
diff --git a/kcmkwin/kwintabbox/main.cpp b/kcmkwin/kwintabbox/main.cpp
index fc696d01ec..d5ce83d108 100644
--- a/kcmkwin/kwintabbox/main.cpp
+++ b/kcmkwin/kwintabbox/main.cpp
@@ -44,7 +44,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "layoutpreview.h"
 
 K_PLUGIN_FACTORY(KWinTabBoxConfigFactory, registerPlugin<KWin::KWinTabBoxConfig>();)
-K_EXPORT_PLUGIN(KWinTabBoxConfigFactory("kcm_kwintabbox"))
 
 namespace KWin
 {
diff --git a/libkwineffects/kwineffects.h b/libkwineffects/kwineffects.h
index 14091fcc81..5966ede237 100644
--- a/libkwineffects/kwineffects.h
+++ b/libkwineffects/kwineffects.h
@@ -562,8 +562,8 @@ public Q_SLOTS:
  * E.g.  KWIN_EFFECT_CONFIG( flames, MyFlameEffectConfig )
  **/
 #define KWIN_EFFECT_CONFIG( name, classname ) \
-    K_PLUGIN_FACTORY(EffectFactory, registerPlugin<classname>(#name);) \
-    K_EXPORT_PLUGIN(EffectFactory("kcm_kwin4_effect_" #name))
+    K_PLUGIN_FACTORY(EffectFactory, registerPlugin<classname>(#name);)
+
 /**
  * Defines the function used to retrieve multiple effects' config widget
  * E.g.  KWIN_EFFECT_CONFIG_MULTIPLE( flames,
@@ -572,8 +572,8 @@ public Q_SLOTS:
  *           )
  **/
 #define KWIN_EFFECT_CONFIG_MULTIPLE( name, singles ) \
-    K_PLUGIN_FACTORY(EffectFactory, singles) \
-    K_EXPORT_PLUGIN(EffectFactory("kcm_kwin4_effect_" #name))
+    K_PLUGIN_FACTORY(EffectFactory, singles)
+
 /**
  * @see KWIN_EFFECT_CONFIG_MULTIPLE
  */
diff --git a/scripting/genericscriptedconfig.cpp b/scripting/genericscriptedconfig.cpp
index 607b4e2155..12d3c602fb 100644
--- a/scripting/genericscriptedconfig.cpp
+++ b/scripting/genericscriptedconfig.cpp
@@ -160,6 +160,5 @@ void ScriptingConfig::reload()
     // TODO: what to call
 }
 
-K_EXPORT_PLUGIN(GenericScriptedConfigFactory())
 
 } // namespace