okay maybe not

app/widget/colorwheel/colorswatchwidget.cpp

@@ -22,8 +22,6 @@
 
 #include <QMouseEvent>
 
-#include "render/backend/opengl/openglrenderfunctions.h"
-
 OLIVE_NAMESPACE_ENTER
 
 ColorSwatchWidget::ColorSwatchWidget(QWidget *parent) :

app/widget/colorwheel/colorswatchwidget.h

@@ -23,7 +23,6 @@
 
 #include <QOpenGLWidget>
 
-#include "render/backend/opengl/openglshader.h"
 #include "render/color.h"
 #include "render/colorprocessor.h"
 

app/widget/colorwheel/colorwheelwidget.h

@@ -24,7 +24,6 @@
 #include <QOpenGLWidget>
 
 #include "colorswatchwidget.h"
-#include "render/backend/opengl/openglshader.h"
 #include "render/color.h"
 
 OLIVE_NAMESPACE_ENTER

app/widget/scope/waveform/waveform.cpp

@@ -36,7 +36,7 @@ WaveformScope::WaveformScope(QWidget* parent) :
 {
 }
 
-OpenGLShaderPtr WaveformScope::CreateShader()
+QVariant WaveformScope::CreateShader()
 {
   OpenGLShaderPtr pipeline = OpenGLShader::Create();
 

app/widget/scope/waveform/waveform.h

@@ -32,7 +32,7 @@ public:
   WaveformScope(QWidget* parent = nullptr);
 
 protected:
-  virtual OpenGLShaderPtr CreateShader() override;
+  virtual QVariant CreateShader() override;
 
   virtual void DrawScope() override;
 

app/widget/timelinewidget/view/timelineviewblockitem.cpp

@@ -94,8 +94,6 @@ void TimelineViewBlockItem::paint(QPainter *painter, const QStyleOptionGraphicsI
     painter->setPen(QColor(64, 64, 64));
     TrackOutput* track = TrackOutput::TrackFromBlock(block_);
     if (track) {
-      QMutexLocker locker(track->waveform_lock());
-
       AudioVisualWaveform::DrawWaveform(painter,
                                         rect().toRect(),
                                         this->GetScale(),

app/widget/viewer/viewerdisplay.h

@@ -22,10 +22,9 @@
 #define VIEWERGLWIDGET_H
 
 #include <QOpenGLWidget>
+#include <QMatrix4x4>
 
 #include "node/node.h"
-#include "render/backend/opengl/openglcolorprocessor.h"
-#include "render/backend/opengl/openglshader.h"
 #include "render/color.h"
 #include "render/colormanager.h"
 #include "tool/tool.h"