diff --git a/src/Mod/Spreadsheet/App/Cell.cpp b/src/Mod/Spreadsheet/App/Cell.cpp
index cf0ffd26d..32700c477 100644
--- a/src/Mod/Spreadsheet/App/Cell.cpp
+++ b/src/Mod/Spreadsheet/App/Cell.cpp
@@ -183,7 +183,7 @@ const Expression *Cell::getExpression() const
 bool Cell::getStringContent(std::string & s) const
 {
     if (expression) {
-        if (freecad_dynamic_cast<StringExpression>(expression)) {
+        if (Spreadsheet::freecad_dynamic_cast<StringExpression>(expression)) {
             s = static_cast<StringExpression*>(expression)->getText();
             char * end;
             errno = 0;
@@ -192,9 +192,9 @@ bool Cell::getStringContent(std::string & s) const
             if (!*end && errno == 0)
                 s = "'" + s;
         }
-        else if (freecad_dynamic_cast<ConstantExpression>(expression))
+        else if (Spreadsheet::freecad_dynamic_cast<ConstantExpression>(expression))
             s = "=" + expression->toString();
-        else if (freecad_dynamic_cast<NumberExpression>(expression))
+        else if (Spreadsheet::freecad_dynamic_cast<NumberExpression>(expression))
             s = expression->toString();
         else
             s = "=" + expression->toString();
diff --git a/src/Mod/Spreadsheet/App/Expression.cpp b/src/Mod/Spreadsheet/App/Expression.cpp
index 50e5f5aad..21d1973ee 100644
--- a/src/Mod/Spreadsheet/App/Expression.cpp
+++ b/src/Mod/Spreadsheet/App/Expression.cpp
@@ -178,7 +178,7 @@ std::string Path::getPythonAccessor() const
     if (!prop)
         throw Exception(std::string("Property '") + getPropertyName() + std::string("' not found."));
 
-    const DocumentObject * docObj = freecad_dynamic_cast<DocumentObject>(prop->getContainer());
+    const DocumentObject * docObj = Spreadsheet::freecad_dynamic_cast<DocumentObject>(prop->getContainer());
 
     if (!docObj)
         throw Exception("Document object not found");
@@ -483,8 +483,8 @@ Expression * OperatorExpression::eval() const
     NumberExpression * v2;
     NumberExpression * output = 0;
 
-    v1 = freecad_dynamic_cast<NumberExpression>(e1.get());
-    v2 = freecad_dynamic_cast<NumberExpression>(e2.get());
+    v1 = Spreadsheet::freecad_dynamic_cast<NumberExpression>(e1.get());
+    v2 = Spreadsheet::freecad_dynamic_cast<NumberExpression>(e2.get());
 
     if (v1 == 0 || v2 == 0)
         throw Exception("Invalid expression");
@@ -567,7 +567,7 @@ Expression *OperatorExpression::simplify() const
     Expression * v2 = right->simplify();
 
     // Both arguments reduced to numerics? Then evaluate and return answer
-    if (freecad_dynamic_cast<NumberExpression>(v1) && freecad_dynamic_cast<NumberExpression>(v2)) {
+    if (Spreadsheet::freecad_dynamic_cast<NumberExpression>(v1) && Spreadsheet::freecad_dynamic_cast<NumberExpression>(v2)) {
         delete v1;
         delete v2;
         return eval();
@@ -785,7 +785,7 @@ Expression * FunctionExpression::eval() const
     case MIN:
     case MAX:
     {
-        RangeExpression * v = freecad_dynamic_cast<RangeExpression>(args[0]);
+        RangeExpression * v = Spreadsheet::freecad_dynamic_cast<RangeExpression>(args[0]);
         Quantity q;
         Quantity mean;
         Quantity M2;
@@ -807,9 +807,9 @@ Expression * FunctionExpression::eval() const
             if (!p)
                 continue;
 
-            if ( (qp = freecad_dynamic_cast<PropertyQuantity>(p)) )
+            if ( (qp = Spreadsheet::freecad_dynamic_cast<PropertyQuantity>(p)) )
                 value = qp->getQuantityValue();
-            else if ( (fp = freecad_dynamic_cast<PropertyFloat>(p)) )
+            else if ( (fp = Spreadsheet::freecad_dynamic_cast<PropertyFloat>(p)) )
                 value = fp->getValue();
             else
                 throw Exception("Invalid property type for aggregate");
@@ -875,8 +875,8 @@ Expression * FunctionExpression::eval() const
 
     std::auto_ptr<Expression> e1(args[0]->eval());
     std::auto_ptr<Expression> e2(args.size() > 1 ? args[1]->eval() : 0);
-    NumberExpression * v1 = freecad_dynamic_cast<NumberExpression>(e1.get());
-    NumberExpression * v2 = freecad_dynamic_cast<NumberExpression>(e2.get());
+    NumberExpression * v1 = Spreadsheet::freecad_dynamic_cast<NumberExpression>(e1.get());
+    NumberExpression * v2 = Spreadsheet::freecad_dynamic_cast<NumberExpression>(e2.get());
     double output = 0;
     Unit unit;
     double scaler = 1;
@@ -1055,7 +1055,7 @@ Expression *FunctionExpression::simplify() const
     Expression * v1 = args[0]->simplify();
 
     // Argument simplified to numeric expression? Then return evaluate and return
-    if (freecad_dynamic_cast<NumberExpression>(v1)) {
+    if (Spreadsheet::freecad_dynamic_cast<NumberExpression>(v1)) {
         switch (f) {
         case ATAN2:
         case MOD:
@@ -1063,7 +1063,7 @@ Expression *FunctionExpression::simplify() const
         {
             Expression * v2 = args[1]->simplify();
 
-            if (freecad_dynamic_cast<NumberExpression>(v2)) {
+            if (Spreadsheet::freecad_dynamic_cast<NumberExpression>(v2)) {
                 delete v1;
                 delete v2;
                 return eval();
@@ -1586,7 +1586,7 @@ bool ConditionalExpression::isTouched() const
 Expression *ConditionalExpression::eval() const
 {
     std::auto_ptr<Expression> e(condition->eval());
-    NumberExpression * v = freecad_dynamic_cast<NumberExpression>(e.get());
+    NumberExpression * v = Spreadsheet::freecad_dynamic_cast<NumberExpression>(e.get());
 
     if (v == 0)
         throw Exception("Invalid expression");
@@ -1600,7 +1600,7 @@ Expression *ConditionalExpression::eval() const
 Expression *ConditionalExpression::simplify() const
 {
     std::auto_ptr<Expression> e(condition->simplify());
-    NumberExpression * v = freecad_dynamic_cast<NumberExpression>(e.get());
+    NumberExpression * v = Spreadsheet::freecad_dynamic_cast<NumberExpression>(e.get());
 
     if (v == 0)
         return new ConditionalExpression(owner, condition->simplify(), trueExpr->simplify(), falseExpr->simplify());
@@ -1895,13 +1895,13 @@ UnitExpression * ExpressionParser::parseUnit(const App::DocumentObject *owner, c
     delete ScanResult;
 
     if (unitExpression) {
-        NumberExpression * num = freecad_dynamic_cast<NumberExpression>(simplified);
+        NumberExpression * num = Spreadsheet::freecad_dynamic_cast<NumberExpression>(simplified);
 
         if (num) {
            simplified = new UnitExpression(num->getOwner(), num->getQuantity());
             delete num;
         }
-        return freecad_dynamic_cast<UnitExpression>(simplified);
+        return Spreadsheet::freecad_dynamic_cast<UnitExpression>(simplified);
     }
     else {
         delete simplified;
diff --git a/src/Mod/Spreadsheet/App/PropertySheet.cpp b/src/Mod/Spreadsheet/App/PropertySheet.cpp
index 35e53b987..f1ab243e3 100644
--- a/src/Mod/Spreadsheet/App/PropertySheet.cpp
+++ b/src/Mod/Spreadsheet/App/PropertySheet.cpp
@@ -49,7 +49,7 @@ class ResolveExpressionVisitor : public ExpressionVisitor {
 public:
 
     void visit(Expression * node) {
-        VariableExpression *expr = freecad_dynamic_cast<VariableExpression>(node);
+        VariableExpression *expr = Spreadsheet::freecad_dynamic_cast<VariableExpression>(node);
 
         if (expr)
             expr->resolve();
@@ -66,7 +66,7 @@ public:
     }
 
     void visit(Expression * node) {
-        VariableExpression *expr = freecad_dynamic_cast<VariableExpression>(node);
+        VariableExpression *expr = Spreadsheet::freecad_dynamic_cast<VariableExpression>(node);
 
         if (expr)
             expr->renameDocumentObject(oldName, newName);
@@ -87,12 +87,12 @@ public:
     }
 
     void visit(Expression * node) {
-        VariableExpression *expr = freecad_dynamic_cast<VariableExpression>(node);
+        VariableExpression *expr = Spreadsheet::freecad_dynamic_cast<VariableExpression>(node);
 
         if (expr) {
             try {
                 const App::Property * prop = expr->getProperty();
-                App::DocumentObject * docObj = freecad_dynamic_cast<DocumentObject>(prop->getContainer());
+                App::DocumentObject * docObj = Spreadsheet::freecad_dynamic_cast<DocumentObject>(prop->getContainer());
 
                 if (docObj)
                     docDeps.insert(docObj);
@@ -117,7 +117,7 @@ public:
     }
 
     void visit(Expression * node) {
-        VariableExpression *expr = freecad_dynamic_cast<VariableExpression>(node);
+        VariableExpression *expr = Spreadsheet::freecad_dynamic_cast<VariableExpression>(node);
 
         if (expr)
             expr->renameDocument(oldName, newName);
@@ -555,8 +555,8 @@ public:
     bool changed() const { return mChanged; }
 
     void visit(Expression * node) {
-        VariableExpression *varExpr = freecad_dynamic_cast<VariableExpression>(node);
-        RangeExpression *rangeExpr = freecad_dynamic_cast<RangeExpression>(node);
+        VariableExpression *varExpr = Spreadsheet::freecad_dynamic_cast<VariableExpression>(node);
+        RangeExpression *rangeExpr = Spreadsheet::freecad_dynamic_cast<RangeExpression>(node);
 
 
         if (varExpr) {
@@ -890,7 +890,7 @@ void PropertySheet::addDependencies(CellAddress key)
         if (!prop)
             cell->setResolveException("Unresolved dependency");
         else {
-            DocumentObject * docObject = freecad_dynamic_cast<DocumentObject>(prop->getContainer());
+            DocumentObject * docObject = Spreadsheet::freecad_dynamic_cast<DocumentObject>(prop->getContainer());
 
             documentObjectName[docObject] = docObject->Label.getValue();
             documentName[docObject->getDocument()] = docObject->getDocument()->Label.getValue();
@@ -986,7 +986,7 @@ void PropertySheet::removeDependencies(CellAddress key)
 
 void PropertySheet::recomputeDependants(const Property *prop)
 {
-    DocumentObject * owner = freecad_dynamic_cast<DocumentObject>(prop->getContainer());
+    DocumentObject * owner = Spreadsheet::freecad_dynamic_cast<DocumentObject>(prop->getContainer());
     const char * name = owner->getPropertyName(prop);
 
     assert(name != 0);
diff --git a/src/Mod/Spreadsheet/App/Sheet.cpp b/src/Mod/Spreadsheet/App/Sheet.cpp
index 4ca5395be..8012826ff 100644
--- a/src/Mod/Spreadsheet/App/Sheet.cpp
+++ b/src/Mod/Spreadsheet/App/Sheet.cpp
@@ -470,7 +470,7 @@ Property * Sheet::setFloatProperty(CellAddress key, double value)
             props.removeDynamicProperty(key.toString().c_str());
             propAddress.erase(prop);
         }
-        floatProp = freecad_dynamic_cast<PropertyFloat>(props.addDynamicProperty("App::PropertyFloat", key.toString().c_str(), 0, 0, Prop_ReadOnly | Prop_Transient, true, true));
+        floatProp = Spreadsheet::freecad_dynamic_cast<PropertyFloat>(props.addDynamicProperty("App::PropertyFloat", key.toString().c_str(), 0, 0, Prop_ReadOnly | Prop_Transient, true, true));
         floatProp->StatusBits.set(3);
     }
     else
@@ -503,7 +503,7 @@ Property * Sheet::setQuantityProperty(CellAddress key, double value, const Base:
             propAddress.erase(prop);
         }
         Property * p = props.addDynamicProperty("Spreadsheet::PropertySpreadsheetQuantity", key.toString().c_str(), 0, 0, Prop_ReadOnly | Prop_Transient, true, true);
-        quantityProp = freecad_dynamic_cast<PropertySpreadsheetQuantity>(p);
+        quantityProp = Spreadsheet::freecad_dynamic_cast<PropertySpreadsheetQuantity>(p);
         quantityProp->StatusBits.set(3);
     }
     else
@@ -530,14 +530,14 @@ Property * Sheet::setQuantityProperty(CellAddress key, double value, const Base:
 Property * Sheet::setStringProperty(CellAddress key, const std::string & value)
 {
     Property * prop = props.getPropertyByName(key.toString().c_str());
-    PropertyString * stringProp = freecad_dynamic_cast<PropertyString>(prop);
+    PropertyString * stringProp = Spreadsheet::freecad_dynamic_cast<PropertyString>(prop);
 
     if (!stringProp) {
         if (prop) {
             props.removeDynamicProperty(key.toString().c_str());
             propAddress.erase(prop);
         }
-        stringProp = freecad_dynamic_cast<PropertyString>(props.addDynamicProperty("App::PropertyString", key.toString().c_str(), 0, 0, Prop_ReadOnly | Prop_Transient, true, true));
+        stringProp = Spreadsheet::freecad_dynamic_cast<PropertyString>(props.addDynamicProperty("App::PropertyString", key.toString().c_str(), 0, 0, Prop_ReadOnly | Prop_Transient, true, true));
         stringProp->StatusBits.set(3);
     }
 
@@ -604,7 +604,7 @@ void Sheet::updateProperty(CellAddress key)
         }
 
         /* Eval returns either NumberExpression or StringExpression objects */
-        if (freecad_dynamic_cast<NumberExpression>(output)) {
+        if (Spreadsheet::freecad_dynamic_cast<NumberExpression>(output)) {
             NumberExpression * number = static_cast<NumberExpression*>(output);
             if (number->getUnit().isEmpty())
                 setFloatProperty(key, number->getValue());
@@ -612,7 +612,7 @@ void Sheet::updateProperty(CellAddress key)
                 setQuantityProperty(key, number->getValue(), number->getUnit());
         }
         else
-            setStringProperty(key, freecad_dynamic_cast<StringExpression>(output)->getText().c_str());
+            setStringProperty(key, Spreadsheet::freecad_dynamic_cast<StringExpression>(output)->getText().c_str());
 
         delete output;
     }
diff --git a/src/Mod/Spreadsheet/Gui/Command.cpp b/src/Mod/Spreadsheet/Gui/Command.cpp
index 3c5a9d798..0970cccdc 100644
--- a/src/Mod/Spreadsheet/Gui/Command.cpp
+++ b/src/Mod/Spreadsheet/Gui/Command.cpp
@@ -64,7 +64,7 @@ void CmdSpreadsheetMergeCells::activated(int iMsg)
 {
     if (getActiveGuiDocument()) {
         Gui::MDIView* activeWindow = Gui::getMainWindow()->activeWindow();
-        SpreadsheetGui::SheetView * sheetView = freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow);
+        SpreadsheetGui::SheetView * sheetView = Spreadsheet::freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow);
 
         if (sheetView) {
             Sheet * sheet = sheetView->getSheet();
@@ -91,7 +91,7 @@ bool CmdSpreadsheetMergeCells::isActive()
 {
     if (getActiveGuiDocument()) {
         Gui::MDIView* activeWindow = Gui::getMainWindow()->activeWindow();
-        if (activeWindow && freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow))
+        if (activeWindow && Spreadsheet::freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow))
             return true;
 
     }
@@ -118,7 +118,7 @@ void CmdSpreadsheetSplitCell::activated(int iMsg)
 {
     if (getActiveGuiDocument()) {
         Gui::MDIView* activeWindow = Gui::getMainWindow()->activeWindow();
-        SpreadsheetGui::SheetView * sheetView = freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow);
+        SpreadsheetGui::SheetView * sheetView = Spreadsheet::freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow);
 
         if (sheetView) {
             Sheet * sheet = sheetView->getSheet();
@@ -140,7 +140,7 @@ bool CmdSpreadsheetSplitCell::isActive()
 {
     if (getActiveGuiDocument()) {
         Gui::MDIView* activeWindow = Gui::getMainWindow()->activeWindow();
-        SpreadsheetGui::SheetView * sheetView = freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow);
+        SpreadsheetGui::SheetView * sheetView = Spreadsheet::freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow);
 
         if (sheetView) {
             QModelIndex current = sheetView->currentIndex();
@@ -180,7 +180,7 @@ void CmdSpreadsheetImport::activated(int iMsg)
                                                         &selectedFilter);
     if (!fileName.isEmpty()) {
         std::string FeatName = getUniqueObjectName("Spreadsheet");
-        Sheet * sheet = freecad_dynamic_cast<Sheet>(App::GetApplication().getActiveDocument()->addObject("Spreadsheet::Sheet", FeatName.c_str()));
+        Sheet * sheet = Spreadsheet::freecad_dynamic_cast<Sheet>(App::GetApplication().getActiveDocument()->addObject("Spreadsheet::Sheet", FeatName.c_str()));
 
         sheet->importFromFile(fileName.toStdString(), '\t', '"', '\\');        
         sheet->execute();
@@ -212,7 +212,7 @@ void CmdSpreadsheetExport::activated(int iMsg)
 {
     if (getActiveGuiDocument()) {
         Gui::MDIView* activeWindow = Gui::getMainWindow()->activeWindow();
-        SpreadsheetGui::SheetView * sheetView = freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow);
+        SpreadsheetGui::SheetView * sheetView = Spreadsheet::freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow);
 
         if (sheetView) {
             Sheet * sheet = sheetView->getSheet();
@@ -233,7 +233,7 @@ bool CmdSpreadsheetExport::isActive()
 {
     if (getActiveGuiDocument()) {
         Gui::MDIView* activeWindow = Gui::getMainWindow()->activeWindow();
-        if (activeWindow && freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow))
+        if (activeWindow && Spreadsheet::freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow))
             return true;
 
     }
@@ -260,7 +260,7 @@ void CmdSpreadsheetAlignLeft::activated(int iMsg)
 {
     if (getActiveGuiDocument()) {
         Gui::MDIView* activeWindow = Gui::getMainWindow()->activeWindow();
-        SpreadsheetGui::SheetView * sheetView = freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow);
+        SpreadsheetGui::SheetView * sheetView = Spreadsheet::freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow);
 
         if (sheetView) {
             Sheet * sheet = sheetView->getSheet();
@@ -284,7 +284,7 @@ bool CmdSpreadsheetAlignLeft::isActive()
 {
     if (getActiveGuiDocument()) {
         Gui::MDIView* activeWindow = Gui::getMainWindow()->activeWindow();
-        if (activeWindow && freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow))
+        if (activeWindow && Spreadsheet::freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow))
             return true;
 
     }
@@ -311,7 +311,7 @@ void CmdSpreadsheetAlignCenter::activated(int iMsg)
 {
     if (getActiveGuiDocument()) {
         Gui::MDIView* activeWindow = Gui::getMainWindow()->activeWindow();
-        SpreadsheetGui::SheetView * sheetView = freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow);
+        SpreadsheetGui::SheetView * sheetView = Spreadsheet::freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow);
 
         if (sheetView) {
             Sheet * sheet = sheetView->getSheet();
@@ -335,7 +335,7 @@ bool CmdSpreadsheetAlignCenter::isActive()
 {
     if (getActiveGuiDocument()) {
         Gui::MDIView* activeWindow = Gui::getMainWindow()->activeWindow();
-        if (activeWindow && freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow))
+        if (activeWindow && Spreadsheet::freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow))
             return true;
 
     }
@@ -362,7 +362,7 @@ void CmdSpreadsheetAlignRight::activated(int iMsg)
 {
     if (getActiveGuiDocument()) {
         Gui::MDIView* activeWindow = Gui::getMainWindow()->activeWindow();
-        SpreadsheetGui::SheetView * sheetView = freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow);
+        SpreadsheetGui::SheetView * sheetView = Spreadsheet::freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow);
 
         if (sheetView) {
             Sheet * sheet = sheetView->getSheet();
@@ -386,7 +386,7 @@ bool CmdSpreadsheetAlignRight::isActive()
 {
     if (getActiveGuiDocument()) {
         Gui::MDIView* activeWindow = Gui::getMainWindow()->activeWindow();
-        if (activeWindow && freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow))
+        if (activeWindow && Spreadsheet::freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow))
             return true;
 
     }
@@ -413,7 +413,7 @@ void CmdSpreadsheetAlignTop::activated(int iMsg)
 {
     if (getActiveGuiDocument()) {
         Gui::MDIView* activeWindow = Gui::getMainWindow()->activeWindow();
-        SpreadsheetGui::SheetView * sheetView = freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow);
+        SpreadsheetGui::SheetView * sheetView = Spreadsheet::freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow);
 
         if (sheetView) {
             Sheet * sheet = sheetView->getSheet();
@@ -437,7 +437,7 @@ bool CmdSpreadsheetAlignTop::isActive()
 {
     if (getActiveGuiDocument()) {
         Gui::MDIView* activeWindow = Gui::getMainWindow()->activeWindow();
-        if (activeWindow && freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow))
+        if (activeWindow && Spreadsheet::freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow))
             return true;
 
     }
@@ -464,7 +464,7 @@ void CmdSpreadsheetAlignBottom::activated(int iMsg)
 {
     if (getActiveGuiDocument()) {
         Gui::MDIView* activeWindow = Gui::getMainWindow()->activeWindow();
-        SpreadsheetGui::SheetView * sheetView = freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow);
+        SpreadsheetGui::SheetView * sheetView = Spreadsheet::freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow);
 
         if (sheetView) {
             Sheet * sheet = sheetView->getSheet();
@@ -488,7 +488,7 @@ bool CmdSpreadsheetAlignBottom::isActive()
 {
     if (getActiveGuiDocument()) {
         Gui::MDIView* activeWindow = Gui::getMainWindow()->activeWindow();
-        if (activeWindow && freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow))
+        if (activeWindow && Spreadsheet::freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow))
             return true;
 
     }
@@ -515,7 +515,7 @@ void CmdSpreadsheetAlignVCenter::activated(int iMsg)
 {
     if (getActiveGuiDocument()) {
         Gui::MDIView* activeWindow = Gui::getMainWindow()->activeWindow();
-        SpreadsheetGui::SheetView * sheetView = freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow);
+        SpreadsheetGui::SheetView * sheetView = Spreadsheet::freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow);
 
         if (sheetView) {
             Sheet * sheet = sheetView->getSheet();
@@ -539,7 +539,7 @@ bool CmdSpreadsheetAlignVCenter::isActive()
 {
     if (getActiveGuiDocument()) {
         Gui::MDIView* activeWindow = Gui::getMainWindow()->activeWindow();
-        if (activeWindow && freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow))
+        if (activeWindow && Spreadsheet::freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow))
             return true;
 
     }
@@ -566,7 +566,7 @@ void CmdSpreadsheetStyleBold::activated(int iMsg)
 {
     if (getActiveGuiDocument()) {
         Gui::MDIView* activeWindow = Gui::getMainWindow()->activeWindow();
-        SpreadsheetGui::SheetView * sheetView = freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow);
+        SpreadsheetGui::SheetView * sheetView = Spreadsheet::freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow);
 
         if (sheetView) {
             Sheet * sheet = sheetView->getSheet();
@@ -612,7 +612,7 @@ bool CmdSpreadsheetStyleBold::isActive()
 {
     if (getActiveGuiDocument()) {
         Gui::MDIView* activeWindow = Gui::getMainWindow()->activeWindow();
-        if (activeWindow && freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow))
+        if (activeWindow && Spreadsheet::freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow))
             return true;
 
     }
@@ -639,7 +639,7 @@ void CmdSpreadsheetStyleItalic::activated(int iMsg)
 {
     if (getActiveGuiDocument()) {
         Gui::MDIView* activeWindow = Gui::getMainWindow()->activeWindow();
-        SpreadsheetGui::SheetView * sheetView = freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow);
+        SpreadsheetGui::SheetView * sheetView = Spreadsheet::freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow);
 
         if (sheetView) {
             Sheet * sheet = sheetView->getSheet();
@@ -685,7 +685,7 @@ bool CmdSpreadsheetStyleItalic::isActive()
 {
     if (getActiveGuiDocument()) {
         Gui::MDIView* activeWindow = Gui::getMainWindow()->activeWindow();
-        if (activeWindow && freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow))
+        if (activeWindow && Spreadsheet::freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow))
             return true;
 
     }
@@ -712,7 +712,7 @@ void CmdSpreadsheetStyleUnderline::activated(int iMsg)
 {
     if (getActiveGuiDocument()) {
         Gui::MDIView* activeWindow = Gui::getMainWindow()->activeWindow();
-        SpreadsheetGui::SheetView * sheetView = freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow);
+        SpreadsheetGui::SheetView * sheetView = Spreadsheet::freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow);
 
         if (sheetView) {
             Sheet * sheet = sheetView->getSheet();
@@ -758,7 +758,7 @@ bool CmdSpreadsheetStyleUnderline::isActive()
 {
     if (getActiveGuiDocument()) {
         Gui::MDIView* activeWindow = Gui::getMainWindow()->activeWindow();
-        if (activeWindow && freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow))
+        if (activeWindow && Spreadsheet::freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow))
             return true;
 
     }
diff --git a/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.cpp b/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.cpp
index b42461a78..9745c3cf3 100644
--- a/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.cpp
+++ b/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.cpp
@@ -137,7 +137,7 @@ void ViewProviderSheet::setupContextMenu(QMenu * menu, QObject *receiver, const
 
 Sheet *ViewProviderSheet::getSpreadsheetObject() const
 {
-    return freecad_dynamic_cast<Sheet>(pcObject);
+    return Spreadsheet::freecad_dynamic_cast<Sheet>(pcObject);
 }
 
 bool ViewProviderSheet::onDelete(const std::vector<std::string> &)
@@ -149,7 +149,7 @@ bool ViewProviderSheet::onDelete(const std::vector<std::string> &)
     // View is not closed, delete cell contents instead if it is active
     if (Gui::Application::Instance->activeDocument()) {
         Gui::MDIView* activeWindow = Gui::getMainWindow()->activeWindow();
-        SpreadsheetGui::SheetView * sheetView = freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow);
+        SpreadsheetGui::SheetView * sheetView = Spreadsheet::freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow);
 
         if (sheetView) {
             Sheet * sheet = sheetView->getSheet();
diff --git a/src/Mod/Spreadsheet/Gui/Workbench.cpp b/src/Mod/Spreadsheet/Gui/Workbench.cpp
index 4cbe89835..f1348a881 100644
--- a/src/Mod/Spreadsheet/Gui/Workbench.cpp
+++ b/src/Mod/Spreadsheet/Gui/Workbench.cpp
@@ -107,7 +107,7 @@ void WorkbenchHelper::setForegroundColor(const QColor & color)
 
     if (doc) {
         Gui::MDIView* activeWindow = Gui::getMainWindow()->activeWindow();
-        SpreadsheetGui::SheetView * sheetView = freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow);
+        SpreadsheetGui::SheetView * sheetView = Spreadsheet::freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow);
 
         if (sheetView) {
             Sheet * sheet = sheetView->getSheet();
@@ -134,7 +134,7 @@ void WorkbenchHelper::setBackgroundColor(const QColor & color)
 
     if (doc) {
         Gui::MDIView* activeWindow = Gui::getMainWindow()->activeWindow();
-        SpreadsheetGui::SheetView * sheetView = freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow);
+        SpreadsheetGui::SheetView * sheetView = Spreadsheet::freecad_dynamic_cast<SpreadsheetGui::SheetView>(activeWindow);
 
         if (sheetView) {
             Sheet * sheet = sheetView->getSheet();