diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc
index ac9bcf16a8abc1bef5ba10c11b6cfe5cada0e7ca..00cbf094aeb60a65ebf7072075d4236b4b0a9f87 100644
--- a/src/QGCApplication.cc
+++ b/src/QGCApplication.cc
@@ -41,8 +41,8 @@
 #include <QDebug>
 
 #if defined(QGC_GST_STREAMING)
-#include <videoitem.h>
-#include <videosurface.h>
+#include <VideoItem.h>
+#include <VideoSurface.h>
 G_BEGIN_DECLS
 GST_PLUGIN_STATIC_DECLARE(QTVIDEOSINK_NAME);
 G_END_DECLS
diff --git a/src/VideoStreaming/VideoItem.cc b/src/VideoStreaming/VideoItem.cc
index c0ae7c0ed802eb7121f9c5791031b3a34ba38e56..b02ff504fd0dd56735dd38b5b8b22498b9a30ade 100644
--- a/src/VideoStreaming/VideoItem.cc
+++ b/src/VideoStreaming/VideoItem.cc
@@ -31,8 +31,8 @@ This file is part of the QGROUNDCONTROL project
 #include <QtQuick/QSGNode>
 #include <QtQuick/QSGFlatColorMaterial>
 
-#include "videoitem.h"
-#include "videosurface_p.h"
+#include "VideoItem.h"
+#include "VideoSurface_p.h"
 
 struct VideoItem::Private
 {
diff --git a/src/VideoStreaming/VideoItem.h b/src/VideoStreaming/VideoItem.h
index 16a7a51ee2ff3ebb8ef34fa53fbe45f27c31fffd..65c38c83a95d9e8687e25a676916ac36990b0357 100644
--- a/src/VideoStreaming/VideoItem.h
+++ b/src/VideoStreaming/VideoItem.h
@@ -31,7 +31,7 @@ This file is part of the QGROUNDCONTROL project
 #define VIDEO_ITEM_H
 
 #include <QtQuick/QQuickItem>
-#include "videosurface.h"
+#include "VideoSurface.h"
 
 class VideoItem : public QQuickItem
 {
diff --git a/src/VideoStreaming/VideoStreaming.pri b/src/VideoStreaming/VideoStreaming.pri
index cb1e3498d94ac02d89d47e86ecb87eb21df556bb..4d4f2a5413a15a325a5ca2b80f20693e79961c47 100644
--- a/src/VideoStreaming/VideoStreaming.pri
+++ b/src/VideoStreaming/VideoStreaming.pri
@@ -29,7 +29,7 @@ LinuxBuild {
     packagesExist(gstreamer-1.0) {
         message("Including support for video streaming")
         DEFINES     += QGC_GST_STREAMING
-        PKGCONFIG   += gstreamer-1.0
+        PKGCONFIG   += gstreamer-1.0  gstreamer-video-1.0
         CONFIG      += VideoEnabled
     }
 } else:MacBuild {
diff --git a/src/VideoStreaming/VideoSurface.cc b/src/VideoStreaming/VideoSurface.cc
index c37a994d8750a6a0cf423c685406a2891a9e04b2..cb067527aacfcca699b91ca2138bbb9c48972fdd 100644
--- a/src/VideoStreaming/VideoSurface.cc
+++ b/src/VideoStreaming/VideoSurface.cc
@@ -27,7 +27,7 @@ This file is part of the QGROUNDCONTROL project
  *   @author Gus Grubba <mavlink@grubba.com>
  */
 
-#include "videosurface_p.h"
+#include "VideoSurface_p.h"
 
 #include <QtCore/QDebug>
 #include <QtQuick/QQuickItem>
diff --git a/src/VideoStreaming/videosurface_p.h b/src/VideoStreaming/VideoSurface_p.h
similarity index 96%
rename from src/VideoStreaming/videosurface_p.h
rename to src/VideoStreaming/VideoSurface_p.h
index 6a86b645391d5ba6d5a159ff6a07551dc3447199..b4dc49632b3b1f5878aa04f092ea23f3501e0a66 100644
--- a/src/VideoStreaming/videosurface_p.h
+++ b/src/VideoStreaming/VideoSurface_p.h
@@ -30,8 +30,8 @@ This file is part of the QGROUNDCONTROL project
 #ifndef VIDEO_SURFACE_P_H
 #define VIDEO_SURFACE_P_H
 
-#include "videosurface.h"
-#include "videoitem.h"
+#include "VideoSurface.h"
+#include "VideoItem.h"
 
 class VideoSurfacePrivate
 {
diff --git a/src/ui/flightdisplay/FlightDisplay.cc b/src/ui/flightdisplay/FlightDisplay.cc
index 8f53f13759069d51d35620a2871aebd4a30ea7fd..f3b8938d6c42ab114e38aade1ad9cf485d9a7f0d 100644
--- a/src/ui/flightdisplay/FlightDisplay.cc
+++ b/src/ui/flightdisplay/FlightDisplay.cc
@@ -32,8 +32,8 @@ This file is part of the QGROUNDCONTROL project
 #include <QSettings>
 
 #if defined(QGC_GST_STREAMING)
-#include <videoitem.h>
-#include <videosurface.h>
+#include <VideoItem.h>
+#include <VideoSurface.h>
 #include "VideoReceiver.h"
 #endif