diff --git a/Plugins/org.mitk.gui.qt.viewnavigator/CMakeLists.txt b/Plugins/org.mitk.gui.qt.viewnavigator/CMakeLists.txt
index 1c96798764..205e7b49fd 100644
--- a/Plugins/org.mitk.gui.qt.viewnavigator/CMakeLists.txt
+++ b/Plugins/org.mitk.gui.qt.viewnavigator/CMakeLists.txt
@@ -1,5 +1,6 @@
 project(org_mitk_gui_qt_viewnavigator)
 
 mitk_create_plugin(
   EXPORT_DIRECTIVE VIEWNAVIGATOR_EXPORT
+  EXPORTED_INCLUDE_SUFFIXES src
 )
diff --git a/Plugins/org.mitk.gui.qt.viewnavigator/files.cmake b/Plugins/org.mitk.gui.qt.viewnavigator/files.cmake
index 54a4224db3..31ef356114 100644
--- a/Plugins/org.mitk.gui.qt.viewnavigator/files.cmake
+++ b/Plugins/org.mitk.gui.qt.viewnavigator/files.cmake
@@ -1,26 +1,26 @@
 set(CPP_FILES
   src/internal/mitkPluginActivator.cpp
-  src/internal/QmitkCategoryItem.cpp
-  src/internal/QmitkCategoryItem.h
-  src/internal/QmitkViewItem.cpp
-  src/internal/QmitkViewItem.h
-  src/internal/QmitkViewNavigatorView.cpp
-  src/internal/QmitkViewModel.cpp
-  src/internal/QmitkViewModel.h
-  src/internal/QmitkViewProxyModel.cpp
-  src/internal/QmitkViewProxyModel.h
+  src/QmitkCategoryItem.cpp
+  src/QmitkCategoryItem.h
+  src/QmitkViewItem.cpp
+  src/QmitkViewItem.h
+  src/QmitkViewNavigatorView.cpp
+  src/QmitkViewModel.cpp
+  src/QmitkViewModel.h
+  src/QmitkViewProxyModel.cpp
+  src/QmitkViewProxyModel.h
 )
 
 set(MOC_H_FILES
   src/internal/mitkPluginActivator.h
-  src/internal/QmitkViewNavigatorView.h
+  src/QmitkViewNavigatorView.h
 )
 
 set(UI_FILES
-  src/internal/QmitkViewNavigatorView.ui
+  src/QmitkViewNavigatorView.ui
 )
 
 set(CACHED_RESOURCE_FILES
   resources/view-manager.svg
   plugin.xml
 )
diff --git a/Plugins/org.mitk.gui.qt.viewnavigator/src/internal/QmitkCategoryItem.cpp b/Plugins/org.mitk.gui.qt.viewnavigator/src/QmitkCategoryItem.cpp
similarity index 100%
rename from Plugins/org.mitk.gui.qt.viewnavigator/src/internal/QmitkCategoryItem.cpp
rename to Plugins/org.mitk.gui.qt.viewnavigator/src/QmitkCategoryItem.cpp
diff --git a/Plugins/org.mitk.gui.qt.viewnavigator/src/internal/QmitkCategoryItem.h b/Plugins/org.mitk.gui.qt.viewnavigator/src/QmitkCategoryItem.h
similarity index 100%
rename from Plugins/org.mitk.gui.qt.viewnavigator/src/internal/QmitkCategoryItem.h
rename to Plugins/org.mitk.gui.qt.viewnavigator/src/QmitkCategoryItem.h
diff --git a/Plugins/org.mitk.gui.qt.viewnavigator/src/internal/QmitkViewItem.cpp b/Plugins/org.mitk.gui.qt.viewnavigator/src/QmitkViewItem.cpp
similarity index 100%
rename from Plugins/org.mitk.gui.qt.viewnavigator/src/internal/QmitkViewItem.cpp
rename to Plugins/org.mitk.gui.qt.viewnavigator/src/QmitkViewItem.cpp
diff --git a/Plugins/org.mitk.gui.qt.viewnavigator/src/internal/QmitkViewItem.h b/Plugins/org.mitk.gui.qt.viewnavigator/src/QmitkViewItem.h
similarity index 100%
rename from Plugins/org.mitk.gui.qt.viewnavigator/src/internal/QmitkViewItem.h
rename to Plugins/org.mitk.gui.qt.viewnavigator/src/QmitkViewItem.h
diff --git a/Plugins/org.mitk.gui.qt.viewnavigator/src/internal/QmitkViewModel.cpp b/Plugins/org.mitk.gui.qt.viewnavigator/src/QmitkViewModel.cpp
similarity index 100%
rename from Plugins/org.mitk.gui.qt.viewnavigator/src/internal/QmitkViewModel.cpp
rename to Plugins/org.mitk.gui.qt.viewnavigator/src/QmitkViewModel.cpp
diff --git a/Plugins/org.mitk.gui.qt.viewnavigator/src/internal/QmitkViewModel.h b/Plugins/org.mitk.gui.qt.viewnavigator/src/QmitkViewModel.h
similarity index 100%
rename from Plugins/org.mitk.gui.qt.viewnavigator/src/internal/QmitkViewModel.h
rename to Plugins/org.mitk.gui.qt.viewnavigator/src/QmitkViewModel.h
diff --git a/Plugins/org.mitk.gui.qt.viewnavigator/src/internal/QmitkViewNavigatorView.cpp b/Plugins/org.mitk.gui.qt.viewnavigator/src/QmitkViewNavigatorView.cpp
similarity index 100%
rename from Plugins/org.mitk.gui.qt.viewnavigator/src/internal/QmitkViewNavigatorView.cpp
rename to Plugins/org.mitk.gui.qt.viewnavigator/src/QmitkViewNavigatorView.cpp
diff --git a/Plugins/org.mitk.gui.qt.viewnavigator/src/internal/QmitkViewNavigatorView.h b/Plugins/org.mitk.gui.qt.viewnavigator/src/QmitkViewNavigatorView.h
similarity index 100%
rename from Plugins/org.mitk.gui.qt.viewnavigator/src/internal/QmitkViewNavigatorView.h
rename to Plugins/org.mitk.gui.qt.viewnavigator/src/QmitkViewNavigatorView.h
diff --git a/Plugins/org.mitk.gui.qt.viewnavigator/src/internal/QmitkViewNavigatorView.ui b/Plugins/org.mitk.gui.qt.viewnavigator/src/QmitkViewNavigatorView.ui
similarity index 100%
rename from Plugins/org.mitk.gui.qt.viewnavigator/src/internal/QmitkViewNavigatorView.ui
rename to Plugins/org.mitk.gui.qt.viewnavigator/src/QmitkViewNavigatorView.ui
diff --git a/Plugins/org.mitk.gui.qt.viewnavigator/src/internal/QmitkViewProxyModel.cpp b/Plugins/org.mitk.gui.qt.viewnavigator/src/QmitkViewProxyModel.cpp
similarity index 100%
rename from Plugins/org.mitk.gui.qt.viewnavigator/src/internal/QmitkViewProxyModel.cpp
rename to Plugins/org.mitk.gui.qt.viewnavigator/src/QmitkViewProxyModel.cpp
diff --git a/Plugins/org.mitk.gui.qt.viewnavigator/src/internal/QmitkViewProxyModel.h b/Plugins/org.mitk.gui.qt.viewnavigator/src/QmitkViewProxyModel.h
similarity index 100%
rename from Plugins/org.mitk.gui.qt.viewnavigator/src/internal/QmitkViewProxyModel.h
rename to Plugins/org.mitk.gui.qt.viewnavigator/src/QmitkViewProxyModel.h
diff --git a/Plugins/org.mitk.gui.qt.viewnavigator/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.gui.qt.viewnavigator/src/internal/mitkPluginActivator.cpp
index bc5345b23e..b22855c5e3 100644
--- a/Plugins/org.mitk.gui.qt.viewnavigator/src/internal/mitkPluginActivator.cpp
+++ b/Plugins/org.mitk.gui.qt.viewnavigator/src/internal/mitkPluginActivator.cpp
@@ -1,23 +1,23 @@
 /*============================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center (DKFZ)
 All rights reserved.
 
 Use of this source code is governed by a 3-clause BSD license that can be
 found in the LICENSE file.
 
 ============================================================================*/
 
 #include "mitkPluginActivator.h"
-#include "QmitkViewNavigatorView.h"
+#include <QmitkViewNavigatorView.h>
 
 void mitk::PluginActivator::start(ctkPluginContext* context)
 {
   BERRY_REGISTER_EXTENSION_CLASS(QmitkViewNavigatorView, context)
 }
 
 void mitk::PluginActivator::stop(ctkPluginContext*)
 {
 }