diff --git a/src/Base/Exception.cpp b/src/Base/Exception.cpp
index abfd2de67..44dbe4c7a 100644
--- a/src/Base/Exception.cpp
+++ b/src/Base/Exception.cpp
@@ -400,7 +400,7 @@ SignalException::~SignalException()
 
 void SignalException::throw_signal(int signum)
 {
-    std::cerr << "SIGSEGV signal raised" << std::endl;
+    std::cerr << "SIGSEGV signal raised: " << signum << std::endl;
     throw std::runtime_error ("throw_signal");
 }
 #endif
diff --git a/src/Base/Interpreter.h b/src/Base/Interpreter.h
index 6357f6200..880dd5eb6 100644
--- a/src/Base/Interpreter.h
+++ b/src/Base/Interpreter.h
@@ -89,10 +89,10 @@ public:
     SystemExitException(void);
     SystemExitException(const SystemExitException &inst);
     virtual ~SystemExitException() throw() {}
-    const long getExitCode(void) const { return _exitCode;}
+    long getExitCode(void) const { return _exitCode;}
 
 protected:
-    long int _exitCode;
+    long _exitCode;
 };
 
 /** If the application starts we release immediately the global interpreter lock
diff --git a/src/Base/MatrixPyImp.cpp b/src/Base/MatrixPyImp.cpp
index f2e7ab900..d7f4bf2d9 100644
--- a/src/Base/MatrixPyImp.cpp
+++ b/src/Base/MatrixPyImp.cpp
@@ -142,21 +142,21 @@ PyObject* MatrixPy::richCompare(PyObject *v, PyObject *w, int op)
         Matrix4D m2 = static_cast<MatrixPy*>(w)->value();
 
         PyObject *res=0;
-        if (op != Py_EQ && op != Py_NE) {
-            PyErr_SetString(PyExc_TypeError,
-            "no ordering relation is defined for Matrix");
-            return 0;
-        }
-        else if (op == Py_EQ) {
-            res = (m1 == m2) ? Py_True : Py_False;
+        if (op != Py_EQ && op != Py_NE) {
+            PyErr_SetString(PyExc_TypeError,
+            "no ordering relation is defined for Matrix");
+            return 0;
+        }
+        else if (op == Py_EQ) {
+            res = (m1 == m2) ? Py_True : Py_False;
             Py_INCREF(res);
             return res;
-        }
-        else {
-            res = (m1 != m2) ? Py_True : Py_False;
+        }
+        else {
+            res = (m1 != m2) ? Py_True : Py_False;
             Py_INCREF(res);
             return res;
-        }
+        }
     }
     else {
         // This always returns False
@@ -696,119 +696,119 @@ int MatrixPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/)
     return 0; 
 }
 
-PyObject * MatrixPy::number_divide_handler (PyObject *self, PyObject *other)
+PyObject * MatrixPy::number_divide_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * MatrixPy::number_remainder_handler (PyObject *self, PyObject *other)
+PyObject * MatrixPy::number_remainder_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * MatrixPy::number_divmod_handler (PyObject *self, PyObject *other)
+PyObject * MatrixPy::number_divmod_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * MatrixPy::number_power_handler (PyObject *self, PyObject *other, PyObject *arg)
+PyObject * MatrixPy::number_power_handler (PyObject* /*self*/, PyObject* /*other*/, PyObject* /*arg*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * MatrixPy::number_negative_handler (PyObject *self)
+PyObject * MatrixPy::number_negative_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * MatrixPy::number_positive_handler (PyObject *self)
+PyObject * MatrixPy::number_positive_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * MatrixPy::number_absolute_handler (PyObject *self)
+PyObject * MatrixPy::number_absolute_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-int MatrixPy::number_nonzero_handler (PyObject *self)
+int MatrixPy::number_nonzero_handler (PyObject* /*self*/)
 {
     return 1;
 }
 
-PyObject * MatrixPy::number_invert_handler (PyObject *self)
+PyObject * MatrixPy::number_invert_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * MatrixPy::number_lshift_handler (PyObject *self, PyObject *other)
+PyObject * MatrixPy::number_lshift_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * MatrixPy::number_rshift_handler (PyObject *self, PyObject *other)
+PyObject * MatrixPy::number_rshift_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * MatrixPy::number_and_handler (PyObject *self, PyObject *other)
+PyObject * MatrixPy::number_and_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * MatrixPy::number_xor_handler (PyObject *self, PyObject *other)
+PyObject * MatrixPy::number_xor_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * MatrixPy::number_or_handler (PyObject *self, PyObject *other)
+PyObject * MatrixPy::number_or_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-int MatrixPy::number_coerce_handler (PyObject **self, PyObject **other)
+int MatrixPy::number_coerce_handler (PyObject ** /*self*/, PyObject ** /*other*/)
 {
     return 1;
 }
 
-PyObject * MatrixPy::number_int_handler (PyObject *self)
+PyObject * MatrixPy::number_int_handler (PyObject * /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * MatrixPy::number_long_handler (PyObject *self)
+PyObject * MatrixPy::number_long_handler (PyObject * /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * MatrixPy::number_float_handler (PyObject *self)
+PyObject * MatrixPy::number_float_handler (PyObject * /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * MatrixPy::number_oct_handler (PyObject *self)
+PyObject * MatrixPy::number_oct_handler (PyObject * /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * MatrixPy::number_hex_handler (PyObject *self)
+PyObject * MatrixPy::number_hex_handler (PyObject * /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
diff --git a/src/Base/PyObjectBase.cpp b/src/Base/PyObjectBase.cpp
index 47bdd87ef..20336866f 100644
--- a/src/Base/PyObjectBase.cpp
+++ b/src/Base/PyObjectBase.cpp
@@ -122,7 +122,8 @@ PyTypeObject PyObjectBase::Type = {
     0,                                                      /*tp_cache */
     0,                                                      /*tp_subclasses */
     0,                                                      /*tp_weaklist */
-    0                                                       /*tp_del */
+    0,                                                      /*tp_del */
+    0                                                       /*tp_version_tag */
 };
 
 /*------------------------------
diff --git a/src/Base/QuantityPyImp.cpp b/src/Base/QuantityPyImp.cpp
index 183bb2779..4acf0243f 100644
--- a/src/Base/QuantityPyImp.cpp
+++ b/src/Base/QuantityPyImp.cpp
@@ -49,7 +49,7 @@ PyObject *QuantityPy::PyMake(struct _typeobject *, PyObject *, PyObject *)  // P
 }
 
 // constructor method
-int QuantityPy::PyInit(PyObject* args, PyObject* kwd)
+int QuantityPy::PyInit(PyObject* args, PyObject* /*kwd*/)
 {
     Quantity *self = getQuantityPtr();
 
@@ -110,7 +110,7 @@ int QuantityPy::PyInit(PyObject* args, PyObject* kwd)
     return -1;
 }
 
-PyObject* QuantityPy::getUserPreferred(PyObject *args)
+PyObject* QuantityPy::getUserPreferred(PyObject* /*args*/)
 {
     QString uus;
     double factor;
@@ -418,14 +418,14 @@ PyObject * QuantityPy::number_remainder_handler (PyObject *self, PyObject *other
     return new QuantityPy(new Quantity(q,a->getUnit()));
 }
 
-PyObject * QuantityPy::number_divmod_handler (PyObject *self, PyObject *other)
+PyObject * QuantityPy::number_divmod_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     //PyNumber_Divmod();
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * QuantityPy::number_power_handler (PyObject *self, PyObject *other, PyObject *modulo)
+PyObject * QuantityPy::number_power_handler (PyObject *self, PyObject *other, PyObject * /*modulo*/)
 {
     if (!PyObject_TypeCheck(self, &(QuantityPy::Type))) {
         PyErr_SetString(PyExc_TypeError, "First arg must be Quantity");
@@ -585,54 +585,54 @@ int QuantityPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/)
     return 0; 
 }
 
-PyObject * QuantityPy::number_invert_handler (PyObject *self)
+PyObject * QuantityPy::number_invert_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_TypeError, "bad operand type for unary ~");
     return 0;
 }
 
-PyObject * QuantityPy::number_lshift_handler (PyObject *self, PyObject *other)
+PyObject * QuantityPy::number_lshift_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_TypeError, "unsupported operand type(s) for <<");
     return 0;
 }
 
-PyObject * QuantityPy::number_rshift_handler (PyObject *self, PyObject *other)
+PyObject * QuantityPy::number_rshift_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_TypeError, "unsupported operand type(s) for >>");
     return 0;
 }
 
-PyObject * QuantityPy::number_and_handler (PyObject *self, PyObject *other)
+PyObject * QuantityPy::number_and_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_TypeError, "unsupported operand type(s) for &");
     return 0;
 }
 
-PyObject * QuantityPy::number_xor_handler (PyObject *self, PyObject *other)
+PyObject * QuantityPy::number_xor_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_TypeError, "unsupported operand type(s) for ^");
     return 0;
 }
 
-PyObject * QuantityPy::number_or_handler (PyObject *self, PyObject *other)
+PyObject * QuantityPy::number_or_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_TypeError, "unsupported operand type(s) for |");
     return 0;
 }
 
-int QuantityPy::number_coerce_handler (PyObject **self, PyObject **other)
+int QuantityPy::number_coerce_handler (PyObject** /*self*/, PyObject** /*other*/)
 {
     return 1;
 }
 
-PyObject * QuantityPy::number_oct_handler (PyObject *self)
+PyObject * QuantityPy::number_oct_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_TypeError, "oct() argument can't be converted to oct");
     return 0;
 }
 
-PyObject * QuantityPy::number_hex_handler (PyObject *self)
+PyObject * QuantityPy::number_hex_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_TypeError, "hex() argument can't be converted to hex");
     return 0;
diff --git a/src/Base/Stream.cpp b/src/Base/Stream.cpp
index 121fe507d..095ca3a02 100644
--- a/src/Base/Stream.cpp
+++ b/src/Base/Stream.cpp
@@ -781,7 +781,7 @@ Streambuf::seekoff(std::streambuf::off_type off,
 
 std::streambuf::pos_type
 Streambuf::seekpos(std::streambuf::pos_type pos,
-                   std::ios_base::openmode which/*mode*/)
+                   std::ios_base::openmode /*mode*/)
 {
     return seekoff(pos, std::ios_base::beg);
 }
diff --git a/src/Base/UnitPyImp.cpp b/src/Base/UnitPyImp.cpp
index 0f2fabde7..cdedd53c1 100644
--- a/src/Base/UnitPyImp.cpp
+++ b/src/Base/UnitPyImp.cpp
@@ -39,7 +39,7 @@ PyObject *UnitPy::PyMake(struct _typeobject *, PyObject *, PyObject *)  // Pytho
 }
 
 // constructor method
-int UnitPy::PyInit(PyObject* args, PyObject* kwd)
+int UnitPy::PyInit(PyObject* args, PyObject* /*kwd*/)
 {
     Unit *self = getUnitPtr();
 
@@ -194,119 +194,119 @@ int UnitPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/)
     return 0; 
 }
 
-PyObject * UnitPy::number_divide_handler (PyObject *self, PyObject *other)
+PyObject * UnitPy::number_divide_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * UnitPy::number_remainder_handler (PyObject *self, PyObject *other)
+PyObject * UnitPy::number_remainder_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * UnitPy::number_divmod_handler (PyObject *self, PyObject *other)
+PyObject * UnitPy::number_divmod_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * UnitPy::number_power_handler (PyObject *self, PyObject *other, PyObject *arg)
+PyObject * UnitPy::number_power_handler (PyObject* /*self*/, PyObject* /*other*/, PyObject* /*modulo*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * UnitPy::number_negative_handler (PyObject *self)
+PyObject * UnitPy::number_negative_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * UnitPy::number_positive_handler (PyObject *self)
+PyObject * UnitPy::number_positive_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * UnitPy::number_absolute_handler (PyObject *self)
+PyObject * UnitPy::number_absolute_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-int UnitPy::number_nonzero_handler (PyObject *self)
+int UnitPy::number_nonzero_handler (PyObject* /*self*/)
 {
     return 1;
 }
 
-PyObject * UnitPy::number_invert_handler (PyObject *self)
+PyObject * UnitPy::number_invert_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * UnitPy::number_lshift_handler (PyObject *self, PyObject *other)
+PyObject * UnitPy::number_lshift_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * UnitPy::number_rshift_handler (PyObject *self, PyObject *other)
+PyObject * UnitPy::number_rshift_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * UnitPy::number_and_handler (PyObject *self, PyObject *other)
+PyObject * UnitPy::number_and_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * UnitPy::number_xor_handler (PyObject *self, PyObject *other)
+PyObject * UnitPy::number_xor_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * UnitPy::number_or_handler (PyObject *self, PyObject *other)
+PyObject * UnitPy::number_or_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-int UnitPy::number_coerce_handler (PyObject **self, PyObject **other)
+int UnitPy::number_coerce_handler (PyObject** /*self*/, PyObject** /*other*/)
 {
     return 1;
 }
 
-PyObject * UnitPy::number_int_handler (PyObject *self)
+PyObject * UnitPy::number_int_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * UnitPy::number_long_handler (PyObject *self)
+PyObject * UnitPy::number_long_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * UnitPy::number_float_handler (PyObject *self)
+PyObject * UnitPy::number_float_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * UnitPy::number_oct_handler (PyObject *self)
+PyObject * UnitPy::number_oct_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * UnitPy::number_hex_handler (PyObject *self)
+PyObject * UnitPy::number_hex_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
diff --git a/src/Base/UnitsApi.cpp b/src/Base/UnitsApi.cpp
index 61fa2304a..b703e1d15 100644
--- a/src/Base/UnitsApi.cpp
+++ b/src/Base/UnitsApi.cpp
@@ -67,11 +67,11 @@ UnitSystem    UnitsApi::actSystem = SI1;
 //QString  UnitsApi::UserPrefUnit   [50];
 int      UnitsApi::UserPrefDecimals = 2;
 
-UnitsApi::UnitsApi(const char* filter)
+UnitsApi::UnitsApi(const char* /*filter*/)
 {
 }
 
-UnitsApi::UnitsApi(const std::string& filter)
+UnitsApi::UnitsApi(const std::string& /*filter*/)
 {
 }
 
diff --git a/src/Base/VectorPyImp.cpp b/src/Base/VectorPyImp.cpp
index 9189aca3a..ddb1f0fb5 100644
--- a/src/Base/VectorPyImp.cpp
+++ b/src/Base/VectorPyImp.cpp
@@ -566,119 +566,119 @@ int VectorPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/)
     return 0; 
 }
 
-PyObject * VectorPy::number_divide_handler (PyObject *self, PyObject *other)
+PyObject * VectorPy::number_divide_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * VectorPy::number_remainder_handler (PyObject *self, PyObject *other)
+PyObject * VectorPy::number_remainder_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * VectorPy::number_divmod_handler (PyObject *self, PyObject *other)
+PyObject * VectorPy::number_divmod_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * VectorPy::number_power_handler (PyObject *self, PyObject *other, PyObject *arg)
+PyObject * VectorPy::number_power_handler (PyObject* /*self*/, PyObject* /*other*/, PyObject* /*arg*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * VectorPy::number_negative_handler (PyObject *self)
+PyObject * VectorPy::number_negative_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * VectorPy::number_positive_handler (PyObject *self)
+PyObject * VectorPy::number_positive_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * VectorPy::number_absolute_handler (PyObject *self)
+PyObject * VectorPy::number_absolute_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-int VectorPy::number_nonzero_handler (PyObject *self)
+int VectorPy::number_nonzero_handler (PyObject* /*self*/)
 {
     return 1;
 }
 
-PyObject * VectorPy::number_invert_handler (PyObject *self)
+PyObject * VectorPy::number_invert_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * VectorPy::number_lshift_handler (PyObject *self, PyObject *other)
+PyObject * VectorPy::number_lshift_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * VectorPy::number_rshift_handler (PyObject *self, PyObject *other)
+PyObject * VectorPy::number_rshift_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * VectorPy::number_and_handler (PyObject *self, PyObject *other)
+PyObject * VectorPy::number_and_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * VectorPy::number_xor_handler (PyObject *self, PyObject *other)
+PyObject * VectorPy::number_xor_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * VectorPy::number_or_handler (PyObject *self, PyObject *other)
+PyObject * VectorPy::number_or_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-int VectorPy::number_coerce_handler (PyObject **self, PyObject **other)
+int VectorPy::number_coerce_handler (PyObject ** /*self*/, PyObject ** /*other*/)
 {
     return 1;
 }
 
-PyObject * VectorPy::number_int_handler (PyObject *self)
+PyObject * VectorPy::number_int_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * VectorPy::number_long_handler (PyObject *self)
+PyObject * VectorPy::number_long_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * VectorPy::number_float_handler (PyObject *self)
+PyObject * VectorPy::number_float_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * VectorPy::number_oct_handler (PyObject *self)
+PyObject * VectorPy::number_oct_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * VectorPy::number_hex_handler (PyObject *self)
+PyObject * VectorPy::number_hex_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
diff --git a/src/Base/swigpyrun_1.3.25.h b/src/Base/swigpyrun_1.3.25.h
index 10968fd1a..91717210b 100644
--- a/src/Base/swigpyrun_1.3.25.h
+++ b/src/Base/swigpyrun_1.3.25.h
@@ -680,7 +680,7 @@ PySwigObject_type(void) {
     (unaryfunc)PySwigObject_oct,  /*nb_oct*/
     (unaryfunc)PySwigObject_hex,  /*nb_hex*/
 #if PY_VERSION_HEX >= 0x02000000
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */ 
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */ 
 #endif
   };
 
@@ -727,6 +727,9 @@ PySwigObject_type(void) {
 #if PY_VERSION_HEX >= 0x02030000
     0,                                  /* tp_del */
 #endif
+#if PY_VERSION_HEX >= 0x02060000
+    0,                                  /* tp_version_tag */
+#endif
 #ifdef COUNT_ALLOCS
     0,0,0,0                             /* tp_alloc -> tp_next */
 #endif
@@ -884,6 +887,9 @@ PySwigPacked_type(void) {
 #if PY_VERSION_HEX >= 0x02030000
     0,                                  /* tp_del */
 #endif
+#if PY_VERSION_HEX >= 0x02060000
+    0,                                  /* tp_version_tag */
+#endif
 #ifdef COUNT_ALLOCS
     0,0,0,0                             /* tp_alloc -> tp_next */
 #endif
diff --git a/src/Base/swigpyrun_1.3.33.h b/src/Base/swigpyrun_1.3.33.h
index 0366e6fd1..f83ac1e89 100644
--- a/src/Base/swigpyrun_1.3.33.h
+++ b/src/Base/swigpyrun_1.3.33.h
@@ -1669,6 +1669,9 @@ _PySwigObject_type(void) {
 #if PY_VERSION_HEX >= 0x02030000
 	0,                                  /* tp_del */
 #endif
+#if PY_VERSION_HEX >= 0x02060000
+    0,                                      /* tp_version_tag */
+#endif
 #ifdef COUNT_ALLOCS
 	0,0,0,0                             /* tp_alloc -> tp_next */
 #endif
@@ -1832,6 +1835,9 @@ _PySwigPacked_type(void) {
 #if PY_VERSION_HEX >= 0x02030000
 	0,                                  /* tp_del */
 #endif
+#if PY_VERSION_HEX >= 0x02060000
+    0,                                      /* tp_version_tag */
+#endif
 #ifdef COUNT_ALLOCS
 	0,0,0,0                             /* tp_alloc -> tp_next */
 #endif
diff --git a/src/Base/swigpyrun_1.3.36.h b/src/Base/swigpyrun_1.3.36.h
index 0e421c508..02c58ad8a 100644
--- a/src/Base/swigpyrun_1.3.36.h
+++ b/src/Base/swigpyrun_1.3.36.h
@@ -1677,6 +1677,9 @@ _PySwigObject_type(void) {
 #if PY_VERSION_HEX >= 0x02030000
 	0,                                  /* tp_del */
 #endif
+#if PY_VERSION_HEX >= 0x02060000
+    0,                                      /* tp_version_tag */
+#endif
 #ifdef COUNT_ALLOCS
 	0,0,0,0                             /* tp_alloc -> tp_next */
 #endif
@@ -1840,6 +1843,9 @@ _PySwigPacked_type(void) {
 #if PY_VERSION_HEX >= 0x02030000
 	0,                                  /* tp_del */
 #endif
+#if PY_VERSION_HEX >= 0x02060000
+    0,                                      /* tp_version_tag */
+#endif
 #ifdef COUNT_ALLOCS
 	0,0,0,0                             /* tp_alloc -> tp_next */
 #endif
diff --git a/src/Base/swigpyrun_1.3.38.h b/src/Base/swigpyrun_1.3.38.h
index 5bb196992..dae058c20 100644
--- a/src/Base/swigpyrun_1.3.38.h
+++ b/src/Base/swigpyrun_1.3.38.h
@@ -1029,11 +1029,12 @@ typedef struct swig_const_info {
  * Wrapper of PyInstanceMethod_New() used in Python 3
  * It is exported to the generated module, used for -fastproxy
  * ----------------------------------------------------------------------------- */
-SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *self, PyObject *func)
+SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject * /*self*/, PyObject *func)
 {
 #if PY_VERSION_HEX >= 0x03000000
   return PyInstanceMethod_New(func);
 #else
+  (void)func;
   return NULL;
 #endif
 }
@@ -1789,6 +1790,9 @@ _PySwigObject_type(void) {
 #if PY_VERSION_HEX >= 0x02030000
 	0,                                  /* tp_del */
 #endif
+#if PY_VERSION_HEX >= 0x02060000
+    0,                                      /* tp_version_tag */
+#endif
 #ifdef COUNT_ALLOCS
 	0,0,0,0                             /* tp_alloc -> tp_next */
 #endif
@@ -1960,6 +1964,9 @@ _PySwigPacked_type(void) {
 #if PY_VERSION_HEX >= 0x02030000
 	0,                                  /* tp_del */
 #endif
+#if PY_VERSION_HEX >= 0x02060000
+    0,                                      /* tp_version_tag */
+#endif
 #ifdef COUNT_ALLOCS
 	0,0,0,0                             /* tp_alloc -> tp_next */
 #endif
diff --git a/src/Base/swigpyrun_1.3.40.h b/src/Base/swigpyrun_1.3.40.h
index ac83756ea..136ba809f 100644
--- a/src/Base/swigpyrun_1.3.40.h
+++ b/src/Base/swigpyrun_1.3.40.h
@@ -1049,11 +1049,12 @@ typedef struct swig_const_info {
  * Wrapper of PyInstanceMethod_New() used in Python 3
  * It is exported to the generated module, used for -fastproxy
  * ----------------------------------------------------------------------------- */
-SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *self, PyObject *func)
+SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject * /*self*/, PyObject *func)
 {
 #if PY_VERSION_HEX >= 0x03000000
   return PyInstanceMethod_New(func);
 #else
+  (void)func;
   return NULL;
 #endif
 }
@@ -1818,6 +1819,9 @@ _PySwigObject_type(void) {
 #if PY_VERSION_HEX >= 0x02030000
 	0,                                  /* tp_del */
 #endif
+#if PY_VERSION_HEX >= 0x02060000
+    0,                                      /* tp_version_tag */
+#endif
 #ifdef COUNT_ALLOCS
 	0,0,0,0                             /* tp_alloc -> tp_next */
 #endif
@@ -1993,6 +1997,9 @@ _PySwigPacked_type(void) {
 #if PY_VERSION_HEX >= 0x02030000
 	0,                                  /* tp_del */
 #endif
+#if PY_VERSION_HEX >= 0x02060000
+    0,                                      /* tp_version_tag */
+#endif
 #ifdef COUNT_ALLOCS
 	0,0,0,0                             /* tp_alloc -> tp_next */
 #endif
@@ -2637,6 +2644,8 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
       SWIG_Python_TypeError(SWIG_TypePrettyName(ty), obj);
       SWIG_Python_ArgFail(argnum);
     }
+#else
+    (void)argnum;
 #endif
   }
   return result;
diff --git a/src/CXX/Python2/cxx_extensions.cxx b/src/CXX/Python2/cxx_extensions.cxx
index 85ae552d8..ce7ec16a0 100644
--- a/src/CXX/Python2/cxx_extensions.cxx
+++ b/src/CXX/Python2/cxx_extensions.cxx
@@ -1397,7 +1397,7 @@ Py::Object PythonExtensionBase::callOnSelf( const std::string &fn_name,
     return self().callMemberFunction( fn_name, args );
 }
 
-void PythonExtensionBase::reinit( Tuple &args, Dict &kwds )
+void PythonExtensionBase::reinit( Tuple & /*args*/, Dict & /*kwds*/ )
 {
     throw RuntimeError( "Must not call __init__ twice on this class" );
 }
@@ -1447,7 +1447,7 @@ int PythonExtensionBase::compare( const Py::Object &)
 }
 
 #if PY_MAJOR_VERSION > 2 || (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION >= 1)
-Py::Object PythonExtensionBase::rich_compare( const Py::Object &, int op )
+Py::Object PythonExtensionBase::rich_compare( const Py::Object &, int /*op*/ )
 {
     missing_method( rich_compare );
     return Py::None();
diff --git a/src/Tools/generateTemplates/templateClassPyExport.py b/src/Tools/generateTemplates/templateClassPyExport.py
index e3f0e0b67..0a92af2bb 100644
--- a/src/Tools/generateTemplates/templateClassPyExport.py
+++ b/src/Tools/generateTemplates/templateClassPyExport.py
@@ -309,7 +309,8 @@ PyTypeObject @self.export.Name@::Type = {
     0,                                                /*tp_cache */
     0,                                                /*tp_subclasses */
     0,                                                /*tp_weaklist */
-    0                                                 /*tp_del */
+    0,                                                /*tp_del */
+    0                                                 /*tp_version_tag */
 };
 
 /// Methods structure of @self.export.Name@
@@ -353,6 +354,21 @@ PyNumberMethods @self.export.Name@::Number[] = { {
     number_float_handler,
     number_oct_handler,
     number_hex_handler,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
     NULL
 } };
 -
@@ -601,9 +617,9 @@ PyObject *@self.export.Name@::PyMake(struct _typeobject *, PyObject *, PyObject
     return 0;
 }
 
-int @self.export.Name@::PyInit(PyObject* /*args*/, PyObject* /*kwd*/)
-{
-    return 0;
+int @self.export.Name@::PyInit(PyObject* /*args*/, PyObject* /*kwd*/)
+{
+    return 0;
 }
 -
 
@@ -617,8 +633,8 @@ int @self.export.Name@::PyInit(PyObject* /*args*/, PyObject* /*kwd*/)
 -
 + if (self.export.Delete):
     // delete the handled object when the PyObject dies
-    @self.export.Name@::PointerType ptr = static_cast<@self.export.Name@::PointerType>(_pcTwinPointer);
-    delete ptr;
+    @self.export.Name@::PointerType ptr = static_cast<@self.export.Name@::PointerType>(_pcTwinPointer);
+    delete ptr;
 -
 }
 
@@ -811,137 +827,137 @@ PyObject* @self.export.Name@::@i.Name@(PyObject *args)
 -
 
 + if (self.export.NumberProtocol):
-PyObject* @self.export.Name@::number_add_handler(PyObject *self, PyObject *other)
+PyObject* @self.export.Name@::number_add_handler(PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject* @self.export.Name@::number_subtract_handler(PyObject *self, PyObject *other)
+PyObject* @self.export.Name@::number_subtract_handler(PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject* @self.export.Name@::number_multiply_handler(PyObject *self, PyObject *other)
+PyObject* @self.export.Name@::number_multiply_handler(PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * @self.export.Name@::number_divide_handler (PyObject *self, PyObject *other)
+PyObject * @self.export.Name@::number_divide_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * @self.export.Name@::number_remainder_handler (PyObject *self, PyObject *other)
+PyObject * @self.export.Name@::number_remainder_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * @self.export.Name@::number_divmod_handler (PyObject *self, PyObject *other)
+PyObject * @self.export.Name@::number_divmod_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * @self.export.Name@::number_power_handler (PyObject *self, PyObject *other, PyObject *modulo)
+PyObject * @self.export.Name@::number_power_handler (PyObject* /*self*/, PyObject* /*other*/, PyObject* /*modulo*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * @self.export.Name@::number_negative_handler (PyObject *self)
+PyObject * @self.export.Name@::number_negative_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * @self.export.Name@::number_positive_handler (PyObject *self)
+PyObject * @self.export.Name@::number_positive_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * @self.export.Name@::number_absolute_handler (PyObject *self)
+PyObject * @self.export.Name@::number_absolute_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-int @self.export.Name@::number_nonzero_handler (PyObject *self)
+int @self.export.Name@::number_nonzero_handler (PyObject* /*self*/)
 {
     return 1;
 }
 
-PyObject * @self.export.Name@::number_invert_handler (PyObject *self)
+PyObject * @self.export.Name@::number_invert_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * @self.export.Name@::number_lshift_handler (PyObject *self, PyObject *other)
+PyObject * @self.export.Name@::number_lshift_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * @self.export.Name@::number_rshift_handler (PyObject *self, PyObject *other)
+PyObject * @self.export.Name@::number_rshift_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * @self.export.Name@::number_and_handler (PyObject *self, PyObject *other)
+PyObject * @self.export.Name@::number_and_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * @self.export.Name@::number_xor_handler (PyObject *self, PyObject *other)
+PyObject * @self.export.Name@::number_xor_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * @self.export.Name@::number_or_handler (PyObject *self, PyObject *other)
+PyObject * @self.export.Name@::number_or_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-int @self.export.Name@::number_coerce_handler (PyObject **self, PyObject **other)
+int @self.export.Name@::number_coerce_handler (PyObject** /*self*/, PyObject** /*other*/)
 {
     return 1;
 }
 
-PyObject * @self.export.Name@::number_int_handler (PyObject *self)
+PyObject * @self.export.Name@::number_int_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * @self.export.Name@::number_long_handler (PyObject *self)
+PyObject * @self.export.Name@::number_long_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * @self.export.Name@::number_float_handler (PyObject *self)
+PyObject * @self.export.Name@::number_float_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * @self.export.Name@::number_oct_handler (PyObject *self)
+PyObject * @self.export.Name@::number_oct_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * @self.export.Name@::number_hex_handler (PyObject *self)
+PyObject * @self.export.Name@::number_hex_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;