diff --git a/App/NatronApp_main.cpp b/App/NatronApp_main.cpp
index 88902f6eba..a43dc2de36 100644
--- a/App/NatronApp_main.cpp
+++ b/App/NatronApp_main.cpp
@@ -23,7 +23,7 @@
 #include <Python.h>
 // ***** END PYTHON BLOCK *****
 
-#include <QtCore/QtGlobal> // for Q_OS_*
+#include <QtGlobal> // for Q_OS_*
 #if defined(Q_OS_UNIX)
 #include <sys/time.h>     // for getrlimit on linux
 #include <sys/resource.h> // for getrlimit
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13c18c12a1..199062bb99 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,6 +28,9 @@ project(Natron
 
 set(CMAKE_CXX_STANDARD 17)
 
+include(GNUInstallDirs)
+
+option(NATRON_QT6 "use Qt6" OFF)
 option(NATRON_SYSTEM_LIBS "use system versions of dependencies instead of bundled ones" OFF)
 option(NATRON_BUILD_TESTS "build the Natron test suite" ON)
 
@@ -55,29 +58,55 @@ if(WIN32)
     set(Python3_FIND_REGISTRY NEVER)
 endif()
 find_package(Python3 COMPONENTS Interpreter Development)
-find_package(Qt5 5.15 CONFIG REQUIRED COMPONENTS Core Gui Network Widgets Concurrent)
 
 if(IS_DEBUG_BUILD AND WIN32)
     # Explicitly setting SHIBOKEN_PYTHON_LIBRARIES variable to avoid PYTHON_DEBUG_LIBRARY-NOTFOUND
     # link errors on Windows debug builds.
     set(SHIBOKEN_PYTHON_LIBRARIES ${Python3_LIBRARIES})
 endif()
-find_package(Shiboken2 5.15 CONFIG REQUIRED COMPONENTS libshiboken2 shiboken2)
 
-if(IS_DEBUG_BUILD AND WIN32)
-    # Remove NDEBUG from Shiboken2 INTERFACE_COMPILE_DEFINITIONS so it is not inherited in debug builds.
-    get_property(ShibokenInterfaceDefs TARGET Shiboken2::libshiboken PROPERTY INTERFACE_COMPILE_DEFINITIONS)
-    list(REMOVE_ITEM ShibokenInterfaceDefs NDEBUG)
-    set_property(TARGET Shiboken2::libshiboken PROPERTY INTERFACE_COMPILE_DEFINITIONS ShibokenInterfaceDefs)
+set(QT_COMPONENTS Core Gui Network Widgets Concurrent)
+if(NATRON_QT6)
+    list(APPEND QT_COMPONENTS OpenGLWidgets)
+    find_package(Qt6 6.3 CONFIG REQUIRED COMPONENTS ${QT_COMPONENTS})
+    find_package(Shiboken6 6.3 CONFIG REQUIRED COMPONENTS libshiboken6)
+    find_package(Shiboken6Tools 6.3 CONFIG REQUIRED COMPONENTS shiboken6)
+    find_package(PySide6 6.3 CONFIG REQUIRED COMPONENTS pyside6)
+    set(QT_VERSION_MAJOR 6)
+    set(PYSIDE_VERSION_MAJOR 6)
+
+    get_target_property(PYSIDE_INCLUDE_DIRS PySide6::pyside6 INTERFACE_INCLUDE_DIRECTORIES)
+    set(QTCORE_INCLUDE_DIRS ${Qt6Core_INCLUDE_DIRS})
+    set(QTGUI_INCLUDE_DIRS ${Qt6Gui_INCLUDE_DIRS})
+    set(QTWIDGETS_INCLUDE_DIRS ${Qt6Widgets_INCLUDE_DIRS})
+
+    set(SHIBOKEN_EXE Shiboken6::shiboken6)
+    set(SHIBOKEN_LIB Shiboken6::libshiboken)
+    set(PYSIDE_LIB PySide6::pyside6)
+else()
+    find_package(Qt5 5.15 CONFIG REQUIRED COMPONENTS ${QT_COMPONENTS})
+    find_package(Shiboken2 5.15 CONFIG REQUIRED COMPONENTS libshiboken2 shiboken2)
+
+    find_package(PySide2 5.15 CONFIG REQUIRED COMPONENTS pyside2)
+    set(QT_VERSION_MAJOR 5)
+    set(PYSIDE_VERSION_MAJOR 2)
+
+    get_target_property(PYSIDE_INCLUDE_DIRS PySide2::pyside2 INTERFACE_INCLUDE_DIRECTORIES)
+    set(QTCORE_INCLUDE_DIRS ${Qt5Core_INCLUDE_DIRS})
+    set(QTGUI_INCLUDE_DIRS ${Qt5Gui_INCLUDE_DIRS})
+    set(QTWIDGETS_INCLUDE_DIRS ${Qt5Widgets_INCLUDE_DIRS})
+
+    set(SHIBOKEN_EXE Shiboken2::shiboken2)
+    set(SHIBOKEN_LIB Shiboken2::libshiboken)
+    set(PYSIDE_LIB PySide2::pyside2)
 endif()
 
-find_package(PySide2 5.15 CONFIG REQUIRED COMPONENTS pyside2)
-set(QT_VERSION_MAJOR 5)
-get_target_property(PYSIDE_INCLUDE_DIRS PySide2::pyside2 INTERFACE_INCLUDE_DIRECTORIES)
-string(REGEX REPLACE "(.*)QtCore$" "\\1" Qt5_INCLUDE_DIR ${Qt5Core_INCLUDE_DIRS})
-set(QTCORE_INCLUDE_DIRS ${Qt5_INCLUDE_DIR} ${Qt5Core_INCLUDE_DIRS})
-set(QTGUI_INCLUDE_DIRS ${Qt5Gui_INCLUDE_DIRS})
-set(QTWIDGETS_INCLUDE_DIRS ${Qt5Widgets_INCLUDE_DIRS})
+if(IS_DEBUG_BUILD AND WIN32)
+    # Remove NDEBUG from Shiboken INTERFACE_COMPILE_DEFINITIONS so it is not inherited in debug builds.
+    get_property(SHIBOKEN_DEFS TARGET ${SHIBOKEN_LIB} PROPERTY INTERFACE_COMPILE_DEFINITIONS)
+    list(REMOVE_ITEM SHIBOKEN_DEFS NDEBUG)
+    set_property(TARGET ${SHIBOKEN_LIB} PROPERTY INTERFACE_COMPILE_DEFINITIONS SHIBOKEN_DEFS)
+endif()
 
 #Since in Natron and OpenFX all strings are supposed UTF-8 and that the constructor
 #for QString(const char*) assumes ASCII strings, we may run into troubles
@@ -120,8 +149,6 @@ elseif(WIN32)
     endif()
 endif()
 
-include(GNUInstallDirs)
-
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 
diff --git a/Engine/AbortableRenderInfo.cpp b/Engine/AbortableRenderInfo.cpp
index c61c4d9ce6..2660c85bca 100644
--- a/Engine/AbortableRenderInfo.cpp
+++ b/Engine/AbortableRenderInfo.cpp
@@ -30,10 +30,10 @@
 #include <string>
 #include <cassert>
 
-#include <QtCore/QMutex>
-#include <QtCore/QAtomicInt>
-#include <QtCore/QTimer>
-#include <QtCore/QDebug>
+#include <QMutex>
+#include <QAtomicInt>
+#include <QTimer>
+#include <QDebug>
 
 #include "Engine/AppManager.h"
 #include "Engine/EffectInstance.h"
diff --git a/Engine/AbortableRenderInfo.h b/Engine/AbortableRenderInfo.h
index 30e035143e..e098cb3fb7 100644
--- a/Engine/AbortableRenderInfo.h
+++ b/Engine/AbortableRenderInfo.h
@@ -30,7 +30,7 @@
 
 #include "Global/GlobalDefines.h"
 
-#include <QtCore/QObject>
+#include <QObject>
 
 #include "Engine/EngineFwd.h"
 
diff --git a/Engine/AppInstance.cpp b/Engine/AppInstance.cpp
index c69ea7f519..e1067c87a2 100644
--- a/Engine/AppInstance.cpp
+++ b/Engine/AppInstance.cpp
@@ -33,15 +33,15 @@
 #include <stdexcept>
 #include <sstream> // stringstream
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
-#include <QtCore/QTextStream>
+#include <QCoreApplication>
+#include <QDir>
+#include <QTextStream>
 #include <QtConcurrentMap> // QtCore on Qt4, QtConcurrent on Qt5
-#include <QtCore/QUrl>
-#include <QtCore/QFileInfo>
-#include <QtCore/QEventLoop>
-#include <QtCore/QSettings>
-#include <QtNetwork/QNetworkReply>
+#include <QUrl>
+#include <QFileInfo>
+#include <QEventLoop>
+#include <QSettings>
+#include <QNetworkReply>
 
 // ofxhPropertySuite.h:565:37: warning: 'this' pointer cannot be null in well-defined C++ code; comparison may be assumed to always evaluate to true [-Wtautological-undefined-compare]
 // clang-format off
diff --git a/Engine/AppInstance.h b/Engine/AppInstance.h
index 60b5856a2d..ab3561194c 100644
--- a/Engine/AppInstance.h
+++ b/Engine/AppInstance.h
@@ -35,9 +35,9 @@
 #include <limits>
 #include <cstddef>              // for NULL
 
-#include <QtCore/QtGlobal>      // for Q_UNUSED
-#include <QtCore/QObject>  // for Q_OBJECT, Q_SIGNALS, Q_SLOTS
-#include <QtCore/QMutex>
+#include <QtGlobal>      // for Q_UNUSED
+#include <QObject>  // for Q_OBJECT, Q_SIGNALS, Q_SLOTS
+#include <QMutex>
 
 #include "Global/GlobalDefines.h"
 #include "Engine/RectD.h"
@@ -193,22 +193,22 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON
     virtual void warningDialog(const std::string & title, const std::string & message, bool* stopAsking, bool useHtml) const;
     virtual void informationDialog(const std::string & title, const std::string & message, bool useHtml) const;
     virtual void informationDialog(const std::string & title, const std::string & message, bool* stopAsking, bool useHtml) const;
-    virtual NATRON_ENUM::StandardButtonEnum questionDialog(const std::string & title,
+    virtual Natron::StandardButtonEnum questionDialog(const std::string & title,
                                               const std::string & message,
                                               bool useHtml,
-                                              NATRON_ENUM::StandardButtons buttons =
-                                                  NATRON_ENUM::StandardButtons(NATRON_ENUM::eStandardButtonYes | NATRON_ENUM::eStandardButtonNo),
-                                              NATRON_ENUM::StandardButtonEnum defaultButton = NATRON_ENUM::eStandardButtonNoButton) const WARN_UNUSED_RETURN;
+                                              Natron::StandardButtons buttons =
+                                                  Natron::StandardButtons(Natron::StandardButtonEnum::eStandardButtonYes | Natron::StandardButtonEnum::eStandardButtonNo),
+                                              Natron::StandardButtonEnum defaultButton = Natron::StandardButtonEnum::eStandardButtonNoButton) const WARN_UNUSED_RETURN;
 
     /**
      * @brief Asks a question to the user and returns the reply.
      * @param stopAsking Set to true if the user do not want Natron to ask the question again.
      **/
-    virtual NATRON_ENUM::StandardButtonEnum questionDialog(const std::string & /*title*/,
+    virtual Natron::StandardButtonEnum questionDialog(const std::string & /*title*/,
                                               const std::string & /*message*/,
                                               bool /*useHtml*/,
-                                              NATRON_ENUM::StandardButtons /*buttons*/,
-                                              NATRON_ENUM::StandardButtonEnum /*defaultButton*/,
+                                              Natron::StandardButtons /*buttons*/,
+                                              Natron::StandardButtonEnum /*defaultButton*/,
                                               bool* /*stopAsking*/)
     {
         return eStandardButtonYes;
@@ -281,7 +281,7 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON
     {
     }
 
-    NATRON_ENUM::ViewerColorSpaceEnum getDefaultColorSpaceForBitDepth(NATRON_ENUM::ImageBitDepthEnum bitdepth) const;
+    Natron::ViewerColorSpaceEnum getDefaultColorSpaceForBitDepth(Natron::ImageBitDepthEnum bitdepth) const;
 
     double getProjectFrameRate() const;
 
diff --git a/Engine/AppManager.cpp b/Engine/AppManager.cpp
index 8712eec00e..9174556ee2 100644
--- a/Engine/AppManager.cpp
+++ b/Engine/AppManager.cpp
@@ -56,7 +56,7 @@
 #include <sstream> // stringstream
 #include <locale>
 
-#include <QtCore/QtGlobal> // for Q_OS_*
+#include <QtGlobal> // for Q_OS_*
 #if defined(Q_OS_LINUX)
 #include <sys/signal.h>
 #ifndef __USE_GNU
@@ -85,17 +85,17 @@
 #include <ceres/version.h>
 #include <openMVG/version.hpp>
 
-#include <QtCore/QDateTime>
-#include <QtCore/QDebug>
-#include <QtCore/QDir>
-#include <QtCore/QTextCodec>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QSettings>
-#include <QtCore/QThreadPool>
-#include <QtCore/QTextStream>
-#include <QtNetwork/QAbstractSocket>
-#include <QtNetwork/QLocalServer>
-#include <QtNetwork/QLocalSocket>
+#include <QDateTime>
+#include <QDebug>
+#include <QDir>
+#include <QTextCodec>
+#include <QCoreApplication>
+#include <QSettings>
+#include <QThreadPool>
+#include <QTextStream>
+#include <QAbstractSocket>
+#include <QLocalServer>
+#include <QLocalSocket>
 
 
 #include "Global/ProcInfo.h"
diff --git a/Engine/AppManager.h b/Engine/AppManager.h
index f7de29dda9..9b56ff0ecb 100644
--- a/Engine/AppManager.h
+++ b/Engine/AppManager.h
@@ -35,14 +35,14 @@
 #include "Global/GlobalDefines.h"
 
 CLANG_DIAG_OFF(deprecated)
-#include <QtCore/QtGlobal> // for Q_OS_*
+#include <QtGlobal> // for Q_OS_*
 // /usr/include/qt5/QtCore/qgenericatomic.h:177:13: warning: 'register' storage class specifier is deprecated [-Wdeprecated]
-#include <QtCore/QObject>
+#include <QObject>
 CLANG_DIAG_ON(deprecated)
-#include <QtCore/QStringList>
-#include <QtCore/QString>
-#include <QtCore/QProcess>
-#include <QtCore/QMap>
+#include <QStringList>
+#include <QString>
+#include <QProcess>
+#include <QMap>
 
 #include "Engine/AfterQuitProcessingI.h"
 #include "Engine/Plugin.h"
@@ -494,7 +494,7 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON
     void setOFXHostHandle(void* handle);
 
     OFX::Host::ImageEffect::Descriptor* getPluginContextAndDescribe(OFX::Host::ImageEffect::ImageEffectPlugin* plugin,
-                                                                    NATRON_ENUM::ContextEnum* ctx);
+                                                                    Natron::ContextEnum* ctx);
     AppTLS* getAppTLS() const;
     const OfxHost* getOFXHost() const;
     GPUContextPool* getGPUContextPool() const;
@@ -567,7 +567,7 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON
 
     bool isTextureFloatSupported() const;
 
-    bool hasOpenGLForRequirements(NATRON_ENUM::OpenGLRequirementsTypeEnum type, QString* missingOpenGLError = 0) const;
+    bool hasOpenGLForRequirements(Natron::OpenGLRequirementsTypeEnum type, QString* missingOpenGLError = 0) const;
 
     virtual void updateAboutWindowLibrariesVersion() {}
 
@@ -736,14 +736,14 @@ void warningDialog(const std::string & title, const std::string & message, bool*
 void informationDialog(const std::string & title, const std::string & message, bool useHtml = false);
 void informationDialog(const std::string & title, const std::string & message, bool* stopAsking, bool useHtml = false);
 
-NATRON_ENUM::StandardButtonEnum questionDialog(const std::string & title, const std::string & message, bool useHtml,
-                                  NATRON_ENUM::StandardButtons buttons =
-                                      NATRON_ENUM::StandardButtons(NATRON_ENUM::eStandardButtonYes | NATRON_ENUM::eStandardButtonNo),
-                                  NATRON_ENUM::StandardButtonEnum defaultButton = NATRON_ENUM::eStandardButtonNoButton);
+Natron::StandardButtonEnum questionDialog(const std::string & title, const std::string & message, bool useHtml,
+                                  Natron::StandardButtons buttons =
+                                      Natron::StandardButtons(Natron::StandardButtonEnum::eStandardButtonYes | Natron::StandardButtonEnum::eStandardButtonNo),
+                                  Natron::StandardButtonEnum defaultButton = Natron::StandardButtonEnum::eStandardButtonNoButton);
 
-NATRON_ENUM::StandardButtonEnum questionDialog(const std::string & title, const std::string & message, bool useHtml,
-                                  NATRON_ENUM::StandardButtons buttons,
-                                  NATRON_ENUM::StandardButtonEnum defaultButton,
+Natron::StandardButtonEnum questionDialog(const std::string & title, const std::string & message, bool useHtml,
+                                  Natron::StandardButtons buttons,
+                                  Natron::StandardButtonEnum defaultButton,
                                   bool* stopAsking);
 } // namespace Dialogs
 
diff --git a/Engine/AppManagerPrivate.cpp b/Engine/AppManagerPrivate.cpp
index 6f396a3cb1..cca26393e8 100644
--- a/Engine/AppManagerPrivate.cpp
+++ b/Engine/AppManagerPrivate.cpp
@@ -25,7 +25,7 @@
 
 #include "AppManagerPrivate.h"
 
-#include <QtCore/QtGlobal> // for Q_OS_*
+#include <QtGlobal> // for Q_OS_*
 #if defined(Q_OS_UNIX)
 #include <sys/time.h>     // for getrlimit on linux
 #include <sys/resource.h> // for getrlimit
@@ -48,12 +48,12 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON
 GCC_DIAG_ON(unused-parameter)
 // clang-format on
 
-#include <QtCore/QDebug>
-#include <QtCore/QProcess>
-#include <QtCore/QTemporaryFile>
-#include <QtCore/QCoreApplication>
-#include <QtNetwork/QLocalServer>
-#include <QtNetwork/QLocalSocket>
+#include <QDebug>
+#include <QProcess>
+#include <QTemporaryFile>
+#include <QCoreApplication>
+#include <QLocalServer>
+#include <QLocalSocket>
 
 #include "Global/QtCompat.h" // for removeRecursively
 #include "Global/GlobalDefines.h"
diff --git a/Engine/AppManagerPrivate.h b/Engine/AppManagerPrivate.h
index fd62319095..9aeb47f6be 100644
--- a/Engine/AppManagerPrivate.h
+++ b/Engine/AppManagerPrivate.h
@@ -33,11 +33,11 @@
 #include <vector>
 #include <map>
 
-#include <QtCore/QtGlobal> // for Q_OS_*
-#include <QtCore/QMutex>
-#include <QtCore/QString>
-#include <QtCore/QAtomicInt>
-#include <QtCore/QCoreApplication>
+#include <QtGlobal> // for Q_OS_*
+#include <QMutex>
+#include <QString>
+#include <QAtomicInt>
+#include <QCoreApplication>
 
 
 #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
diff --git a/Engine/Bezier.cpp b/Engine/Bezier.cpp
index 1b30f5be8a..10df164382 100644
--- a/Engine/Bezier.cpp
+++ b/Engine/Bezier.cpp
@@ -33,8 +33,8 @@
 #include <cassert>
 #include <stdexcept>
 
-#include <QtCore/QLineF>
-#include <QtCore/QDebug>
+#include <QLineF>
+#include <QDebug>
 
 #include "Engine/RotoContextPrivate.h"
 
diff --git a/Engine/Bezier.h b/Engine/Bezier.h
index 3cd4cf6460..f50e16592b 100644
--- a/Engine/Bezier.h
+++ b/Engine/Bezier.h
@@ -35,7 +35,7 @@
 
 // clang-format off
 CLANG_DIAG_OFF(deprecated-declarations)
-#include <QtCore/QObject>
+#include <QObject>
 CLANG_DIAG_ON(deprecated-declarations)
 // clang-format on
 
diff --git a/Engine/BezierCP.cpp b/Engine/BezierCP.cpp
index 5e9f453627..1978208ec2 100644
--- a/Engine/BezierCP.cpp
+++ b/Engine/BezierCP.cpp
@@ -34,9 +34,9 @@
 #include <cassert>
 #include <stdexcept>
 
-#include <QtCore/QThread>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
+#include <QThread>
+#include <QCoreApplication>
+#include <QDebug>
 
 #include "Engine/Bezier.h"
 #include "Engine/KnobTypes.h"
diff --git a/Engine/BezierCPPrivate.h b/Engine/BezierCPPrivate.h
index 07501ba508..79d1af133a 100644
--- a/Engine/BezierCPPrivate.h
+++ b/Engine/BezierCPPrivate.h
@@ -28,8 +28,8 @@
 
 #include "Global/Macros.h"
 
-#include <QtCore/QMutex>
-#include <QtCore/QReadWriteLock>
+#include <QMutex>
+#include <QReadWriteLock>
 
 #include "Engine/Curve.h"
 #include "Engine/EngineFwd.h"
diff --git a/Engine/BlockingBackgroundRender.cpp b/Engine/BlockingBackgroundRender.cpp
index f3f761bbb6..1f6b21b9c3 100644
--- a/Engine/BlockingBackgroundRender.cpp
+++ b/Engine/BlockingBackgroundRender.cpp
@@ -31,7 +31,7 @@
 #include "Global/Macros.h"
 // clang-format off
 CLANG_DIAG_OFF(deprecated-register) //'register' storage class specifier is deprecated
-#include <QtCore/QDebug>
+#include <QDebug>
 CLANG_DIAG_ON(deprecated-register)
 // clang-format on
 
diff --git a/Engine/BlockingBackgroundRender.h b/Engine/BlockingBackgroundRender.h
index a6ce0c1472..f096fdf4b6 100644
--- a/Engine/BlockingBackgroundRender.h
+++ b/Engine/BlockingBackgroundRender.h
@@ -28,8 +28,8 @@
 
 #include "Global/Macros.h"
 
-#include <QtCore/QMutex>
-#include <QtCore/QWaitCondition>
+#include <QMutex>
+#include <QWaitCondition>
 
 #include "Engine/EngineFwd.h"
 
diff --git a/Engine/CLArgs.cpp b/Engine/CLArgs.cpp
index c5f6dd61e0..e91b46cee8 100644
--- a/Engine/CLArgs.cpp
+++ b/Engine/CLArgs.cpp
@@ -35,10 +35,10 @@
 #include <shellapi.h>  // CommandLineToArgvW
 #endif
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
+#include <QCoreApplication>
+#include <QDebug>
+#include <QFile>
+#include <QFileInfo>
 
 #include "Global/GlobalDefines.h"
 #include "Global/GitVersion.h"
diff --git a/Engine/CLArgs.h b/Engine/CLArgs.h
index d3761387c2..a6ca74cdf2 100644
--- a/Engine/CLArgs.h
+++ b/Engine/CLArgs.h
@@ -36,9 +36,9 @@
 
 #include "Global/GlobalDefines.h"
 CLANG_DIAG_OFF(deprecated)
-#include <QtCore/QStringList>
-#include <QtCore/QString>
-#include <QtCore/QCoreApplication>
+#include <QStringList>
+#include <QString>
+#include <QCoreApplication>
 CLANG_DIAG_ON(deprecated)
 
 #include "Engine/EngineFwd.h"
diff --git a/Engine/CMakeLists.txt b/Engine/CMakeLists.txt
index bd9eebda1e..576f7b2003 100644
--- a/Engine/CMakeLists.txt
+++ b/Engine/CMakeLists.txt
@@ -28,8 +28,7 @@ set(PYENGINE_OUT ${CMAKE_CURRENT_BINARY_DIR}/Qt${QT_VERSION_MAJOR})
 set(PYENGINE_INCLUDE_DIRS ${PYSIDE_INCLUDE_DIRS} ${PYSIDE_INCLUDE_DIRS}/QtCore)
 list(APPEND PYENGINE_INCLUDE_DIRS ${QTCORE_INCLUDE_DIRS} ${Python3_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
 list(TRANSFORM PYENGINE_INCLUDE_DIRS PREPEND "-I" OUTPUT_VARIABLE PYENGINE_INCS)
-set(PYENGINE_HEADER PySide2_Engine_Python.h)
-set(POST_SHIBOKEN ../tools/utils/runPostShiboken2.sh)
+set(PYENGINE_HEADER PySide${PYSIDE_VERSION_MAJOR}_Engine_Python.h)
 
 set(shiboken_args
     "-std=c++17" "--enable-parent-ctor-heuristic" "--use-isnull-as-nb_nonzero"
@@ -37,18 +36,15 @@ set(shiboken_args
     "-I." "-I.." "-I../Global" "-I../libs/OpenFX/include" ${PYENGINE_INCS}
     "-T${PYSIDE_TYPESYSTEMS}" "--output-directory=${PYENGINE_OUT}"
     "${PYENGINE_HEADER}" "typesystem_engine.xml")
-if(APPLE)
-    list(PREPEND shiboken_args -I${Qt5_DIR}/../../../include)
- endif()
- 
+
 execute_process(COMMAND ${Python3_EXECUTABLE} ../tools/utils/sourceList.py typesystem_engine.xml ${PYENGINE_OUT}
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     OUTPUT_VARIABLE PyEngine_SOURCES)
 set_property(SOURCE ${PyEngine_SOURCES} PROPERTY SKIP_AUTOGEN ON)
 add_custom_command(OUTPUT ${PyEngine_SOURCES}
-    COMMAND Shiboken2::shiboken2 ${shiboken_args}
-    COMMAND bash ${POST_SHIBOKEN} ${PYENGINE_OUT}/NatronEngine natronengine
-    DEPENDS ${PYENGINE_HEADER} ${NatronEngine_HEADERS} ${POST_SHIBOKEN} typesystem_engine.xml
+    COMMAND $<TARGET_FILE:${SHIBOKEN_EXE}> ${shiboken_args}
+    COMMAND ${Python3_EXECUTABLE} ../tools/utils/sourceCleanup.py typesystem_engine.xml ${PYENGINE_OUT}
+    DEPENDS ${SHIBOKEN_EXE} ${PYENGINE_HEADER} ${NatronEngine_HEADERS} ../tools/utils/sourceCleanup.py typesystem_engine.xml
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 
 if(UNIX AND NOT APPLE)
@@ -78,11 +74,11 @@ target_link_libraries(NatronEngine
         Boost::serialization
         PkgConfig::Cairo
     PRIVATE
-        Shiboken2::libshiboken
-        PySide2::pyside2
-        Qt5::Core
-        Qt5::Concurrent
-        Qt5::Network
+        ${SHIBOKEN_LIB}
+        ${PYSIDE_LIB}
+        Qt::Core
+        Qt::Concurrent
+        Qt::Network
         Python3::Module
         ${XDG_LIBS}
         ceres
@@ -112,5 +108,6 @@ target_compile_definitions(NatronEngine
     PRIVATE
         NATRON_CUSTOM_BUILD_USER_TOKEN="${BUILD_USER_NAME}"
         NATRON_BUILD_NUMBER=0
+        QT_NO_KEYWORDS
         ${XDG_DEFS}
 )
diff --git a/Engine/Cache.h b/Engine/Cache.h
index 018aef01f6..6a25e3ddca 100644
--- a/Engine/Cache.h
+++ b/Engine/Cache.h
@@ -44,13 +44,13 @@
 #include "Global/StrUtils.h"
 
 GCC_DIAG_OFF(deprecated)
-#include <QtCore/QMutex>
-#include <QtCore/QThread>
-#include <QtCore/QWaitCondition>
-#include <QtCore/QMutexLocker>
-#include <QtCore/QObject>
-#include <QtCore/QBuffer>
-#include <QtCore/QRunnable>
+#include <QMutex>
+#include <QThread>
+#include <QWaitCondition>
+#include <QMutexLocker>
+#include <QObject>
+#include <QBuffer>
+#include <QRunnable>
 GCC_DIAG_ON(deprecated)
 
 #include "Engine/AppManager.h" //for access to settings
diff --git a/Engine/CacheEntry.h b/Engine/CacheEntry.h
index c42a7ab4c5..ec5053ae0a 100644
--- a/Engine/CacheEntry.h
+++ b/Engine/CacheEntry.h
@@ -45,11 +45,11 @@
 #include <windows.h>
 #endif
 
-#include <QtCore/QFile>
-#include <QtCore/QMutex>
-#include <QtCore/QReadWriteLock>
-#include <QtCore/QDir>
-#include <QtCore/QDebug>
+#include <QFile>
+#include <QMutex>
+#include <QReadWriteLock>
+#include <QDir>
+#include <QDebug>
 
 #ifdef DEBUG
 #include <SequenceParsing.h> // for removePath
diff --git a/Engine/CurvePrivate.h b/Engine/CurvePrivate.h
index 65101f32f3..4d292c2b23 100644
--- a/Engine/CurvePrivate.h
+++ b/Engine/CurvePrivate.h
@@ -28,8 +28,8 @@
 
 #include "Global/Macros.h"
 
-#include <QtCore/QMutex>
-#include <QtCore/QRecursiveMutex>
+#include <QMutex>
+#include <QRecursiveMutex>
 
 #include "Engine/Variant.h"
 #include "Engine/Knob.h"
diff --git a/Engine/EffectInstance.cpp b/Engine/EffectInstance.cpp
index ecbeceb227..0234ee387a 100644
--- a/Engine/EffectInstance.cpp
+++ b/Engine/EffectInstance.cpp
@@ -36,8 +36,8 @@
 #include <stdexcept>
 #include <sstream> // stringstream
 
-#include <QtCore/QReadWriteLock>
-#include <QtCore/QCoreApplication>
+#include <QReadWriteLock>
+#include <QCoreApplication>
 #include <QtConcurrentMap> // QtCore on Qt4, QtConcurrent on Qt5
 #include <QtConcurrentRun> // QtCore on Qt4, QtConcurrent on Qt5
 
diff --git a/Engine/EffectInstancePrivate.h b/Engine/EffectInstancePrivate.h
index 2ed88cafbd..6b0233b8ea 100644
--- a/Engine/EffectInstancePrivate.h
+++ b/Engine/EffectInstancePrivate.h
@@ -34,10 +34,10 @@
 #include <list>
 #include <string>
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QWaitCondition>
-#include <QtCore/QMutex>
-#include <QtCore/QRecursiveMutex>
+#include <QCoreApplication>
+#include <QWaitCondition>
+#include <QMutex>
+#include <QRecursiveMutex>
 
 #include "Global/GlobalDefines.h"
 
diff --git a/Engine/EffectInstanceRenderRoI.cpp b/Engine/EffectInstanceRenderRoI.cpp
index 42c0802593..de9da7d0e3 100644
--- a/Engine/EffectInstanceRenderRoI.cpp
+++ b/Engine/EffectInstanceRenderRoI.cpp
@@ -35,9 +35,9 @@
 #include <stdexcept>
 #include <sstream> // stringstream
 
-#include <QtCore/QThreadPool>
-#include <QtCore/QReadWriteLock>
-#include <QtCore/QCoreApplication>
+#include <QThreadPool>
+#include <QReadWriteLock>
+#include <QCoreApplication>
 #include <QtConcurrentMap> // QtCore on Qt4, QtConcurrent on Qt5
 #include <QtConcurrentRun> // QtCore on Qt4, QtConcurrent on Qt5
 
diff --git a/Engine/ExistenceCheckThread.cpp b/Engine/ExistenceCheckThread.cpp
index 5f9e641532..00590460ce 100644
--- a/Engine/ExistenceCheckThread.cpp
+++ b/Engine/ExistenceCheckThread.cpp
@@ -30,10 +30,10 @@
 #include <stdexcept>
 #include <iostream>
 
-#include <QtNetwork/QLocalSocket>
-#include <QtCore/QMutex>
-#include <QtCore/QWaitCondition>
-#include <QtCore/QDebug>
+#include <QLocalSocket>
+#include <QMutex>
+#include <QWaitCondition>
+#include <QDebug>
 
 #ifdef DEBUG
 #include "Global/FloatingPointExceptions.h"
diff --git a/Engine/ExistenceCheckThread.h b/Engine/ExistenceCheckThread.h
index 8fdc3013fc..339f94239c 100644
--- a/Engine/ExistenceCheckThread.h
+++ b/Engine/ExistenceCheckThread.h
@@ -28,7 +28,7 @@
 
 #include "Global/Macros.h"
 
-#include <QtCore/QThread>
+#include <QThread>
 
 #include "Engine/EngineFwd.h"
 
diff --git a/Engine/FileDownloader.cpp b/Engine/FileDownloader.cpp
index dbbae92b42..a2bcf14541 100644
--- a/Engine/FileDownloader.cpp
+++ b/Engine/FileDownloader.cpp
@@ -28,11 +28,11 @@
 #include <cassert>
 #include <stdexcept>
 
-#include <QtCore/QTimer>
-#include <QtNetwork/QAbstractNetworkCache>
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkReply>
-#include <QtNetwork/QNetworkRequest>
+#include <QTimer>
+#include <QAbstractNetworkCache>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QNetworkRequest>
 
 #define NATRON_FILE_DOWNLOAD_HEARBEAT_TIMEOUT_MS 5000
 
diff --git a/Engine/FileDownloader.h b/Engine/FileDownloader.h
index 45e2986e4e..ed79199af5 100644
--- a/Engine/FileDownloader.h
+++ b/Engine/FileDownloader.h
@@ -30,7 +30,7 @@
 
 // clang-format off
 CLANG_DIAG_OFF(deprecated-register) //'register' storage class specifier is deprecated
-#include <QtCore/QObject>
+#include <QObject>
 CLANG_DIAG_ON(deprecated-register)
 // clang-format on
 
diff --git a/Engine/FileSystemModel.cpp b/Engine/FileSystemModel.cpp
index 63841176ac..9529b707e7 100644
--- a/Engine/FileSystemModel.cpp
+++ b/Engine/FileSystemModel.cpp
@@ -37,16 +37,16 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QtGlobal> // for Q_OS_*
-#include <QtCore/QMutex>
-#include <QtCore/QWaitCondition>
-#include <QtCore/QFileSystemWatcher>
-#include <QtCore/QFileInfo>
-#include <QtCore/QDateTime>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
-#include <QtCore/QUrl>
-#include <QtCore/QMimeData>
+#include <QtGlobal> // for Q_OS_*
+#include <QMutex>
+#include <QWaitCondition>
+#include <QFileSystemWatcher>
+#include <QFileInfo>
+#include <QDateTime>
+#include <QCoreApplication>
+#include <QDebug>
+#include <QUrl>
+#include <QMimeData>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Engine/FileSystemModel.h b/Engine/FileSystemModel.h
index 0484e9bd8d..40a2c558ee 100644
--- a/Engine/FileSystemModel.h
+++ b/Engine/FileSystemModel.h
@@ -30,9 +30,9 @@
 
 #include <map>
 
-#include <QtCore/QThread>
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QDir>
+#include <QThread>
+#include <QAbstractItemModel>
+#include <QDir>
 
 #include "Global/GlobalDefines.h"
 #include "Engine/EngineFwd.h"
diff --git a/Engine/Format.h b/Engine/Format.h
index f0bd7b7201..3192fa3543 100644
--- a/Engine/Format.h
+++ b/Engine/Format.h
@@ -31,7 +31,7 @@
 #include <string>
 
 CLANG_DIAG_OFF(deprecated)
-#include <QtCore/QMetaType>
+#include <QMetaType>
 CLANG_DIAG_ON(deprecated)
 
 #include "Engine/RectD.h"
diff --git a/Engine/FrameEntry.h b/Engine/FrameEntry.h
index 48d7b103d2..785dcefc14 100644
--- a/Engine/FrameEntry.h
+++ b/Engine/FrameEntry.h
@@ -32,8 +32,8 @@
 #include <string>
 
 CLANG_DIAG_OFF(deprecated)
-#include <QtCore/QObject>
-#include <QtCore/QMutex>
+#include <QObject>
+#include <QMutex>
 CLANG_DIAG_ON(deprecated)
 
 #include "Global/GlobalDefines.h"
diff --git a/Engine/GenericSchedulerThread.cpp b/Engine/GenericSchedulerThread.cpp
index 3bd336a5bb..70a4a7cfe4 100644
--- a/Engine/GenericSchedulerThread.cpp
+++ b/Engine/GenericSchedulerThread.cpp
@@ -25,11 +25,11 @@
 
 #include "GenericSchedulerThread.h"
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QMutex>
-#include <QtCore/QWaitCondition>
-#include <QtCore/QMetaType>
-#include <QtCore/QDebug>
+#include <QCoreApplication>
+#include <QMutex>
+#include <QWaitCondition>
+#include <QMetaType>
+#include <QDebug>
 
 #ifdef DEBUG
 #include "Global/FloatingPointExceptions.h"
diff --git a/Engine/GenericSchedulerThreadWatcher.cpp b/Engine/GenericSchedulerThreadWatcher.cpp
index 59dddd7cfa..7ba9af6a6a 100644
--- a/Engine/GenericSchedulerThreadWatcher.cpp
+++ b/Engine/GenericSchedulerThreadWatcher.cpp
@@ -27,8 +27,8 @@
 
 #include "GenericSchedulerThreadWatcher.h"
 
-#include <QtCore/QMetaType>
-#include <QtCore/QWaitCondition>
+#include <QMetaType>
+#include <QWaitCondition>
 
 #include "Engine/GenericSchedulerThread.h"
 #include "Engine/OutputSchedulerThread.h"
diff --git a/Engine/Hash64.cpp b/Engine/Hash64.cpp
index dfd47c3895..6c1c2def1b 100644
--- a/Engine/Hash64.cpp
+++ b/Engine/Hash64.cpp
@@ -32,7 +32,7 @@
 #if !defined(Q_MOC_RUN) && !defined(SBK_RUN)
 #include <boost/crc.hpp>
 #endif
-#include <QtCore/QString>
+#include <QString>
 
 #include "Engine/Node.h"
 
diff --git a/Engine/HistogramCPU.cpp b/Engine/HistogramCPU.cpp
index e58d0702cb..ce23306617 100644
--- a/Engine/HistogramCPU.cpp
+++ b/Engine/HistogramCPU.cpp
@@ -29,8 +29,8 @@
 #include <cassert>
 #include <stdexcept>
 
-#include <QtCore/QMutex>
-#include <QtCore/QWaitCondition>
+#include <QMutex>
+#include <QWaitCondition>
 
 #ifdef DEBUG
 #include "Global/FloatingPointExceptions.h"
diff --git a/Engine/HistogramCPU.h b/Engine/HistogramCPU.h
index 4a9b961d2b..2b79825245 100644
--- a/Engine/HistogramCPU.h
+++ b/Engine/HistogramCPU.h
@@ -30,7 +30,7 @@
 
 #include <vector>
 
-#include <QtCore/QThread>
+#include <QThread>
 
 #include "Engine/EngineFwd.h"
 
diff --git a/Engine/Image.cpp b/Engine/Image.cpp
index f356ed2c40..d3f1317a74 100644
--- a/Engine/Image.cpp
+++ b/Engine/Image.cpp
@@ -30,7 +30,7 @@
 #include <cstring> // for std::memcpy, std::memset
 #include <stdexcept>
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 #include "Engine/AppManager.h"
 #include "Engine/ViewIdx.h"
diff --git a/Engine/Image.h b/Engine/Image.h
index 36469b2d5d..ee75ebf652 100644
--- a/Engine/Image.h
+++ b/Engine/Image.h
@@ -36,9 +36,9 @@
 #include "Global/GlobalDefines.h"
 
 CLANG_DIAG_OFF(deprecated)
-#include <QtCore/QHash>
+#include <QHash>
 CLANG_DIAG_ON(deprecated)
-#include <QtCore/QReadWriteLock>
+#include <QReadWriteLock>
 
 #include "Engine/ImageKey.h"
 #include "Engine/ImagePlaneDesc.h"
diff --git a/Engine/ImageConvert.cpp b/Engine/ImageConvert.cpp
index a12ad661e9..c8b1ae2e79 100644
--- a/Engine/ImageConvert.cpp
+++ b/Engine/ImageConvert.cpp
@@ -29,7 +29,7 @@
 #include <cassert>
 #include <stdexcept>
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 #include "Engine/AppManager.h"
 #include "Engine/Lut.h"
diff --git a/Engine/ImageCopyChannels.cpp b/Engine/ImageCopyChannels.cpp
index 55c0179853..2239f145f3 100644
--- a/Engine/ImageCopyChannels.cpp
+++ b/Engine/ImageCopyChannels.cpp
@@ -28,7 +28,7 @@
 #include <cassert>
 #include <stdexcept>
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 #include "Engine/OSGLContext.h"
 #include "Engine/GLShader.h"
diff --git a/Engine/JoinViewsNode.cpp b/Engine/JoinViewsNode.cpp
index f0e1bb6c36..5340eaee9f 100644
--- a/Engine/JoinViewsNode.cpp
+++ b/Engine/JoinViewsNode.cpp
@@ -25,7 +25,7 @@
 
 #include "JoinViewsNode.h"
 
-#include <QtCore/QMutex>
+#include <QMutex>
 
 #include "Engine/AppInstance.h"
 #include "Engine/Project.h"
diff --git a/Engine/Knob.cpp b/Engine/Knob.cpp
index d3fd616515..48e5bd3c14 100644
--- a/Engine/Knob.cpp
+++ b/Engine/Knob.cpp
@@ -32,12 +32,12 @@
 #include <sstream> // stringstream
 #include <cctype> // isspace
 
-#include <QtCore/QDataStream>
-#include <QtCore/QDateTime>
-#include <QtCore/QByteArray>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QThread>
-#include <QtCore/QDebug>
+#include <QDataStream>
+#include <QDateTime>
+#include <QByteArray>
+#include <QCoreApplication>
+#include <QThread>
+#include <QDebug>
 
 #include "Global/GlobalDefines.h"
 
diff --git a/Engine/Knob.h b/Engine/Knob.h
index 27d82d106a..1e3cd0e264 100644
--- a/Engine/Knob.h
+++ b/Engine/Knob.h
@@ -33,11 +33,11 @@
 #include <set>
 #include <map>
 
-#include <QtCore/QReadWriteLock>
-#include <QtCore/QMutex>
-#include <QtCore/QString>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QRecursiveMutex>
+#include <QReadWriteLock>
+#include <QMutex>
+#include <QString>
+#include <QCoreApplication>
+#include <QRecursiveMutex>
 
 #include "Engine/Variant.h"
 #include "Engine/AppManager.h" // for AppManager::createKnob
@@ -153,7 +153,7 @@ class KnobSignalSlotHandler
         Q_EMIT setValueWithUndoStack(v, view, dim);
     }
 
-    void s_appendParamEditChange(NATRON_ENUM::ValueChangedReasonEnum reason,
+    void s_appendParamEditChange(Natron::ValueChangedReasonEnum reason,
                                  Variant v,
                                  ViewSpec view,
                                  int dim,
@@ -182,7 +182,7 @@ class KnobSignalSlotHandler
         Q_EMIT keyFrameMoved(view, dimension, oldTime, newTime);
     }
 
-    void s_redrawGuiCurve(NATRON_ENUM::CurveChangeReason reason,
+    void s_redrawGuiCurve(Natron::CurveChangeReason reason,
                           ViewSpec view,
                           int dimension)
     {
@@ -354,7 +354,7 @@ public Q_SLOTS:
 struct KnobChange
 {
     KnobIPtr knob;
-    NATRON_ENUM::ValueChangedReasonEnum reason, originalReason;
+    Natron::ValueChangedReasonEnum reason, originalReason;
     bool originatedFromMainThread;
     bool refreshGui;
     double time;
@@ -485,7 +485,7 @@ class KnobI
      * evaluate the new value (cause a render).
      * @returns true if the knobChanged handler was called once for this knob
      **/
-    virtual bool evaluateValueChange(int dimension, double time, ViewSpec view, NATRON_ENUM::ValueChangedReasonEnum reason) = 0;
+    virtual bool evaluateValueChange(int dimension, double time, ViewSpec view, Natron::ValueChangedReasonEnum reason) = 0;
 
     /**
      * @brief Copies all the values, animations and extra data the other knob might have
@@ -561,28 +561,28 @@ class KnobI
     /**
      * @brief Removes all the keyframes in the given dimension.
      **/
-    virtual void removeAnimationWithReason(ViewSpec view, int dimension, NATRON_ENUM::ValueChangedReasonEnum reason) = 0;
+    virtual void removeAnimationWithReason(ViewSpec view, int dimension, Natron::ValueChangedReasonEnum reason) = 0;
 
 public:
 
     /**
      * @brief Removes the keyframe at the given time and dimension if it matches any.
      **/
-    virtual void deleteValueAtTime(NATRON_ENUM::CurveChangeReason curveChangeReason, double time, ViewSpec view, int dimension, bool copyCurveValueAtTimeToInternalValue) = 0;
-    virtual void deleteValuesAtTime(NATRON_ENUM::CurveChangeReason curveChangeReason, const std::list<double>& times, ViewSpec view, int dimension, bool copyCurveValueAtTimeToInternalValue) = 0;
+    virtual void deleteValueAtTime(Natron::CurveChangeReason curveChangeReason, double time, ViewSpec view, int dimension, bool copyCurveValueAtTimeToInternalValue) = 0;
+    virtual void deleteValuesAtTime(Natron::CurveChangeReason curveChangeReason, const std::list<double>& times, ViewSpec view, int dimension, bool copyCurveValueAtTimeToInternalValue) = 0;
 
 
     /**
      * @brief Moves a keyframe by a given delta and emits the signal keyframeMoved
      **/
-    virtual bool moveValueAtTime(NATRON_ENUM::CurveChangeReason reason, double time, ViewSpec view,  int dimension, double dt, double dv, KeyFrame* newKey) = 0;
-    virtual bool moveValuesAtTime(NATRON_ENUM::CurveChangeReason reason, ViewSpec view,  int dimension, double dt, double dv, std::vector<KeyFrame>* keyframes) = 0;
+    virtual bool moveValueAtTime(Natron::CurveChangeReason reason, double time, ViewSpec view,  int dimension, double dt, double dv, KeyFrame* newKey) = 0;
+    virtual bool moveValuesAtTime(Natron::CurveChangeReason reason, ViewSpec view,  int dimension, double dt, double dv, std::vector<KeyFrame>* keyframes) = 0;
 
     /**
      * @brief Transforms a keyframe by a given matrix. The matrix must not contain any skew or rotation.
      **/
-    virtual bool transformValueAtTime(NATRON_ENUM::CurveChangeReason curveChangeReason, double time, ViewSpec view,  int dimension, const Transform::Matrix3x3& matrix, KeyFrame* newKey) = 0;
-    virtual bool transformValuesAtTime(NATRON_ENUM::CurveChangeReason curveChangeReason, ViewSpec view,  int dimension, const Transform::Matrix3x3& matrix, std::vector<KeyFrame>* keyframes) = 0;
+    virtual bool transformValueAtTime(Natron::CurveChangeReason curveChangeReason, double time, ViewSpec view,  int dimension, const Transform::Matrix3x3& matrix, KeyFrame* newKey) = 0;
+    virtual bool transformValuesAtTime(Natron::CurveChangeReason curveChangeReason, ViewSpec view,  int dimension, const Transform::Matrix3x3& matrix, std::vector<KeyFrame>* keyframes) = 0;
 
     /**
      * @brief Copies all the animation of *curve* into the animation curve at the given dimension.
@@ -592,25 +592,25 @@ class KnobI
     /**
      * @brief Changes the interpolation type for the given keyframe
      **/
-    virtual bool setInterpolationAtTime(NATRON_ENUM::CurveChangeReason reason, ViewSpec view, int dimension, double time, NATRON_ENUM::KeyframeTypeEnum interpolation, KeyFrame* newKey) = 0;
+    virtual bool setInterpolationAtTime(Natron::CurveChangeReason reason, ViewSpec view, int dimension, double time, Natron::KeyframeTypeEnum interpolation, KeyFrame* newKey) = 0;
 
     /**
      * @brief Set the left/right derivatives of the control point at the given time.
      **/
-    virtual bool moveDerivativesAtTime(NATRON_ENUM::CurveChangeReason reason, ViewSpec view, int dimension, double time, double left, double right) = 0;
-    virtual bool moveDerivativeAtTime(NATRON_ENUM::CurveChangeReason reason, ViewSpec view, int dimension, double time, double derivative, bool isLeft) = 0;
+    virtual bool moveDerivativesAtTime(Natron::CurveChangeReason reason, ViewSpec view, int dimension, double time, double left, double right) = 0;
+    virtual bool moveDerivativeAtTime(Natron::CurveChangeReason reason, ViewSpec view, int dimension, double time, double derivative, bool isLeft) = 0;
 
     /**
      * @brief Removes animation before the given time and dimension. If the reason is different than eValueChangedReasonUserEdited
      * a signal will be emitted
      **/
-    virtual void deleteAnimationBeforeTime(double time, ViewSpec view, int dimension, NATRON_ENUM::ValueChangedReasonEnum reason) = 0;
+    virtual void deleteAnimationBeforeTime(double time, ViewSpec view, int dimension, Natron::ValueChangedReasonEnum reason) = 0;
 
     /**
      * @brief Removes animation before the given time and dimension. If the reason is different than eValueChangedReasonUserEdited
      * a signal will be emitted
      **/
-    virtual void deleteAnimationAfterTime(double time, ViewSpec view, int dimension, NATRON_ENUM::ValueChangedReasonEnum reason) = 0;
+    virtual void deleteAnimationAfterTime(double time, ViewSpec view, int dimension, Natron::ValueChangedReasonEnum reason) = 0;
 
     /**
      * @brief Calls removeAnimation with a reason of eValueChangedReasonNatronInternalEdited.
@@ -689,7 +689,7 @@ class KnobI
 
 protected:
 
-    virtual void refreshListenersAfterValueChange(ViewSpec view, NATRON_ENUM::ValueChangedReasonEnum reason, int dimension) = 0;
+    virtual void refreshListenersAfterValueChange(ViewSpec view, Natron::ValueChangedReasonEnum reason, int dimension) = 0;
 
 public:
 
@@ -710,7 +710,7 @@ class KnobI
      **/
     virtual bool onKeyFrameSet(double time, ViewSpec view, int dimension) = 0;
     virtual bool onKeyFrameSet(double time, ViewSpec view, const KeyFrame& key, int dimension) = 0;
-    virtual bool setKeyFrame(const KeyFrame& key, ViewSpec view,  int dimension, NATRON_ENUM::ValueChangedReasonEnum reason) = 0;
+    virtual bool setKeyFrame(const KeyFrame& key, ViewSpec view,  int dimension, Natron::ValueChangedReasonEnum reason) = 0;
 
     /**
      * @brief Called when the current time of the timeline changes.
@@ -1163,14 +1163,14 @@ class KnobI
      * at the same dimension for the knob 'other'.
      * In case of success, this function returns true, otherwise false.
      **/
-    virtual bool slaveToInternal(int dimension, const KnobIPtr &  other, int otherDimension, NATRON_ENUM::ValueChangedReasonEnum reason,
+    virtual bool slaveToInternal(int dimension, const KnobIPtr &  other, int otherDimension, Natron::ValueChangedReasonEnum reason,
                                  bool ignoreMasterPersistence) = 0;
 
     /**
      * @brief Unslaves a previously slaved dimension. The implementation should assert that
      * the dimension was really slaved.
      **/
-    virtual void unSlaveInternal(int dimension, NATRON_ENUM::ValueChangedReasonEnum reason, bool copyState) = 0;
+    virtual void unSlaveInternal(int dimension, Natron::ValueChangedReasonEnum reason, bool copyState) = 0;
 
 public:
 
@@ -1279,7 +1279,7 @@ class KnobI
     /**
      * @brief Get the current animation level.
      **/
-    virtual NATRON_ENUM::AnimationLevelEnum getAnimationLevel(int dimension) const = 0;
+    virtual Natron::AnimationLevelEnum getAnimationLevel(int dimension) const = 0;
 
     /**
      * @brief Restores the default value
@@ -1389,15 +1389,15 @@ class KnobHelper
     virtual void blockListenersNotification() OVERRIDE FINAL;
     virtual void unblockListenersNotification() OVERRIDE FINAL;
     virtual bool isListenersNotificationBlocked() const OVERRIDE FINAL WARN_UNUSED_RETURN;
-    virtual bool evaluateValueChange(int dimension, double time, ViewSpec view,  NATRON_ENUM::ValueChangedReasonEnum reason) OVERRIDE FINAL;
+    virtual bool evaluateValueChange(int dimension, double time, ViewSpec view,  Natron::ValueChangedReasonEnum reason) OVERRIDE FINAL;
 
 protected:
     // Returns true if the knobChanged handler was called
     bool evaluateValueChangeInternal(int dimension,
                                      double time,
                                      ViewSpec view,
-                                     NATRON_ENUM::ValueChangedReasonEnum reason,
-                                     NATRON_ENUM::ValueChangedReasonEnum originalReason);
+                                     Natron::ValueChangedReasonEnum reason,
+                                     Natron::ValueChangedReasonEnum originalReason);
 
     virtual void onInternalValueChanged(int /*dimension*/,
                                         double /*time*/,
@@ -1426,15 +1426,15 @@ class KnobHelper
 private:
 
 
-    virtual void removeAnimationWithReason(ViewSpec view, int dimension, NATRON_ENUM::ValueChangedReasonEnum reason) OVERRIDE FINAL;
-    virtual void deleteValueAtTime(NATRON_ENUM::CurveChangeReason curveChangeReason, double time, ViewSpec view,  int dimension,bool copyCurveValueAtTimeToInternalValue) OVERRIDE FINAL;
-    virtual void deleteValuesAtTime(NATRON_ENUM::CurveChangeReason curveChangeReason, const std::list<double>& times, ViewSpec view, int dimension, bool copyCurveValueAtTimeToInternalValue) OVERRIDE FINAL;
+    virtual void removeAnimationWithReason(ViewSpec view, int dimension, Natron::ValueChangedReasonEnum reason) OVERRIDE FINAL;
+    virtual void deleteValueAtTime(Natron::CurveChangeReason curveChangeReason, double time, ViewSpec view,  int dimension,bool copyCurveValueAtTimeToInternalValue) OVERRIDE FINAL;
+    virtual void deleteValuesAtTime(Natron::CurveChangeReason curveChangeReason, const std::list<double>& times, ViewSpec view, int dimension, bool copyCurveValueAtTimeToInternalValue) OVERRIDE FINAL;
 
 public:
 
     virtual void onKeyFrameRemoved(double time, ViewSpec view, int dimension, bool copyCurveValueAtTimeToInternalValue) OVERRIDE FINAL;
-    virtual bool moveValueAtTime(NATRON_ENUM::CurveChangeReason reason, double time, ViewSpec view, int dimension, double dt, double dv, KeyFrame* newKey) OVERRIDE FINAL;
-    virtual bool moveValuesAtTime(NATRON_ENUM::CurveChangeReason reason, ViewSpec view,  int dimension, double dt, double dv, std::vector<KeyFrame>* keyframes) OVERRIDE FINAL;
+    virtual bool moveValueAtTime(Natron::CurveChangeReason reason, double time, ViewSpec view, int dimension, double dt, double dv, KeyFrame* newKey) OVERRIDE FINAL;
+    virtual bool moveValuesAtTime(Natron::CurveChangeReason reason, ViewSpec view,  int dimension, double dt, double dv, std::vector<KeyFrame>* keyframes) OVERRIDE FINAL;
 
 private:
     bool moveValueAtTimeInternal(bool useGuiCurve, double time, ViewSpec view, int dimension, double dt, double dv, KeyFrame* newKey);
@@ -1442,8 +1442,8 @@ class KnobHelper
 public:
 
 
-    virtual bool transformValueAtTime(NATRON_ENUM::CurveChangeReason curveChangeReason, double time, ViewSpec view, int dimension, const Transform::Matrix3x3& matrix, KeyFrame* newKey) OVERRIDE FINAL;
-    virtual bool transformValuesAtTime(NATRON_ENUM::CurveChangeReason curveChangeReason, ViewSpec view,  int dimension, const Transform::Matrix3x3& matrix, std::vector<KeyFrame>* keyframes) OVERRIDE FINAL;
+    virtual bool transformValueAtTime(Natron::CurveChangeReason curveChangeReason, double time, ViewSpec view, int dimension, const Transform::Matrix3x3& matrix, KeyFrame* newKey) OVERRIDE FINAL;
+    virtual bool transformValuesAtTime(Natron::CurveChangeReason curveChangeReason, ViewSpec view,  int dimension, const Transform::Matrix3x3& matrix, std::vector<KeyFrame>* keyframes) OVERRIDE FINAL;
 
 private:
     bool transformValueAtTimeInternal(bool useGuiCurve, double time, ViewSpec view, int dimension, const Transform::Matrix3x3& matrix, KeyFrame* newKey);
@@ -1451,15 +1451,15 @@ class KnobHelper
 public:
 
     virtual void cloneCurve(ViewSpec view, int dimension, const Curve& curve) OVERRIDE FINAL;
-    virtual bool setInterpolationAtTime(NATRON_ENUM::CurveChangeReason reason, ViewSpec view, int dimension, double time, NATRON_ENUM::KeyframeTypeEnum interpolation, KeyFrame* newKey) OVERRIDE FINAL;
-    virtual bool moveDerivativesAtTime(NATRON_ENUM::CurveChangeReason reason, ViewSpec view, int dimension, double time, double left, double right)  OVERRIDE FINAL WARN_UNUSED_RETURN;
-    virtual bool moveDerivativeAtTime(NATRON_ENUM::CurveChangeReason reason, ViewSpec view, int dimension, double time, double derivative, bool isLeft) OVERRIDE FINAL WARN_UNUSED_RETURN;
-    virtual void deleteAnimationBeforeTime(double time, ViewSpec view, int dimension, NATRON_ENUM::ValueChangedReasonEnum reason) OVERRIDE FINAL;
-    virtual void deleteAnimationAfterTime(double time, ViewSpec view, int dimension, NATRON_ENUM::ValueChangedReasonEnum reason) OVERRIDE FINAL;
+    virtual bool setInterpolationAtTime(Natron::CurveChangeReason reason, ViewSpec view, int dimension, double time, Natron::KeyframeTypeEnum interpolation, KeyFrame* newKey) OVERRIDE FINAL;
+    virtual bool moveDerivativesAtTime(Natron::CurveChangeReason reason, ViewSpec view, int dimension, double time, double left, double right)  OVERRIDE FINAL WARN_UNUSED_RETURN;
+    virtual bool moveDerivativeAtTime(Natron::CurveChangeReason reason, ViewSpec view, int dimension, double time, double derivative, bool isLeft) OVERRIDE FINAL WARN_UNUSED_RETURN;
+    virtual void deleteAnimationBeforeTime(double time, ViewSpec view, int dimension, Natron::ValueChangedReasonEnum reason) OVERRIDE FINAL;
+    virtual void deleteAnimationAfterTime(double time, ViewSpec view, int dimension, Natron::ValueChangedReasonEnum reason) OVERRIDE FINAL;
 
 private:
 
-    void deleteAnimationConditional(double time, ViewSpec view, int dimension, NATRON_ENUM::ValueChangedReasonEnum reason, bool before);
+    void deleteAnimationConditional(double time, ViewSpec view, int dimension, Natron::ValueChangedReasonEnum reason, bool before);
 
 public:
 
@@ -1494,7 +1494,7 @@ class KnobHelper
     template <typename T>
     static T pyObjectToType(PyObject* o);
 
-    virtual void refreshListenersAfterValueChange(ViewSpec view, NATRON_ENUM::ValueChangedReasonEnum reason, int dimension) OVERRIDE FINAL;
+    virtual void refreshListenersAfterValueChange(ViewSpec view, Natron::ValueChangedReasonEnum reason, int dimension) OVERRIDE FINAL;
 
 public:
 
@@ -1612,7 +1612,7 @@ class KnobHelper
 private:
 
 
-    virtual bool slaveToInternal(int dimension, const KnobIPtr &  other, int otherDimension, NATRON_ENUM::ValueChangedReasonEnum reason
+    virtual bool slaveToInternal(int dimension, const KnobIPtr &  other, int otherDimension, Natron::ValueChangedReasonEnum reason
                                  , bool ignoreMasterPersistence) OVERRIDE FINAL WARN_UNUSED_RETURN;
 
 protected:
@@ -1638,7 +1638,7 @@ class KnobHelper
 
     virtual std::pair<int, KnobIPtr> getMaster(int dimension) const OVERRIDE FINAL WARN_UNUSED_RETURN;
     virtual bool isSlave(int dimension) const OVERRIDE FINAL WARN_UNUSED_RETURN;
-    virtual NATRON_ENUM::AnimationLevelEnum getAnimationLevel(int dimension) const OVERRIDE FINAL WARN_UNUSED_RETURN;
+    virtual Natron::AnimationLevelEnum getAnimationLevel(int dimension) const OVERRIDE FINAL WARN_UNUSED_RETURN;
     virtual bool isTypeCompatible(const KnobIPtr & other) const OVERRIDE WARN_UNUSED_RETURN = 0;
 
     /**
@@ -1748,19 +1748,19 @@ class KnobHelper
     {
     }
 
-    void cloneGuiCurvesIfNeeded(std::map<int, NATRON_ENUM::ValueChangedReasonEnum>& modifiedDimensions);
+    void cloneGuiCurvesIfNeeded(std::map<int, Natron::ValueChangedReasonEnum>& modifiedDimensions);
 
-    void cloneInternalCurvesIfNeeded(std::map<int, NATRON_ENUM::ValueChangedReasonEnum>& modifiedDimensions);
+    void cloneInternalCurvesIfNeeded(std::map<int, Natron::ValueChangedReasonEnum>& modifiedDimensions);
 
     void setInternalCurveHasChanged(ViewSpec view, int dimension, bool changed);
 
-    void guiCurveCloneInternalCurve(NATRON_ENUM::CurveChangeReason curveChangeReason, ViewSpec view, int dimension, NATRON_ENUM::ValueChangedReasonEnum reason);
+    void guiCurveCloneInternalCurve(Natron::CurveChangeReason curveChangeReason, ViewSpec view, int dimension, Natron::ValueChangedReasonEnum reason);
 
     virtual std::shared_ptr<Curve> getGuiCurve(ViewSpec view, int dimension, bool byPassMaster = false) const OVERRIDE FINAL;
 
     void setGuiCurveHasChanged(ViewSpec view, int dimension, bool changed);
     bool hasGuiCurveChanged(ViewSpec view, int dimension) const;
-    void clearExpressionsResultsIfNeeded(std::map<int, NATRON_ENUM::ValueChangedReasonEnum>& modifiedDimensions);
+    void clearExpressionsResultsIfNeeded(std::map<int, Natron::ValueChangedReasonEnum>& modifiedDimensions);
 
 
     std::shared_ptr<KnobSignalSlotHandler> _signalSlotHandler;
@@ -1842,7 +1842,7 @@ class Knob
 
 
     virtual void unSlaveInternal(int dimension,
-                                 NATRON_ENUM::ValueChangedReasonEnum reason,
+                                 Natron::ValueChangedReasonEnum reason,
                                  bool copyState) OVERRIDE FINAL;
 
 public:
@@ -1857,11 +1857,11 @@ class Knob
                                               const T & v,
                                               ViewSpec view,
                                               int dimension,
-                                              NATRON_ENUM::ValueChangedReasonEnum reason,
+                                              Natron::ValueChangedReasonEnum reason,
                                               KeyFrame* newKey,
                                               bool hasChanged = false); //!< set to true if any previous dimension of the same knob have changed
 
-    virtual bool setKeyFrame(const KeyFrame& key, ViewSpec view, int dimension, NATRON_ENUM::ValueChangedReasonEnum reason) OVERRIDE FINAL;
+    virtual bool setKeyFrame(const KeyFrame& key, ViewSpec view, int dimension, Natron::ValueChangedReasonEnum reason) OVERRIDE FINAL;
 
     /**
      * @brief Set the value of the knob in the given dimension with the given reason.
@@ -1871,7 +1871,7 @@ class Knob
     ValueChangedReturnCodeEnum setValue(const T & v,
                                         ViewSpec view,
                                         int dimension,
-                                        NATRON_ENUM::ValueChangedReasonEnum reason,
+                                        Natron::ValueChangedReasonEnum reason,
                                         KeyFrame* newKey,
                                         bool hasChanged = false); //!< set to true if any previous dimension of the same knob have changed
 
@@ -1889,25 +1889,25 @@ class Knob
     void setValues(const T& value0,
                    const T& value1,
                    ViewSpec view,
-                   NATRON_ENUM::ValueChangedReasonEnum reason);
+                   Natron::ValueChangedReasonEnum reason);
 
     void setValues(const T& value0,
                    const T& value1,
                    ViewSpec view,
-                   NATRON_ENUM::ValueChangedReasonEnum reason,
+                   Natron::ValueChangedReasonEnum reason,
                    int dimensionOffset);
 
     void setValues(const T& value0,
                    const T& value1,
                    const T& value2,
                    ViewSpec view,
-                   NATRON_ENUM::ValueChangedReasonEnum reason);
+                   Natron::ValueChangedReasonEnum reason);
 
     void setValues(const T& value0,
                    const T& value1,
                    const T& value2,
                    ViewSpec view,
-                   NATRON_ENUM::ValueChangedReasonEnum reason,
+                   Natron::ValueChangedReasonEnum reason,
                    int dimensionOffset);
 
 
@@ -1916,7 +1916,7 @@ class Knob
                    const T& value2,
                    const T& value3,
                    ViewSpec view,
-                   NATRON_ENUM::ValueChangedReasonEnum reason);
+                   Natron::ValueChangedReasonEnum reason);
 
     /**
      * @brief Calls setValue
@@ -1928,7 +1928,7 @@ class Knob
     ValueChangedReturnCodeEnum onValueChanged(const T & v,
                                               ViewSpec view,
                                               int dimension,
-                                              NATRON_ENUM::ValueChangedReasonEnum reason,
+                                              Natron::ValueChangedReasonEnum reason,
                                               KeyFrame* newKey);
 
     /**
@@ -1959,13 +1959,13 @@ class Knob
                          const T& value0,
                          const T& value1,
                          ViewSpec view,
-                         NATRON_ENUM::ValueChangedReasonEnum reason);
+                         Natron::ValueChangedReasonEnum reason);
 
     void setValuesAtTime(double time,
                          const T& value0,
                          const T& value1,
                          ViewSpec view,
-                         NATRON_ENUM::ValueChangedReasonEnum reason,
+                         Natron::ValueChangedReasonEnum reason,
                          int dimensionOffset);
 
     void setValuesAtTime(double time,
@@ -1973,14 +1973,14 @@ class Knob
                          const T& value1,
                          const T& value2,
                          ViewSpec view,
-                         NATRON_ENUM::ValueChangedReasonEnum reason);
+                         Natron::ValueChangedReasonEnum reason);
 
     void setValuesAtTime(double time,
                          const T& value0,
                          const T& value1,
                          const T& value2,
                          ViewSpec view,
-                         NATRON_ENUM::ValueChangedReasonEnum reason,
+                         Natron::ValueChangedReasonEnum reason,
                          int dimensionOffset);
 
     void setValuesAtTime(double time,
@@ -1989,7 +1989,7 @@ class Knob
                          const T& value2,
                          const T& value3,
                          ViewSpec view,
-                         NATRON_ENUM::ValueChangedReasonEnum reason);
+                         Natron::ValueChangedReasonEnum reason);
 
     /**
      * @brief Unlike getValueAtTime this function doesn't interpolate the values.
@@ -2180,7 +2180,7 @@ class Knob
                        const T& value,
                        const KeyFrame& key,
                        bool useKey,
-                       NATRON_ENUM::ValueChangedReasonEnum reason,
+                       Natron::ValueChangedReasonEnum reason,
                        bool valueChangesBlocked);
 
         virtual bool isSetValueAtTime() const { return false; }
@@ -2196,7 +2196,7 @@ class Knob
 
         bool useKey() const;
 
-        NATRON_ENUM::ValueChangedReasonEnum reason() const;
+        Natron::ValueChangedReasonEnum reason() const;
 
         bool valueChangesBlocked() const;
 
@@ -2215,7 +2215,7 @@ class Knob
                              int dimension,
                              const T& value,
                              const KeyFrame& key,
-                             NATRON_ENUM::ValueChangedReasonEnum reason,
+                             Natron::ValueChangedReasonEnum reason,
                              bool valueChangesBlocked)
             : QueuedSetValue(view, dimension, value, key, true, reason, valueChangesBlocked)
             , _time(time)
@@ -2544,8 +2544,8 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON
                            bool refreshGui,
                            double time,
                            ViewSpec view,
-                           NATRON_ENUM::ValueChangedReasonEnum originalReason,
-                           NATRON_ENUM::ValueChangedReasonEnum reason);
+                           Natron::ValueChangedReasonEnum originalReason,
+                           Natron::ValueChangedReasonEnum reason);
 
     bool isSetValueCurrentlyPossible() const;
 
@@ -2610,14 +2610,14 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON
      * You should NEVER CALL THIS YOURSELF as it would break the bracketing system.
      * You can overload this to prepare yourself to a lot of value changes.
      **/
-    void beginKnobsValuesChanged_public(NATRON_ENUM::ValueChangedReasonEnum reason);
+    void beginKnobsValuesChanged_public(Natron::ValueChangedReasonEnum reason);
 
     /**
      * @brief The virtual portion of notifyProjectEndKnobsValuesChanged(). This is called by the project
      * You should NEVER CALL THIS YOURSELF as it would break the bracketing system.
      * You can overload this to finish a serie of value changes, thus limiting the amount of changes to do.
      **/
-    void endKnobsValuesChanged_public(NATRON_ENUM::ValueChangedReasonEnum reason);
+    void endKnobsValuesChanged_public(Natron::ValueChangedReasonEnum reason);
 
 
     /**
@@ -2626,7 +2626,7 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON
      * You can overload this to do things when a value is changed. Bear in mind that you can compress
      * the change by using the begin/end[ValueChanges] to optimize the changes.
      **/
-    virtual bool onKnobValueChanged_public(KnobI* k, NATRON_ENUM::ValueChangedReasonEnum reason, double time, ViewSpec view,
+    virtual bool onKnobValueChanged_public(KnobI* k, Natron::ValueChangedReasonEnum reason, double time, ViewSpec view,
                                            bool originatedFromMainThread);
 
 
@@ -2708,7 +2708,7 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON
      * You should NEVER CALL THIS YOURSELF as it would break the bracketing system.
      * You can overload this to prepare yourself to a lot of value changes.
      **/
-    virtual void beginKnobsValuesChanged(NATRON_ENUM::ValueChangedReasonEnum reason)
+    virtual void beginKnobsValuesChanged(Natron::ValueChangedReasonEnum reason)
     {
         Q_UNUSED(reason);
     }
@@ -2718,7 +2718,7 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON
      * You should NEVER CALL THIS YOURSELF as it would break the bracketing system.
      * You can overload this to finish a serie of value changes, thus limiting the amount of changes to do.
      **/
-    virtual void endKnobsValuesChanged(NATRON_ENUM::ValueChangedReasonEnum reason)
+    virtual void endKnobsValuesChanged(Natron::ValueChangedReasonEnum reason)
     {
         Q_UNUSED(reason);
     }
@@ -2730,7 +2730,7 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON
      * the change by using the begin/end[ValueChanges] to optimize the changes.
      **/
     virtual bool onKnobValueChanged(KnobI* /*k*/,
-                                    NATRON_ENUM::ValueChangedReasonEnum /*reason*/,
+                                    Natron::ValueChangedReasonEnum /*reason*/,
                                     double /*time*/,
                                     ViewSpec /*view*/,
                                     bool /*originatedFromMainThread*/)
diff --git a/Engine/KnobFile.cpp b/Engine/KnobFile.cpp
index f053439084..0db3804b27 100644
--- a/Engine/KnobFile.cpp
+++ b/Engine/KnobFile.cpp
@@ -30,9 +30,9 @@
 #include <stdexcept>
 #include <sstream> // stringstream
 
-#include <QtCore/QStringList>
-#include <QtCore/QMutexLocker>
-#include <QtCore/QDebug>
+#include <QStringList>
+#include <QMutexLocker>
+#include <QDebug>
 
 #include "Engine/EffectInstance.h"
 #include "Engine/Transform.h"
diff --git a/Engine/KnobFile.h b/Engine/KnobFile.h
index 3db97d5232..8e74e1167e 100644
--- a/Engine/KnobFile.h
+++ b/Engine/KnobFile.h
@@ -32,10 +32,10 @@
 #include <map>
 
 CLANG_DIAG_OFF(deprecated)
-#include <QtCore/QObject>
+#include <QObject>
 CLANG_DIAG_ON(deprecated)
-#include <QtCore/QMutex>
-#include <QtCore/QString>
+#include <QMutex>
+#include <QString>
 
 #include "Engine/KnobTypes.h"
 #include "Engine/ViewIdx.h"
diff --git a/Engine/KnobImpl.h b/Engine/KnobImpl.h
index 9df9943c96..3fde421b40 100644
--- a/Engine/KnobImpl.h
+++ b/Engine/KnobImpl.h
@@ -35,10 +35,10 @@
 #include <string>
 #include <algorithm> // min, max
 
-#include <QtCore/QString>
-#include <QtCore/QDebug>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QThread>
+#include <QString>
+#include <QDebug>
+#include <QCoreApplication>
+#include <QThread>
 
 #include "Global/PythonUtils.h"
 
diff --git a/Engine/KnobSerialization.cpp b/Engine/KnobSerialization.cpp
index 349aa6e07c..bbb014d790 100644
--- a/Engine/KnobSerialization.cpp
+++ b/Engine/KnobSerialization.cpp
@@ -31,8 +31,8 @@
 
 #include <ofxNatron.h>
 
-#include <QtCore/QDateTime>
-#include <QtCore/QDebug>
+#include <QDateTime>
+#include <QDebug>
 
 #include <ofxNatron.h>
 
diff --git a/Engine/KnobTypes.cpp b/Engine/KnobTypes.cpp
index 54c0ea0a14..6ec7dcbb4d 100644
--- a/Engine/KnobTypes.cpp
+++ b/Engine/KnobTypes.cpp
@@ -34,9 +34,9 @@
 #include <stdexcept>
 #include <sstream> // stringstream
 
-#include <QtCore/QDebug>
-#include <QtCore/QThread>
-#include <QtCore/QCoreApplication>
+#include <QDebug>
+#include <QThread>
+#include <QCoreApplication>
 
 #include "Engine/AppInstance.h"
 #include "Engine/Bezier.h"
diff --git a/Engine/KnobTypes.h b/Engine/KnobTypes.h
index 387f371832..3c307954c4 100644
--- a/Engine/KnobTypes.h
+++ b/Engine/KnobTypes.h
@@ -33,14 +33,14 @@
 #include <map>
 
 CLANG_DIAG_OFF(deprecated)
-#include <QtCore/QCoreApplication>
-#include <QtCore/QObject>
+#include <QCoreApplication>
+#include <QObject>
 CLANG_DIAG_ON(deprecated)
 GCC_ONLY_DIAG_OFF(class-memaccess)
-#include <QtCore/QVector>
+#include <QVector>
 GCC_ONLY_DIAG_ON(class-memaccess)
-#include <QtCore/QMutex>
-#include <QtCore/QString>
+#include <QMutex>
+#include <QString>
 
 #include "Global/GlobalDefines.h"
 #include "Engine/Knob.h"
@@ -248,13 +248,13 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON
 
     static const std::string & typeNameStatic();
 
-    NATRON_ENUM::ValueIsNormalizedEnum getValueIsNormalized(int dimension) const
+    Natron::ValueIsNormalizedEnum getValueIsNormalized(int dimension) const
     {
         return _valueIsNormalized[dimension];
     }
 
     void setValueIsNormalized(int dimension,
-                              NATRON_ENUM::ValueIsNormalizedEnum state)
+                              Natron::ValueIsNormalizedEnum state)
     {
         _valueIsNormalized[dimension] = state;
     }
@@ -372,7 +372,7 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON
     /// - kOfxParamDoubleTypeNormalisedYAbsolute - normalised absolute position on the Y axis (1D only)
     /// - kOfxParamDoubleTypeNormalisedXY - normalised to the project's X and Y size (2D only),
     /// - kOfxParamDoubleTypeNormalisedXYAbsolute - normalised to the projects X and Y size, and is an absolute position on the image plane,
-    std::vector<NATRON_ENUM::ValueIsNormalizedEnum> _valueIsNormalized;
+    std::vector<Natron::ValueIsNormalizedEnum> _valueIsNormalized;
 
     ///For double params respecting the kOfxParamCoordinatesNormalised
     ///This tells us that only the default value is stored normalized.
@@ -1009,33 +1009,33 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON
     std::pair<double, double> getParametricRange() const WARN_UNUSED_RETURN;
     CurvePtr getParametricCurve(int dimension) const;
     CurvePtr getDefaultParametricCurve(int dimension) const;
-    NATRON_ENUM::StatusEnum addControlPoint(NATRON_ENUM::ValueChangedReasonEnum reason, int dimension, double key, double value, NATRON_ENUM::KeyframeTypeEnum interpolation = NATRON_ENUM::eKeyframeTypeSmooth) WARN_UNUSED_RETURN;
-    NATRON_ENUM::StatusEnum addControlPoint(NATRON_ENUM::ValueChangedReasonEnum reason, int dimension, double key, double value, double leftDerivative, double rightDerivative, NATRON_ENUM::KeyframeTypeEnum interpolation = NATRON_ENUM::eKeyframeTypeSmooth) WARN_UNUSED_RETURN;
-    NATRON_ENUM::StatusEnum getValue(int dimension, double parametricPosition, double *returnValue) const WARN_UNUSED_RETURN;
-    NATRON_ENUM::StatusEnum getNControlPoints(int dimension, int *returnValue) const WARN_UNUSED_RETURN;
-    NATRON_ENUM::StatusEnum getNthControlPoint(int dimension,
+    Natron::StatusEnum addControlPoint(Natron::ValueChangedReasonEnum reason, int dimension, double key, double value, Natron::KeyframeTypeEnum interpolation = Natron::KeyframeTypeEnum::eKeyframeTypeSmooth) WARN_UNUSED_RETURN;
+    Natron::StatusEnum addControlPoint(Natron::ValueChangedReasonEnum reason, int dimension, double key, double value, double leftDerivative, double rightDerivative, Natron::KeyframeTypeEnum interpolation = Natron::KeyframeTypeEnum::eKeyframeTypeSmooth) WARN_UNUSED_RETURN;
+    Natron::StatusEnum getValue(int dimension, double parametricPosition, double *returnValue) const WARN_UNUSED_RETURN;
+    Natron::StatusEnum getNControlPoints(int dimension, int *returnValue) const WARN_UNUSED_RETURN;
+    Natron::StatusEnum getNthControlPoint(int dimension,
                                   int nthCtl,
                                   double *key,
                                   double *value) const WARN_UNUSED_RETURN;
-    NATRON_ENUM::StatusEnum getNthControlPoint(int dimension,
+    Natron::StatusEnum getNthControlPoint(int dimension,
                                   int nthCtl,
                                   double *key,
                                   double *value,
                                   double *leftDerivative,
                                   double *rightDerivative) const WARN_UNUSED_RETURN;
 
-    NATRON_ENUM::StatusEnum setNthControlPointInterpolation(NATRON_ENUM::ValueChangedReasonEnum reason,
+    Natron::StatusEnum setNthControlPointInterpolation(Natron::ValueChangedReasonEnum reason,
                                                int dimension,
                                                int nThCtl,
-                                               NATRON_ENUM::KeyframeTypeEnum interpolation) WARN_UNUSED_RETURN;
+                                               Natron::KeyframeTypeEnum interpolation) WARN_UNUSED_RETURN;
 
-    NATRON_ENUM::StatusEnum setNthControlPoint(NATRON_ENUM::ValueChangedReasonEnum reason,
+    Natron::StatusEnum setNthControlPoint(Natron::ValueChangedReasonEnum reason,
                                   int dimension,
                                   int nthCtl,
                                   double key,
                                   double value) WARN_UNUSED_RETURN;
 
-    NATRON_ENUM::StatusEnum setNthControlPoint(NATRON_ENUM::ValueChangedReasonEnum reason,
+    Natron::StatusEnum setNthControlPoint(Natron::ValueChangedReasonEnum reason,
                                   int dimension,
                                   int nthCtl,
                                   double key,
@@ -1044,8 +1044,8 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON
                                   double rightDerivative) WARN_UNUSED_RETURN;
 
 
-    NATRON_ENUM::StatusEnum deleteControlPoint(NATRON_ENUM::ValueChangedReasonEnum reason, int dimension, int nthCtl) WARN_UNUSED_RETURN;
-    NATRON_ENUM::StatusEnum deleteAllControlPoints(NATRON_ENUM::ValueChangedReasonEnum reason, int dimension) WARN_UNUSED_RETURN;
+    Natron::StatusEnum deleteControlPoint(Natron::ValueChangedReasonEnum reason, int dimension, int nthCtl) WARN_UNUSED_RETURN;
+    Natron::StatusEnum deleteAllControlPoints(Natron::ValueChangedReasonEnum reason, int dimension) WARN_UNUSED_RETURN;
     static const std::string & typeNameStatic() WARN_UNUSED_RETURN;
 
     void saveParametricCurves(std::list<Curve >* curves) const;
diff --git a/Engine/Log.cpp b/Engine/Log.cpp
index d518d10301..4e1572b704 100644
--- a/Engine/Log.cpp
+++ b/Engine/Log.cpp
@@ -35,9 +35,9 @@
 #include <cassert>
 #include <stdexcept>
 
-#include <QtCore/QFile>
-#include <QtCore/QTextStream>
-#include <QtCore/QMutex>
+#include <QFile>
+#include <QTextStream>
+#include <QMutex>
 
 #include "Global/GlobalDefines.h"
 
diff --git a/Engine/LogEntry.h b/Engine/LogEntry.h
index 6b2cd4a379..74a2fb0fc1 100644
--- a/Engine/LogEntry.h
+++ b/Engine/LogEntry.h
@@ -29,8 +29,8 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QString>
-#include <QtCore/QDateTime>
+#include <QString>
+#include <QDateTime>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Engine/Lut.h b/Engine/Lut.h
index a1359c2e35..9d39ab726e 100644
--- a/Engine/Lut.h
+++ b/Engine/Lut.h
@@ -38,7 +38,7 @@
 #include <string>
 
 CLANG_DIAG_OFF(deprecated)
-#include <QtCore/QMutex>
+#include <QMutex>
 CLANG_DIAG_ON(deprecated)
 
 #include "Engine/EngineFwd.h"
diff --git a/Engine/Markdown.cpp b/Engine/Markdown.cpp
index 3bc939b95f..718decd6a9 100644
--- a/Engine/Markdown.cpp
+++ b/Engine/Markdown.cpp
@@ -29,8 +29,8 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QTextStream>
-#include <QtCore/QRegExp>
+#include <QTextStream>
+#include <QRegExp>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Engine/Markdown.h b/Engine/Markdown.h
index 86d7d948e4..f619541288 100644
--- a/Engine/Markdown.h
+++ b/Engine/Markdown.h
@@ -31,10 +31,10 @@
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
 GCC_ONLY_DIAG_OFF(class-memaccess)
-#include <QtCore/QVector>
+#include <QVector>
 GCC_ONLY_DIAG_ON(class-memaccess)
-#include <QtCore/QStringList>
-#include <QtCore/QCoreApplication>
+#include <QStringList>
+#include <QCoreApplication>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Engine/MemoryInfo.cpp b/Engine/MemoryInfo.cpp
index 07ad4915e6..18e8d7b140 100644
--- a/Engine/MemoryInfo.cpp
+++ b/Engine/MemoryInfo.cpp
@@ -70,10 +70,10 @@
 #  error "Cannot define getPeakRSS( ) or getCurrentRSS( ) for an unknown OS."
 #endif
 
-#include <QtCore/QString>
-#include <QtCore/QLocale>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
+#include <QString>
+#include <QLocale>
+#include <QCoreApplication>
+#include <QDebug>
 
 #include "Global/GlobalDefines.h"
 
diff --git a/Engine/MemoryInfo.h b/Engine/MemoryInfo.h
index 0c5903b701..07a6c27b27 100644
--- a/Engine/MemoryInfo.h
+++ b/Engine/MemoryInfo.h
@@ -30,7 +30,7 @@
 
 #include <cstddef> // std::size_t
 
-#include <QtCore/QString>
+#include <QString>
 
 #include "Global/GlobalDefines.h"
 
diff --git a/Engine/MergingEnum.h b/Engine/MergingEnum.h
index 1084a658a7..b6cf303cfc 100644
--- a/Engine/MergingEnum.h
+++ b/Engine/MergingEnum.h
@@ -43,7 +43,7 @@ namespace Merge {
  * Keep this in sync with the Merge node's operators otherwise everything will fall apart.
  **/
 inline std::string
-getOperatorString(NATRON_ENUM::MergingFunctionEnum operation)
+getOperatorString(Natron::MergingFunctionEnum operation)
 {
     switch (operation) {
     case eMergeATop:
@@ -169,7 +169,7 @@ getOperatorString(NATRON_ENUM::MergingFunctionEnum operation)
 } // getOperationString
 
 inline std::string
-getOperatorHelpString(NATRON_ENUM::MergingFunctionEnum operation)
+getOperatorHelpString(Natron::MergingFunctionEnum operation)
 {
     switch (operation) {
     case eMergeATop:
@@ -295,8 +295,8 @@ getOperatorHelpString(NATRON_ENUM::MergingFunctionEnum operation)
 } // getOperationHelpString
 
 inline
-NATRON_ENUM::PixmapEnum
-getOperatorPixmap(NATRON_ENUM::MergingFunctionEnum operation)
+Natron::PixmapEnum
+getOperatorPixmap(Natron::MergingFunctionEnum operation)
 {
     switch (operation) {
     case eMergeATop:
diff --git a/Engine/Node.cpp b/Engine/Node.cpp
index aa0a905d5e..8d6add0343 100644
--- a/Engine/Node.cpp
+++ b/Engine/Node.cpp
@@ -35,14 +35,14 @@
 
 #include "Global/Macros.h"
 
-#include <QtCore/QDateTime>
-#include <QtCore/QDebug>
-#include <QtCore/QReadWriteLock>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QWaitCondition>
-#include <QtCore/QTextStream>
-#include <QtCore/QFile>
-#include <QtCore/QRegExp>
+#include <QDateTime>
+#include <QDebug>
+#include <QReadWriteLock>
+#include <QCoreApplication>
+#include <QWaitCondition>
+#include <QTextStream>
+#include <QFile>
+#include <QRegExp>
 
 #include <ofxNatron.h>
 
diff --git a/Engine/Node.h b/Engine/Node.h
index f5e433b754..d8d939a6db 100644
--- a/Engine/Node.h
+++ b/Engine/Node.h
@@ -35,10 +35,10 @@
 #include <bitset>
 
 CLANG_DIAG_OFF(deprecated)
-#include <QtCore/QMetaType>
-#include <QtCore/QObject>
+#include <QMetaType>
+#include <QObject>
 CLANG_DIAG_ON(deprecated)
-#include <QtCore/QMutex>
+#include <QMutex>
 
 #include "Engine/AppManager.h"
 #include "Global/KeySymbols.h"
diff --git a/Engine/NodeDocumentation.cpp b/Engine/NodeDocumentation.cpp
index 6882309f61..4d1ff2af6f 100644
--- a/Engine/NodeDocumentation.cpp
+++ b/Engine/NodeDocumentation.cpp
@@ -25,8 +25,8 @@
 
 #include "NodePrivate.h"
 
-#include <QtCore/QTextStream>
-#include <QtCore/QFile>
+#include <QTextStream>
+#include <QFile>
 
 #include "Engine/EffectInstance.h"
 #include "Engine/KnobTypes.h"
diff --git a/Engine/NodeGroup.cpp b/Engine/NodeGroup.cpp
index 609d365927..4d5a6a68a7 100644
--- a/Engine/NodeGroup.cpp
+++ b/Engine/NodeGroup.cpp
@@ -34,8 +34,8 @@
 #include <sstream> // stringstream
 #include <limits>
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QTextStream>
+#include <QCoreApplication>
+#include <QTextStream>
 
 #include "Engine/AppInstance.h"
 #include "Engine/Bezier.h"
diff --git a/Engine/NodeGroup.h b/Engine/NodeGroup.h
index b9c3675404..701d35ef90 100644
--- a/Engine/NodeGroup.h
+++ b/Engine/NodeGroup.h
@@ -33,7 +33,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Engine/NodeGroupSerialization.cpp b/Engine/NodeGroupSerialization.cpp
index f32d0c115f..be11ac90b3 100644
--- a/Engine/NodeGroupSerialization.cpp
+++ b/Engine/NodeGroupSerialization.cpp
@@ -28,8 +28,8 @@
 #include <cassert>
 #include <stdexcept>
 
-#include <QtCore/QDateTime>
-#include <QtCore/QFileInfo>
+#include <QDateTime>
+#include <QFileInfo>
 
 #include "Engine/AppManager.h"
 #include "Engine/CreateNodeArgs.h"
diff --git a/Engine/NodeGroupSerialization.h b/Engine/NodeGroupSerialization.h
index 253fd00d5f..c0e8b98691 100644
--- a/Engine/NodeGroupSerialization.h
+++ b/Engine/NodeGroupSerialization.h
@@ -45,7 +45,7 @@ GCC_DIAG_ON(unused-parameter)
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Engine/NodeInputs.cpp b/Engine/NodeInputs.cpp
index 7af97bcf18..6baa55b4e4 100644
--- a/Engine/NodeInputs.cpp
+++ b/Engine/NodeInputs.cpp
@@ -26,7 +26,7 @@
 #include "NodePrivate.h"
 
 #include <QDebug>
-#include <QtCore/QThread>
+#include <QThread>
 
 #include "Engine/NodeGroup.h"
 #include "Engine/PrecompNode.h"
diff --git a/Engine/NodeMain.cpp b/Engine/NodeMain.cpp
index fb03e30fb7..13b9dfb915 100644
--- a/Engine/NodeMain.cpp
+++ b/Engine/NodeMain.cpp
@@ -25,7 +25,7 @@
 
 #include "NodePrivate.h"
 
-#include <QtCore/QThread>
+#include <QThread>
 
 #include "Engine/AppInstance.h"
 #include "Engine/CreateNodeArgs.h"
diff --git a/Engine/NodeName.cpp b/Engine/NodeName.cpp
index cb8b681743..5266e9e188 100644
--- a/Engine/NodeName.cpp
+++ b/Engine/NodeName.cpp
@@ -25,7 +25,7 @@
 
 #include "NodePrivate.h"
 
-#include <QtCore/QThread>
+#include <QThread>
 
 #include <sstream>
 
diff --git a/Engine/NodeOverlay.cpp b/Engine/NodeOverlay.cpp
index 907c459041..6048e8bca4 100644
--- a/Engine/NodeOverlay.cpp
+++ b/Engine/NodeOverlay.cpp
@@ -25,7 +25,7 @@
 
 #include "NodePrivate.h"
 
-#include <QtCore/QThread>
+#include <QThread>
 
 #include "Engine/EffectInstance.h"
 #include "Engine/KnobTypes.h"
diff --git a/Engine/NodePrivate.h b/Engine/NodePrivate.h
index d78813a1b6..bbad791372 100644
--- a/Engine/NodePrivate.h
+++ b/Engine/NodePrivate.h
@@ -31,9 +31,9 @@
 #include "Node.h"
 #include "Timer.h" // gettimeofday()
 
-#include <QtCore/QWaitCondition>
-#include <QtCore/QReadWriteLock>
-#include <QtCore/QMutex>
+#include <QWaitCondition>
+#include <QReadWriteLock>
+#include <QMutex>
 
 #include "Engine/Hash64.h"
 
diff --git a/Engine/OSGLContext.cpp b/Engine/OSGLContext.cpp
index 5e4011ba0d..b66a92133d 100644
--- a/Engine/OSGLContext.cpp
+++ b/Engine/OSGLContext.cpp
@@ -29,9 +29,9 @@
 #include <stdexcept>
 #include <sstream> // stringstream
 
-#include <QtCore/QDebug>
-#include <QtCore/QMutex>
-#include <QtCore/QWaitCondition>
+#include <QDebug>
+#include <QMutex>
+#include <QWaitCondition>
 
 #include "Engine/AppManager.h"
 
diff --git a/Engine/OSGLContext_win.cpp b/Engine/OSGLContext_win.cpp
index 2e994c3eb0..4d4f9abafa 100644
--- a/Engine/OSGLContext_win.cpp
+++ b/Engine/OSGLContext_win.cpp
@@ -29,7 +29,7 @@
 #include <iostream> // std::cerr
 #include <sstream> // stringstream
 
-#include <QtCore/QtGlobal>      // for Q_UNUSED
+#include <QtGlobal>      // for Q_UNUSED
 
 #include "Engine/AppManager.h"
 #include "Engine/MemoryInfo.h" // isApplication32Bits
diff --git a/Engine/OfxClipInstance.cpp b/Engine/OfxClipInstance.cpp
index f794631568..9a674f3bfb 100644
--- a/Engine/OfxClipInstance.cpp
+++ b/Engine/OfxClipInstance.cpp
@@ -32,9 +32,9 @@
 #include <stdexcept>
 #include <sstream> // stringstream
 
-#include <QtCore/QTextStream>
-#include <QtCore/QDebug>
-#include <QtCore/QCoreApplication>
+#include <QTextStream>
+#include <QDebug>
+#include <QCoreApplication>
 
 #include "Engine/CacheEntry.h"
 #include "Engine/OfxEffectInstance.h"
diff --git a/Engine/OfxClipInstance.h b/Engine/OfxClipInstance.h
index 4b016025e8..39c92c45da 100644
--- a/Engine/OfxClipInstance.h
+++ b/Engine/OfxClipInstance.h
@@ -32,7 +32,7 @@
 #include <list>
 
 CLANG_DIAG_OFF(deprecated)
-#include <QtCore/QMutex>
+#include <QMutex>
 CLANG_DIAG_ON(deprecated)
 
 //ofx
diff --git a/Engine/OfxEffectInstance.cpp b/Engine/OfxEffectInstance.cpp
index 325ec3b721..bfb96b5682 100644
--- a/Engine/OfxEffectInstance.cpp
+++ b/Engine/OfxEffectInstance.cpp
@@ -30,10 +30,10 @@
 #include <cassert>
 #include <stdexcept>
 
-#include <QtCore/QDebug>
-#include <QtCore/QByteArray>
-#include <QtCore/QReadWriteLock>
-#include <QtCore/QPointF>
+#include <QDebug>
+#include <QByteArray>
+#include <QReadWriteLock>
+#include <QPointF>
 
 // ofxhPropertySuite.h:565:37: warning: 'this' pointer cannot be null in well-defined C++ code; comparison may be assumed to always evaluate to true [-Wtautological-undefined-compare]
 // clang-format off
diff --git a/Engine/OfxEffectInstance.h b/Engine/OfxEffectInstance.h
index 005dd826bc..e8fb054899 100644
--- a/Engine/OfxEffectInstance.h
+++ b/Engine/OfxEffectInstance.h
@@ -32,11 +32,11 @@
 #include <string>
 
 CLANG_DIAG_OFF(deprecated)
-#include <QtCore/QMutex>
-#include <QtCore/QString>
-#include <QtCore/QObject>
+#include <QMutex>
+#include <QString>
+#include <QObject>
 CLANG_DIAG_ON(deprecated)
-#include <QtCore/QStringList>
+#include <QStringList>
 
 #include "Engine/OutputEffectInstance.h"
 #include "Engine/ViewIdx.h"
diff --git a/Engine/OfxHost.cpp b/Engine/OfxHost.cpp
index 6d1e0e8c15..b857d6a8ab 100644
--- a/Engine/OfxHost.cpp
+++ b/Engine/OfxHost.cpp
@@ -40,18 +40,18 @@ CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
 // clang-format off
 CLANG_DIAG_OFF(deprecated-register) //'register' storage class specifier is deprecated
-#include <QtCore/QDateTime>
-#include <QtCore/QDir>
-#include <QtCore/QMutex>
-#include <QtCore/QThreadPool>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
-#include <QtCore/QTemporaryFile>
+#include <QDateTime>
+#include <QDir>
+#include <QMutex>
+#include <QThreadPool>
+#include <QCoreApplication>
+#include <QDebug>
+#include <QTemporaryFile>
 CLANG_DIAG_ON(deprecated-register)
 // clang-format on
 #ifdef OFX_SUPPORTS_MULTITHREAD
-#include <QtCore/QThread>
-#include <QtCore/QThreadStorage>
+#include <QThread>
+#include <QThreadStorage>
 #include <QtConcurrentMap> // QtCore on Qt4, QtConcurrent on Qt5
 #endif
 CLANG_DIAG_ON(deprecated)
diff --git a/Engine/OfxHost.h b/Engine/OfxHost.h
index 2ce626c6d6..9ba0325a41 100644
--- a/Engine/OfxHost.h
+++ b/Engine/OfxHost.h
@@ -32,7 +32,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Engine/OfxImageEffectInstance.cpp b/Engine/OfxImageEffectInstance.cpp
index e5bda6ad39..cceafdd90c 100644
--- a/Engine/OfxImageEffectInstance.cpp
+++ b/Engine/OfxImageEffectInstance.cpp
@@ -36,8 +36,8 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QDateTime>
-#include <QtCore/QDebug>
+#include <QDateTime>
+#include <QDebug>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Engine/OfxImageEffectInstance.h b/Engine/OfxImageEffectInstance.h
index 60b7e77d2f..54091d3f39 100644
--- a/Engine/OfxImageEffectInstance.h
+++ b/Engine/OfxImageEffectInstance.h
@@ -33,7 +33,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Engine/OfxMemory.cpp b/Engine/OfxMemory.cpp
index fba96559cd..4600a24d7f 100644
--- a/Engine/OfxMemory.cpp
+++ b/Engine/OfxMemory.cpp
@@ -29,7 +29,7 @@
 #include <stdexcept>
 
 CLANG_DIAG_OFF(deprecated)
-#include <QtCore/QMutex>
+#include <QMutex>
 CLANG_DIAG_ON(deprecated)
 
 #include "Engine/EffectInstance.h"
diff --git a/Engine/OfxParamInstance.cpp b/Engine/OfxParamInstance.cpp
index 91facaf655..f4d954986e 100644
--- a/Engine/OfxParamInstance.cpp
+++ b/Engine/OfxParamInstance.cpp
@@ -36,7 +36,7 @@
 #include <ofxParametricParam.h>
 #include <ofxNatron.h>
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 #include "Global/GlobalDefines.h"
 #include "Engine/AppManager.h"
diff --git a/Engine/OfxParamInstance.h b/Engine/OfxParamInstance.h
index 45eb573f89..2f16ccf702 100644
--- a/Engine/OfxParamInstance.h
+++ b/Engine/OfxParamInstance.h
@@ -33,8 +33,8 @@
 #include <vector>
 
 CLANG_DIAG_OFF(deprecated)
-#include <QtCore/QStringList>
-#include <QtCore/QMutex>
+#include <QStringList>
+#include <QMutex>
 CLANG_DIAG_ON(deprecated)
 
 
diff --git a/Engine/OutputEffectInstance.cpp b/Engine/OutputEffectInstance.cpp
index 00a5914835..0db16894fe 100644
--- a/Engine/OutputEffectInstance.cpp
+++ b/Engine/OutputEffectInstance.cpp
@@ -32,10 +32,10 @@
 #include <cassert>
 #include <stdexcept>
 
-#include <QtCore/QReadWriteLock>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QThread>
-#include <QtCore/QRegExp>
+#include <QReadWriteLock>
+#include <QCoreApplication>
+#include <QThread>
+#include <QRegExp>
 #include <QtConcurrentMap> // QtCore on Qt4, QtConcurrent on Qt5
 #include <QtConcurrentRun> // QtCore on Qt4, QtConcurrent on Qt5
 
diff --git a/Engine/OutputEffectInstance.h b/Engine/OutputEffectInstance.h
index 977f98aff2..0c3478b96d 100644
--- a/Engine/OutputEffectInstance.h
+++ b/Engine/OutputEffectInstance.h
@@ -30,7 +30,7 @@
 
 #include <list>
 
-#include <QtCore/QMutex>
+#include <QMutex>
 
 #include "Engine/EffectInstance.h"
 #include "Engine/ViewIdx.h"
diff --git a/Engine/OutputSchedulerThread.cpp b/Engine/OutputSchedulerThread.cpp
index 49d7910bcf..048b7acd72 100644
--- a/Engine/OutputSchedulerThread.cpp
+++ b/Engine/OutputSchedulerThread.cpp
@@ -34,15 +34,15 @@
 #include <stdexcept>
 #include <sstream> // stringstream
 
-#include <QtCore/QMetaType>
-#include <QtCore/QMutex>
-#include <QtCore/QWaitCondition>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QString>
-#include <QtCore/QThreadPool>
-#include <QtCore/QDebug>
-#include <QtCore/QTextStream>
-#include <QtCore/QRunnable>
+#include <QMetaType>
+#include <QMutex>
+#include <QWaitCondition>
+#include <QCoreApplication>
+#include <QString>
+#include <QThreadPool>
+#include <QDebug>
+#include <QTextStream>
+#include <QRunnable>
 
 #include "Global/MathUtils.h"
 #ifdef DEBUG
diff --git a/Engine/OutputSchedulerThread.h b/Engine/OutputSchedulerThread.h
index 9effc483df..856f534518 100644
--- a/Engine/OutputSchedulerThread.h
+++ b/Engine/OutputSchedulerThread.h
@@ -30,8 +30,8 @@
 
 #include <vector>
 
-#include <QtCore/QThread>
-#include <QtCore/QMutex>
+#include <QThread>
+#include <QMutex>
 
 #include "Global/GlobalDefines.h"
 
diff --git a/Engine/OverlaySupport.h b/Engine/OverlaySupport.h
index e03fe06165..06cc290e94 100644
--- a/Engine/OverlaySupport.h
+++ b/Engine/OverlaySupport.h
@@ -30,7 +30,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QPointF>
+#include <QPointF>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Engine/Plugin.cpp b/Engine/Plugin.cpp
index 1478a5e362..d9df86cad6 100644
--- a/Engine/Plugin.cpp
+++ b/Engine/Plugin.cpp
@@ -30,7 +30,7 @@
 #include <locale>
 #include <stdexcept>
 
-#include <QtCore/QMutex>
+#include <QMutex>
 
 #include "Engine/AppManager.h"
 #include "Engine/LibraryBinary.h"
diff --git a/Engine/Plugin.h b/Engine/Plugin.h
index 3f1b743348..c48b136431 100644
--- a/Engine/Plugin.h
+++ b/Engine/Plugin.h
@@ -32,9 +32,9 @@
 #include <set>
 #include <map>
 #include <list>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QRecursiveMutex>
+#include <QString>
+#include <QStringList>
+#include <QRecursiveMutex>
 
 #include "Global/Enums.h"
 #include "Engine/EngineFwd.h"
@@ -173,7 +173,7 @@ class Plugin
 
     int _majorVersion;
     int _minorVersion;
-    NATRON_ENUM::ContextEnum _ofxContext;
+    Natron::ContextEnum _ofxContext;
     mutable bool _hasShortcutSet; //< to speed up the keypress event of Nodegraph, this is used to find out quickly whether it has a shortcut or not.
     bool _isReader, _isWriter;
 
@@ -195,7 +195,7 @@ class Plugin
     bool _multiThreadingEnabled;
     bool _openglActivated;
 
-    NATRON_ENUM::PluginOpenGLRenderSupport _openglRenderSupport;
+    Natron::PluginOpenGLRenderSupport _openglRenderSupport;
 
 public:
 
@@ -357,9 +357,9 @@ class Plugin
     void setOfxPlugin(OFX::Host::ImageEffect::ImageEffectPlugin* p);
 
     OFX::Host::ImageEffect::ImageEffectPlugin* getOfxPlugin() const;
-    OFX::Host::ImageEffect::Descriptor* getOfxDesc(NATRON_ENUM::ContextEnum* ctx) const;
+    OFX::Host::ImageEffect::Descriptor* getOfxDesc(Natron::ContextEnum* ctx) const;
 
-    void setOfxDesc(OFX::Host::ImageEffect::Descriptor* desc, NATRON_ENUM::ContextEnum ctx);
+    void setOfxDesc(OFX::Host::ImageEffect::Descriptor* desc, Natron::ContextEnum ctx);
 
     bool isRenderScaleEnabled() const;
     void setRenderScaleEnabled(bool b);
@@ -373,8 +373,8 @@ class Plugin
     bool isOpenGLEnabled() const;
     void setOpenGLEnabled(bool b);
 
-    void setOpenGLRenderSupport(NATRON_ENUM::PluginOpenGLRenderSupport support);
-    NATRON_ENUM::PluginOpenGLRenderSupport getPluginOpenGLRenderSupport() const;
+    void setOpenGLRenderSupport(Natron::PluginOpenGLRenderSupport support);
+    Natron::PluginOpenGLRenderSupport getPluginOpenGLRenderSupport() const;
 };
 
 struct Plugin_compare_version
diff --git a/Engine/PluginMemory.cpp b/Engine/PluginMemory.cpp
index 26a2697c97..290149c0ce 100644
--- a/Engine/PluginMemory.cpp
+++ b/Engine/PluginMemory.cpp
@@ -30,7 +30,7 @@
 #include <stdexcept>
 
 CLANG_DIAG_OFF(deprecated)
-#include <QtCore/QMutex>
+#include <QMutex>
 CLANG_DIAG_ON(deprecated)
 #include "Engine/EffectInstance.h"
 #include "Engine/CacheEntry.h"
diff --git a/Engine/PrecompNode.cpp b/Engine/PrecompNode.cpp
index a6af1facfb..ef52908e16 100644
--- a/Engine/PrecompNode.cpp
+++ b/Engine/PrecompNode.cpp
@@ -34,7 +34,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Engine/ProcessHandler.cpp b/Engine/ProcessHandler.cpp
index f1204af738..f1ba52a276 100644
--- a/Engine/ProcessHandler.cpp
+++ b/Engine/ProcessHandler.cpp
@@ -28,16 +28,16 @@
 #include <cassert>
 #include <stdexcept>
 
-#include <QtCore/QtGlobal> // for Q_OS_*
-#include <QtCore/QProcess>
-#include <QtNetwork/QLocalServer>
-#include <QtNetwork/QLocalSocket>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QTemporaryFile>
-#include <QtCore/QWaitCondition>
-#include <QtCore/QMutex>
-#include <QtCore/QDir>
-#include <QtCore/QDebug>
+#include <QtGlobal> // for Q_OS_*
+#include <QProcess>
+#include <QLocalServer>
+#include <QLocalSocket>
+#include <QCoreApplication>
+#include <QTemporaryFile>
+#include <QWaitCondition>
+#include <QMutex>
+#include <QDir>
+#include <QDebug>
 
 #ifdef DEBUG
 #include "Global/FloatingPointExceptions.h"
diff --git a/Engine/ProcessHandler.h b/Engine/ProcessHandler.h
index abae69ea1f..2bbc3e73b1 100644
--- a/Engine/ProcessHandler.h
+++ b/Engine/ProcessHandler.h
@@ -29,12 +29,12 @@
 #include "Global/Macros.h"
 
 CLANG_DIAG_OFF(deprecated)
-#include <QtCore/QProcess>
-#include <QtCore/QThread>
-#include <QtCore/QStringList>
-#include <QtCore/QString>
-#include <QtCore/QMutex>
-#include <QtCore/QWaitCondition>
+#include <QProcess>
+#include <QThread>
+#include <QStringList>
+#include <QString>
+#include <QMutex>
+#include <QWaitCondition>
 CLANG_DIAG_ON(deprecated)
 
 #include "Global/GlobalDefines.h"
diff --git a/Engine/Project.cpp b/Engine/Project.cpp
index 1f4ffc4b0a..cc6c75cf9d 100644
--- a/Engine/Project.cpp
+++ b/Engine/Project.cpp
@@ -44,16 +44,16 @@
 #endif
 
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QTimer>
-#include <QtCore/QThread>
-#include <QtCore/QDir>
-#include <QtCore/QDirIterator>
-#include <QtCore/QTemporaryFile>
-#include <QtCore/QFileInfo>
-#include <QtCore/QDebug>
-#include <QtCore/QTextStream>
-#include <QtNetwork/QHostInfo>
+#include <QCoreApplication>
+#include <QTimer>
+#include <QThread>
+#include <QDir>
+#include <QDirIterator>
+#include <QTemporaryFile>
+#include <QFileInfo>
+#include <QDebug>
+#include <QTextStream>
+#include <QHostInfo>
 #include <QtConcurrentRun> // QtCore on Qt4, QtConcurrent on Qt5
 
 #include <ofxhXml.h> // OFX::XML::escape
diff --git a/Engine/Project.h b/Engine/Project.h
index c18f25c27f..9e3bedce4a 100644
--- a/Engine/Project.h
+++ b/Engine/Project.h
@@ -33,8 +33,8 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QDateTime>
-#include <QtCore/QObject>
+#include <QDateTime>
+#include <QObject>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Engine/ProjectPrivate.cpp b/Engine/ProjectPrivate.cpp
index 7a298e4c2f..bd5035fcae 100644
--- a/Engine/ProjectPrivate.cpp
+++ b/Engine/ProjectPrivate.cpp
@@ -30,11 +30,11 @@
 #include <stdexcept>
 #include <sstream> // stringstream
 
-#include <QtCore/QDebug>
-#include <QtCore/QTimer>
-#include <QtCore/QDateTime>
-#include <QtCore/QFile>
-#include <QtCore/QDir>
+#include <QDebug>
+#include <QTimer>
+#include <QDateTime>
+#include <QFile>
+#include <QDir>
 
 #include "Global/PythonUtils.h"
 
diff --git a/Engine/ProjectPrivate.h b/Engine/ProjectPrivate.h
index 0935016cdd..edfc391b4a 100644
--- a/Engine/ProjectPrivate.h
+++ b/Engine/ProjectPrivate.h
@@ -33,12 +33,12 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDateTime>
-#include <QtCore/QString>
+#include <QCoreApplication>
+#include <QDateTime>
+#include <QString>
 #include <QFuture>
 #include <QFutureWatcher>
-#include <QtCore/QMutex>
+#include <QMutex>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Engine/PyAppInstance.cpp b/Engine/PyAppInstance.cpp
index d9ae1f8586..38b4a04bd1 100644
--- a/Engine/PyAppInstance.cpp
+++ b/Engine/PyAppInstance.cpp
@@ -29,7 +29,7 @@
 #include <stdexcept>
 #include <sstream> // stringstream
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 #include "Engine/AppInstance.h"
 #include "Engine/CreateNodeArgs.h"
diff --git a/Engine/PyAppInstance.h b/Engine/PyAppInstance.h
index 5a704a1386..18bbca23ee 100644
--- a/Engine/PyAppInstance.h
+++ b/Engine/PyAppInstance.h
@@ -37,8 +37,8 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QCoreApplication>
-#include <QtCore/QString>
+#include <QCoreApplication>
+#include <QString>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Engine/PyNode.h b/Engine/PyNode.h
index 805587b2be..0d0b244e9e 100644
--- a/Engine/PyNode.h
+++ b/Engine/PyNode.h
@@ -200,7 +200,7 @@ class UserParamHolder
     void refreshUserParamsGUI();
 
     virtual bool onKnobValueChanged(KnobI* k,
-                                    NATRON_ENUM::ValueChangedReasonEnum reason,
+                                    Natron::ValueChangedReasonEnum reason,
                                     double time,
                                     ViewSpec view,
                                     bool originatedFromMainThread)
@@ -383,8 +383,8 @@ class Effect
 
     double getPixelAspectRatio() const;
 
-    NATRON_ENUM::ImageBitDepthEnum getBitDepth() const;
-    NATRON_ENUM::ImagePremultiplicationEnum getPremult() const;
+    Natron::ImageBitDepthEnum getBitDepth() const;
+    Natron::ImagePremultiplicationEnum getPremult() const;
 
     void setPagesOrder(const QStringList& pages);
 };
diff --git a/Engine/PyParameter.h b/Engine/PyParameter.h
index ca1e240c1f..78aee842f5 100644
--- a/Engine/PyParameter.h
+++ b/Engine/PyParameter.h
@@ -264,7 +264,7 @@ class AnimatedParam
     bool setExpression(const QString& expr, bool hasRetVariable, int dimension = 0);
     QString getExpression(int dimension, bool* hasRetVariable) const;
 
-    bool setInterpolationAtTime(double time, NATRON_ENUM::KeyframeTypeEnum interpolation, int dimension = 0);
+    bool setInterpolationAtTime(double time, Natron::KeyframeTypeEnum interpolation, int dimension = 0);
 };
 
 /**
@@ -1169,31 +1169,31 @@ class ParametricParam
 
     void getCurveColor(int dimension, ColorTuple& ret) const;
 
-    NATRON_ENUM::StatusEnum addControlPoint(int dimension, double key, double value, NATRON_ENUM::KeyframeTypeEnum interpolation = NATRON_ENUM::eKeyframeTypeSmooth);
-    NATRON_ENUM::StatusEnum addControlPoint(int dimension, double key, double value, double leftDerivative, double rightDerivative, NATRON_ENUM::KeyframeTypeEnum interpolation = NATRON_ENUM::eKeyframeTypeSmooth);
+    Natron::StatusEnum addControlPoint(int dimension, double key, double value, Natron::KeyframeTypeEnum interpolation = Natron::KeyframeTypeEnum::eKeyframeTypeSmooth);
+    Natron::StatusEnum addControlPoint(int dimension, double key, double value, double leftDerivative, double rightDerivative, Natron::KeyframeTypeEnum interpolation = Natron::KeyframeTypeEnum::eKeyframeTypeSmooth);
 
     double getValue(int dimension, double parametricPosition) const;
 
     int getNControlPoints(int dimension) const;
 
-    // NATRON_ENUM:: is necessary for shiboken
-    NATRON_ENUM::StatusEnum getNthControlPoint(int dimension,
+    // Natron:: is necessary for shiboken
+    Natron::StatusEnum getNthControlPoint(int dimension,
                                                     int nthCtl,
                                                     double *key,
                                                     double *value,
                                                     double *leftDerivative,
                                                     double *rightDerivative) const;
-    NATRON_ENUM::StatusEnum setNthControlPoint(int dimension,
+    Natron::StatusEnum setNthControlPoint(int dimension,
                                                     int nthCtl,
                                                     double key,
                                                     double value,
                                                     double leftDerivative,
                                                     double rightDerivative);
-    NATRON_ENUM::StatusEnum setNthControlPointInterpolation(int dimension,
+    Natron::StatusEnum setNthControlPointInterpolation(int dimension,
                                                                  int nThCtl,
-                                                                 NATRON_ENUM::KeyframeTypeEnum interpolation);
-    NATRON_ENUM::StatusEnum deleteControlPoint(int dimension, int nthCtl);
-    NATRON_ENUM::StatusEnum deleteAllControlPoints(int dimension);
+                                                                 Natron::KeyframeTypeEnum interpolation);
+    Natron::StatusEnum deleteControlPoint(int dimension, int nthCtl);
+    Natron::StatusEnum deleteAllControlPoints(int dimension);
 
     void setDefaultCurvesFromCurrentCurves();
 };
diff --git a/Engine/PyRoto.h b/Engine/PyRoto.h
index 7725846fde..38bb985e8d 100644
--- a/Engine/PyRoto.h
+++ b/Engine/PyRoto.h
@@ -153,8 +153,8 @@ class BezierCurve
     ColorTuple getColor(double time);
     void setColor(double time, double r, double g, double b);
 
-    void setCompositingOperator(NATRON_ENUM::MergingFunctionEnum op);
-    NATRON_ENUM::MergingFunctionEnum getCompositingOperator() const;
+    void setCompositingOperator(Natron::MergingFunctionEnum op);
+    Natron::MergingFunctionEnum getCompositingOperator() const;
     BooleanParam* getActivatedParam() const;
     DoubleParam* getOpacityParam() const;
     DoubleParam* getFeatherDistanceParam() const;
diff --git a/Engine/PySide6_Engine_Python.h b/Engine/PySide6_Engine_Python.h
new file mode 100644
index 0000000000..279d28109d
--- /dev/null
+++ b/Engine/PySide6_Engine_Python.h
@@ -0,0 +1,39 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * This file is part of Natron <https://natrongithub.github.io/>,
+ * (C) 2018-2024 The Natron developers
+ * (C) 2013-2018 INRIA and Alexandre Gauthier-Foichat
+ *
+ * Natron is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Natron is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Natron.  If not, see <http://www.gnu.org/licenses/gpl-2.0.html>
+ * ***** END LICENSE BLOCK ***** */
+
+
+#ifndef PYSIDE6_ENGINE_PYTHON_H
+#define PYSIDE6_ENGINE_PYTHON_H
+
+// Defined for shiboken6-specific tweaks
+#define SBK6_RUN
+
+#ifndef BOOST_SERIALIZATION_VERSION_HPP
+#define BOOST_SERIALIZATION_VERSION_HPP
+#define BOOST_CLASS_VERSION(T, N)
+#endif /* BOOST_SERIALIZATION_VERSION_HPP */
+
+#ifndef BOOST_SERIALIZATION_SPLIT_MEMBER_HPP
+#define BOOST_SERIALIZATION_SPLIT_MEMBER_HPP
+#define BOOST_SERIALIZATION_SPLIT_MEMBER()
+#endif /* BOOST_SERIALIZATION_SPLIT_MEMBER_HPP */
+
+#include "Pyside_Engine_Python.h"
+
+#endif // PYSIDE6_ENGINE_PYTHON_H
diff --git a/Engine/Pyside_Engine_Python.h b/Engine/Pyside_Engine_Python.h
index 333422aebd..ea70319564 100644
--- a/Engine/Pyside_Engine_Python.h
+++ b/Engine/Pyside_Engine_Python.h
@@ -39,7 +39,7 @@
 #ifdef SBK2_RUN
 #include <pyside2_global.h>
 #else
-#include <pyside_global.h>
+#include <pyside6_global.h>
 #endif
 #include <string>
 //Global
diff --git a/Engine/ReadNode.cpp b/Engine/ReadNode.cpp
index 4f86bb8f44..3b4af89f92 100644
--- a/Engine/ReadNode.cpp
+++ b/Engine/ReadNode.cpp
@@ -48,8 +48,8 @@ GCC_DIAG_ON(unused-parameter)
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QCoreApplication>
-#include <QtCore/QProcess>
+#include <QCoreApplication>
+#include <QProcess>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Engine/RenderStats.cpp b/Engine/RenderStats.cpp
index 4f6b779566..b0314435ac 100644
--- a/Engine/RenderStats.cpp
+++ b/Engine/RenderStats.cpp
@@ -29,7 +29,7 @@
 #include <cassert>
 #include <stdexcept>
 
-#include <QtCore/QMutex>
+#include <QMutex>
 
 #include "Engine/Node.h"
 #include "Engine/Timer.h"
diff --git a/Engine/RotoContext.cpp b/Engine/RotoContext.cpp
index e07710d6ef..36281f7c17 100644
--- a/Engine/RotoContext.cpp
+++ b/Engine/RotoContext.cpp
@@ -34,8 +34,8 @@
 #include <cstring> // for std::memcpy, std::memset
 #include <sstream> // stringstream
 
-#include <QtCore/QLineF>
-#include <QtCore/QDebug>
+#include <QLineF>
+#include <QDebug>
 
 //#define ROTO_RENDER_TRIANGLES_ONLY
 
diff --git a/Engine/RotoContext.h b/Engine/RotoContext.h
index eaaff66f49..18c9057efd 100644
--- a/Engine/RotoContext.h
+++ b/Engine/RotoContext.h
@@ -34,9 +34,9 @@
 
 // clang-format off
 CLANG_DIAG_OFF(deprecated-declarations)
-#include <QtCore/QObject>
-#include <QtCore/QMutex>
-#include <QtCore/QMetaType>
+#include <QObject>
+#include <QMutex>
+#include <QMetaType>
 CLANG_DIAG_ON(deprecated-declarations)
 // clang-format on
 
diff --git a/Engine/RotoContextPrivate.h b/Engine/RotoContextPrivate.h
index aad27495ee..8eff9599d1 100644
--- a/Engine/RotoContextPrivate.h
+++ b/Engine/RotoContextPrivate.h
@@ -38,12 +38,12 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QMutex>
-#include <QtCore/QReadWriteLock>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QThread>
-#include <QtCore/QReadWriteLock>
-#include <QtCore/QWaitCondition>
+#include <QMutex>
+#include <QReadWriteLock>
+#include <QCoreApplication>
+#include <QThread>
+#include <QReadWriteLock>
+#include <QWaitCondition>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Engine/RotoDrawableItem.cpp b/Engine/RotoDrawableItem.cpp
index b27498721a..08bd6a20fc 100644
--- a/Engine/RotoDrawableItem.cpp
+++ b/Engine/RotoDrawableItem.cpp
@@ -33,8 +33,8 @@
 #include <cstring> // for std::memcpy
 #include <stdexcept>
 
-#include <QtCore/QLineF>
-#include <QtCore/QDebug>
+#include <QLineF>
+#include <QDebug>
 
 #include "Engine/RotoContextPrivate.h"
 
diff --git a/Engine/RotoDrawableItem.h b/Engine/RotoDrawableItem.h
index e81870cc32..c4c5c638e0 100644
--- a/Engine/RotoDrawableItem.h
+++ b/Engine/RotoDrawableItem.h
@@ -34,9 +34,9 @@
 
 // clang-format off
 CLANG_DIAG_OFF(deprecated-declarations)
-#include <QtCore/QObject>
-#include <QtCore/QMutex>
-#include <QtCore/QMetaType>
+#include <QObject>
+#include <QMutex>
+#include <QMetaType>
 CLANG_DIAG_ON(deprecated-declarations)
 // clang-format on
 
diff --git a/Engine/RotoItem.cpp b/Engine/RotoItem.cpp
index b8d59a861a..db33f57520 100644
--- a/Engine/RotoItem.cpp
+++ b/Engine/RotoItem.cpp
@@ -32,8 +32,8 @@
 #include <cassert>
 #include <stdexcept>
 
-#include <QtCore/QLineF>
-#include <QtCore/QDebug>
+#include <QLineF>
+#include <QDebug>
 
 #include "Engine/AppInstance.h"
 #include "Engine/BezierCP.h"
diff --git a/Engine/RotoItem.h b/Engine/RotoItem.h
index a37e50340a..4160f000dd 100644
--- a/Engine/RotoItem.h
+++ b/Engine/RotoItem.h
@@ -34,9 +34,9 @@
 
 // clang-format off
 CLANG_DIAG_OFF(deprecated-declarations)
-#include <QtCore/QObject>
-#include <QtCore/QMutex>
-#include <QtCore/QMetaType>
+#include <QObject>
+#include <QMutex>
+#include <QMetaType>
 CLANG_DIAG_ON(deprecated-declarations)
 // clang-format on
 
diff --git a/Engine/RotoLayer.cpp b/Engine/RotoLayer.cpp
index fa2d532878..734d4d5e0b 100644
--- a/Engine/RotoLayer.cpp
+++ b/Engine/RotoLayer.cpp
@@ -32,8 +32,8 @@
 #include <cassert>
 #include <stdexcept>
 
-#include <QtCore/QLineF>
-#include <QtCore/QDebug>
+#include <QLineF>
+#include <QDebug>
 
 #include "Engine/AppInstance.h"
 #include "Engine/Bezier.h"
diff --git a/Engine/RotoLayer.h b/Engine/RotoLayer.h
index 6dbc0a7edb..2f6b39e207 100644
--- a/Engine/RotoLayer.h
+++ b/Engine/RotoLayer.h
@@ -34,9 +34,9 @@
 
 // clang-format off
 CLANG_DIAG_OFF(deprecated-declarations)
-#include <QtCore/QObject>
-#include <QtCore/QMutex>
-#include <QtCore/QMetaType>
+#include <QObject>
+#include <QMutex>
+#include <QMetaType>
 CLANG_DIAG_ON(deprecated-declarations)
 // clang-format on
 
diff --git a/Engine/RotoPaintInteract.cpp b/Engine/RotoPaintInteract.cpp
index 2ea85156bf..9ceac356fb 100644
--- a/Engine/RotoPaintInteract.cpp
+++ b/Engine/RotoPaintInteract.cpp
@@ -28,7 +28,7 @@
 
 #include <limits>
 
-#include <QtCore/QLineF>
+#include <QLineF>
 
 #include "Global/GLIncludes.h"
 #include "Engine/KnobTypes.h"
diff --git a/Engine/RotoPaintInteract.h b/Engine/RotoPaintInteract.h
index e80d614d76..c5c638c00d 100644
--- a/Engine/RotoPaintInteract.h
+++ b/Engine/RotoPaintInteract.h
@@ -29,8 +29,8 @@
 #include "Global/Macros.h"
 
 #include <list>
-#include <QtCore/QPointF>
-#include <QtCore/QRectF>
+#include <QPointF>
+#include <QRectF>
 
 #include <ofxNatron.h>
 
diff --git a/Engine/RotoPoint.h b/Engine/RotoPoint.h
index e0cb6876f5..63ebe0abcc 100644
--- a/Engine/RotoPoint.h
+++ b/Engine/RotoPoint.h
@@ -34,9 +34,9 @@
 
 // clang-format off
 CLANG_DIAG_OFF(deprecated-declarations)
-#include <QtCore/QObject>
-#include <QtCore/QMutex>
-#include <QtCore/QMetaType>
+#include <QObject>
+#include <QMutex>
+#include <QMetaType>
 CLANG_DIAG_ON(deprecated-declarations)
 // clang-format on
 
diff --git a/Engine/RotoStrokeItem.cpp b/Engine/RotoStrokeItem.cpp
index 12cf842e96..a682f99b9d 100644
--- a/Engine/RotoStrokeItem.cpp
+++ b/Engine/RotoStrokeItem.cpp
@@ -32,8 +32,8 @@
 #include <cassert>
 #include <stdexcept>
 
-#include <QtCore/QLineF>
-#include <QtCore/QDebug>
+#include <QLineF>
+#include <QDebug>
 
 
 #include "Engine/AppInstance.h"
diff --git a/Engine/RotoStrokeItem.h b/Engine/RotoStrokeItem.h
index b816fe10ee..d6d571d07b 100644
--- a/Engine/RotoStrokeItem.h
+++ b/Engine/RotoStrokeItem.h
@@ -34,9 +34,9 @@
 
 // clang-format off
 CLANG_DIAG_OFF(deprecated-declarations)
-#include <QtCore/QObject>
-#include <QtCore/QMutex>
-#include <QtCore/QMetaType>
+#include <QObject>
+#include <QMutex>
+#include <QMetaType>
 CLANG_DIAG_ON(deprecated-declarations)
 // clang-format on
 
diff --git a/Engine/RotoUndoCommand.cpp b/Engine/RotoUndoCommand.cpp
index 2cbf6a4539..461db98fec 100644
--- a/Engine/RotoUndoCommand.cpp
+++ b/Engine/RotoUndoCommand.cpp
@@ -29,7 +29,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QDebug>
+#include <QDebug>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Engine/RotoUndoCommand.h b/Engine/RotoUndoCommand.h
index b6656ce4b8..611e196570 100644
--- a/Engine/RotoUndoCommand.h
+++ b/Engine/RotoUndoCommand.h
@@ -33,7 +33,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Engine/ScriptObject.cpp b/Engine/ScriptObject.cpp
index 205e02ca51..c21090103a 100644
--- a/Engine/ScriptObject.cpp
+++ b/Engine/ScriptObject.cpp
@@ -29,7 +29,7 @@
 #include <cassert>
 #include <stdexcept>
 
-#include <QtCore/QMutex>
+#include <QMutex>
 
 NATRON_NAMESPACE_ENTER
 
diff --git a/Engine/Settings.cpp b/Engine/Settings.cpp
index 02c52afec0..64b63b4c7b 100644
--- a/Engine/Settings.cpp
+++ b/Engine/Settings.cpp
@@ -29,12 +29,12 @@
 #include <limits>
 #include <stdexcept>
 
-#include <QtCore/QDebug>
-#include <QtCore/QDir>
-#include <QtCore/QSettings>
-#include <QtCore/QThreadPool>
-#include <QtCore/QThread>
-#include <QtCore/QTextStream>
+#include <QDebug>
+#include <QDir>
+#include <QSettings>
+#include <QThreadPool>
+#include <QThread>
+#include <QTextStream>
 
 #ifdef WINDOWS
 #include <tchar.h>
diff --git a/Engine/Singleton.h b/Engine/Singleton.h
index 22558203d6..63fce8b1fb 100644
--- a/Engine/Singleton.h
+++ b/Engine/Singleton.h
@@ -30,7 +30,7 @@
 
 #include <cstdlib> // for std::atexit()
 
-#include <QtCore/QMutexLocker>
+#include <QMutexLocker>
 
 #include "Engine/EngineFwd.h"
 
diff --git a/Engine/StandardPaths.cpp b/Engine/StandardPaths.cpp
index ae7549246d..adf0572fe3 100644
--- a/Engine/StandardPaths.cpp
+++ b/Engine/StandardPaths.cpp
@@ -28,14 +28,14 @@
 #include <cassert>
 #include <stdexcept>
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
-#include <QtCore/QString>
+#include <QCoreApplication>
+#include <QDir>
+#include <QString>
 #include <QStandardPaths>
 
 #include "Global/GlobalDefines.h"
 
-#include <QtCore/QtGlobal> // for Q_OS_*
+#include <QtGlobal> // for Q_OS_*
 #if defined(Q_OS_WIN)
 #include <combaseapi.h>
 #include <IntShCut.h>
@@ -44,7 +44,7 @@
 #define CSIDL_MYMUSIC 13
 #define CSIDL_MYVIDEO 14
 #endif
-#include <QtCore/QFileInfo>
+#include <QFileInfo>
 
 #elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
 #include <cerrno>
@@ -53,7 +53,7 @@
 #include <sys/types.h>
 #include <pwd.h>
 CLANG_DIAG_OFF(deprecated)
-#include <QtCore/QTextStream>
+#include <QTextStream>
 #include <QHash>
 #include <QVarLengthArray>
 CLANG_DIAG_ON(deprecated)
diff --git a/Engine/StandardPaths.h b/Engine/StandardPaths.h
index cc8092dd45..7cff5ebcbf 100644
--- a/Engine/StandardPaths.h
+++ b/Engine/StandardPaths.h
@@ -28,7 +28,7 @@
 
 #include "Global/Macros.h"
 
-#include <QtCore/QString>
+#include <QString>
 
 #include "Engine/EngineFwd.h"
 
diff --git a/Engine/StringAnimationManager.cpp b/Engine/StringAnimationManager.cpp
index 173779188b..0b92d6b392 100644
--- a/Engine/StringAnimationManager.cpp
+++ b/Engine/StringAnimationManager.cpp
@@ -30,7 +30,7 @@
 #include <cassert>
 #include <stdexcept>
 
-#include <QtCore/QMutex>
+#include <QMutex>
 
 #include <ofxParam.h>
 #include <ofxhPropertySuite.h> // PropSpec
diff --git a/Engine/TLSHolder.cpp b/Engine/TLSHolder.cpp
index 235bc67ea3..b2fca830a7 100644
--- a/Engine/TLSHolder.cpp
+++ b/Engine/TLSHolder.cpp
@@ -35,9 +35,9 @@
 #include "Engine/Project.h"
 #include "Engine/ThreadPool.h"
 
-#include <QtCore/QWaitCondition>
-#include <QtCore/QThread>
-#include <QtCore/QDebug>
+#include <QWaitCondition>
+#include <QThread>
+#include <QDebug>
 
 NATRON_NAMESPACE_ENTER
 
diff --git a/Engine/TLSHolder.h b/Engine/TLSHolder.h
index 25968365ae..48eb354aa7 100644
--- a/Engine/TLSHolder.h
+++ b/Engine/TLSHolder.h
@@ -36,8 +36,8 @@
 
 #include "Global/GlobalDefines.h"
 
-#include <QtCore/QReadWriteLock>
-#include <QtCore/QThread>
+#include <QReadWriteLock>
+#include <QThread>
 
 #include "Engine/EngineFwd.h"
 
diff --git a/Engine/ThreadPool.cpp b/Engine/ThreadPool.cpp
index 03fd1e03e4..02f27989e3 100644
--- a/Engine/ThreadPool.cpp
+++ b/Engine/ThreadPool.cpp
@@ -28,10 +28,10 @@
 #include <string>
 #include <sstream> // stringstream
 
-#include <QtCore/QAtomicInt>
-#include <QtCore/QMutex>
-#include <QtCore/QThread>
-#include <QtCore/QThreadPool>
+#include <QAtomicInt>
+#include <QMutex>
+#include <QThread>
+#include <QThreadPool>
 
 #include "Engine/AbortableRenderInfo.h"
 #include "Engine/Node.h"
diff --git a/Engine/ThreadPool.h b/Engine/ThreadPool.h
index 9fc9bcfe15..6a7b4ae4d5 100644
--- a/Engine/ThreadPool.h
+++ b/Engine/ThreadPool.h
@@ -28,7 +28,7 @@
 
 #include "Global/Macros.h"
 
-#include <QtCore/QThreadPool> // defines QT_CUSTOM_THREADPOOL (or not)
+#include <QThreadPool> // defines QT_CUSTOM_THREADPOOL (or not)
 
 #include "Engine/EngineFwd.h"
 
diff --git a/Engine/ThreadStorage.h b/Engine/ThreadStorage.h
index ac48b4702e..de8e421b1b 100644
--- a/Engine/ThreadStorage.h
+++ b/Engine/ThreadStorage.h
@@ -28,9 +28,9 @@
 
 #include "Global/Macros.h"
 
-#include <QtCore/QThread>
-#include <QtCore/QThreadStorage>
-#include <QtCore/QCoreApplication>
+#include <QThread>
+#include <QThreadStorage>
+#include <QCoreApplication>
 
 #include "Engine/EngineFwd.h"
 
diff --git a/Engine/TimeLine.cpp b/Engine/TimeLine.cpp
index 2b0a84eaee..be658fcbca 100644
--- a/Engine/TimeLine.cpp
+++ b/Engine/TimeLine.cpp
@@ -29,8 +29,8 @@
 #include <stdexcept>
 
 #ifndef NDEBUG
-#include <QtCore/QThread>
-#include <QtCore/QCoreApplication>
+#include <QThread>
+#include <QCoreApplication>
 #endif
 
 #include "Engine/Project.h"
diff --git a/Engine/TimeLine.h b/Engine/TimeLine.h
index 63b1de056a..f07aca84ba 100644
--- a/Engine/TimeLine.h
+++ b/Engine/TimeLine.h
@@ -31,8 +31,8 @@
 #include <list>
 
 CLANG_DIAG_OFF(deprecated)
-#include <QtCore/QMutex>
-#include <QtCore/QObject>
+#include <QMutex>
+#include <QObject>
 CLANG_DIAG_ON(deprecated)
 
 #include "Global/GlobalDefines.h"
diff --git a/Engine/Timer.cpp b/Engine/Timer.cpp
index aa7e59a42b..9fd75b7c35 100644
--- a/Engine/Timer.cpp
+++ b/Engine/Timer.cpp
@@ -31,8 +31,8 @@
 #include <cassert>
 #include <stdexcept>
 
-#include <QtCore/QMutex>
-#include <QtCore/QMutexLocker>
+#include <QMutex>
+#include <QMutexLocker>
 
 #include "Global/GlobalDefines.h"
 
diff --git a/Engine/Timer.h b/Engine/Timer.h
index ae58ae72a2..f7015e2953 100644
--- a/Engine/Timer.h
+++ b/Engine/Timer.h
@@ -41,9 +41,9 @@
 #endif
 
 
-#include <QtCore/QString>
-#include <QtCore/QObject>
-#include <QtCore/QMutex>
+#include <QString>
+#include <QObject>
+#include <QMutex>
 
 #include "Engine/EngineFwd.h"
 
diff --git a/Engine/TrackMarker.cpp b/Engine/TrackMarker.cpp
index eb98dcd132..a5493c3f3f 100644
--- a/Engine/TrackMarker.cpp
+++ b/Engine/TrackMarker.cpp
@@ -25,7 +25,7 @@
 
 #include "TrackMarker.h"
 
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 
 #include "Engine/AbortableRenderInfo.h"
 #include "Engine/CreateNodeArgs.h"
diff --git a/Engine/TrackerContext.cpp b/Engine/TrackerContext.cpp
index 0ddad33c33..33eb0ed7ec 100644
--- a/Engine/TrackerContext.cpp
+++ b/Engine/TrackerContext.cpp
@@ -31,9 +31,9 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QWaitCondition>
-#include <QtCore/QThread>
-#include <QtCore/QCoreApplication>
+#include <QWaitCondition>
+#include <QThread>
+#include <QCoreApplication>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Engine/TrackerContext.h b/Engine/TrackerContext.h
index 19d69cc274..740b4b8bf4 100644
--- a/Engine/TrackerContext.h
+++ b/Engine/TrackerContext.h
@@ -33,8 +33,8 @@
 
 #include "Global/GlobalDefines.h"
 
-#include <QtCore/QMutex>
-#include <QtCore/QThread>
+#include <QMutex>
+#include <QThread>
 
 #include "Global/KeySymbols.h"
 #include "Engine/EngineFwd.h"
diff --git a/Engine/TrackerContextPrivate.cpp b/Engine/TrackerContextPrivate.cpp
index 57ba0f20fc..449fb603b7 100644
--- a/Engine/TrackerContextPrivate.cpp
+++ b/Engine/TrackerContextPrivate.cpp
@@ -31,7 +31,7 @@
 #include <omp.h>
 #endif
 
-#include <QtCore/QThreadPool>
+#include <QThreadPool>
 
 #include "Engine/AppInstance.h"
 #include "Engine/Curve.h"
diff --git a/Engine/TrackerFrameAccessor.cpp b/Engine/TrackerFrameAccessor.cpp
index 3f2b3a6334..00e07841f9 100644
--- a/Engine/TrackerFrameAccessor.cpp
+++ b/Engine/TrackerFrameAccessor.cpp
@@ -35,7 +35,7 @@ GCC_DIAG_ON(unused-function)
 GCC_DIAG_ON(unused-parameter)
 // clang-format on
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 #include "Engine/AbortableRenderInfo.h"
 #include "Engine/AppInstance.h"
diff --git a/Engine/TrackerNodeInteract.h b/Engine/TrackerNodeInteract.h
index cbef0c1b9e..b845f11bd1 100644
--- a/Engine/TrackerNodeInteract.h
+++ b/Engine/TrackerNodeInteract.h
@@ -30,8 +30,8 @@
 
 #include <QFutureWatcher>
 #include <QtConcurrentRun>
-#include <QtCore/QPointF>
-#include <QtCore/QRectF>
+#include <QPointF>
+#include <QRectF>
 
 #include <ofxNatron.h>
 
diff --git a/Engine/TrackerUndoCommand.h b/Engine/TrackerUndoCommand.h
index 45d2250757..4527cb08af 100644
--- a/Engine/TrackerUndoCommand.h
+++ b/Engine/TrackerUndoCommand.h
@@ -33,7 +33,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Engine/Utils.cpp b/Engine/Utils.cpp
index 738f266198..e2b6471041 100644
--- a/Engine/Utils.cpp
+++ b/Engine/Utils.cpp
@@ -27,9 +27,9 @@
 
 #include <stdexcept>
 
-#include <QtCore/QString>
-#include <QtCore/QChar>
-#include <QtCore/QDebug>
+#include <QString>
+#include <QChar>
+#include <QDebug>
 
 NATRON_NAMESPACE_ENTER
 
diff --git a/Engine/Variant.h b/Engine/Variant.h
index f08639bc5b..efad8dcd94 100644
--- a/Engine/Variant.h
+++ b/Engine/Variant.h
@@ -29,12 +29,12 @@
 #include "Global/Macros.h"
 
 CLANG_DIAG_OFF(deprecated)
-#include <QtCore/QVariant>
-#include <QtCore/QMetaType>
-#include <QtCore/QDataStream>
-#include <QtCore/QByteArray>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
+#include <QVariant>
+#include <QMetaType>
+#include <QDataStream>
+#include <QByteArray>
+#include <QString>
+#include <QStringList>
 CLANG_DIAG_ON(deprecated)
 
 #include "Engine/EngineFwd.h"
diff --git a/Engine/ViewerInstance.cpp b/Engine/ViewerInstance.cpp
index 75f86ff27c..acd55c5e6c 100644
--- a/Engine/ViewerInstance.cpp
+++ b/Engine/ViewerInstance.cpp
@@ -33,13 +33,13 @@
 #include <limits>
 
 CLANG_DIAG_OFF(deprecated)
-#include <QtCore/QtGlobal>
+#include <QtGlobal>
 #include <QtConcurrentMap> // QtCore on Qt4, QtConcurrent on Qt5
-#include <QtCore/QFutureWatcher>
-#include <QtCore/QMutex>
-#include <QtCore/QWaitCondition>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QThreadPool>
+#include <QFutureWatcher>
+#include <QMutex>
+#include <QWaitCondition>
+#include <QCoreApplication>
+#include <QThreadPool>
 CLANG_DIAG_ON(deprecated)
 
 #include "Engine/AppInstance.h"
diff --git a/Engine/ViewerInstancePrivate.h b/Engine/ViewerInstancePrivate.h
index 7fa3ec0ca7..6910488c5a 100644
--- a/Engine/ViewerInstancePrivate.h
+++ b/Engine/ViewerInstancePrivate.h
@@ -37,11 +37,11 @@
 #include <cassert>
 #include <algorithm> // min, max
 
-#include <QtCore/QMutex>
-#include <QtCore/QWaitCondition>
-#include <QtCore/QReadWriteLock>
-#include <QtCore/QThread>
-#include <QtCore/QCoreApplication>
+#include <QMutex>
+#include <QWaitCondition>
+#include <QReadWriteLock>
+#include <QThread>
+#include <QCoreApplication>
 
 #include "Engine/AbortableRenderInfo.h"
 #include "Engine/OutputSchedulerThread.h"
diff --git a/Engine/WriteNode.cpp b/Engine/WriteNode.cpp
index 47834783b9..68984d9217 100644
--- a/Engine/WriteNode.cpp
+++ b/Engine/WriteNode.cpp
@@ -46,7 +46,7 @@ GCC_DIAG_ON(unused-parameter)
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Engine/pch.h b/Engine/pch.h
index db89a8bb85..30724c08d6 100644
--- a/Engine/pch.h
+++ b/Engine/pch.h
@@ -34,7 +34,7 @@
 
 GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF
 GCC_ONLY_DIAG_OFF(class-memaccess)
-#include <QtCore/QVector>
+#include <QVector>
 GCC_ONLY_DIAG_ON(class-memaccess)
 #include <QtCore>
 GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON
diff --git a/Engine/typesystem_engine.xml b/Engine/typesystem_engine.xml
index e01264e84c..7aa3a1ea69 100644
--- a/Engine/typesystem_engine.xml
+++ b/Engine/typesystem_engine.xml
@@ -210,7 +210,7 @@
     </container-type>
 
      <!--Natron global enums-->
-    <namespace-type name="NATRON_ENUM">
+    <namespace-type name="Natron">
     <enum-type name="StatusEnum"/>
     <enum-type name="MergingFunctionEnum"/>
     <enum-type name="StandardButtonEnum" flags="StandardButtons"/>
@@ -1502,7 +1502,7 @@
                 double key,value,left,right;
                 %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(%1, %2,&amp;key,&amp;value, &amp;left, &amp;right);
                 %PYARG_0 = PyTuple_New(5);
-                PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[NATRON_ENUM::StatusEnum](%0));
+                PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[Natron::StatusEnum](%0));
                 PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[double](key));
                 PyTuple_SET_ITEM(%PYARG_0, 2, %CONVERTTOPYTHON[double](value));
                 PyTuple_SET_ITEM(%PYARG_0, 3, %CONVERTTOPYTHON[double](left));
@@ -1856,6 +1856,10 @@
         </modify-function>
     </object-type>
 
+    <inject-code class="target" position="declaration">
+    NATRON_NAMESPACE_USING NATRON_PYTHON_NAMESPACE_USING
+    </inject-code>
+
 
 </typesystem>
 
diff --git a/Global/Enums.h b/Global/Enums.h
index fbcb456ffa..37f75d66ce 100644
--- a/Global/Enums.h
+++ b/Global/Enums.h
@@ -22,16 +22,16 @@
 
 #include "Global/Macros.h"
 
-#include <QtCore/QFlags>
+#include <QFlags>
 CLANG_DIAG_OFF(deprecated)
-#include <QtCore/QMetaType>
+#include <QMetaType>
 CLANG_DIAG_ON(deprecated)
 
 NATRON_NAMESPACE_ENTER
 #ifdef SBK_RUN
 // shiboken doesn't generate SbkNatronEngine_StandardButtonEnum_as_number unless it is put in a class or namespace
 NATRON_NAMESPACE_EXIT
-namespace NATRON_ENUM {
+namespace Natron {
 #endif
 
 enum ScaleTypeEnum
@@ -693,7 +693,7 @@ NATRON_NAMESPACE_ENTER
 
 NATRON_NAMESPACE_EXIT
 
-Q_DECLARE_METATYPE(NATRON_ENUM::StandardButtons)
+Q_DECLARE_METATYPE(Natron::StandardButtons)
 
 
 #endif // NATRON_GLOBAL_ENUMS_H
diff --git a/Global/GlobalDefines.h b/Global/GlobalDefines.h
index 2b24765110..1c4ecde289 100644
--- a/Global/GlobalDefines.h
+++ b/Global/GlobalDefines.h
@@ -48,10 +48,10 @@
 #undef isalpha
 #undef isalnum
 
-#include <QtCore/QtGlobal>
-#include <QtCore/QString>
+#include <QtGlobal>
+#include <QString>
 CLANG_DIAG_OFF(deprecated)
-#include <QtCore/QMetaType>
+#include <QMetaType>
 CLANG_DIAG_ON(deprecated)
 #include "Global/Enums.h"
 
diff --git a/Global/KeySymbols.h b/Global/KeySymbols.h
index 70b1f0d4a6..a44d5094f0 100644
--- a/Global/KeySymbols.h
+++ b/Global/KeySymbols.h
@@ -21,7 +21,7 @@
 #define KEYSYMBOLS_H
 
 #include <ofxKeySyms.h>
-#include <QtCore/QFlags>
+#include <QFlags>
 NATRON_NAMESPACE_ENTER
 enum Key
 {
diff --git a/Global/Macros.h b/Global/Macros.h
index 4462278f53..ef86526083 100644
--- a/Global/Macros.h
+++ b/Global/Macros.h
@@ -52,7 +52,6 @@ namespace Python { }
 
 // run shiboken without the Natron namespace, and add NATRON_NAMESPACE_USING to each cpp afterwards
 #define NATRON_NAMESPACE
-#undef NATRON_ENUM
 #define NATRON_NAMESPACE_ENTER
 #define NATRON_NAMESPACE_EXIT
 #define NATRON_PYTHON_NAMESPACE
@@ -62,7 +61,6 @@ namespace Python { }
 #else // !SBK_RUN
 
 #define NATRON_NAMESPACE Natron
-#define NATRON_ENUM NATRON_NAMESPACE
 // Macros to use in each file to enter and exit the right name spaces.
 #define NATRON_NAMESPACE_ENTER namespace NATRON_NAMESPACE {
 #define NATRON_NAMESPACE_EXIT }
diff --git a/Global/QtCompat.h b/Global/QtCompat.h
index 10a68eac28..53e36c366d 100644
--- a/Global/QtCompat.h
+++ b/Global/QtCompat.h
@@ -21,10 +21,10 @@
 
 #include "Global/Macros.h"
 
-#include <QtCore/QtGlobal> // for Q_OS_*
-#include <QtCore/QString>
-#include <QtCore/QUrl>
-#include <QtCore/QFileInfo>
+#include <QtGlobal> // for Q_OS_*
+#include <QString>
+#include <QUrl>
+#include <QFileInfo>
 
 NATRON_NAMESPACE_ENTER
 
diff --git a/Gui/AboutWindow.cpp b/Gui/AboutWindow.cpp
index e7827a1281..8dc8f5fdab 100644
--- a/Gui/AboutWindow.cpp
+++ b/Gui/AboutWindow.cpp
@@ -36,11 +36,11 @@ CLANG_DIAG_OFF(deprecated)
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 #include <QTabWidget>
-#include <QtCore/QFile>
-#include <QtCore/QTextCodec>
+#include <QFile>
+#include <QTextCodec>
 #include <QItemSelectionModel>
 #include <QHeaderView>
-#include <QtCore/QDir>
+#include <QDir>
 CLANG_DIAG_ON(deprecated)
 #include <qhttpserver.h>
 
diff --git a/Gui/ActionShortcuts.h b/Gui/ActionShortcuts.h
index 2605ae77e8..68e8d4b9bf 100644
--- a/Gui/ActionShortcuts.h
+++ b/Gui/ActionShortcuts.h
@@ -40,7 +40,7 @@ CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
 #include <QKeyEvent>
 #include <QMouseEvent>
-#include <QtCore/QString>
+#include <QString>
 #include <QAction>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
diff --git a/Gui/AddKnobDialog.cpp b/Gui/AddKnobDialog.cpp
index 03a47901bc..789b6fa3d7 100644
--- a/Gui/AddKnobDialog.cpp
+++ b/Gui/AddKnobDialog.cpp
@@ -32,7 +32,7 @@
 
 #include <QCheckBox>
 #include <QTextEdit>
-#include <QtCore/QTextStream>
+#include <QTextStream>
 #include <QFormLayout>
 
 #include "Engine/EffectInstance.h"
diff --git a/Gui/AnimatedCheckBox.h b/Gui/AnimatedCheckBox.h
index b13a34715f..7e2cbf360a 100644
--- a/Gui/AnimatedCheckBox.h
+++ b/Gui/AnimatedCheckBox.h
@@ -30,7 +30,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QSize>
+#include <QSize>
 #include <QFrame>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
diff --git a/Gui/BackdropGui.cpp b/Gui/BackdropGui.cpp
index 7aabce4ba4..ca5d768d1b 100644
--- a/Gui/BackdropGui.cpp
+++ b/Gui/BackdropGui.cpp
@@ -31,8 +31,8 @@
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
 #include <QGraphicsTextItem>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QThread>
+#include <QCoreApplication>
+#include <QThread>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Gui/CMakeLists.txt b/Gui/CMakeLists.txt
index d20159d934..b3e06b0f1c 100644
--- a/Gui/CMakeLists.txt
+++ b/Gui/CMakeLists.txt
@@ -28,8 +28,11 @@ list(APPEND PYGUI_INCLUDE_DIRS ${PYSIDE_INCLUDE_DIRS} ${PYSIDE_INCLUDE_DIRS}/QtC
 list(APPEND PYGUI_INCLUDE_DIRS ${QTCORE_INCLUDE_DIRS} ${QTGUI_INCLUDE_DIRS}
     ${QTWIDGETS_INCLUDE_DIRS} ${Python3_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
 list(TRANSFORM PYGUI_INCLUDE_DIRS PREPEND "-I" OUTPUT_VARIABLE PYGUI_INCS)
-set(PYGUI_HEADER PySide2_Gui_Python.h)
-set(POST_SHIBOKEN ../tools/utils/runPostShiboken2.sh)
+set(PYGUI_HEADER PySide${PYSIDE_VERSION_MAJOR}_Gui_Python.h)
+
+if(NATRON_QT6)
+    set(QT_OPENGLWIDGETS Qt::OpenGLWidgets)
+endif()
 
 set(shiboken_args
     "-std=c++17" "--enable-parent-ctor-heuristic" "--use-isnull-as-nb_nonzero"
@@ -37,18 +40,15 @@ set(shiboken_args
     ${PYGUI_INCS}
     "-T../Engine" "-T${PYSIDE_TYPESYSTEMS}" "--output-directory=${PYGUI_OUT}"
     "${PYGUI_HEADER}" "typesystem_natronGui.xml")
-if(APPLE)
-   list(APPEND shiboken_args -I${Qt5_DIR}/../../../include)
-endif()
 
 execute_process(COMMAND ${Python3_EXECUTABLE} ../tools/utils/sourceList.py typesystem_natronGui.xml ${PYGUI_OUT}
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     OUTPUT_VARIABLE PyGui_SOURCES)
 set_property(SOURCE ${PyGui_SOURCES} PROPERTY SKIP_AUTOGEN ON)
 add_custom_command(OUTPUT ${PyGui_SOURCES}
-    COMMAND Shiboken2::shiboken2 ${shiboken_args}
-    COMMAND bash ${POST_SHIBOKEN} ${PYGUI_OUT}/NatronGui natrongui
-    DEPENDS ${PYGUI_HEADER} ${NatronEngine_HEADERS} ${NatronGui_HEADERS} ${POST_SHIBOKEN} typesystem_natronGui.xml
+    COMMAND $<TARGET_FILE:${SHIBOKEN_EXE}> ${shiboken_args}
+    COMMAND ${Python3_EXECUTABLE} ../tools/utils/sourceCleanup.py typesystem_natronGui.xml ${PYGUI_OUT}
+    DEPENDS ${SHIBOKEN_EXE} ${PYGUI_HEADER} NatronEngine ${NatronGui_HEADERS} ../tools/utils/sourceCleanup.py typesystem_natronGui.xml
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 
 if(APPLE)
@@ -63,13 +63,14 @@ list(APPEND NatronGui_SOURCES
 add_library(NatronGui STATIC ${NatronGui_HEADERS} ${NatronGui_SOURCES})
 target_link_libraries(NatronGui
     PUBLIC
-        Shiboken2::libshiboken
-        PySide2::pyside2
-        Qt5::Core
-        Qt5::Concurrent
-        Qt5::Network
-        Qt5::Gui
-        Qt5::Widgets
+        ${SHIBOKEN_LIB}
+        ${PYSIDE_LIB}
+        Qt::Core
+        Qt::Concurrent
+        Qt::Network
+        Qt::Gui
+        Qt::Widgets
+        ${QT_OPENGLWIDGETS}
         Python3::Module
         NatronEngine
     PRIVATE
diff --git a/Gui/ChannelsComboBox.cpp b/Gui/ChannelsComboBox.cpp
index 54c7aa95bb..33fa93de53 100644
--- a/Gui/ChannelsComboBox.cpp
+++ b/Gui/ChannelsComboBox.cpp
@@ -28,11 +28,11 @@
 #include <cassert>
 #include <stdexcept>
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 // /opt/local/include/QtGui/qmime.h:119:10: warning: private field 'type' is not used [-Wunused-private-field]
-#include <QtGui/QPaintEvent>
+#include <QPaintEvent>
 GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
 #include <QPainter>
 #include <QPainterPath>
diff --git a/Gui/ClickableLabel.h b/Gui/ClickableLabel.h
index bea19c1815..668f1005ad 100644
--- a/Gui/ClickableLabel.h
+++ b/Gui/ClickableLabel.h
@@ -30,7 +30,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QObject>
+#include <QObject>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Gui/ComboBox.cpp b/Gui/ComboBox.cpp
index a8c67678d0..f3e7dd384c 100644
--- a/Gui/ComboBox.cpp
+++ b/Gui/ComboBox.cpp
@@ -34,7 +34,7 @@
 #include <QFont>
 #include <QStyleOption>
 #include <QFontMetrics>
-#include <QtCore/QDebug>
+#include <QDebug>
 #include <QPainter>
 #include <QPainterPath>
 GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
diff --git a/Gui/ComboBox.h b/Gui/ComboBox.h
index cb24ee5bc9..65296a718c 100644
--- a/Gui/ComboBox.h
+++ b/Gui/ComboBox.h
@@ -32,10 +32,10 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QSize>
+#include <QSize>
 #include <QFrame>
-#include <QtGui/QKeySequence>
-#include <QtGui/QIcon>
+#include <QKeySequence>
+#include <QIcon>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Gui/CurveEditorUndoRedo.cpp b/Gui/CurveEditorUndoRedo.cpp
index 64c5b70e44..72ec83c9e2 100644
--- a/Gui/CurveEditorUndoRedo.cpp
+++ b/Gui/CurveEditorUndoRedo.cpp
@@ -28,7 +28,7 @@
 #include <cmath>
 #include <stdexcept>
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 #include "Global/GlobalDefines.h"
 
diff --git a/Gui/CurveEditorUndoRedo.h b/Gui/CurveEditorUndoRedo.h
index 8706eb864f..31834c51e7 100644
--- a/Gui/CurveEditorUndoRedo.h
+++ b/Gui/CurveEditorUndoRedo.h
@@ -33,7 +33,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 #include <QUndoCommand> // in QtGui on Qt4, in QtWidgets on Qt5
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
diff --git a/Gui/CurveGui.cpp b/Gui/CurveGui.cpp
index 0452af3ae4..32386f6377 100644
--- a/Gui/CurveGui.cpp
+++ b/Gui/CurveGui.cpp
@@ -30,10 +30,10 @@
 #include <limits>
 #include <stdexcept>
 
-#include <QtCore/QThread>
-#include <QtCore/QObject>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
+#include <QThread>
+#include <QObject>
+#include <QCoreApplication>
+#include <QDebug>
 
 #include "Engine/Bezier.h"
 #include "Engine/Knob.h"
diff --git a/Gui/CurveGui.h b/Gui/CurveGui.h
index 83f54f98fb..20c15d6b41 100644
--- a/Gui/CurveGui.h
+++ b/Gui/CurveGui.h
@@ -30,8 +30,8 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QObject> // QObject
-#include <QtGui/QColor> // QColor
+#include <QObject> // QObject
+#include <QColor> // QColor
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Gui/CurveWidget.cpp b/Gui/CurveWidget.cpp
index 9fe4a612ec..67fe8b60e4 100644
--- a/Gui/CurveWidget.cpp
+++ b/Gui/CurveWidget.cpp
@@ -34,8 +34,8 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 // /opt/local/include/QtGui/qmime.h:119:10: warning: private field 'type' is not used [-Wunused-private-field]
 #include <QMouseEvent>
 GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
-#include <QtCore/QTextStream>
-#include <QtCore/QThread>
+#include <QTextStream>
+#include <QThread>
 #include <QApplication>
 #include <QToolButton>
 #include <QScreen>
diff --git a/Gui/CurveWidget.h b/Gui/CurveWidget.h
index 248e89775c..1d9015a348 100644
--- a/Gui/CurveWidget.h
+++ b/Gui/CurveWidget.h
@@ -34,10 +34,10 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QMetaType>
-#include <QtCore/QSize>
+#include <QMetaType>
+#include <QSize>
 #include <QDialog>
-#include <QtCore/QByteArray>
+#include <QByteArray>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Gui/CurveWidgetDialogs.cpp b/Gui/CurveWidgetDialogs.cpp
index 5d0f4df48f..19d694e77c 100644
--- a/Gui/CurveWidgetDialogs.cpp
+++ b/Gui/CurveWidgetDialogs.cpp
@@ -32,13 +32,13 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 //// /opt/local/include/QtGui/qmime.h:119:10: warning: private field 'type' is not used [-Wunused-private-field]
 #include <QKeyEvent>
 GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 #include <QApplication>
 #include <QHBoxLayout> // in QtGui on Qt4, in QtWidgets on Qt5
 #include <QVBoxLayout> // in QtGui on Qt4, in QtWidgets on Qt5
-#include <QtCore/QThread>
-#include <QtCore/QSettings>
-#include <QtCore/QDebug>
+#include <QThread>
+#include <QSettings>
+#include <QDebug>
 
 #include "Engine/AppManager.h" // appPTR
 #include "Engine/Knob.h"
diff --git a/Gui/CurveWidgetDialogs.h b/Gui/CurveWidgetDialogs.h
index d705dd4abf..63705c63b3 100644
--- a/Gui/CurveWidgetDialogs.h
+++ b/Gui/CurveWidgetDialogs.h
@@ -32,9 +32,9 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QMetaType>
+#include <QMetaType>
 #include <QDialog>
-#include <QtCore/QByteArray>
+#include <QByteArray>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Gui/CurveWidgetPrivate.cpp b/Gui/CurveWidgetPrivate.cpp
index 0cad9bf800..dc3eea48aa 100644
--- a/Gui/CurveWidgetPrivate.cpp
+++ b/Gui/CurveWidgetPrivate.cpp
@@ -30,9 +30,9 @@
 #include <limits>
 #include <stdexcept>
 
-#include <QtCore/QThread>
+#include <QThread>
 #include <QApplication>
-#include <QtCore/QDebug>
+#include <QDebug>
 
 #include "Engine/Bezier.h"
 #include "Engine/TimeLine.h"
diff --git a/Gui/CurveWidgetPrivate.h b/Gui/CurveWidgetPrivate.h
index 8797e3d0a3..e35b3f857a 100644
--- a/Gui/CurveWidgetPrivate.h
+++ b/Gui/CurveWidgetPrivate.h
@@ -38,7 +38,7 @@
 #include "Gui/GuiFwd.h"
 #include "Engine/OfxOverlayInteract.h"
 
-#include <QtCore/QSize>
+#include <QSize>
 
 #define CURVEWIDGET_DERIVATIVE_ROUND_PRECISION 3
 
diff --git a/Gui/CustomParamInteract.cpp b/Gui/CustomParamInteract.cpp
index a63a4c3bd4..3ae944bbda 100644
--- a/Gui/CustomParamInteract.cpp
+++ b/Gui/CustomParamInteract.cpp
@@ -27,11 +27,11 @@
 
 #include <stdexcept>
 
-#include <QtCore/QSize>
-#include <QtCore/QThread>
-#include <QtCore/QCoreApplication>
+#include <QSize>
+#include <QThread>
+#include <QCoreApplication>
 #include <QMouseEvent>
-#include <QtCore/QByteArray>
+#include <QByteArray>
 
 #include <QWindow>
 
diff --git a/Gui/DockablePanel.cpp b/Gui/DockablePanel.cpp
index bc90fc1d62..2ca62895ce 100644
--- a/Gui/DockablePanel.cpp
+++ b/Gui/DockablePanel.cpp
@@ -29,16 +29,16 @@
 
 #include <QApplication> // qApp
 #include <QColorDialog>
-#include <QtCore/QSize>
-#include <QtCore/QTimer>
+#include <QSize>
+#include <QTimer>
 GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 // /opt/local/include/QtGui/qmime.h:119:10: warning: private field 'type' is not used [-Wunused-private-field]
 #include <QMouseEvent>
 GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
 #include <QHBoxLayout>
 #include <QVBoxLayout>
-#include <QtCore/QFile>
-#include <QtCore/QTextStream>
+#include <QFile>
+#include <QTextStream>
 #include <QDesktopServices>
 #include <QTextDocument>
 
diff --git a/Gui/DockablePanelPrivate.cpp b/Gui/DockablePanelPrivate.cpp
index 617dd3dadf..8d86f92436 100644
--- a/Gui/DockablePanelPrivate.cpp
+++ b/Gui/DockablePanelPrivate.cpp
@@ -29,7 +29,7 @@
 #include <utility>
 #include <stdexcept>
 
-#include <QtCore/QDebug>
+#include <QDebug>
 #include <QGridLayout>
 #include <QUndoStack>
 #include <QScrollArea>
diff --git a/Gui/DockablePanelPrivate.h b/Gui/DockablePanelPrivate.h
index b8ced07a0e..bac1465fbe 100644
--- a/Gui/DockablePanelPrivate.h
+++ b/Gui/DockablePanelPrivate.h
@@ -32,7 +32,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QMutex>
+#include <QMutex>
 #include <QFrame>
 #include <QTabWidget>
 #include <QDialog>
diff --git a/Gui/DockablePanelTabWidget.h b/Gui/DockablePanelTabWidget.h
index 87f9e68600..3b3dac07ad 100644
--- a/Gui/DockablePanelTabWidget.h
+++ b/Gui/DockablePanelTabWidget.h
@@ -30,7 +30,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QSize>
+#include <QSize>
 #include <QTabWidget>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
diff --git a/Gui/DocumentationManager.cpp b/Gui/DocumentationManager.cpp
index c064dec14b..f112edd5e7 100644
--- a/Gui/DocumentationManager.cpp
+++ b/Gui/DocumentationManager.cpp
@@ -25,10 +25,10 @@
 
 #include "DocumentationManager.h"
 
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
+#include <QFile>
+#include <QFileInfo>
 GCC_ONLY_DIAG_OFF(class-memaccess)
-#include <QtCore/QVector>
+#include <QVector>
 GCC_ONLY_DIAG_ON(class-memaccess)
 
 #include <iostream>
diff --git a/Gui/DocumentationManager.h b/Gui/DocumentationManager.h
index 1b081be9dc..d52536cf1e 100644
--- a/Gui/DocumentationManager.h
+++ b/Gui/DocumentationManager.h
@@ -30,7 +30,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QObject>
+#include <QObject>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Gui/DopeSheet.cpp b/Gui/DopeSheet.cpp
index dfb56d14b1..547b577627 100644
--- a/Gui/DopeSheet.cpp
+++ b/Gui/DopeSheet.cpp
@@ -30,8 +30,8 @@
 #include <stdexcept>
 
 // Qt includes
-#include <QtCore/QDebug>
-#include <QtCore/QSize>
+#include <QDebug>
+#include <QSize>
 #include <QtEvents>
 #include <QTreeWidget>
 #include <QUndoStack>
diff --git a/Gui/DopeSheetEditor.h b/Gui/DopeSheetEditor.h
index cfda330441..91f02a9780 100644
--- a/Gui/DopeSheetEditor.h
+++ b/Gui/DopeSheetEditor.h
@@ -31,8 +31,8 @@
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
 
-#include <QtCore/QtGlobal>
-#include <QtWidgets/QWidget>
+#include <QtGlobal>
+#include <QWidget>
 
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
diff --git a/Gui/DopeSheetEditorUndoRedo.cpp b/Gui/DopeSheetEditorUndoRedo.cpp
index aaba9cb492..dd4755ce3c 100644
--- a/Gui/DopeSheetEditorUndoRedo.cpp
+++ b/Gui/DopeSheetEditorUndoRedo.cpp
@@ -27,7 +27,7 @@
 
 #include <stdexcept>
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 #ifndef NATRON_ENABLE_IO_META_NODES
 #include "Engine/AppInstance.h"
diff --git a/Gui/DopeSheetEditorUndoRedo.h b/Gui/DopeSheetEditorUndoRedo.h
index c3fe3f3f67..ae9a7288a4 100644
--- a/Gui/DopeSheetEditorUndoRedo.h
+++ b/Gui/DopeSheetEditorUndoRedo.h
@@ -33,7 +33,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 #include <QUndoCommand> // in QtGui on Qt4, in QtWidgets on Qt5
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
diff --git a/Gui/DopeSheetHierarchyView.cpp b/Gui/DopeSheetHierarchyView.cpp
index 5edb84ea8b..a65f46b37b 100644
--- a/Gui/DopeSheetHierarchyView.cpp
+++ b/Gui/DopeSheetHierarchyView.cpp
@@ -27,8 +27,8 @@
 
 #include <stdexcept>
 
-#include <QtCore/QDebug> //REMOVEME
-#include <QtCore/QSize>
+#include <QDebug> //REMOVEME
+#include <QSize>
 #include <QHeaderView>
 #include <QPainter>
 #include <QResizeEvent>
diff --git a/Gui/DopeSheetHierarchyView.h b/Gui/DopeSheetHierarchyView.h
index d99b6160cf..c47de8da66 100644
--- a/Gui/DopeSheetHierarchyView.h
+++ b/Gui/DopeSheetHierarchyView.h
@@ -33,10 +33,10 @@
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
 
-#include <QtCore/QtGlobal>
+#include <QtGlobal>
 
-#include <QtWidgets/QTreeWidget>
-#include <QtWidgets/QStyledItemDelegate>
+#include <QTreeWidget>
+#include <QStyledItemDelegate>
 
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
diff --git a/Gui/DopeSheetView.cpp b/Gui/DopeSheetView.cpp
index bbaa4e3c24..b0c7bc0164 100644
--- a/Gui/DopeSheetView.cpp
+++ b/Gui/DopeSheetView.cpp
@@ -33,7 +33,7 @@
 #include <QApplication>
 #include <QMouseEvent>
 #include <QScrollBar>
-#include <QtCore/QThread>
+#include <QThread>
 #include <QToolButton>
 
 #include <QWindow>
diff --git a/Gui/DotGui.cpp b/Gui/DotGui.cpp
index 407b3d2256..e59249918c 100644
--- a/Gui/DotGui.cpp
+++ b/Gui/DotGui.cpp
@@ -38,7 +38,7 @@ CLANG_DIAG_OFF(uninitialized)
 #include <QTextBlockFormat>
 #include <QTextCursor>
 #include <QGridLayout>
-#include <QtCore/QFile>
+#include <QFile>
 #include <QApplication>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
diff --git a/Gui/DotGui.h b/Gui/DotGui.h
index 85298ea646..27ea37afa6 100644
--- a/Gui/DotGui.h
+++ b/Gui/DotGui.h
@@ -32,11 +32,11 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QRectF>
-#include <QtCore/QMutex>
+#include <QRectF>
+#include <QMutex>
 #include <QGraphicsItem>
 #include <QDialog>
-#include <QtCore/QMutex>
+#include <QMutex>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Gui/Edge.cpp b/Gui/Edge.cpp
index 903cb82eab..a960ef0f27 100644
--- a/Gui/Edge.cpp
+++ b/Gui/Edge.cpp
@@ -29,7 +29,7 @@
 #include <cmath>
 #include <stdexcept>
 
-#include <QtCore/QSize>
+#include <QSize>
 #include <QPainter>
 #include <QApplication>
 #include <QGraphicsScene>
diff --git a/Gui/EditExpressionDialog.cpp b/Gui/EditExpressionDialog.cpp
index d93081c75c..60fcc01dca 100644
--- a/Gui/EditExpressionDialog.cpp
+++ b/Gui/EditExpressionDialog.cpp
@@ -29,14 +29,14 @@
 #include <cfloat>
 #include <stdexcept>
 
-#include <QtCore/QString>
+#include <QString>
 #include <QHBoxLayout>
 #include <QPushButton>
 #include <QFormLayout>
 #include <QFileDialog>
 #include <QTextEdit>
 #include <QStyle> // in QtGui on Qt4, in QtWidgets on Qt5
-#include <QtCore/QTimer>
+#include <QTimer>
 
 GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 // /opt/local/include/QtGui/qmime.h:119:10: warning: private field 'type' is not used [-Wunused-private-field]
@@ -44,7 +44,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
 #include <QColorDialog>
 #include <QGroupBox>
-#include <QtGui/QVector4D>
+#include <QVector4D>
 #include <QStyleFactory>
 #include <QCompleter>
 
diff --git a/Gui/EditExpressionDialog.h b/Gui/EditExpressionDialog.h
index ef6ee9ff56..014155184e 100644
--- a/Gui/EditExpressionDialog.h
+++ b/Gui/EditExpressionDialog.h
@@ -31,7 +31,7 @@
 #include <list>
 #include <utility>
 
-#include <QtCore/QString>
+#include <QString>
 
 #include "Gui/EditScriptDialog.h"
 #include "Gui/GuiFwd.h"
diff --git a/Gui/EditScriptDialog.cpp b/Gui/EditScriptDialog.cpp
index 2dfed072b3..0af24a054a 100644
--- a/Gui/EditScriptDialog.cpp
+++ b/Gui/EditScriptDialog.cpp
@@ -29,14 +29,14 @@
 #include <cfloat>
 #include <stdexcept>
 
-#include <QtCore/QString>
+#include <QString>
 #include <QHBoxLayout>
 #include <QPushButton>
 #include <QFormLayout>
 #include <QFileDialog>
 #include <QTextEdit>
 #include <QStyle> // in QtGui on Qt4, in QtWidgets on Qt5
-#include <QtCore/QTimer>
+#include <QTimer>
 
 GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 // /opt/local/include/QtGui/qmime.h:119:10: warning: private field 'type' is not used [-Wunused-private-field]
@@ -44,7 +44,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
 #include <QColorDialog>
 #include <QGroupBox>
-#include <QtGui/QVector4D>
+#include <QVector4D>
 #include <QStyleFactory>
 #include <QCompleter>
 
diff --git a/Gui/EditScriptDialog.h b/Gui/EditScriptDialog.h
index 686010ae00..082035e6e8 100644
--- a/Gui/EditScriptDialog.h
+++ b/Gui/EditScriptDialog.h
@@ -32,8 +32,8 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QObject>
-#include <QtCore/QString>
+#include <QObject>
+#include <QString>
 #include <QDialog>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
diff --git a/Gui/ExportGroupTemplateDialog.cpp b/Gui/ExportGroupTemplateDialog.cpp
index a299070a6d..9e7fe97c76 100644
--- a/Gui/ExportGroupTemplateDialog.cpp
+++ b/Gui/ExportGroupTemplateDialog.cpp
@@ -31,7 +31,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QTextStream>
+#include <QTextStream>
 #include <QGridLayout>
 #include <QTextEdit>
 CLANG_DIAG_ON(deprecated)
diff --git a/Gui/FileTypeMainWindow_win.cpp b/Gui/FileTypeMainWindow_win.cpp
index 025f0fea18..5cf275db4d 100644
--- a/Gui/FileTypeMainWindow_win.cpp
+++ b/Gui/FileTypeMainWindow_win.cpp
@@ -49,9 +49,9 @@
 
 #include <QMessageBox>
 #include <QApplication>
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QRegExp>
+#include <QDir>
+#include <QFileInfo>
+#include <QRegExp>
 
 NATRON_NAMESPACE_ENTER
 
diff --git a/Gui/FloatingWidget.cpp b/Gui/FloatingWidget.cpp
index cca745a267..ea6ca00839 100644
--- a/Gui/FloatingWidget.cpp
+++ b/Gui/FloatingWidget.cpp
@@ -29,7 +29,7 @@
 #include <algorithm> // min, max
 #include <stdexcept>
 
-#include <QtCore/QSize>
+#include <QSize>
 #include <QHBoxLayout>
 #include <QApplication> // qApp
 
diff --git a/Gui/GroupBoxLabel.cpp b/Gui/GroupBoxLabel.cpp
index 174235f779..b242cca681 100644
--- a/Gui/GroupBoxLabel.cpp
+++ b/Gui/GroupBoxLabel.cpp
@@ -45,7 +45,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 // /opt/local/include/QtGui/qmime.h:119:10: warning: private field 'type' is not used [-Wunused-private-field]
 #include <QKeyEvent>
 GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
-#include <QtCore/QDebug>
+#include <QDebug>
 #include <QFontComboBox>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
diff --git a/Gui/Gui.cpp b/Gui/Gui.cpp
index bb48affe76..b6972b2fdd 100644
--- a/Gui/Gui.cpp
+++ b/Gui/Gui.cpp
@@ -28,8 +28,8 @@
 #include <cassert>
 #include <stdexcept>
 
-#include <QtCore/QtGlobal> // for Q_OS_*
-#include <QtCore/QDebug>
+#include <QtGlobal> // for Q_OS_*
+#include <QDebug>
 GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 // /opt/local/include/QtGui/qmime.h:119:10: warning: private field 'type' is not used [-Wunused-private-field]
 #include <QCloseEvent>
@@ -38,7 +38,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
 #include <QMenuBar>
 #include <QUndoGroup>
 #include <QDesktopServices>
-#include <QtCore/QUrl>
+#include <QUrl>
 
 #include "Engine/Node.h"
 #include "Engine/Project.h"
diff --git a/Gui/Gui.h b/Gui/Gui.h
index 69187ceaa8..8c0a6b52a9 100644
--- a/Gui/Gui.h
+++ b/Gui/Gui.h
@@ -30,9 +30,9 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QtGlobal> // for Q_OS_*
+#include <QtGlobal> // for Q_OS_*
 #include <QMainWindow>
-#include <QtCore/QUrl>
+#include <QUrl>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Gui/Gui05.cpp b/Gui/Gui05.cpp
index aec7cc0883..dc4719fcd7 100644
--- a/Gui/Gui05.cpp
+++ b/Gui/Gui05.cpp
@@ -28,9 +28,9 @@
 #include <cassert>
 #include <stdexcept>
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QThread>
-#include <QtCore/QTimer>
+#include <QCoreApplication>
+#include <QThread>
+#include <QTimer>
 
 #include <QHBoxLayout>
 #include <QGraphicsScene>
diff --git a/Gui/Gui20.cpp b/Gui/Gui20.cpp
index 7c7b976b30..1ccbb77d17 100644
--- a/Gui/Gui20.cpp
+++ b/Gui/Gui20.cpp
@@ -33,10 +33,10 @@
 #include <utility>
 #include <stdexcept>
 
-#include <QtCore/QTextStream>
-#include <QtCore/QSettings>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
+#include <QTextStream>
+#include <QSettings>
+#include <QFile>
+#include <QFileInfo>
 
 #include <QAction>
 #include <QApplication>
diff --git a/Gui/Gui30.cpp b/Gui/Gui30.cpp
index c949835de4..d5ab9446ab 100644
--- a/Gui/Gui30.cpp
+++ b/Gui/Gui30.cpp
@@ -32,8 +32,8 @@
 #include <utility>
 #include <stdexcept>
 
-#include <QtCore/QThread>
-#include <QtCore/QDebug>
+#include <QThread>
+#include <QDebug>
 
 #include <QAction>
 #include <QApplication> // qApp
diff --git a/Gui/Gui40.cpp b/Gui/Gui40.cpp
index 820a5bd141..181f12497c 100644
--- a/Gui/Gui40.cpp
+++ b/Gui/Gui40.cpp
@@ -33,12 +33,12 @@
 #include <utility>
 #include <stdexcept>
 
-#include <QtCore/QDebug>
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QSettings>
+#include <QDebug>
+#include <QDir>
+#include <QFileInfo>
+#include <QSettings>
 
-#include <QtGui/QScreen>
+#include <QScreen>
 
 #include <QAction>
 #include <QApplication> // qApp
diff --git a/Gui/Gui50.cpp b/Gui/Gui50.cpp
index b126c9dab3..ef6aa4191f 100644
--- a/Gui/Gui50.cpp
+++ b/Gui/Gui50.cpp
@@ -33,10 +33,10 @@
 #include <utility>
 #include <stdexcept>
 
-#include <QtCore/QtGlobal> // for Q_OS_*
-#include <QtCore/QDebug>
-#include <QtCore/QThread>
-#include <QtCore/QTimer>
+#include <QtGlobal> // for Q_OS_*
+#include <QDebug>
+#include <QThread>
+#include <QTimer>
 
 #include <QApplication> // qApp
 GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
@@ -58,7 +58,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
 #include <QCheckBox>
 #include <QTreeView>
 #ifdef Q_WS_X11
-#include <QtGui/QX11Info>
+#include <QX11Info>
 #endif
 
 #include "Global/QtCompat.h"
diff --git a/Gui/GuiAppInstance.cpp b/Gui/GuiAppInstance.cpp
index 5a904f8976..a4eddc6798 100644
--- a/Gui/GuiAppInstance.cpp
+++ b/Gui/GuiAppInstance.cpp
@@ -28,10 +28,10 @@
 #include <stdexcept>
 #include <sstream> // stringstream
 
-#include <QtCore/QDir>
+#include <QDir>
 #include <QSettings>
-#include <QtCore/QMutex>
-#include <QtCore/QCoreApplication>
+#include <QMutex>
+#include <QCoreApplication>
 
 #include "Engine/CLArgs.h"
 #include "Engine/Project.h"
diff --git a/Gui/GuiAppInstance.h b/Gui/GuiAppInstance.h
index bbb125b829..e542fb6659 100644
--- a/Gui/GuiAppInstance.h
+++ b/Gui/GuiAppInstance.h
@@ -120,16 +120,16 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON
     virtual void warningDialog(const std::string & title, const std::string & message, bool* stopAsking, bool useHtml) const OVERRIDE FINAL;
     virtual void informationDialog(const std::string & title, const std::string & message, bool useHtml) const OVERRIDE FINAL;
     virtual void informationDialog(const std::string & title, const std::string & message, bool* stopAsking, bool useHtml) const OVERRIDE FINAL;
-    virtual NATRON_ENUM::StandardButtonEnum questionDialog(const std::string & title,
+    virtual Natron::StandardButtonEnum questionDialog(const std::string & title,
                                               const std::string & message,
                                               bool useHtml,
-                                              NATRON_ENUM::StandardButtons buttons = NATRON_ENUM::StandardButtons(NATRON_ENUM::eStandardButtonYes | NATRON_ENUM::eStandardButtonNo),
-                                              NATRON_ENUM::StandardButtonEnum defaultButton = NATRON_ENUM::eStandardButtonNoButton) const OVERRIDE FINAL WARN_UNUSED_RETURN;
-    virtual NATRON_ENUM::StandardButtonEnum questionDialog(const std::string & title,
+                                              Natron::StandardButtons buttons = Natron::StandardButtons(Natron::StandardButtonEnum::eStandardButtonYes | Natron::StandardButtonEnum::eStandardButtonNo),
+                                              Natron::StandardButtonEnum defaultButton = Natron::StandardButtonEnum::eStandardButtonNoButton) const OVERRIDE FINAL WARN_UNUSED_RETURN;
+    virtual Natron::StandardButtonEnum questionDialog(const std::string & title,
                                               const std::string & message,
                                               bool useHtml,
-                                              NATRON_ENUM::StandardButtons buttons,
-                                              NATRON_ENUM::StandardButtonEnum defaultButton,
+                                              Natron::StandardButtons buttons,
+                                              Natron::StandardButtonEnum defaultButton,
                                               bool* stopAsking) OVERRIDE FINAL WARN_UNUSED_RETURN;
     virtual void loadProjectGui(bool isAutosave,  boost::archive::xml_iarchive & archive) const OVERRIDE FINAL;
     virtual void saveProjectGui(boost::archive::xml_oarchive & archive) OVERRIDE FINAL;
diff --git a/Gui/GuiApplicationManager.cpp b/Gui/GuiApplicationManager.cpp
index f59bcaf909..25df689ca0 100644
--- a/Gui/GuiApplicationManager.cpp
+++ b/Gui/GuiApplicationManager.cpp
@@ -30,9 +30,9 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QtGlobal> // for Q_OS_*
-#include <QtCore/QDebug>
-#include <QtCore/QSettings>
+#include <QtGlobal> // for Q_OS_*
+#include <QDebug>
+#include <QSettings>
 #include <QPixmapCache>
 #include <QApplication>
 #include <QFontDatabase>
diff --git a/Gui/GuiApplicationManager.h b/Gui/GuiApplicationManager.h
index 2ceb5ccb6b..64d9d100fb 100644
--- a/Gui/GuiApplicationManager.h
+++ b/Gui/GuiApplicationManager.h
@@ -31,7 +31,7 @@
 
 #include <list>
 
-#include <QtCore/QtGlobal> // for Q_OS_*
+#include <QtGlobal> // for Q_OS_*
 
 #include "Engine/AppManager.h"
 #include "Engine/Variant.h"
@@ -100,15 +100,15 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON
         return false;
     }
 
-    void getIcon(NATRON_ENUM::PixmapEnum e, QPixmap* pix) const;
-    void getIcon(NATRON_ENUM::PixmapEnum e, int size, QPixmap* pix) const;
+    void getIcon(Natron::PixmapEnum e, QPixmap* pix) const;
+    void getIcon(Natron::PixmapEnum e, int size, QPixmap* pix) const;
 
-    void setKnobClipBoard(NATRON_ENUM::KnobClipBoardType type,
+    void setKnobClipBoard(Natron::KnobClipBoardType type,
                           const KnobIPtr& serialization,
                           int dimension);
 
 
-    void getKnobClipBoard(NATRON_ENUM::KnobClipBoardType *type,
+    void getKnobClipBoard(Natron::KnobClipBoardType *type,
                           KnobIPtr* serialization,
                           int *dimension) const;
 
diff --git a/Gui/GuiApplicationManager10.cpp b/Gui/GuiApplicationManager10.cpp
index 99bda2614c..452b4255c6 100644
--- a/Gui/GuiApplicationManager10.cpp
+++ b/Gui/GuiApplicationManager10.cpp
@@ -36,10 +36,10 @@
 ///gui
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QtGlobal> // for Q_OS_*
-#include <QtCore/QDebug>
-#include <QtCore/QSettings>
-#include <QtCore/QFileInfo>
+#include <QtGlobal> // for Q_OS_*
+#include <QDebug>
+#include <QSettings>
+#include <QFileInfo>
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QFileOpenEvent>
diff --git a/Gui/GuiApplicationManagerPrivate.cpp b/Gui/GuiApplicationManagerPrivate.cpp
index 5d5e5cdc3c..63ae448443 100644
--- a/Gui/GuiApplicationManagerPrivate.cpp
+++ b/Gui/GuiApplicationManagerPrivate.cpp
@@ -31,7 +31,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QDebug>
+#include <QDebug>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Gui/GuiApplicationManagerPrivate.h b/Gui/GuiApplicationManagerPrivate.h
index e7fd4a7614..36fd492066 100644
--- a/Gui/GuiApplicationManagerPrivate.h
+++ b/Gui/GuiApplicationManagerPrivate.h
@@ -35,8 +35,8 @@
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
 #include <QFutureWatcher>
-#include <QtCore/QString>
-#include <QtCore/QTimer>
+#include <QString>
+#include <QTimer>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Gui/GuiFwd.h b/Gui/GuiFwd.h
index 6938951267..d939dbe927 100644
--- a/Gui/GuiFwd.h
+++ b/Gui/GuiFwd.h
@@ -36,7 +36,7 @@
 #endif
 
 // Qt
-#include <QtCore/QtGlobal>
+#include <QtGlobal>
 
 class QAbstractButton;
 class QAction;
diff --git a/Gui/GuiPrivate.cpp b/Gui/GuiPrivate.cpp
index 30cc04b0b6..d5fdde1c4f 100644
--- a/Gui/GuiPrivate.cpp
+++ b/Gui/GuiPrivate.cpp
@@ -30,16 +30,16 @@
 #include <algorithm> // min, max
 #include <stdexcept>
 
-#include <QtCore/QTextStream>
-#include <QtCore/QWaitCondition>
-#include <QtCore/QMutex>
-#include <QtCore/QCoreApplication>
+#include <QTextStream>
+#include <QWaitCondition>
+#include <QMutex>
+#include <QCoreApplication>
 #include <QAction>
 #include <QSettings>
-#include <QtCore/QDebug>
-#include <QtCore/QThread>
+#include <QDebug>
+#include <QThread>
 #include <QCheckBox>
-#include <QtCore/QTimer>
+#include <QTimer>
 #include <QTextEdit>
 
 #include <QScreen>
diff --git a/Gui/GuiPrivate.h b/Gui/GuiPrivate.h
index 5ed3d5f154..059d812ce0 100644
--- a/Gui/GuiPrivate.h
+++ b/Gui/GuiPrivate.h
@@ -34,10 +34,10 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QSize>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QMutex>
-#include <QtCore/QWaitCondition>
+#include <QSize>
+#include <QCoreApplication>
+#include <QMutex>
+#include <QWaitCondition>
 #include <QToolBar>
 #include <QMessageBox>
 CLANG_DIAG_ON(deprecated)
diff --git a/Gui/Histogram.cpp b/Gui/Histogram.cpp
index 73a130273f..6f09fab587 100644
--- a/Gui/Histogram.cpp
+++ b/Gui/Histogram.cpp
@@ -37,7 +37,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 // /opt/local/include/QtGui/qmime.h:119:10: warning: private field 'type' is not used [-Wunused-private-field]
 #include <QMouseEvent>
 GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
-#include <QtCore/QDebug>
+#include <QDebug>
 #include <QApplication>
 #include <QToolButton>
 #include <QActionGroup>
diff --git a/Gui/Histogram.h b/Gui/Histogram.h
index cad1f3854e..5abbbdbe3a 100644
--- a/Gui/Histogram.h
+++ b/Gui/Histogram.h
@@ -31,7 +31,7 @@
 #include "Global/GLIncludes.h" //!<must be included before QGlWidget because of gl.h and glew.h
 
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QSize>
+#include <QSize>
 CLANG_DIAG_ON(uninitialized)
 
 #include <QOpenGLWidget>
diff --git a/Gui/HostOverlay.cpp b/Gui/HostOverlay.cpp
index 922046de80..5efe644f5d 100644
--- a/Gui/HostOverlay.cpp
+++ b/Gui/HostOverlay.cpp
@@ -47,9 +47,9 @@
 #include "Global/KeySymbols.h"
 
 #include "Global/GLIncludes.h" //!<must be included before QGlWidget because of gl.h and glew.h
-#include <QtCore/QDebug>
-#include <QtCore/QPointF>
-#include <QtCore/QThread>
+#include <QDebug>
+#include <QPointF>
+#include <QThread>
 #include <QFont>
 #include <QColor>
 #include <QApplication>
diff --git a/Gui/InfoViewerWidget.cpp b/Gui/InfoViewerWidget.cpp
index 79fcd6bb6d..c796854ff5 100644
--- a/Gui/InfoViewerWidget.cpp
+++ b/Gui/InfoViewerWidget.cpp
@@ -28,12 +28,12 @@
 #include <cstdlib>
 #include <stdexcept>
 
-#include <QtGui/QImage>
+#include <QImage>
 #include <QHBoxLayout>
-#include <QtCore/QThread>
+#include <QThread>
 #include <QPaintEvent>
 #include <QPainter>
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 
 #include "Engine/ViewerInstance.h"
 #include "Engine/Lut.h"
diff --git a/Gui/InfoViewerWidget.h b/Gui/InfoViewerWidget.h
index fa63344043..a537721c82 100644
--- a/Gui/InfoViewerWidget.h
+++ b/Gui/InfoViewerWidget.h
@@ -31,9 +31,9 @@
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
 #include <QWidget>
-#include <QtCore/QPoint>
-#include <QtCore/QSize>
-#include <QtGui/QVector4D>
+#include <QPoint>
+#include <QSize>
+#include <QVector4D>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Gui/KnobGui.h b/Gui/KnobGui.h
index 1732498910..1a84a76350 100644
--- a/Gui/KnobGui.h
+++ b/Gui/KnobGui.h
@@ -32,7 +32,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QObject>
+#include <QObject>
 #include <QDialog>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
diff --git a/Gui/KnobGuiBool.cpp b/Gui/KnobGuiBool.cpp
index d7a7deede4..1af3e89183 100644
--- a/Gui/KnobGuiBool.cpp
+++ b/Gui/KnobGuiBool.cpp
@@ -45,7 +45,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 // /opt/local/include/QtGui/qmime.h:119:10: warning: private field 'type' is not used [-Wunused-private-field]
 #include <QKeyEvent>
 GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
-#include <QtCore/QDebug>
+#include <QDebug>
 #include <QFontComboBox>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
diff --git a/Gui/KnobGuiBool.h b/Gui/KnobGuiBool.h
index de5a79dabb..ad86679b8f 100644
--- a/Gui/KnobGuiBool.h
+++ b/Gui/KnobGuiBool.h
@@ -33,7 +33,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QObject>
+#include <QObject>
 #include <QStyledItemDelegate>
 #include <QTextEdit>
 CLANG_DIAG_ON(deprecated)
diff --git a/Gui/KnobGuiButton.cpp b/Gui/KnobGuiButton.cpp
index 7cffd57415..2d3da0e61d 100644
--- a/Gui/KnobGuiButton.cpp
+++ b/Gui/KnobGuiButton.cpp
@@ -45,7 +45,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 // /opt/local/include/QtGui/qmime.h:119:10: warning: private field 'type' is not used [-Wunused-private-field]
 #include <QKeyEvent>
 GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
-#include <QtCore/QDebug>
+#include <QDebug>
 #include <QFontComboBox>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
diff --git a/Gui/KnobGuiButton.h b/Gui/KnobGuiButton.h
index 0429f8fa92..85d9ee102e 100644
--- a/Gui/KnobGuiButton.h
+++ b/Gui/KnobGuiButton.h
@@ -33,7 +33,7 @@
 #include "Global/Macros.h"
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QObject>
+#include <QObject>
 #include <QStyledItemDelegate>
 #include <QTextEdit>
 CLANG_DIAG_ON(deprecated)
diff --git a/Gui/KnobGuiChoice.cpp b/Gui/KnobGuiChoice.cpp
index 2991cb5b13..2a9ae49558 100644
--- a/Gui/KnobGuiChoice.cpp
+++ b/Gui/KnobGuiChoice.cpp
@@ -47,7 +47,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 // /opt/local/include/QtGui/qmime.h:119:10: warning: private field 'type' is not used [-Wunused-private-field]
 #include <QKeyEvent>
 GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
-#include <QtCore/QDebug>
+#include <QDebug>
 #include <QFontComboBox>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
diff --git a/Gui/KnobGuiChoice.h b/Gui/KnobGuiChoice.h
index 1dad91b462..1b4218c80f 100644
--- a/Gui/KnobGuiChoice.h
+++ b/Gui/KnobGuiChoice.h
@@ -33,7 +33,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QObject>
+#include <QObject>
 #include <QStyledItemDelegate>
 #include <QTextEdit>
 CLANG_DIAG_ON(deprecated)
diff --git a/Gui/KnobGuiColor.cpp b/Gui/KnobGuiColor.cpp
index 90d8f43599..683c7cfe6f 100644
--- a/Gui/KnobGuiColor.cpp
+++ b/Gui/KnobGuiColor.cpp
@@ -45,7 +45,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 // /opt/local/include/QtGui/qmime.h:119:10: warning: private field 'type' is not used [-Wunused-private-field]
 #include <QKeyEvent>
 GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
-#include <QtCore/QDebug>
+#include <QDebug>
 #include <QFontComboBox>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
diff --git a/Gui/KnobGuiColor.h b/Gui/KnobGuiColor.h
index c90b9a67cd..7dd3df2129 100644
--- a/Gui/KnobGuiColor.h
+++ b/Gui/KnobGuiColor.h
@@ -33,7 +33,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QObject>
+#include <QObject>
 #include <QStyledItemDelegate>
 #include <QTextEdit>
 #include <QToolButton>
diff --git a/Gui/KnobGuiFile.cpp b/Gui/KnobGuiFile.cpp
index 4508880b57..5d857118a7 100644
--- a/Gui/KnobGuiFile.cpp
+++ b/Gui/KnobGuiFile.cpp
@@ -29,7 +29,7 @@
 
 #include <QFormLayout> // in QtGui on Qt4, in QtWidgets on Qt5
 #include <QHBoxLayout> // in QtGui on Qt4, in QtWidgets on Qt5
-#include <QtCore/QDebug>
+#include <QDebug>
 #include <QItemSelectionModel>
 #include <QHeaderView>
 #include <QPainter>
diff --git a/Gui/KnobGuiFile.h b/Gui/KnobGuiFile.h
index 53d260dc53..5ca042d7e3 100644
--- a/Gui/KnobGuiFile.h
+++ b/Gui/KnobGuiFile.h
@@ -32,8 +32,8 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QString>
-#include <QtCore/QDateTime>
+#include <QString>
+#include <QDateTime>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Gui/KnobGuiGroup.cpp b/Gui/KnobGuiGroup.cpp
index 969d6a15f9..710c916c2f 100644
--- a/Gui/KnobGuiGroup.cpp
+++ b/Gui/KnobGuiGroup.cpp
@@ -45,7 +45,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 // /opt/local/include/QtGui/qmime.h:119:10: warning: private field 'type' is not used [-Wunused-private-field]
 #include <QKeyEvent>
 GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
-#include <QtCore/QDebug>
+#include <QDebug>
 #include <QFontComboBox>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
diff --git a/Gui/KnobGuiGroup.h b/Gui/KnobGuiGroup.h
index b99ecb65a4..f2f2455eb8 100644
--- a/Gui/KnobGuiGroup.h
+++ b/Gui/KnobGuiGroup.h
@@ -33,7 +33,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QObject>
+#include <QObject>
 #include <QStyledItemDelegate>
 #include <QTextEdit>
 CLANG_DIAG_ON(deprecated)
diff --git a/Gui/KnobGuiParametric.cpp b/Gui/KnobGuiParametric.cpp
index a54f0e2903..7594a45945 100644
--- a/Gui/KnobGuiParametric.cpp
+++ b/Gui/KnobGuiParametric.cpp
@@ -45,7 +45,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 // /opt/local/include/QtGui/qmime.h:119:10: warning: private field 'type' is not used [-Wunused-private-field]
 #include <QKeyEvent>
 GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
-#include <QtCore/QDebug>
+#include <QDebug>
 #include <QFontComboBox>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
diff --git a/Gui/KnobGuiParametric.h b/Gui/KnobGuiParametric.h
index be06ae3593..70e40c6ed5 100644
--- a/Gui/KnobGuiParametric.h
+++ b/Gui/KnobGuiParametric.h
@@ -33,7 +33,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QObject>
+#include <QObject>
 #include <QStyledItemDelegate>
 #include <QTextEdit>
 CLANG_DIAG_ON(deprecated)
diff --git a/Gui/KnobGuiPrivate.h b/Gui/KnobGuiPrivate.h
index 94588250f2..410d916094 100644
--- a/Gui/KnobGuiPrivate.h
+++ b/Gui/KnobGuiPrivate.h
@@ -35,7 +35,7 @@
 #include <stdexcept>
 #include <map>
 
-#include <QtCore/QString>
+#include <QString>
 #include <QHBoxLayout>
 #include <QPushButton>
 #include <QFormLayout>
@@ -50,7 +50,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
 #include <QColorDialog>
 #include <QGroupBox>
-#include <QtGui/QVector4D>
+#include <QVector4D>
 #include <QStyleFactory>
 #include <QComboBox>
 #include <QDialogButtonBox>
diff --git a/Gui/KnobGuiSeparator.cpp b/Gui/KnobGuiSeparator.cpp
index d4f19e5b40..08aedcaee0 100644
--- a/Gui/KnobGuiSeparator.cpp
+++ b/Gui/KnobGuiSeparator.cpp
@@ -45,7 +45,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 // /opt/local/include/QtGui/qmime.h:119:10: warning: private field 'type' is not used [-Wunused-private-field]
 #include <QKeyEvent>
 GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
-#include <QtCore/QDebug>
+#include <QDebug>
 #include <QFontComboBox>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
diff --git a/Gui/KnobGuiSeparator.h b/Gui/KnobGuiSeparator.h
index 060d791f8c..cbf322f6e8 100644
--- a/Gui/KnobGuiSeparator.h
+++ b/Gui/KnobGuiSeparator.h
@@ -33,7 +33,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QObject>
+#include <QObject>
 #include <QStyledItemDelegate>
 #include <QTextEdit>
 CLANG_DIAG_ON(deprecated)
diff --git a/Gui/KnobGuiString.cpp b/Gui/KnobGuiString.cpp
index ed2dff80ad..d0ef55d9ee 100644
--- a/Gui/KnobGuiString.cpp
+++ b/Gui/KnobGuiString.cpp
@@ -45,7 +45,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 // /opt/local/include/QtGui/qmime.h:119:10: warning: private field 'type' is not used [-Wunused-private-field]
 #include <QKeyEvent>
 GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
-#include <QtCore/QDebug>
+#include <QDebug>
 #include <QFontComboBox>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
diff --git a/Gui/KnobGuiString.h b/Gui/KnobGuiString.h
index 196762d14b..0217f18431 100644
--- a/Gui/KnobGuiString.h
+++ b/Gui/KnobGuiString.h
@@ -33,7 +33,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QObject>
+#include <QObject>
 #include <QStyledItemDelegate>
 #include <QTextEdit>
 CLANG_DIAG_ON(deprecated)
diff --git a/Gui/KnobGuiValue.cpp b/Gui/KnobGuiValue.cpp
index 4bd693f8f9..10512d2ebf 100644
--- a/Gui/KnobGuiValue.cpp
+++ b/Gui/KnobGuiValue.cpp
@@ -45,7 +45,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 // /opt/local/include/QtGui/qmime.h:119:10: warning: private field 'type' is not used [-Wunused-private-field]
 #include <QKeyEvent>
 GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
-#include <QtCore/QDebug>
+#include <QDebug>
 #include <QFontComboBox>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
diff --git a/Gui/KnobGuiValue.h b/Gui/KnobGuiValue.h
index 5d503ebd6b..a697fea24e 100644
--- a/Gui/KnobGuiValue.h
+++ b/Gui/KnobGuiValue.h
@@ -33,7 +33,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QObject>
+#include <QObject>
 #include <QStyledItemDelegate>
 #include <QTextEdit>
 CLANG_DIAG_ON(deprecated)
diff --git a/Gui/KnobWidgetDnD.cpp b/Gui/KnobWidgetDnD.cpp
index 25c863de64..1905adfaca 100644
--- a/Gui/KnobWidgetDnD.cpp
+++ b/Gui/KnobWidgetDnD.cpp
@@ -30,7 +30,7 @@
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
 #include <QDrag>
-#include <QtCore/QMimeData>
+#include <QMimeData>
 #include <QPainter>
 #include <QDragEnterEvent>
 #include <QDragLeaveEvent>
diff --git a/Gui/KnobWidgetDnD.h b/Gui/KnobWidgetDnD.h
index cdb511e172..549f3eb7a1 100644
--- a/Gui/KnobWidgetDnD.h
+++ b/Gui/KnobWidgetDnD.h
@@ -28,7 +28,7 @@
 
 #include "Global/Macros.h"
 
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 
 #include "Gui/GuiFwd.h"
 
diff --git a/Gui/Label.h b/Gui/Label.h
index 63b38f4d66..03da0a5c6e 100644
--- a/Gui/Label.h
+++ b/Gui/Label.h
@@ -30,7 +30,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QObject>
+#include <QObject>
 #include <QLabel> // in QtGui on Qt4, in QtWidgets on Qt5
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
diff --git a/Gui/LineEdit.cpp b/Gui/LineEdit.cpp
index 658b5c9f38..2a9722aa70 100644
--- a/Gui/LineEdit.cpp
+++ b/Gui/LineEdit.cpp
@@ -38,8 +38,8 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
 #include <QDragMoveEvent>
 #include <QDropEvent>
 #include <QKeySequence>
-#include <QtCore/QUrl>
-#include <QtCore/QMimeData>
+#include <QUrl>
+#include <QMimeData>
 #include <QStyle>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
diff --git a/Gui/LinkToKnobDialog.cpp b/Gui/LinkToKnobDialog.cpp
index 2d57914d57..418c720909 100644
--- a/Gui/LinkToKnobDialog.cpp
+++ b/Gui/LinkToKnobDialog.cpp
@@ -29,14 +29,14 @@
 #include <cfloat>
 #include <stdexcept>
 
-#include <QtCore/QString>
+#include <QString>
 #include <QHBoxLayout>
 #include <QPushButton>
 #include <QFormLayout>
 #include <QFileDialog>
 #include <QTextEdit>
 #include <QStyle> // in QtGui on Qt4, in QtWidgets on Qt5
-#include <QtCore/QTimer>
+#include <QTimer>
 
 GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 // /opt/local/include/QtGui/qmime.h:119:10: warning: private field 'type' is not used [-Wunused-private-field]
@@ -44,7 +44,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
 #include <QColorDialog>
 #include <QGroupBox>
-#include <QtGui/QVector4D>
+#include <QVector4D>
 #include <QStyleFactory>
 #include <QCompleter>
 
diff --git a/Gui/LinkToKnobDialog.h b/Gui/LinkToKnobDialog.h
index f8a704d631..cbf6dbfb67 100644
--- a/Gui/LinkToKnobDialog.h
+++ b/Gui/LinkToKnobDialog.h
@@ -33,8 +33,8 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QObject>
-#include <QtCore/QString>
+#include <QObject>
+#include <QString>
 #include <QDialog>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
diff --git a/Gui/LogWindow.cpp b/Gui/LogWindow.cpp
index 921b57d076..3d36f71bdf 100644
--- a/Gui/LogWindow.cpp
+++ b/Gui/LogWindow.cpp
@@ -30,8 +30,8 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QDateTime>
-#include <QtCore/QLocale>
+#include <QDateTime>
+#include <QLocale>
 #include <QVBoxLayout>
 #include <QScrollBar>
 #include <QTextBrowser>
diff --git a/Gui/MessageBox.cpp b/Gui/MessageBox.cpp
index 29f754d3cb..e12c5d372e 100644
--- a/Gui/MessageBox.cpp
+++ b/Gui/MessageBox.cpp
@@ -30,7 +30,7 @@
 #include "Global/Macros.h"
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QtGlobal> // for Q_OS_*
+#include <QtGlobal> // for Q_OS_*
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 #include <QStyle>
diff --git a/Gui/MultiInstancePanel.cpp b/Gui/MultiInstancePanel.cpp
index 22b788d099..65368cf9a3 100644
--- a/Gui/MultiInstancePanel.cpp
+++ b/Gui/MultiInstancePanel.cpp
@@ -31,20 +31,20 @@
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
 
-#include <QtCore/QDebug>
-#include <QtCore/QThread>
-#include <QtCore/QWaitCondition>
+#include <QDebug>
+#include <QThread>
+#include <QWaitCondition>
 #include <QtConcurrentMap> // QtCore on Qt4, QtConcurrent on Qt5
 
-#include <QtWidgets/QVBoxLayout>
-#include <QtWidgets/QHeaderView>
-#include <QtWidgets/QCheckBox>
-#include <QtWidgets/QStyledItemDelegate>
-#include <QtWidgets/QUndoCommand>
-#include <QtWidgets/QApplication>
+#include <QVBoxLayout>
+#include <QHeaderView>
+#include <QCheckBox>
+#include <QStyledItemDelegate>
+#include <QUndoCommand>
+#include <QApplication>
 
-#include <QtGui/QPixmap>
-#include <QtGui/QPainter>
+#include <QPixmap>
+#include <QPainter>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Gui/MultiInstancePanel.h b/Gui/MultiInstancePanel.h
index 8dc4ca3201..17995cef13 100644
--- a/Gui/MultiInstancePanel.h
+++ b/Gui/MultiInstancePanel.h
@@ -30,7 +30,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QThread>
+#include <QThread>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Gui/NewLayerDialog.cpp b/Gui/NewLayerDialog.cpp
index 2a748bb81a..167c24adb2 100644
--- a/Gui/NewLayerDialog.cpp
+++ b/Gui/NewLayerDialog.cpp
@@ -45,7 +45,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 // /opt/local/include/QtGui/qmime.h:119:10: warning: private field 'type' is not used [-Wunused-private-field]
 #include <QKeyEvent>
 GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
-#include <QtCore/QDebug>
+#include <QDebug>
 #include <QFontComboBox>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
diff --git a/Gui/NodeCreationDialog.cpp b/Gui/NodeCreationDialog.cpp
index 912610c867..f73f142bde 100644
--- a/Gui/NodeCreationDialog.cpp
+++ b/Gui/NodeCreationDialog.cpp
@@ -30,15 +30,15 @@
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
 #include <QVBoxLayout>
-#include <QtCore/QStringList>
+#include <QStringList>
 #include <QKeyEvent>
 #include <QAbstractItemView>
-#include <QtCore/QTimer>
+#include <QTimer>
 #include <QApplication>
 #include <QListView>
 #include <QSettings>
 #include <QDesktopWidget>
-#include <QtCore/QRegExp>
+#include <QRegExp>
 #include <QApplication>
 #include <QStringListModel>
 CLANG_DIAG_ON(deprecated)
diff --git a/Gui/NodeGraph10.cpp b/Gui/NodeGraph10.cpp
index 0decd50bbe..bf30258a26 100644
--- a/Gui/NodeGraph10.cpp
+++ b/Gui/NodeGraph10.cpp
@@ -32,7 +32,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
 #include <QMouseEvent>
-#include <QtCore/QString>
+#include <QString>
 #include <QAction>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
diff --git a/Gui/NodeGraph40.cpp b/Gui/NodeGraph40.cpp
index 4dcfd66b03..bc82a215fe 100644
--- a/Gui/NodeGraph40.cpp
+++ b/Gui/NodeGraph40.cpp
@@ -47,7 +47,7 @@ GCC_DIAG_ON(unused-parameter)
 
 #include <QApplication>
 #include <QClipboard>
-#include <QtCore/QMimeData>
+#include <QMimeData>
 
 #include "Engine/Node.h"
 #include "Engine/NodeGroup.h"
diff --git a/Gui/NodeGraph45.cpp b/Gui/NodeGraph45.cpp
index 574267ca2f..b3e428c3f9 100644
--- a/Gui/NodeGraph45.cpp
+++ b/Gui/NodeGraph45.cpp
@@ -33,7 +33,7 @@
 GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QThread>
+#include <QThread>
 #include <QVBoxLayout>
 #include <QKeyEvent>
 #include <QApplication>
diff --git a/Gui/NodeGraphPrivate.h b/Gui/NodeGraphPrivate.h
index 5d7c948f91..e4630c626a 100644
--- a/Gui/NodeGraphPrivate.h
+++ b/Gui/NodeGraphPrivate.h
@@ -36,13 +36,13 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QTimer>
-#include <QtCore/QMutex>
+#include <QTimer>
+#include <QMutex>
 #include <QGraphicsItem>
 #include <QGraphicsLineItem>
 #include <QGraphicsPixmapItem>
 #include <QPainter>
-#include <QtCore/QPointF>
+#include <QPointF>
 #include <QColor>
 #include <QPen>
 #include <QStyleOptionGraphicsItem>
diff --git a/Gui/NodeGraphTextItem.cpp b/Gui/NodeGraphTextItem.cpp
index 211274f0a3..5f1977a0aa 100644
--- a/Gui/NodeGraphTextItem.cpp
+++ b/Gui/NodeGraphTextItem.cpp
@@ -28,7 +28,7 @@
 #include <cmath>
 #include <stdexcept>
 
-#include <QtCore/QDebug>
+#include <QDebug>
 #include <QStyleOption>
 
 #include "Engine/Settings.h"
diff --git a/Gui/NodeGraphUndoRedo.cpp b/Gui/NodeGraphUndoRedo.cpp
index 317b42cf9a..84434d131d 100644
--- a/Gui/NodeGraphUndoRedo.cpp
+++ b/Gui/NodeGraphUndoRedo.cpp
@@ -31,7 +31,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QDebug>
+#include <QDebug>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Gui/NodeGraphUndoRedo.h b/Gui/NodeGraphUndoRedo.h
index cdc82c7bd2..d5c7d4bdbe 100644
--- a/Gui/NodeGraphUndoRedo.h
+++ b/Gui/NodeGraphUndoRedo.h
@@ -32,8 +32,8 @@
 #include <vector>
 #include <map>
 
-#include <QtCore/QPointF>
-#include <QtCore/QCoreApplication>
+#include <QPointF>
+#include <QCoreApplication>
 #include <QUndoCommand>
 
 #include "Global/GlobalDefines.h"
diff --git a/Gui/NodeGui.cpp b/Gui/NodeGui.cpp
index 3efe12077b..48a009549e 100644
--- a/Gui/NodeGui.cpp
+++ b/Gui/NodeGui.cpp
@@ -31,16 +31,16 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QDebug>
+#include <QDebug>
 #include <QLayout>
 #include <QAction>
-#include <QtCore/QThread>
+#include <QThread>
 #include <QFontMetrics>
 #include <QTextBlockFormat>
 #include <QTextCursor>
 #include <QGridLayout>
 #include <QCursor>
-#include <QtCore/QFile>
+#include <QFile>
 #include <QApplication>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
diff --git a/Gui/NodeGui.h b/Gui/NodeGui.h
index ef76344494..c7140a9cb0 100644
--- a/Gui/NodeGui.h
+++ b/Gui/NodeGui.h
@@ -36,15 +36,15 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QRectF>
-#include <QtCore/QMutex>
-#include <QtCore/QSize>
+#include <QRectF>
+#include <QMutex>
+#include <QSize>
 GCC_ONLY_DIAG_OFF(class-memaccess)
-#include <QtCore/QVector>
+#include <QVector>
 GCC_ONLY_DIAG_ON(class-memaccess)
 #include <QGraphicsItem>
 #include <QDialog>
-#include <QtCore/QMutex>
+#include <QMutex>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Gui/NodeSettingsPanel.cpp b/Gui/NodeSettingsPanel.cpp
index cc0bd37fc6..89f49afade 100644
--- a/Gui/NodeSettingsPanel.cpp
+++ b/Gui/NodeSettingsPanel.cpp
@@ -32,7 +32,7 @@
 #include <fstream>
 #include <stdexcept>
 
-#include <QtWidgets/QStyle>
+#include <QStyle>
 
 #include "Global/FStreamsSupport.h"
 
diff --git a/Gui/NodeViewerContext.h b/Gui/NodeViewerContext.h
index 7bdfb5431c..8ba4b59441 100644
--- a/Gui/NodeViewerContext.h
+++ b/Gui/NodeViewerContext.h
@@ -29,7 +29,7 @@
 #include "Global/Macros.h"
 
 CLANG_DIAG_OFF(deprecated)
-#include <QtCore/QObject>
+#include <QObject>
 CLANG_DIAG_ON(deprecated)
 
 #include "Engine/ViewIdx.h"
diff --git a/Gui/PickKnobDialog.cpp b/Gui/PickKnobDialog.cpp
index 49ef89e10e..39f06b0d80 100644
--- a/Gui/PickKnobDialog.cpp
+++ b/Gui/PickKnobDialog.cpp
@@ -32,7 +32,7 @@
 
 #include <QGridLayout>
 #include <QCheckBox>
-#include <QtCore/QTimer>
+#include <QTimer>
 
 #include "Engine/Knob.h" // KnobI
 #include "Engine/KnobTypes.h" // KnobButton...
diff --git a/Gui/PreviewThread.cpp b/Gui/PreviewThread.cpp
index bbbcf3f977..5bf319d306 100644
--- a/Gui/PreviewThread.cpp
+++ b/Gui/PreviewThread.cpp
@@ -30,8 +30,8 @@
 #include <stdexcept>
 #include <cstring> // for std::memcpy, std::memset
 
-#include <QtCore/QWaitCondition>
-#include <QtCore/QMutex>
+#include <QWaitCondition>
+#include <QMutex>
 
 #include "Gui/GuiDefines.h"
 #include "Gui/NodeGui.h"
diff --git a/Gui/PreviewThread.h b/Gui/PreviewThread.h
index c6ba4fbd70..42bf798c3d 100644
--- a/Gui/PreviewThread.h
+++ b/Gui/PreviewThread.h
@@ -28,7 +28,7 @@
 
 #include "Global/Macros.h"
 
-#include <QtCore/QThread>
+#include <QThread>
 
 #include "Engine/GenericSchedulerThread.h"
 
diff --git a/Gui/ProgressPanel.cpp b/Gui/ProgressPanel.cpp
index 5c0485408a..b5797aefa7 100644
--- a/Gui/ProgressPanel.cpp
+++ b/Gui/ProgressPanel.cpp
@@ -30,18 +30,18 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QMutex>
+#include <QMutex>
 #include <QProgressBar>
 #include <QVBoxLayout>
 #include <QKeyEvent>
 #include <QItemSelectionModel>
 #include <QTextEdit>
 #include <QApplication>
-#include <QtCore/QThread>
+#include <QThread>
 #include <QHeaderView>
 #include <QCheckBox>
 #include <QCursor>
-#include <QtCore/QTimer>
+#include <QTimer>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Gui/ProgressTaskInfo.cpp b/Gui/ProgressTaskInfo.cpp
index a1395ba585..c27cb20857 100644
--- a/Gui/ProgressTaskInfo.cpp
+++ b/Gui/ProgressTaskInfo.cpp
@@ -27,10 +27,10 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QTimer>
+#include <QTimer>
 #include <QProgressBar>
 #include <QApplication>
-#include <QtCore/QThread>
+#include <QThread>
 #include <QProgressBar>
 #include <QHBoxLayout>
 CLANG_DIAG_ON(deprecated)
diff --git a/Gui/ProgressTaskInfo.h b/Gui/ProgressTaskInfo.h
index 8f196b0db4..0c17b8f287 100644
--- a/Gui/ProgressTaskInfo.h
+++ b/Gui/ProgressTaskInfo.h
@@ -28,7 +28,7 @@
 
 #include "Global/Macros.h"
 
-#include <QtCore/QObject>
+#include <QObject>
 
 #include "Gui/GuiFwd.h"
 
diff --git a/Gui/ProjectGui.cpp b/Gui/ProjectGui.cpp
index 8640f946b8..0eddd2e6fd 100644
--- a/Gui/ProjectGui.cpp
+++ b/Gui/ProjectGui.cpp
@@ -33,8 +33,8 @@ CLANG_DIAG_OFF(uninitialized)
 #include <QVBoxLayout>
 #include <QHBoxLayout>
 #include <QSplitter>
-#include <QtCore/QTimer>
-#include <QtCore/QDebug>
+#include <QTimer>
+#include <QDebug>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Gui/ProjectGui.h b/Gui/ProjectGui.h
index f4377b0e0c..7021f327ef 100644
--- a/Gui/ProjectGui.h
+++ b/Gui/ProjectGui.h
@@ -30,7 +30,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QObject>
+#include <QObject>
 #include <QDialog>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
diff --git a/Gui/ProjectGuiSerialization.cpp b/Gui/ProjectGuiSerialization.cpp
index f596877cfb..2f0daaeca2 100644
--- a/Gui/ProjectGuiSerialization.cpp
+++ b/Gui/ProjectGuiSerialization.cpp
@@ -31,7 +31,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QDebug>
+#include <QDebug>
 #include <QSplitter>
 #include <QVBoxLayout>
 CLANG_DIAG_ON(deprecated)
diff --git a/Gui/PyGlobalGui.h b/Gui/PyGlobalGui.h
index f14836dac5..f96fc2a1e5 100644
--- a/Gui/PyGlobalGui.h
+++ b/Gui/PyGlobalGui.h
@@ -59,7 +59,7 @@ class PyGuiApplication
     {
     }
 
-    QPixmap getIcon(NATRON_ENUM::PixmapEnum val) const
+    QPixmap getIcon(Natron::PixmapEnum val) const
     {
         QPixmap ret;
 
@@ -101,7 +101,7 @@ class PyGuiApplication
         Dialogs::errorDialog( title.toStdString(), message.toStdString() );
     }
 
-    NATRON_ENUM::StandardButtonEnum questionDialog(const QString& title,
+    Natron::StandardButtonEnum questionDialog(const QString& title,
                                                         const QString& message)
     {
         return Dialogs::questionDialog(title.toStdString(), message.toStdString(), false);
diff --git a/Gui/PyGuiApp.h b/Gui/PyGuiApp.h
index b045e1bbf3..57c7857238 100644
--- a/Gui/PyGuiApp.h
+++ b/Gui/PyGuiApp.h
@@ -74,13 +74,13 @@ class PyViewer
 
     void getFrameRange(int* firstFrame, int* lastFrame) const;
 
-    void setPlaybackMode(NATRON_ENUM::PlaybackModeEnum mode);
+    void setPlaybackMode(Natron::PlaybackModeEnum mode);
 
-    NATRON_ENUM::PlaybackModeEnum getPlaybackMode() const;
+    Natron::PlaybackModeEnum getPlaybackMode() const;
 
-    NATRON_ENUM::ViewerCompositingOperatorEnum getCompositingOperator() const;
+    Natron::ViewerCompositingOperatorEnum getCompositingOperator() const;
 
-    void setCompositingOperator(NATRON_ENUM::ViewerCompositingOperatorEnum op);
+    void setCompositingOperator(Natron::ViewerCompositingOperatorEnum op);
 
     int getAInput() const;
 
@@ -90,9 +90,9 @@ class PyViewer
 
     void setBInput(int index);
 
-    void setChannels(NATRON_ENUM::DisplayChannelsEnum channels);
+    void setChannels(Natron::DisplayChannelsEnum channels);
 
-    NATRON_ENUM::DisplayChannelsEnum getChannels() const;
+    Natron::DisplayChannelsEnum getChannels() const;
 
     void setProxyModeEnabled(bool enabled);
 
diff --git a/Gui/PySide6_Gui_Python.h b/Gui/PySide6_Gui_Python.h
new file mode 100644
index 0000000000..ec6965d9c2
--- /dev/null
+++ b/Gui/PySide6_Gui_Python.h
@@ -0,0 +1,39 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * This file is part of Natron <https://natrongithub.github.io/>,
+ * (C) 2018-2024 The Natron developers
+ * (C) 2013-2018 INRIA and Alexandre Gauthier-Foichat
+ *
+ * Natron is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Natron is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Natron.  If not, see <http://www.gnu.org/licenses/gpl-2.0.html>
+ * ***** END LICENSE BLOCK ***** */
+
+
+#ifndef PYSIDE6_GUI_PYTHON_H
+#define PYSIDE6_GUI_PYTHON_H
+
+// Defined for shiboken6-specific tweaks
+#define SBK6_RUN
+
+#ifndef BOOST_SERIALIZATION_VERSION_HPP
+#define BOOST_SERIALIZATION_VERSION_HPP
+#define BOOST_CLASS_VERSION(T, N)
+#endif /* BOOST_SERIALIZATION_VERSION_HPP */
+
+#ifndef BOOST_SERIALIZATION_SPLIT_MEMBER_HPP
+#define BOOST_SERIALIZATION_SPLIT_MEMBER_HPP
+#define BOOST_SERIALIZATION_SPLIT_MEMBER()
+#endif /* BOOST_SERIALIZATION_SPLIT_MEMBER_HPP */
+
+#include "Pyside_Gui_Python.h"
+
+#endif // PYSIDE6_GUI_PYTHON_H
diff --git a/Gui/Pyside_Gui_Python.h b/Gui/Pyside_Gui_Python.h
index a6533e9017..2d01249348 100644
--- a/Gui/Pyside_Gui_Python.h
+++ b/Gui/Pyside_Gui_Python.h
@@ -34,13 +34,13 @@
 #ifdef SBK2_RUN
 #include <pyside2_global.h>
 #else
-#include <pyside_global.h>
+#include <pyside6_global.h>
 #endif
 
 #include <QSize>
 #include <QObject>
 
-#include <QtGui/qpytextobject.h>
+#include <qpytextobject.h>
 
 //Global
 #include <GlobalDefines.h>
diff --git a/Gui/PythonPanels.cpp b/Gui/PythonPanels.cpp
index 20f8f6d285..4173a01b84 100644
--- a/Gui/PythonPanels.cpp
+++ b/Gui/PythonPanels.cpp
@@ -30,7 +30,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QMutex>
+#include <QMutex>
 #include <QVBoxLayout>
 #include <QHBoxLayout>
 CLANG_DIAG_ON(deprecated)
diff --git a/Gui/PythonPanels.h b/Gui/PythonPanels.h
index c5f83ed529..b4acbe6f43 100644
--- a/Gui/PythonPanels.h
+++ b/Gui/PythonPanels.h
@@ -74,7 +74,7 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON
     virtual void initializeKnobs() OVERRIDE FINAL {}
 
     virtual bool onKnobValueChanged(KnobI* k,
-                                    NATRON_ENUM::ValueChangedReasonEnum reason,
+                                    Natron::ValueChangedReasonEnum reason,
                                     double time,
                                     ViewSpec view,
                                     bool originatedFromMainThread) OVERRIDE FINAL;
@@ -91,7 +91,7 @@ class PyModalDialog
 public:
 
     PyModalDialog( Gui* gui,
-                   NATRON_ENUM::StandardButtons defaultButtons = NATRON_ENUM::StandardButtons(NATRON_ENUM::eStandardButtonOk | NATRON_ENUM::eStandardButtonCancel) );
+                   Natron::StandardButtons defaultButtons = Natron::StandardButtons(Natron::StandardButtonEnum::eStandardButtonOk | Natron::StandardButtonEnum::eStandardButtonCancel) );
 
     virtual ~PyModalDialog();
 
diff --git a/Gui/QtEnumConvert.cpp b/Gui/QtEnumConvert.cpp
index 202f350c6b..5637f86ad9 100644
--- a/Gui/QtEnumConvert.cpp
+++ b/Gui/QtEnumConvert.cpp
@@ -25,7 +25,7 @@
 
 #include "QtEnumConvert.h"
 
-#include <QtCore/QDebug>
+#include <QDebug>
 #include <stdexcept>
 
 NATRON_NAMESPACE_ENTER
diff --git a/Gui/QtMac.mm b/Gui/QtMac.mm
index ebc0e09a13..dd64086b98 100644
--- a/Gui/QtMac.mm
+++ b/Gui/QtMac.mm
@@ -19,7 +19,7 @@
 
 #include "Gui/Gui.h"
 
-#include <QtCore/QtGlobal> // for Q_OS_*
+#include <QtGlobal> // for Q_OS_*
 #ifdef Q_OS_DARWIN
 
 #include <AppKit/NSView.h>
diff --git a/Gui/RenderStatsDialog.cpp b/Gui/RenderStatsDialog.cpp
index a0ca891714..a3bb460be7 100644
--- a/Gui/RenderStatsDialog.cpp
+++ b/Gui/RenderStatsDialog.cpp
@@ -28,13 +28,13 @@
 #include <bitset>
 #include <stdexcept>
 
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 #include <QVBoxLayout>
 #include <QHBoxLayout>
 #include <QHeaderView>
 #include <QCheckBox>
 #include <QItemSelectionModel>
-#include <QtCore/QRegExp>
+#include <QRegExp>
 
 #include "Engine/Node.h"
 #include "Engine/Timer.h"
diff --git a/Gui/RightClickableWidget.cpp b/Gui/RightClickableWidget.cpp
index d101d45777..a1050b2ce5 100644
--- a/Gui/RightClickableWidget.cpp
+++ b/Gui/RightClickableWidget.cpp
@@ -27,7 +27,7 @@
 
 #include <stdexcept>
 
-#include <QtCore/QThread>
+#include <QThread>
 #include <QApplication>
 GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 // /opt/local/include/QtGui/qmime.h:119:10: warning: private field 'type' is not used [-Wunused-private-field]
diff --git a/Gui/RotoPanel.cpp b/Gui/RotoPanel.cpp
index 9c4f8a8a19..d102d70d73 100644
--- a/Gui/RotoPanel.cpp
+++ b/Gui/RotoPanel.cpp
@@ -42,8 +42,8 @@ CLANG_DIAG_OFF(uninitialized)
 #include <QCursor>
 #include <QMouseEvent>
 #include <QApplication>
-#include <QtCore/QDataStream>
-#include <QtCore/QMimeData>
+#include <QDataStream>
+#include <QMimeData>
 #include <QImage>
 #include <QPainter>
 #include <QUndoCommand>
diff --git a/Gui/ScaleSliderQWidget.cpp b/Gui/ScaleSliderQWidget.cpp
index 1f556802f6..195d4ce435 100644
--- a/Gui/ScaleSliderQWidget.cpp
+++ b/Gui/ScaleSliderQWidget.cpp
@@ -32,10 +32,10 @@
 
 GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 // /opt/local/include/QtGui/qmime.h:119:10: warning: private field 'type' is not used [-Wunused-private-field]
-#include <QtGui/QPaintEvent>
+#include <QPaintEvent>
 GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
-#include <QtGui/QMouseEvent>
-#include <QtGui/QPainter>
+#include <QMouseEvent>
+#include <QPainter>
 #include <QApplication>
 #include <QStyleOption>
 
diff --git a/Gui/ScaleSliderQWidget.h b/Gui/ScaleSliderQWidget.h
index 279825a817..642b4d7772 100644
--- a/Gui/ScaleSliderQWidget.h
+++ b/Gui/ScaleSliderQWidget.h
@@ -30,7 +30,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QSize>
+#include <QSize>
 #include <QWidget>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
diff --git a/Gui/ScriptEditor.cpp b/Gui/ScriptEditor.cpp
index 612d4d9871..a5957e5248 100644
--- a/Gui/ScriptEditor.cpp
+++ b/Gui/ScriptEditor.cpp
@@ -31,14 +31,14 @@
 #include <QVBoxLayout>
 #include <QUndoStack>
 #include <QUndoCommand>
-#include <QtCore/QFile>
-#include <QtCore/QTextStream>
+#include <QFile>
+#include <QTextStream>
 #include <QTextCursor>
-#include <QtCore/QThread>
+#include <QThread>
 #include <QApplication>
 #include <QSplitter>
-#include <QtCore/QTimer>
-#include <QtCore/QMutex>
+#include <QTimer>
+#include <QMutex>
 #include <QFont>
 #include <QScrollBar>
 #include <QKeyEvent>
diff --git a/Gui/ScriptTextEdit.cpp b/Gui/ScriptTextEdit.cpp
index 74cd9779f1..5d58f1ad9a 100644
--- a/Gui/ScriptTextEdit.cpp
+++ b/Gui/ScriptTextEdit.cpp
@@ -33,8 +33,8 @@ CLANG_DIAG_OFF(uninitialized)
 #include <QScrollBar>
 #include <QTextBlock>
 #include <QPainter>
-#include <QtCore/QRegExp>
-#include <QtCore/QMimeData>
+#include <QRegExp>
+#include <QMimeData>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Gui/ScriptTextEdit.h b/Gui/ScriptTextEdit.h
index 8f3c3d7a86..f3ee988c8c 100644
--- a/Gui/ScriptTextEdit.h
+++ b/Gui/ScriptTextEdit.h
@@ -30,7 +30,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QSize>
+#include <QSize>
 #include <QTextEdit>
 #include <QPlainTextEdit>
 #include <QSyntaxHighlighter>
diff --git a/Gui/SequenceFileDialog.cpp b/Gui/SequenceFileDialog.cpp
index eb73ea80e7..01a6c80198 100644
--- a/Gui/SequenceFileDialog.cpp
+++ b/Gui/SequenceFileDialog.cpp
@@ -25,12 +25,12 @@
 
 #include "SequenceFileDialog.h"
 
-#include <QtCore/QtGlobal> // for Q_OS_*
+#include <QtGlobal> // for Q_OS_*
 #if defined(Q_OS_UNIX)
 #include <pwd.h>
 #include <unistd.h> // for pathconf() on OS X
 #elif defined(Q_OS_WIN)
-#  include <QtCore/qt_windows.h>
+#  include <qt_windows.h>
 #endif
 #include <cassert>
 #include <locale>
@@ -42,7 +42,7 @@ CLANG_DIAG_OFF(uninitialized)
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 #include <QMessageBox>
-#include <QtGui/QPainter>
+#include <QPainter>
 #include <QListView>
 #include <QHeaderView>
 #include <QCheckBox>
@@ -50,7 +50,7 @@ CLANG_DIAG_OFF(uninitialized)
 #include <QFileSystemModel>
 //#include <QInputDialog>
 #include <QSplitter>
-#include <QtGui/QIcon>
+#include <QIcon>
 #include <QDialog>
 #include <QScrollBar>
 #include <QFileDialog>
@@ -58,19 +58,19 @@ CLANG_DIAG_OFF(uninitialized)
 #include <QFileIconProvider>
 GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 // /opt/local/include/QtGui/qmime.h:119:10: warning: private field 'type' is not used [-Wunused-private-field]
-#include <QtGui/QKeyEvent>
+#include <QKeyEvent>
 GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
-#include <QtGui/QColor>
-#include <QtWidgets/QAction>
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QStylePainter>
-#include <QtWidgets/QStyleOptionViewItem>
+#include <QColor>
+#include <QAction>
+#include <QApplication>
+#include <QStylePainter>
+#include <QStyleOptionViewItem>
 #include <QStandardPaths>
-#include <QtCore/QDebug>
-#include <QtCore/QEvent>
-#include <QtCore/QMimeData>
+#include <QDebug>
+#include <QEvent>
+#include <QMimeData>
 #include <QtConcurrentRun> // QtCore on Qt4, QtConcurrent on Qt5
-#include <QtCore/QSettings>
+#include <QSettings>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Gui/SequenceFileDialog.h b/Gui/SequenceFileDialog.h
index eecdc64379..e9a2f92f99 100644
--- a/Gui/SequenceFileDialog.h
+++ b/Gui/SequenceFileDialog.h
@@ -37,19 +37,19 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QtGlobal> // for Q_OS_*
+#include <QtGlobal> // for Q_OS_*
 #include <QStyledItemDelegate>
 #include <QTreeView>
 #include <QDialog>
-#include <QtCore/QByteArray>
-#include <QtGui/QStandardItemModel>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QDir>
-#include <QtCore/QUrl>
-#include <QtCore/QRegExp>
-#include <QtCore/QLatin1Char>
-#include <QtCore/QSize>
+#include <QByteArray>
+#include <QStandardItemModel>
+#include <QString>
+#include <QStringList>
+#include <QDir>
+#include <QUrl>
+#include <QRegExp>
+#include <QLatin1Char>
+#include <QSize>
 #include <QComboBox>
 #include <QListView>
 CLANG_DIAG_ON(deprecated)
diff --git a/Gui/SerializableWindow.cpp b/Gui/SerializableWindow.cpp
index e4d60a121e..9a8bf2dd2e 100644
--- a/Gui/SerializableWindow.cpp
+++ b/Gui/SerializableWindow.cpp
@@ -27,7 +27,7 @@
 
 #include <stdexcept>
 
-#include <QtCore/QMutex>
+#include <QMutex>
 
 NATRON_NAMESPACE_ENTER
 
diff --git a/Gui/SpinBox.cpp b/Gui/SpinBox.cpp
index 64de42c301..df81b71a76 100644
--- a/Gui/SpinBox.cpp
+++ b/Gui/SpinBox.cpp
@@ -32,13 +32,13 @@
 
 GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 // /opt/local/include/QtGui/qmime.h:119:10: warning: private field 'type' is not used [-Wunused-private-field]
-#include <QtGui/QWheelEvent>
+#include <QWheelEvent>
 GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
-#include <QtGui/QDoubleValidator>
-#include <QtGui/QIntValidator>
+#include <QDoubleValidator>
+#include <QIntValidator>
 #include <QStyle> // in QtGui on Qt4, in QtWidgets on Qt5
 #include <QApplication>
-#include <QtCore/QDebug>
+#include <QDebug>
 #include <QMenu>
 #include <QPainter>
 
diff --git a/Gui/SplashScreen.h b/Gui/SplashScreen.h
index 75f2c25ae3..ad8753f8ba 100644
--- a/Gui/SplashScreen.h
+++ b/Gui/SplashScreen.h
@@ -32,7 +32,7 @@ CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
 #include <QWidget>
 #include <QPixmap>
-#include <QtCore/QString>
+#include <QString>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Gui/Splitter.h b/Gui/Splitter.h
index 4d91143056..a68efb59c6 100644
--- a/Gui/Splitter.h
+++ b/Gui/Splitter.h
@@ -33,7 +33,7 @@
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
 #include <QSplitter>
-#include <QtCore/QMutex>
+#include <QMutex>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Gui/TabWidget.cpp b/Gui/TabWidget.cpp
index 9ab7d999e5..182ea6971a 100644
--- a/Gui/TabWidget.cpp
+++ b/Gui/TabWidget.cpp
@@ -29,23 +29,23 @@
 #include <sstream> // stringstream
 
 CLANG_DIAG_OFF(deprecated)
-#include <QtCore/QThread>
+#include <QThread>
 #include <QLayout>
 #include <QMenu>
 #include <QApplication>
-#include <QtGui/QImage>
-#include <QtGui/QPixmap>
-#include <QtGui/QIcon>
-#include <QtCore/QMimeData>
-#include <QtGui/QDrag>
+#include <QImage>
+#include <QPixmap>
+#include <QIcon>
+#include <QMimeData>
+#include <QDrag>
 #include <QStyle>
-#include <QtCore/QDebug>
+#include <QDebug>
 GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 // /opt/local/include/QtGui/qmime.h:119:10: warning: private field 'type' is not used [-Wunused-private-field]
-#include <QtGui/QDragEnterEvent>
+#include <QDragEnterEvent>
 GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
-#include <QtGui/QDragLeaveEvent>
-#include <QtGui/QPaintEvent>
+#include <QDragLeaveEvent>
+#include <QPaintEvent>
 #include <QScrollArea>
 #include <QSplitter>
 CLANG_DIAG_ON(deprecated)
diff --git a/Gui/TabWidget.h b/Gui/TabWidget.h
index b285c39b7f..96b30e84ca 100644
--- a/Gui/TabWidget.h
+++ b/Gui/TabWidget.h
@@ -35,7 +35,7 @@ CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
 #include <QFrame>
 #include <QTabBar>
-#include <QtCore/QMutex>
+#include <QMutex>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Gui/TableModelView.h b/Gui/TableModelView.h
index d81040e3ba..d3657f72b0 100644
--- a/Gui/TableModelView.h
+++ b/Gui/TableModelView.h
@@ -33,13 +33,13 @@
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
 GCC_ONLY_DIAG_OFF(class-memaccess)
-#include <QtCore/QVector>
+#include <QVector>
 GCC_ONLY_DIAG_ON(class-memaccess)
 #include <QTreeView>
 #include <QAbstractItemModel>
 #include <QItemEditorFactory>
-#include <QtCore/QMetaType>
-#include <QtCore/QSize>
+#include <QMetaType>
+#include <QSize>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Gui/TextRenderer.cpp b/Gui/TextRenderer.cpp
index e24922a9c5..013d6bc9c4 100644
--- a/Gui/TextRenderer.cpp
+++ b/Gui/TextRenderer.cpp
@@ -29,10 +29,10 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QString>
-#include <QtGui/QFont>
-#include <QtGui/QImage>
-#include <QtCore/QHash>
+#include <QString>
+#include <QFont>
+#include <QImage>
+#include <QHash>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Gui/TimeLineGui.cpp b/Gui/TimeLineGui.cpp
index 585466e7ad..0a077ea854 100644
--- a/Gui/TimeLineGui.cpp
+++ b/Gui/TimeLineGui.cpp
@@ -29,14 +29,14 @@
 #include <set>
 #include <stdexcept>
 
-#include <QtGui/QFont>
+#include <QFont>
 GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 // /opt/local/include/QtGui/qmime.h:119:10: warning: private field 'type' is not used [-Wunused-private-field]
-#include <QtGui/QMouseEvent>
+#include <QMouseEvent>
 GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
-#include <QtCore/QCoreApplication>
-#include <QtCore/QThread>
-#include <QtCore/QTimer>
+#include <QCoreApplication>
+#include <QThread>
+#include <QTimer>
 
 #include "Global/GlobalDefines.h"
 
diff --git a/Gui/TimeLineGui.h b/Gui/TimeLineGui.h
index 43dbbcd234..db13f5ff7c 100644
--- a/Gui/TimeLineGui.h
+++ b/Gui/TimeLineGui.h
@@ -33,9 +33,9 @@
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
 #include "Global/GLIncludes.h" //!<must be included before QGlWidget because of gl.h and glew.h
-#include <QtCore/QList>
-#include <QtCore/QPointF>
-#include <QtCore/QSize>
+#include <QList>
+#include <QPointF>
+#include <QSize>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Gui/ToolButton.cpp b/Gui/ToolButton.cpp
index 1b1ed46220..657e3da84c 100644
--- a/Gui/ToolButton.cpp
+++ b/Gui/ToolButton.cpp
@@ -30,7 +30,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 #include <QMenu>
-#include <QtCore/QtAlgorithms>
+#include <QtAlgorithms>
 CLANG_DIAG_ON(deprecated)
 
 #include "Gui/GuiAppInstance.h"
diff --git a/Gui/ToolButton.h b/Gui/ToolButton.h
index f9ec127829..1c5cd15e81 100644
--- a/Gui/ToolButton.h
+++ b/Gui/ToolButton.h
@@ -30,7 +30,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QObject>
+#include <QObject>
 #include <QIcon>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
diff --git a/Gui/TrackerPanel.cpp b/Gui/TrackerPanel.cpp
index dd0c32be29..65422e76f6 100644
--- a/Gui/TrackerPanel.cpp
+++ b/Gui/TrackerPanel.cpp
@@ -36,7 +36,7 @@
 #include <QHeaderView>
 #include <QCheckBox>
 #include <QItemSelection>
-#include <QtCore/QDebug>
+#include <QDebug>
 
 
 #include "Engine/Settings.h"
diff --git a/Gui/VerticalColorBar.h b/Gui/VerticalColorBar.h
index ba8dabaecd..e28d4dbcf3 100644
--- a/Gui/VerticalColorBar.h
+++ b/Gui/VerticalColorBar.h
@@ -30,11 +30,11 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QSize>
+#include <QSize>
 
-#include <QtWidgets/QWidget>
+#include <QWidget>
 
-#include <QtGui/QColor>
+#include <QColor>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Gui/ViewerGL.cpp b/Gui/ViewerGL.cpp
index 98ed44f438..eeb97bf44e 100644
--- a/Gui/ViewerGL.cpp
+++ b/Gui/ViewerGL.cpp
@@ -34,16 +34,16 @@
 
 #include "Global/GLIncludes.h" //!<must be included before QGlWidget because of gl.h and glew.h
 
-#include <QtWidgets/QMenu>
-#include <QtWidgets/QToolButton>
-#include <QtWidgets/QApplication> // qApp
+#include <QMenu>
+#include <QToolButton>
+#include <QApplication> // qApp
 #include <QScreen>
 #include <QWindow>
 
 GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 // /opt/local/include/QtGui/qmime.h:119:10: warning: private field 'type' is not used [-Wunused-private-field]
-#include <QtGui/QKeyEvent>
-#include <QtGui/QMouseEvent>
+#include <QKeyEvent>
+#include <QMouseEvent>
 GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
 #include <QTreeWidget>
 #include <QTabBar>
diff --git a/Gui/ViewerGL.h b/Gui/ViewerGL.h
index 7da7b4161e..631fe88bf8 100644
--- a/Gui/ViewerGL.h
+++ b/Gui/ViewerGL.h
@@ -34,7 +34,7 @@
 
 #include "Global/GLIncludes.h" //!<must be included before QGlWidget because of gl.h and glew.h
 
-#include <QtCore/QSize>
+#include <QSize>
 
 #include <QOpenGLWidget>
 
diff --git a/Gui/ViewerGLPrivate.h b/Gui/ViewerGLPrivate.h
index 5348df6588..c3d66782d8 100644
--- a/Gui/ViewerGLPrivate.h
+++ b/Gui/ViewerGLPrivate.h
@@ -30,8 +30,8 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QMutex>
-#include <QtCore/QSize>
+#include <QMutex>
+#include <QSize>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Gui/ViewerTab.cpp b/Gui/ViewerTab.cpp
index 0292f8ef9d..92853dcf54 100644
--- a/Gui/ViewerTab.cpp
+++ b/Gui/ViewerTab.cpp
@@ -29,8 +29,8 @@
 #include <cassert>
 #include <stdexcept>
 
-#include <QtCore/QDebug>
-#include <QtCore/QTimer>
+#include <QDebug>
+#include <QTimer>
 
 #include <QAction>
 #include <QVBoxLayout>
diff --git a/Gui/ViewerTab.h b/Gui/ViewerTab.h
index d6480031d0..c94f7f3c83 100644
--- a/Gui/ViewerTab.h
+++ b/Gui/ViewerTab.h
@@ -38,7 +38,7 @@
 #include "Gui/PanelWidget.h"
 #include "Gui/GuiFwd.h"
 
-#include <QtCore/QSize>
+#include <QSize>
 
 NATRON_NAMESPACE_ENTER
 
diff --git a/Gui/ViewerTab10.cpp b/Gui/ViewerTab10.cpp
index b4e8e1b8b0..86e6857a5c 100644
--- a/Gui/ViewerTab10.cpp
+++ b/Gui/ViewerTab10.cpp
@@ -28,13 +28,13 @@
 
 #include <cassert>
 #include <stdexcept>
-#include <QtCore/QDebug>
+#include <QDebug>
 
 #include <QApplication>
 GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 // /opt/local/include/QtGui/qmime.h:119:10: warning: private field 'type' is not used [-Wunused-private-field]
-#include <QtGui/QKeyEvent>
-#include <QtCore/QTimer>
+#include <QKeyEvent>
+#include <QTimer>
 GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
 
 #include "Engine/Node.h"
diff --git a/Gui/ViewerTab20.cpp b/Gui/ViewerTab20.cpp
index ef4159efc9..3e48665c59 100644
--- a/Gui/ViewerTab20.cpp
+++ b/Gui/ViewerTab20.cpp
@@ -31,11 +31,11 @@
 
 #include "Global/GLIncludes.h" //!<must be included before QGlWidget because of gl.h and glew.h
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF
 // /opt/local/include/QtGui/qmime.h:119:10: warning: private field 'type' is not used [-Wunused-private-field]
-#include <QtGui/QKeyEvent>
+#include <QKeyEvent>
 GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
 
 #include "Engine/Node.h"
diff --git a/Gui/ViewerTab30.cpp b/Gui/ViewerTab30.cpp
index 330d495068..f0aa5bc793 100644
--- a/Gui/ViewerTab30.cpp
+++ b/Gui/ViewerTab30.cpp
@@ -31,7 +31,7 @@
 #include <stdexcept>
 #include <sstream> // stringstream
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 #include <QVBoxLayout>
 #include <QCheckBox>
diff --git a/Gui/ViewerTab40.cpp b/Gui/ViewerTab40.cpp
index a74139d292..76529f87b8 100644
--- a/Gui/ViewerTab40.cpp
+++ b/Gui/ViewerTab40.cpp
@@ -29,7 +29,7 @@
 #include <cassert>
 #include <stdexcept>
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 #include <QApplication>
 #include <QCheckBox>
diff --git a/Gui/ViewerTabPrivate.cpp b/Gui/ViewerTabPrivate.cpp
index 10e9e35706..a99997976d 100644
--- a/Gui/ViewerTabPrivate.cpp
+++ b/Gui/ViewerTabPrivate.cpp
@@ -28,7 +28,7 @@
 #include <cassert>
 #include <stdexcept>
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 #include "Engine/EffectInstance.h"
 #include "Engine/Node.h"
diff --git a/Gui/ViewerTabPrivate.h b/Gui/ViewerTabPrivate.h
index a2b9a994e6..c2a0df662b 100644
--- a/Gui/ViewerTabPrivate.h
+++ b/Gui/ViewerTabPrivate.h
@@ -33,8 +33,8 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QMutex>
-#include <QtCore/QTimer>
+#include <QMutex>
+#include <QTimer>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Gui/ViewerToolButton.cpp b/Gui/ViewerToolButton.cpp
index da6984ef8c..ed4c32a63d 100644
--- a/Gui/ViewerToolButton.cpp
+++ b/Gui/ViewerToolButton.cpp
@@ -29,7 +29,7 @@ CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
 #include <QStyle>
 #include <QMouseEvent>
-#include <QtCore/QTimer>
+#include <QTimer>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Gui/ZoomContext.h b/Gui/ZoomContext.h
index 60e4bc65a2..98dff2c3d7 100644
--- a/Gui/ZoomContext.h
+++ b/Gui/ZoomContext.h
@@ -30,7 +30,7 @@
 
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
-#include <QtCore/QPointF>
+#include <QPointF>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
diff --git a/Gui/typesystem_natronGui.xml b/Gui/typesystem_natronGui.xml
index c612ff9e8d..727c5cb480 100644
--- a/Gui/typesystem_natronGui.xml
+++ b/Gui/typesystem_natronGui.xml
@@ -211,4 +211,8 @@
             </inject-code>
         </modify-function>
     </object-type>
+
+    <inject-code class="target" position="declaration">
+    NATRON_NAMESPACE_USING NATRON_PYTHON_NAMESPACE_USING
+    </inject-code>
 </typesystem>
diff --git a/Renderer/CMakeLists.txt b/Renderer/CMakeLists.txt
index 740db68b30..b54e1f254c 100644
--- a/Renderer/CMakeLists.txt
+++ b/Renderer/CMakeLists.txt
@@ -25,9 +25,9 @@ add_executable(NatronRenderer ${NatronRenderer_SOURCES})
 target_link_libraries(NatronRenderer
     PRIVATE
         NatronEngine
-        Qt5::Core
-        Qt5::Concurrent
-        Qt5::Network
+        Qt::Core
+        Qt::Concurrent
+        Qt::Network
         Python3::Python
 )
 target_include_directories(NatronRenderer
diff --git a/Renderer/NatronRenderer_main.cpp b/Renderer/NatronRenderer_main.cpp
index 385adf75d3..59112444b4 100644
--- a/Renderer/NatronRenderer_main.cpp
+++ b/Renderer/NatronRenderer_main.cpp
@@ -23,7 +23,7 @@
 #include <Python.h>
 // ***** END PYTHON BLOCK *****
 
-#include <QtCore/QtGlobal> // for Q_OS_*
+#include <QtGlobal> // for Q_OS_*
 #if defined(Q_OS_UNIX)
 #include <sys/time.h>     // for getrlimit on linux
 #include <sys/resource.h> // for getrlimit
@@ -36,7 +36,7 @@
 #include <cstdlib> // exit
 #include <iostream>
 
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 
 #ifdef DEBUG
 #include "Global/FloatingPointExceptions.h"
diff --git a/Tests/BaseTest.cpp b/Tests/BaseTest.cpp
index 76a9f333ed..2e9d207c36 100644
--- a/Tests/BaseTest.cpp
+++ b/Tests/BaseTest.cpp
@@ -29,8 +29,8 @@
 
 #include "BaseTest.h"
 
-#include <QtCore/QFile>
-#include <QtCore/QThreadPool>
+#include <QFile>
+#include <QThreadPool>
 
 // ofxhPropertySuite.h:565:37: warning: 'this' pointer cannot be null in well-defined C++ code; comparison may be assumed to always evaluate to true [-Wtautological-undefined-compare]
 // clang-format off
diff --git a/Tests/BaseTest.h b/Tests/BaseTest.h
index b57d3e138d..06e6a08180 100644
--- a/Tests/BaseTest.h
+++ b/Tests/BaseTest.h
@@ -38,7 +38,7 @@
 #include <gtest/gtest.h>
 
 CLANG_DIAG_OFF(deprecated)
-#include <QtCore/QString>
+#include <QString>
 CLANG_DIAG_ON(deprecated)
 
 #include "Engine/EngineFwd.h"
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 333e6038d3..f40cbcb9d2 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -36,7 +36,7 @@ add_executable(Tests ${Tests_HEADERS} ${Tests_SOURCES})
 target_link_libraries(Tests
     PRIVATE
         NatronEngine
-        Qt5::Core
+        Qt::Core
         Python3::Python
         openMVG
 )
diff --git a/Tests/Curve_Test.cpp b/Tests/Curve_Test.cpp
index c71413d5a5..8408b6611c 100644
--- a/Tests/Curve_Test.cpp
+++ b/Tests/Curve_Test.cpp
@@ -27,8 +27,8 @@
 
 #include <gtest/gtest.h>
 
-#include <QtCore/QString>
-#include <QtCore/QDir>
+#include <QString>
+#include <QDir>
 
 #include "Engine/Curve.h"
 
diff --git a/Tests/KnobFile_Test.cpp b/Tests/KnobFile_Test.cpp
index 2a41d9e4f7..1f134687af 100644
--- a/Tests/KnobFile_Test.cpp
+++ b/Tests/KnobFile_Test.cpp
@@ -27,8 +27,8 @@
 
 #include <gtest/gtest.h>
 
-#include <QtCore/QString>
-#include <QtCore/QDir>
+#include <QString>
+#include <QDir>
 
 #include <QRandomGenerator>
 
diff --git a/libs/qhttpserver/CMakeLists.txt b/libs/qhttpserver/CMakeLists.txt
index 7a3b3a2e9b..bac81b9894 100644
--- a/libs/qhttpserver/CMakeLists.txt
+++ b/libs/qhttpserver/CMakeLists.txt
@@ -29,6 +29,6 @@ set(qhttpserver_HEADERS
 file(GLOB qhttpserver_SOURCES src/*.cpp)
 set(qhttpserver_SOURCES ${qhttpserver_SOURCES} http-parser/http_parser.c)
 add_library(qhttpserver STATIC ${qhttpserver_HEADERS} ${qhttpserver_SOURCES})
-target_link_libraries(qhttpserver PRIVATE Qt5::Core Qt5::Network)
+target_link_libraries(qhttpserver PRIVATE Qt::Core Qt::Network)
 target_include_directories(qhttpserver PRIVATE http-parser)
 set_target_properties(qhttpserver PROPERTIES POSITION_INDEPENDENT_CODE ON)
diff --git a/tools/utils/runPostShiboken.bat b/tools/utils/runPostShiboken.bat
deleted file mode 100644
index 45edf4351a..0000000000
--- a/tools/utils/runPostShiboken.bat
+++ /dev/null
@@ -1,31 +0,0 @@
-:: ***** BEGIN LICENSE BLOCK *****
-:: This file is part of Natron <http://www.natron.fr/>,
-:: Copyright (C) 2016 INRIA and Alexandre Gauthier
-::
-:: Natron is free software: you can redistribute it and/or modify
-:: it under the terms of the GNU General Public License as published by
-:: the Free Software Foundation; either version 2 of the License, or
-:: (at your option) any later version.
-::
-:: Natron is distributed in the hope that it will be useful,
-:: but WITHOUT ANY WARRANTY; without even the implied warranty of
-:: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-:: GNU General Public License for more details.
-::
-:: You should have received a copy of the GNU General Public License
-:: along with Natron.  If not, see <http://www.gnu.org/licenses/gpl-2.0.html>
-:: ***** END LICENSE BLOCK *****
-
-:: To be run after shiboken to fix errors
-
-sed "/<destroylistener.h>/d" -i Engine/NatronEngine/*.cpp
-sed "/<destroylistener.h>/d" -i Gui/NatronGui/*.cpp
-sed -e "/SbkPySide_QtCoreTypes;/d" -i Gui/NatronGui/natrongui_module_wrapper.cpp
-sed -e "/SbkPySide_QtCoreTypeConverters;/d" -i  Gui/NatronGui/natrongui_module_wrapper.cpp
-sed -e "/SbkNatronEngineTypes;/d" -i Gui/NatronGui/natrongui_module_wrapper.cpp
-sed -e "/SbkNatronEngineTypeConverters;/d" -i Gui/NatronGui/natrongui_module_wrapper.cpp
-sed -e "s/cleanTypesAttributes/cleanGuiTypesAttributes/g" -i Gui/NatronGui/natrongui_module_wrapper.cpp
-
-
-rm sed*
-rm */sed*
diff --git a/tools/utils/runPostShiboken.sh b/tools/utils/runPostShiboken.sh
deleted file mode 100755
index e27d7d50f7..0000000000
--- a/tools/utils/runPostShiboken.sh
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/bash
-# ***** BEGIN LICENSE BLOCK *****
-# This file is part of Natron <http://www.natron.fr/>,
-# Copyright (C) 2016 INRIA and Alexandre Gauthier
-#
-# Natron is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# Natron is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Natron.  If not, see <http://www.gnu.org/licenses/gpl-2.0.html>
-# ***** END LICENSE BLOCK *****
-
-# exit if a command returns an error status
-set -e
-
-if [ "$#" -ne 2 ]; then
-    echo "usage: <generated-dir> <module-wrapper>" 2>&1
-    exit 1
-fi
-
-wrapper_dir="$1"
-wrapper_name=$2
-wrapper_source=${wrapper_name}_module_wrapper.cpp
-wrapper_header=${wrapper_name}_python.h
-
-# To be run after shiboken to fix errors
-
-sed -e '/<destroylistener.h>/d' -i'.bak' "$wrapper_dir"/*.cpp
-sed -e '/<destroylistener.h>/d' -i'.bak' "$wrapper_dir"/*.cpp
-sed -e '/Py_BEGIN_ALLOW_THREADS/d' -i'.bak' "$wrapper_dir"/*.cpp
-sed -e '/Py_BEGIN_ALLOW_THREADS/d' -i'.bak' "$wrapper_dir"/*.cpp
-sed -e '/Py_END_ALLOW_THREADS/d' -i'.bak' "$wrapper_dir"/*.cpp
-sed -e '/Py_END_ALLOW_THREADS/d' -i'.bak' "$wrapper_dir"/*.cpp
-if [ "$wrapper_name" = "natrongui" ]; then
-    $SED -e "/SbkPySide_QtCoreTypes;/d" -i'.bak' "$wrapper_dir/$wrapper_source"
-    $SED -e "/SbkPySide_QtCoreTypeConverters;/d" -i'.bak' "$wrapper_dir/$wrapper_source"
-    $SED -e '/SbkNatronEngineTypes;/d' -i'.bak' "$wrapper_dir/$wrapper_source"
-    $SED -e '/SbkNatronEngineTypeConverters;/d' -i'.bak' "$wrapper_dir/$wrapper_source"
-    $SED -e 's/cleanTypesAttributes/cleanGuiTypesAttributes/g' -i'.bak' "$wrapper_dir/$wrapper_source"
-fi
-
-# fix warnings
-sed -e 's@^#include <shiboken.h>$@#include "Global/Macros.h"\
-// clang-format off\
-CLANG_DIAG_OFF(mismatched-tags)\
-GCC_DIAG_OFF(unused-parameter)\
-GCC_DIAG_OFF(missing-field-initializers)\
-GCC_DIAG_OFF(missing-declarations)\
-GCC_DIAG_OFF(uninitialized)\
-GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF\
-// clang-format on\
-#include <shiboken.h> // produces many warnings@' -i'.bak' "$wrapper_dir"/*.cpp
-
-sed -e 's@// Extra includes@// Extra includes\
-NATRON_NAMESPACE_USING NATRON_PYTHON_NAMESPACE_USING@' -i'.bak' "$wrapper_dir"/*.cpp
-
-# replace NATRON_NAMESPACE with Natron for enums with flags (e.g. StandardButtonEnum)
-sed -e 's@"NatronEngine\.NATRON_NAMESPACE@"NatronEngine.Natron@g' -e 's@, NatronEngine\.NATRON_NAMESPACE@, NatronEngine.Natron@g' -e 's@"NatronGui\.NATRON_NAMESPACE@"NatronGui.Natron@g' -e 's@"NATRON_NAMESPACE@"Natron@g' -i'.bak' "$wrapper_dir"/*_wrapper.cpp
-
-# re-add the Natron namespace
-#sed -e 's@" ::\([^s][^t][^d]\)@ NATRON_NAMESPACE::\1@g' -i'.bak' Engine/NatronEngine/*.cpp Engine/NatronEngine/*.h Gui/NatronGui/*.cpp Gui/NatronGui/*.h
-
-sed -e 's@SbkType< ::@SbkType<NATRON_NAMESPACE::NATRON_PYTHON_NAMESPACE::@g' -e 's@SbkType<NATRON_NAMESPACE::NATRON_PYTHON_NAMESPACE::QFlags<@SbkType< ::QFlags<NATRON_NAMESPACE::NATRON_PYTHON_NAMESPACE::@g' -e's@NATRON_NAMESPACE::NATRON_PYTHON_NAMESPACE::Rect@NATRON_NAMESPACE::Rect@g' -i'.bak' "$wrapper_dir/$wrapper_header"
-sed -e 's@^class @NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER\
-class @g' -e 's@^};@};\
-NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT@g'  -i'.bak' "$wrapper_dir"/*.h
-
-# replace NATRON_NAMESPACE::NATRON_NAMESPACE with NATRON_NAMESPACE in the enums wrappers
-sed -e 's@NATRON_NAMESPACE::NATRON_PYTHON_NAMESPACE::NATRON_NAMESPACE@NATRON_NAMESPACE@g' -i'.bak' "$wrapper_dir/$wrapper_header"
-sed -e 's@NATRON_NAMESPACE::NATRON_PYTHON_NAMESPACE::NATRON_ENUM@NATRON_ENUM@g' -i'.bak' "$wrapper_dir/$wrapper_header"
-sed -e 's@"NATRON_ENUM@"Natron@g' -e 's@\.NATRON_ENUM@.Natron@g' -e 's@NATRON_ENUM\.@Natron.@g' -i'.bak' "$wrapper_dir"/*_wrapper.cpp
-
-perl -pe 'BEGIN{undef $/;} s/    \{\n.*SnakeOil(.*\n)*.*SnakeOil.*\n    }//g;' -i'.bak' "$wrapper_dir/$wrapper_source"
-sed -e '/SnakeOil/d' -i'.bak' "$wrapper_dir/$wrapper_source"
-sed -e '/snakeoil_python/d' -i'.bak' "$wrapper_dir/$wrapper_header"
-
-sed -e 's@^#include <pysidemetafunction.h>$@CLANG_DIAG_OFF(header-guard)\
-#include <pysidemetafunction.h> // has wrong header guards in pyside 1.2.2@' -i'.bak' "$wrapper_dir"/*.cpp
-
-sed -e 's@^#include <pyside_qtcore_python.h>$@// clang-format off\
-CLANG_DIAG_OFF(deprecated)\
-CLANG_DIAG_OFF(uninitialized)\
-CLANG_DIAG_OFF(keyword-macro)\
-#include <pyside_qtcore_python.h> // produces warnings\
-CLANG_DIAG_ON(deprecated)\
-CLANG_DIAG_ON(uninitialized)\
-CLANG_DIAG_ON(keyword-macro)\
-// clang-format on@' -i'.bak' "$wrapper_dir"/*.cpp "$wrapper_dir"/*.h
-
-sed -e 's@^#include <pyside_qtgui_python.h>$@// clang-format off\
-CLANG_DIAG_OFF(deprecated)\
-CLANG_DIAG_OFF(uninitialized)\
-CLANG_DIAG_OFF(keyword-macro)\
-#include <pyside_qtgui_python.h> // produces warnings\
-CLANG_DIAG_ON(deprecated)\
-CLANG_DIAG_ON(uninitialized)\
-CLANG_DIAG_ON(keyword-macro)\
-// clang-format on@' -i'.bak' "$wrapper_dir"/*.cpp "$wrapper_dir"/*.h
-
-# clean up
-rm "$wrapper_dir"/*.bak
diff --git a/tools/utils/runPostShiboken2.sh b/tools/utils/runPostShiboken2.sh
deleted file mode 100755
index 349970b45e..0000000000
--- a/tools/utils/runPostShiboken2.sh
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/bash
-# ***** BEGIN LICENSE BLOCK *****
-# This file is part of Natron <http://www.natron.fr/>,
-# Copyright (C) 2016 INRIA and Alexandre Gauthier
-#
-# Natron is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# Natron is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Natron.  If not, see <http://www.gnu.org/licenses/gpl-2.0.html>
-# ***** END LICENSE BLOCK *****
-
-# exit if a command returns an error status
-set -e
-
-if [ "$#" -ne 2 ]; then
-    echo "usage: <generated-dir> <module-wrapper>" 2>&1
-    exit 1
-fi
-
-wrapper_dir="$1"
-wrapper_name="$2"
-wrapper_source=${wrapper_name}_module_wrapper.cpp
-wrapper_header=${wrapper_name}_python.h
-
-SED="sed"
-if [ "$(uname)" = "Darwin" ]; then
-    # this script uses the sed cammand "T;", which is a GNU extension
-    SED=gsed
-    path_to_sed="$(which $SED)"
-    if [ ! -x "$path_to_sed" ] ; then
-        echo "$SED is required but not available; please install it:"
-        echo "- 'brew install gnu-sed' on Homebrew,"
-        echo "- 'sudo port install gsed' on MacPorts."
-        exit 1
-    fi
-fi
-
-# To be run after shiboken to fix errors
-
-if [ "$wrapper_name" = "natrongui" ]; then
-    $SED -e "/SbkPySide2_QtCoreTypes;/d" -i'.bak' "$wrapper_dir/$wrapper_source"
-    $SED -e "/SbkPySide2_QtCoreTypeConverters;/d" -i'.bak' "$wrapper_dir/$wrapper_source"
-    $SED -e '/SbkNatronEngineTypes;/d' -i'.bak' "$wrapper_dir/$wrapper_source"
-    $SED -e '/SbkNatronEngineTypeConverters;/d' -i'.bak' "$wrapper_dir/$wrapper_source"
-    $SED -e 's/cleanTypesAttributes/cleanGuiTypesAttributes/g' -i'.bak' "$wrapper_dir/$wrapper_source"
-fi
-
-# fix warnings
-$SED -e 's@^#include <shiboken.h>$@#include "Global/Macros.h"\
-// clang-format off\
-CLANG_DIAG_OFF(mismatched-tags)\
-GCC_DIAG_OFF(unused-parameter)\
-GCC_DIAG_OFF(missing-field-initializers)\
-GCC_DIAG_OFF(missing-declarations)\
-GCC_DIAG_OFF(uninitialized)\
-GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF\
-// clang-format on\
-#include <pysidesignal.h>\
-#include <shiboken.h> // produces many warnings@' -i'.bak' "$wrapper_dir"/*.cpp
-
-$SED -e 's@// inner classes@// inner classes\
-NATRON_NAMESPACE_USING NATRON_PYTHON_NAMESPACE_USING@' -i'.bak' "$wrapper_dir"/*.cpp
-$SED -e 's@// Extra includes@// Extra includes\
-NATRON_NAMESPACE_USING NATRON_PYTHON_NAMESPACE_USING@' -i'.bak' "$wrapper_dir/$wrapper_source"
-
-# replace NATRON_NAMESPACE with Natron for enums with flags (e.g. StandardButtonEnum)
-$SED -e 's@"1:NatronEngine\.NATRON_NAMESPACE@"1:NatronEngine.Natron@g' -e 's@, NatronEngine\.NATRON_NAMESPACE@, NatronEngine.Natron@g' -e 's@"1:NatronGui\.NATRON_NAMESPACE@"NatronGui.Natron@g' -e 's@"NATRON_NAMESPACE@"Natron@g' -i'.bak' "$wrapper_dir"/*_wrapper.cpp
-
-# re-add the Natron namespace
-#sed -e 's@" ::\([^s][^t][^d]\)@ NATRON_NAMESPACE::\1@g' -i'.bak' Engine/Qt5/NatronEngine/*.cpp Engine/Qt5/NatronEngine/*.h Gui/Qt5/NatronGui/*.cpp Gui/Qt5/NatronGui/*.h
-
-$SED -e 's@SbkType< ::@SbkType<NATRON_NAMESPACE::NATRON_PYTHON_NAMESPACE::@g' -e 's@SbkType<NATRON_NAMESPACE.*::QFlags<@SbkType< ::QFlags<::@g' -e's@NATRON_NAMESPACE::NATRON_PYTHON_NAMESPACE::Rect@NATRON_NAMESPACE::Rect@g' -i'.bak' "$wrapper_dir/$wrapper_header"
-$SED -e 's@^class @NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER\
-class @g;T;{:y;/^};/! {n;by}};s@^};@};\
-NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT@g' -i'.bak' "$wrapper_dir"/*.h
-
-# replace NATRON_NAMESPACE::NATRON_NAMESPACE with NATRON_NAMESPACE in the enums wrappers
-$SED -e 's@NATRON_NAMESPACE::NATRON_PYTHON_NAMESPACE::NATRON_NAMESPACE@NATRON_NAMESPACE@g' -i'.bak' "$wrapper_dir/$wrapper_header"
-$SED -e 's@NATRON_NAMESPACE::NATRON_PYTHON_NAMESPACE::NATRON_ENUM@NATRON_ENUM@g' -i'.bak' "$wrapper_dir/$wrapper_header"
-$SED -e 's@"NATRON_ENUM@"Natron@g' -e 's@\.NATRON_ENUM@.Natron@g' -e 's@NATRON_ENUM\.@Natron.@g' -i'.bak' "$wrapper_dir"/*_wrapper.cpp
-
-
-$SED -e 's@^#include <pysidemetafunction.h>$@CLANG_DIAG_OFF(header-guard)\
-#include <pysidemetafunction.h> // has wrong header guards in pyside 1.2.2@' -i'.bak' "$wrapper_dir"/*.cpp
-
-$SED -e 's@^#include <pyside2_qtcore_python.h>$@CLANG_DIAG_OFF(deprecated)\
-CLANG_DIAG_OFF(uninitialized)\
-CLANG_DIAG_OFF(keyword-macro)\
-#include <pyside2_qtcore_python.h> // produces warnings\
-CLANG_DIAG_ON(deprecated)\
-CLANG_DIAG_ON(uninitialized)\
-CLANG_DIAG_ON(keyword-macro)@' -i'.bak' "$wrapper_dir"/*.cpp "$wrapper_dir"/*.h
-
-$SED -e 's@^#include <pyside2_qtgui_python.h>$@CLANG_DIAG_OFF(deprecated)\
-CLANG_DIAG_OFF(uninitialized)\
-CLANG_DIAG_OFF(keyword-macro)\
-#include <pyside2_qtgui_python.h> // produces warnings\
-CLANG_DIAG_ON(deprecated)\
-CLANG_DIAG_ON(uninitialized)\
-CLANG_DIAG_ON(keyword-macro)@' -i'.bak' "$wrapper_dir"/*.cpp "$wrapper_dir"/*.h
-
-# clean up
-rm "$wrapper_dir"/*.bak
diff --git a/tools/utils/sourceCleanup.py b/tools/utils/sourceCleanup.py
new file mode 100644
index 0000000000..74167b5b5b
--- /dev/null
+++ b/tools/utils/sourceCleanup.py
@@ -0,0 +1,50 @@
+from xml.etree import ElementTree
+import os
+import re
+import sys
+
+
+def clean_typesystem_cpp_sources(typesystem, out):
+    tree = ElementTree.parse(typesystem)
+    root = tree.getroot()
+
+    package = root.attrib["package"]
+
+    tags = ["namespace-type", "object-type", "value-type"]
+    types = [child.attrib["name"] for child in root if child.tag in tags]
+
+    sources = [f"{package.lower()}_module_wrapper.cpp", f"{package.lower()}_python.h"]
+    sources.extend([f"{t.lower()}_wrapper.cpp" for t in types])
+    sources.extend([f"{t.lower()}_wrapper.h" for t in types])
+
+    prog = re.compile("([\\s(,])::(?!Natron)(\\w+[^:])")
+
+    for s in sources:
+        with open(os.path.normpath(os.path.join(out, package, s)), "r+") as f:
+            lines = f.readlines()
+            f.seek(0)
+            for l in lines:
+                f.write(prog.sub("\\1\\2", l))
+            f.truncate()
+
+    if package.lower() == "natrongui":
+        with open(os.path.normpath(os.path.join(out, package, sources[0])), "r+") as f:
+            lines = f.readlines()
+            f.seek(0)
+            for l in lines:
+                if (l.endswith("QtCoreTypes;\n") or
+                    l.endswith("QtCoreTypeStructs;\n") or
+                    l.endswith("QtCoreTypeConverters;\n") or
+                    l.endswith("SbkNatronEngineTypes;\n") or
+                    l.endswith("SbkNatronEngineTypeStructs;\n") or
+                    l.endswith("SbkNatronEngineTypeConverters;\n")):
+                    continue
+                f.write(l.replace("cleanTypesAttributes", "cleanGuiTypesAttributes"))
+            f.truncate()
+
+
+if __name__ == "__main__":
+    if len(sys.argv) != 3:
+        print("usage: sourceCleanup.py <typesystem> <gen-directory>", file=sys.stderr)
+        exit(1)
+    clean_typesystem_cpp_sources(sys.argv[1], sys.argv[2])