diff --git a/ground/gcs/src/libs/opmapcontrol/src/mapwidget/opmapwidget.cpp b/ground/gcs/src/libs/opmapcontrol/src/mapwidget/opmapwidget.cpp
index ee28e2501..f38632da4 100644
--- a/ground/gcs/src/libs/opmapcontrol/src/mapwidget/opmapwidget.cpp
+++ b/ground/gcs/src/libs/opmapcontrol/src/mapwidget/opmapwidget.cpp
@@ -26,9 +26,11 @@
  */
 
 #include "opmapwidget.h"
+#include "waypointitem.h"
+
 #include <QtGui>
 #include <QMetaObject>
-#include "waypointitem.h"
+#include <QOpenGLWidget>
 
 namespace mapcontrol {
 OPMapWidget::OPMapWidget(QWidget *parent, Configuration *config) : QGraphicsView(parent), configuration(config), UAV(0), GPS(0), Home(0)
@@ -210,7 +212,7 @@ void OPMapWidget::SetUseOpenGL(const bool &value)
 {
     useOpenGL = value;
     if (useOpenGL) {
-        setViewport(new QGLWidget(QGLFormat(QGL::SampleBuffers)));
+        setViewport(new QOpenGLWidget()); // QGLFormat(QGL::SampleBuffers)));
     } else {
         setupViewport(new QWidget());
     }
diff --git a/ground/gcs/src/libs/opmapcontrol/src/mapwidget/opmapwidget.h b/ground/gcs/src/libs/opmapcontrol/src/mapwidget/opmapwidget.h
index 895baf452..4f7d9d7fc 100644
--- a/ground/gcs/src/libs/opmapcontrol/src/mapwidget/opmapwidget.h
+++ b/ground/gcs/src/libs/opmapcontrol/src/mapwidget/opmapwidget.h
@@ -33,11 +33,7 @@
 #include "../core/languagetype.h"
 #include "../core/diagnostics.h"
 #include "configuration.h"
-#include <QObject>
-#include <QtOpenGL/QGLWidget>
 #include "waypointitem.h"
-#include "QtSvg/QGraphicsSvgItem"
-#include "QGraphicsView"
 #include "uavitem.h"
 #include "gpsitem.h"
 #include "homeitem.h"
@@ -45,6 +41,11 @@
 #include "waypointline.h"
 #include "waypointcircle.h"
 #include "waypointitem.h"
+
+#include <QObject>
+#include "QtSvg/QGraphicsSvgItem"
+#include "QGraphicsView"
+
 namespace mapcontrol {
 class UAVItem;
 class GPSItem;
diff --git a/ground/gcs/src/plugins/dial/dialgadgetwidget.cpp b/ground/gcs/src/plugins/dial/dialgadgetwidget.cpp
index 14bfba5cb..ac7f9e46b 100644
--- a/ground/gcs/src/plugins/dial/dialgadgetwidget.cpp
+++ b/ground/gcs/src/plugins/dial/dialgadgetwidget.cpp
@@ -30,7 +30,7 @@
 #include <utils/stylehelper.h>
 #include <iostream>
 #include <math.h>
-#include <QtOpenGL/QGLWidget>
+#include <QOpenGLWidget>
 #include <QDebug>
 
 DialGadgetWidget::DialGadgetWidget(QWidget *parent) : QGraphicsView(parent)
@@ -75,7 +75,7 @@ DialGadgetWidget::~DialGadgetWidget()
 void DialGadgetWidget::enableOpenGL(bool flag)
 {
     if (flag) {
-        setViewport(new QGLWidget(QGLFormat(QGL::SampleBuffers)));
+        setViewport(new QOpenGLWidget()); // QGLFormat(QGL::SampleBuffers)));
     } else {
         setViewport(new QWidget);
     }
diff --git a/ground/gcs/src/plugins/gcscontrol/joystickcontrol.cpp b/ground/gcs/src/plugins/gcscontrol/joystickcontrol.cpp
index 2d8dfdd6c..6d0a44ce7 100644
--- a/ground/gcs/src/plugins/gcscontrol/joystickcontrol.cpp
+++ b/ground/gcs/src/plugins/gcscontrol/joystickcontrol.cpp
@@ -29,7 +29,7 @@
 #include "extensionsystem/pluginmanager.h"
 #include <QDebug>
 #include <QWidget>
-#include <QtOpenGL/QGLWidget>
+#include <QOpenGLWidget>
 #include <QMouseEvent>
 
 /**
@@ -85,7 +85,7 @@ JoystickControl::~JoystickControl()
 void JoystickControl::enableOpenGL(bool flag)
 {
     if (flag) {
-        setViewport(new QGLWidget(QGLFormat(QGL::SampleBuffers)));
+        setViewport(new QOpenGLWidget()); // QGLFormat(QGL::SampleBuffers)));
     } else {
         setViewport(new QWidget);
     }
diff --git a/ground/gcs/src/plugins/lineardial/lineardialgadgetwidget.cpp b/ground/gcs/src/plugins/lineardial/lineardialgadgetwidget.cpp
index 8bc583ff6..9bfb4a84f 100644
--- a/ground/gcs/src/plugins/lineardial/lineardialgadgetwidget.cpp
+++ b/ground/gcs/src/plugins/lineardial/lineardialgadgetwidget.cpp
@@ -28,7 +28,7 @@
 #include "lineardialgadgetwidget.h"
 #include <utils/stylehelper.h>
 #include <QFileDialog>
-#include <QtOpenGL/QGLWidget>
+#include <QOpenGLWidget>
 #include <QDebug>
 
 LineardialGadgetWidget::LineardialGadgetWidget(QWidget *parent) : QGraphicsView(parent)
@@ -66,7 +66,7 @@ LineardialGadgetWidget::~LineardialGadgetWidget()
 void LineardialGadgetWidget::enableOpenGL(bool flag)
 {
     if (flag) {
-        setViewport(new QGLWidget(QGLFormat(QGL::SampleBuffers)));
+        setViewport(new QOpenGLWidget()); // QGLFormat(QGL::SampleBuffers)));
     } else {
         setViewport(new QWidget);
     }
diff --git a/ground/gcs/src/plugins/qmlview/qmlviewgadgetwidget.cpp b/ground/gcs/src/plugins/qmlview/qmlviewgadgetwidget.cpp
index 808cf3e80..813061aa2 100644
--- a/ground/gcs/src/plugins/qmlview/qmlviewgadgetwidget.cpp
+++ b/ground/gcs/src/plugins/qmlview/qmlviewgadgetwidget.cpp
@@ -34,7 +34,6 @@
 
 #include <QDebug>
 #include <QSvgRenderer>
-#include <QtOpenGL/QGLWidget>
 #include <QtCore/qfileinfo.h>
 #include <QtCore/qdir.h>
 
diff --git a/ground/gcs/src/plugins/telemetry/monitorwidget.cpp b/ground/gcs/src/plugins/telemetry/monitorwidget.cpp
index 3f9dcfb20..405f326c9 100644
--- a/ground/gcs/src/plugins/telemetry/monitorwidget.cpp
+++ b/ground/gcs/src/plugins/telemetry/monitorwidget.cpp
@@ -198,18 +198,6 @@ MonitorWidget::~MonitorWidget()
     }
 }
 
-/*!
-   \brief Enables/Disables OpenGL
- */
-// void LineardialGadgetWidget::enableOpenGL(bool flag)
-// {
-// if (flag) {
-// setViewport(new QGLWidget(QGLFormat(QGL::SampleBuffers)));
-// } else {
-// setViewport(new QWidget);
-// }
-// }
-
 void MonitorWidget::telemetryConnected()
 {
     qDebug() << "telemetry connected";