cherry-pick: 1f49e3fa6d

src/Gui/ApplicationPy.cpp

@@ -2271,7 +2271,7 @@ PyObject* ApplicationPy::sRegisterEditingContext(PyObject* /*self*/, PyObject* a
         }
         catch (Py::Exception&) {
             Base::PyException e;
-            e.ReportException();
+            e.reportException();
             return false;
         }
     };
@@ -2322,7 +2322,7 @@ PyObject* ApplicationPy::sRegisterEditingOverlay(PyObject* /*self*/, PyObject* a
         }
         catch (Py::Exception&) {
             Base::PyException e;
-            e.ReportException();
+            e.reportException();
             return false;
         }
     };

src/Gui/Workbench.h

@@ -29,6 +29,7 @@
 #include <Base/BaseClass.h>
 #include <Base/Parameter.h>
 #include <Gui/TaskView/TaskWatcher.h>
+#include <Gui/ToolBarManager.h>
 
 namespace Base
 {
@@ -39,7 +40,6 @@ namespace Gui
 {
 
 class MenuItem;
-class ToolBarItem;
 class DockWindowItems;
 class WorkbenchManager;