diff --git a/ground/src/plugins/plugins.pro b/ground/src/plugins/plugins.pro
index 78d4f978a..f70dd70e2 100644
--- a/ground/src/plugins/plugins.pro
+++ b/ground/src/plugins/plugins.pro
@@ -19,14 +19,14 @@ plugin_welcome.subdir = welcome
 plugin_welcome.depends = plugin_coreplugin
 
 # UAVObjects plug-in
-#SUBDIRS += plugin_uavobjects
-#plugin_uavobjects.subdir = uavobjects
-#plugin_uavobjects.depends = plugin_coreplugin
+SUBDIRS += plugin_uavobjects
+plugin_uavobjects.subdir = uavobjects
+plugin_uavobjects.depends = plugin_coreplugin
 
 # UAVTalk plug-in
-#SUBDIRS += plugin_uavtalk
-#plugin_uavtalk.subdir = uavtalk
-#plugin_uavtalk.depends = plugin_uavobjects
-#plugin_uavtalk.depends += plugin_coreplugin
+SUBDIRS += plugin_uavtalk
+plugin_uavtalk.subdir = uavtalk
+plugin_uavtalk.depends = plugin_uavobjects
+plugin_uavtalk.depends += plugin_coreplugin
 
 
diff --git a/ground/src/plugins/uavobjects/uavobjectsplugin.cpp b/ground/src/plugins/uavobjects/uavobjectsplugin.cpp
index be166806a..486335e22 100644
--- a/ground/src/plugins/uavobjects/uavobjectsplugin.cpp
+++ b/ground/src/plugins/uavobjects/uavobjectsplugin.cpp
@@ -25,38 +25,40 @@
  * with this program; if not, write to the Free Software Foundation, Inc., 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-#include "uavobjectsplugin.h"
-#include "uavobjectsinit.h"
-
-UAVObjectsPlugin::UAVObjectsPlugin()
-{
-
-}
-
-UAVObjectsPlugin::~UAVObjectsPlugin()
-{
-
-}
-
-void UAVObjectsPlugin::extensionsInitialized()
-{
-
-}
-
-bool UAVObjectsPlugin::initialize(const QStringList & arguments, QString * errorString)
-{
-    // Create object manager and expose object
-    UAVObjectManager* objMngr = new UAVObjectManager();
-    addObject(objMngr);
-    // Initialize UAVObjects
-    UAVObjectsInitialize(objMngr);
-    // Done
-    Q_UNUSED(arguments);
-    Q_UNUSED(errorString);
-    return true;
-}
-
-void UAVObjectsPlugin::shutdown()
-{
-
-}
+#include "uavobjectsplugin.h"
+#include "uavobjectsinit.h"
+
+UAVObjectsPlugin::UAVObjectsPlugin()
+{
+
+}
+
+UAVObjectsPlugin::~UAVObjectsPlugin()
+{
+
+}
+
+void UAVObjectsPlugin::extensionsInitialized()
+{
+
+}
+
+bool UAVObjectsPlugin::initialize(const QStringList & arguments, QString * errorString)
+{
+    // Create object manager and expose object
+    UAVObjectManager* objMngr = new UAVObjectManager();
+    addObject(objMngr);
+    // Initialize UAVObjects
+    UAVObjectsInitialize(objMngr);
+    // Done
+    Q_UNUSED(arguments);
+    Q_UNUSED(errorString);
+    return true;
+}
+
+void UAVObjectsPlugin::shutdown()
+{
+
+}
+
+Q_EXPORT_PLUGIN(UAVObjectsPlugin)
diff --git a/ground/src/plugins/uavobjects/uavobjectsplugin.h b/ground/src/plugins/uavobjects/uavobjectsplugin.h
index 5ebd9fe1d..6a336ce52 100644
--- a/ground/src/plugins/uavobjects/uavobjectsplugin.h
+++ b/ground/src/plugins/uavobjects/uavobjectsplugin.h
@@ -25,22 +25,25 @@
  * with this program; if not, write to the Free Software Foundation, Inc., 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-#ifndef UAVOBJECTSPLUGIN_H
-#define UAVOBJECTSPLUGIN_H
-
-#include <extensionsystem/iplugin.h>
-#include <QtPlugin>
-#include "uavobjectmanager.h"
-
-class UAVObjectsPlugin: public ExtensionSystem::IPlugin
-{
-public:
-    UAVObjectsPlugin();
-    ~UAVObjectsPlugin();
-
-    void extensionsInitialized();
-    bool initialize(const QStringList & arguments, QString * errorString);
-    void shutdown();
-};
-
-#endif // UAVOBJECTSPLUGIN_H
+#ifndef UAVOBJECTSPLUGIN_H
+#define UAVOBJECTSPLUGIN_H
+
+#include <extensionsystem/iplugin.h>
+#include <QtPlugin>
+#include "uavobjectmanager.h"
+
+class UAVObjectsPlugin:
+        public ExtensionSystem::IPlugin
+{
+    Q_OBJECT
+
+public:
+    UAVObjectsPlugin();
+    ~UAVObjectsPlugin();
+
+    void extensionsInitialized();
+    bool initialize(const QStringList & arguments, QString * errorString);
+    void shutdown();
+};
+
+#endif // UAVOBJECTSPLUGIN_H
diff --git a/ground/src/plugins/uavtalk/uavtalkplugin.cpp b/ground/src/plugins/uavtalk/uavtalkplugin.cpp
index b09bcb468..0d35c5e01 100644
--- a/ground/src/plugins/uavtalk/uavtalkplugin.cpp
+++ b/ground/src/plugins/uavtalk/uavtalkplugin.cpp
@@ -25,8 +25,35 @@
  * with this program; if not, write to the Free Software Foundation, Inc., 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-#include "uavtalkplugin.h"
-
-UAVTalkPlugin::UAVTalkPlugin()
-{
-}
+
+#include "uavtalkplugin.h"
+
+UAVTalkPlugin::UAVTalkPlugin()
+{
+
+}
+
+UAVTalkPlugin::~UAVTalkPlugin()
+{
+
+}
+
+void UAVTalkPlugin::extensionsInitialized()
+{
+
+}
+
+bool UAVTalkPlugin::initialize(const QStringList & arguments, QString * errorString)
+{
+    Q_UNUSED(arguments);
+    Q_UNUSED(errorString);
+
+    return true;
+}
+
+void UAVTalkPlugin::shutdown()
+{
+
+}
+
+Q_EXPORT_PLUGIN(UAVTalkPlugin)
diff --git a/ground/src/plugins/uavtalk/uavtalkplugin.h b/ground/src/plugins/uavtalk/uavtalkplugin.h
index 37dd171ee..3784c8958 100644
--- a/ground/src/plugins/uavtalk/uavtalkplugin.h
+++ b/ground/src/plugins/uavtalk/uavtalkplugin.h
@@ -25,13 +25,25 @@
  * with this program; if not, write to the Free Software Foundation, Inc., 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-#ifndef UAVTALKPLUGIN_H
-#define UAVTALKPLUGIN_H
-
-class UAVTalkPlugin
-{
-public:
-    UAVTalkPlugin();
-};
-
-#endif // UAVTALKPLUGIN_H
+#ifndef UAVTALKPLUGIN_H
+#define UAVTALKPLUGIN_H
+
+
+#include <extensionsystem/iplugin.h>
+#include <QtPlugin>
+
+class UAVTalkPlugin:
+        public ExtensionSystem::IPlugin
+{
+    Q_OBJECT
+
+public:
+    UAVTalkPlugin();
+    ~UAVTalkPlugin();
+
+    void extensionsInitialized();
+    bool initialize(const QStringList & arguments, QString * errorString);
+    void shutdown();
+};
+
+#endif // UAVTALKPLUGIN_H