diff --git a/Modules/ModuleList.cmake b/Modules/ModuleList.cmake
index 8b765b5939..3666bc1792 100644
--- a/Modules/ModuleList.cmake
+++ b/Modules/ModuleList.cmake
@@ -1,78 +1,79 @@
 # The entries in the mitk_modules list must be
 # ordered according to their dependencies.
 
 set(mitk_modules
   Core
   CommandLine
   AppUtil
   DCMTesting
   RDF
   LegacyIO
   DataTypesExt
   Annotation
   LegacyGL
   AlgorithmsExt
   MapperExt
   DICOMReader
   DICOMReaderServices
   DICOMTesting
   SceneSerializationBase
   PlanarFigure
   ImageDenoising
   ImageExtraction
   SceneSerialization
   Gizmo
   GraphAlgorithms
   Multilabel
   ImageStatistics
   ContourModel
   SurfaceInterpolation
   Segmentation
   PlanarFigureSegmentation
+  OpenViewCore
   QtWidgets
   QtWidgetsExt
   Chart
   QmlItems
   SegmentationUI
   Classification
   DiffusionImaging
   GPGPU
   OpenIGTLink
   IGTBase
   IGT
   CameraCalibration
   OpenCL
   OpenCVVideoSupport
   QtOverlays
   ToFHardware
   ToFProcessing
   ToFUI
   US
   USUI
   DicomUI
   Simulation
   Remeshing
   Python
   QtPython
   Persistence
   OpenIGTLinkUI
   IGTUI
   DicomRT
   RTUI
   IOExt
   XNAT
   TubeGraph
   BiophotonicsHardware
   TumorInvasionAnalysis
   MatchPointRegistration
   MatchPointRegistrationUI
   BoundingShape
   RenderWindowManager
   RenderWindowManagerUI
   CEST
   DICOMQI
 )
 
 if(MITK_ENABLE_PIC_READER)
   list(APPEND mitk_modules IpPicSupportIO)
 endif()
diff --git a/Modules/OpenViewCore/src/vtkInternalOpenGLRenderWindow.cxx b/Modules/OpenViewCore/src/vtkInternalOpenGLRenderWindow.cxx
index 8743363367..d6d5ac4b1a 100644
--- a/Modules/OpenViewCore/src/vtkInternalOpenGLRenderWindow.cxx
+++ b/Modules/OpenViewCore/src/vtkInternalOpenGLRenderWindow.cxx
@@ -1,80 +1,80 @@
 /*===================================================================
 
  The Medical Imaging Interaction Toolkit (MITK)
 
  Copyright (c) German Cancer Research Center,
  Division of Medical and Biological Informatics.
  All rights reserved.
 
  This software is distributed WITHOUT ANY WARRANTY; without
  even the implied warranty of MERCHANTABILITY or FITNESS FOR
  A PARTICULAR PURPOSE.
 
  See LICENSE.txt or http://www.mitk.org for details.
 
  ===================================================================*/
 
 #include "vtk_glew.h"
-#include "QVTKInternalOpenglRenderWindow.h"
+#include "vtkInternalOpenGLRenderWindow.h"
 #include "QVTKFramebufferObjectRenderer.h"
 
 #include <vtkObjectFactory.h>
 
 vtkStandardNewMacro(vtkInternalOpenGLRenderWindow);
 
 vtkInternalOpenGLRenderWindow::~vtkInternalOpenGLRenderWindow()
 {
   this->OffScreenRendering = false;
 }
 
 vtkInternalOpenGLRenderWindow::vtkInternalOpenGLRenderWindow() :
 QtParentRenderer(0)
 {
 }
 
 void vtkInternalOpenGLRenderWindow::InternalRender()
 {
   Superclass::Render();
 }
 
 void vtkInternalOpenGLRenderWindow::OpenGLEndState()
 {
   glDepthMask(GL_TRUE);
 }
 
 void vtkInternalOpenGLRenderWindow::OpenGLInitState()
 {
   Superclass::OpenGLInitState();
 //  vtkgl::UseProgram(0); TODO18922
   glEnable(GL_BLEND);
   glHint(GL_CLIP_VOLUME_CLIPPING_HINT_EXT, GL_FASTEST);
   glDepthMask(GL_TRUE);
 }
 
 void vtkInternalOpenGLRenderWindow::Render()
 {
   if (this->QtParentRenderer)
   {
     this->QtParentRenderer->update();
   }
 }
 
 void vtkInternalOpenGLRenderWindow::SetFramebufferObject(QOpenGLFramebufferObject *fbo)
 {
   this->SetFrontBuffer(GL_COLOR_ATTACHMENT0);
   this->SetFrontLeftBuffer(GL_COLOR_ATTACHMENT0);
   this->SetBackBuffer(GL_COLOR_ATTACHMENT0);
   this->SetBackLeftBuffer(GL_COLOR_ATTACHMENT0);
 
   QSize fboSize = fbo->size();
   this->SetSize(fboSize.width(), fboSize.height());
 
   this->NumberOfFrameBuffers    = 1;
   this->FrameBufferObject       = static_cast<unsigned int>(fbo->handle());
   this->DepthRenderBufferObject = 0; // static_cast<unsigned int>(depthRenderBufferObject);
   this->TextureObjects[0]       = static_cast<unsigned int>(fbo->texture());
   this->OffScreenRendering	  = true;
   this->OffScreenUseFrameBuffer = true;
 
   this->Modified();
 }
diff --git a/Plugins/org.mitk.gui.qt.moviemaker/CMakeLists.txt b/Plugins/org.mitk.gui.qt.moviemaker/CMakeLists.txt
index 08a202e5d0..d38a3d1797 100644
--- a/Plugins/org.mitk.gui.qt.moviemaker/CMakeLists.txt
+++ b/Plugins/org.mitk.gui.qt.moviemaker/CMakeLists.txt
@@ -1,10 +1,10 @@
 # The project name must correspond to the directory name of your plug-in
 # and must not contain periods.
 project(org_mitk_gui_qt_moviemaker)
 
 mitk_create_plugin(
   EXPORT_DIRECTIVE MOVIEMAKER_EXPORT
   EXPORTED_INCLUDE_SUFFIXES src
-  MODULE_DEPENDS MitkQtWidgetsExt MitkOpenViewCore
+  MODULE_DEPENDS MitkQtWidgetsExt
   PACKAGE_DEPENDS VTK|vtkTestingCore
 )