diff --git a/ground/src/plugins/uavobjects/uavobjects.pluginspec b/ground/src/plugins/uavobjects/UAVObjects.pluginspec
similarity index 67%
rename from ground/src/plugins/uavobjects/uavobjects.pluginspec
rename to ground/src/plugins/uavobjects/UAVObjects.pluginspec
index e94047c00..e567a6bbc 100644
--- a/ground/src/plugins/uavobjects/uavobjects.pluginspec
+++ b/ground/src/plugins/uavobjects/UAVObjects.pluginspec
@@ -1,10 +1,10 @@
-<plugin name="UAVObjects" version="0.0.1" compatVersion="1.1">
+<plugin name="UAVObjects" version="0.0.1" compatVersion="0.0.1">
     <vendor>The OpenPilot Project</vendor>
     <copyright>(C) 2010 OpenPilot Project</copyright>
     <license>Your License goes here</license>
     <description>UAV telemetry objects</description>
     <url>http://www.openpilot.org</url>
     <dependencyList>
-        <dependency name="Core" version="1.1"/>
+        <dependency name="Core" version="1.0.0"/>
     </dependencyList>
-</plugin> 
\ No newline at end of file
+</plugin> 
diff --git a/ground/src/plugins/uavobjects/uavmetaobject.cpp b/ground/src/plugins/uavobjects/uavmetaobject.cpp
index cbf6cf587..4702e67b4 100644
--- a/ground/src/plugins/uavobjects/uavmetaobject.cpp
+++ b/ground/src/plugins/uavobjects/uavmetaobject.cpp
@@ -1,4 +1,4 @@
-#include "UAVMetaObject.h"
+#include "uavmetaobject.h"
 
 UAVMetaObject::UAVMetaObject(quint32 objID, QString& name, Metadata& mdata, UAVObject* parent):
         UAVObject(objID, 0, true, name, sizeof(Metadata))
diff --git a/ground/src/plugins/uavobjects/uavmetaobject.h b/ground/src/plugins/uavobjects/uavmetaobject.h
index 6c01aeb44..f51a980ef 100644
--- a/ground/src/plugins/uavobjects/uavmetaobject.h
+++ b/ground/src/plugins/uavobjects/uavmetaobject.h
@@ -1,7 +1,7 @@
 #ifndef UAVMETAOBJECT_H
 #define UAVMETAOBJECT_H
 
-#include "UAVObject.h"
+#include "uavobject.h"
 
 class UAVMetaObject: public UAVObject
 {
diff --git a/ground/src/plugins/uavobjects/uavobjects.pri b/ground/src/plugins/uavobjects/uavobjects.pri
new file mode 100644
index 000000000..b4df10403
--- /dev/null
+++ b/ground/src/plugins/uavobjects/uavobjects.pri
@@ -0,0 +1,3 @@
+include(uavobjects_dependencies.pri)
+
+LIBS *= -l$$qtLibraryTarget(UAVObjects)
diff --git a/ground/src/plugins/uavobjects/uavobjects.pro b/ground/src/plugins/uavobjects/uavobjects.pro
index 051db0ff1..a2d2c3c18 100644
--- a/ground/src/plugins/uavobjects/uavobjects.pro
+++ b/ground/src/plugins/uavobjects/uavobjects.pro
@@ -1,7 +1,9 @@
 TEMPLATE = lib
 TARGET = UAVObjects
+
 include(../../openpilotgcsplugin.pri)
-include(../../plugins/coreplugin/coreplugin.pri)
+include(uavobjects_dependencies.pri)
+
 HEADERS += uavobject.h \
     uavmetaobject.h \
     uavobjectmanager.h \
@@ -9,6 +11,7 @@ HEADERS += uavobject.h \
     uavobjectfield.h \
     uavobjectsinit.h \
     uavobjectsplugin.h
+
 SOURCES += uavobject.cpp \
     uavmetaobject.cpp \
     uavobjectmanager.cpp \
@@ -16,4 +19,5 @@ SOURCES += uavobject.cpp \
     uavobjectfield.cpp \
     uavobjectsinit.cpp \
     uavobjectsplugin.cpp
-OTHER_FILES += uavobjects.pluginspec
+
+OTHER_FILES += UAVObjects.pluginspec
diff --git a/ground/src/plugins/uavobjects/uavobjects_dependencies.pri b/ground/src/plugins/uavobjects/uavobjects_dependencies.pri
new file mode 100644
index 000000000..7f369f632
--- /dev/null
+++ b/ground/src/plugins/uavobjects/uavobjects_dependencies.pri
@@ -0,0 +1,2 @@
+include(../../plugins/coreplugin/coreplugin.pri)
+include(../../libs/utils/utils.pri)
diff --git a/ground/src/plugins/uavtalk/uavtalk.pluginspec b/ground/src/plugins/uavtalk/UAVTalk.pluginspec
similarity index 59%
rename from ground/src/plugins/uavtalk/uavtalk.pluginspec
rename to ground/src/plugins/uavtalk/UAVTalk.pluginspec
index 04d1ed779..fa7599a2e 100644
--- a/ground/src/plugins/uavtalk/uavtalk.pluginspec
+++ b/ground/src/plugins/uavtalk/UAVTalk.pluginspec
@@ -1,10 +1,11 @@
-<plugin name="UAVTalk" version="0.0.1" compatVersion="1.1">
+<plugin name="UAVTalk" version="0.0.1" compatVersion="0.0.1">
     <vendor>The OpenPilot Project</vendor>
     <copyright>(C) 2010 OpenPilot Project</copyright>
     <license>Your License goes here</license>
     <description>UAVTalk telemetry protocol</description>
     <url>http://www.openpilot.org</url>
     <dependencyList>
-        <dependency name="Core" version="1.1"/>
+        <dependency name="Core" version="1.0.0"/>
+        <dependency name="UAVObjects" version="0.0.1"/>
     </dependencyList>
-</plugin> 
\ No newline at end of file
+</plugin> 
diff --git a/ground/src/plugins/uavtalk/uavtalk.h b/ground/src/plugins/uavtalk/uavtalk.h
index da95957a4..15a471ca0 100644
--- a/ground/src/plugins/uavtalk/uavtalk.h
+++ b/ground/src/plugins/uavtalk/uavtalk.h
@@ -5,7 +5,7 @@
 #include <QMutex>
 #include <QMutexLocker>
 #include <QSemaphore>
-#include "uavobjects\uavobjectmanager.h"
+#include "uavobjects/uavobjectmanager.h"
 
 class UAVTalk: public QObject
 {
diff --git a/ground/src/plugins/uavtalk/uavtalk.pri b/ground/src/plugins/uavtalk/uavtalk.pri
new file mode 100644
index 000000000..addc16a2a
--- /dev/null
+++ b/ground/src/plugins/uavtalk/uavtalk.pri
@@ -0,0 +1,3 @@
+include(uavtalk_dependencies.pri)
+
+LIBS *= -l$$qtLibraryTarget(UAVTalk)
diff --git a/ground/src/plugins/uavtalk/uavtalk.pro b/ground/src/plugins/uavtalk/uavtalk.pro
index 2e767806a..053ef9de4 100644
--- a/ground/src/plugins/uavtalk/uavtalk.pro
+++ b/ground/src/plugins/uavtalk/uavtalk.pro
@@ -1,11 +1,12 @@
 TEMPLATE = lib
 TARGET = UAVTalk
 include(../../openpilotgcsplugin.pri)
-include(../../plugins/coreplugin/coreplugin.pri)
+include(uavtalk_dependencies.pri)
+
 HEADERS += uavtalk.h \
     uavtalkplugin.h
 SOURCES += uavtalk.cpp \
     uavtalkplugin.cpp
 HEADERS += telemetry.h
 SOURCES += telemetry.cpp
-OTHER_FILES += uavtalk.pluginspec
+OTHER_FILES += UAVTalk.pluginspec
diff --git a/ground/src/plugins/uavtalk/uavtalk_dependencies.pri b/ground/src/plugins/uavtalk/uavtalk_dependencies.pri
new file mode 100644
index 000000000..9da489f64
--- /dev/null
+++ b/ground/src/plugins/uavtalk/uavtalk_dependencies.pri
@@ -0,0 +1,3 @@
+include(../../plugins/uavobjects/uavobjects.pri)
+include(../../plugins/coreplugin/coreplugin.pri)
+include(../../libs/utils/utils.pri)