diff --git a/AppFwk/cafHexInterpolator/cafHexInterpolator_UnitTest/cafHexInterpolator_UnitTests_main.cpp b/AppFwk/cafHexInterpolator/cafHexInterpolator_UnitTest/cafHexInterpolator_UnitTests_main.cpp
index 4be9ffb5..4d0c1124 100644
--- a/AppFwk/cafHexInterpolator/cafHexInterpolator_UnitTest/cafHexInterpolator_UnitTests_main.cpp
+++ b/AppFwk/cafHexInterpolator/cafHexInterpolator_UnitTest/cafHexInterpolator_UnitTests_main.cpp
@@ -35,8 +35,8 @@
 //##################################################################################################
 
 #include "gtest/gtest.h"
+#include <cstdio>
 #include <iostream>
-#include <stdio.h>
 #include <string>
 
 //--------------------------------------------------------------------------------------------------
diff --git a/AppFwk/cafHexInterpolator/cafHexInterpolator_UnitTest/gtest/gtest.h b/AppFwk/cafHexInterpolator/cafHexInterpolator_UnitTest/gtest/gtest.h
index df1441aa..d4eabe9f 100644
--- a/AppFwk/cafHexInterpolator/cafHexInterpolator_UnitTest/gtest/gtest.h
+++ b/AppFwk/cafHexInterpolator/cafHexInterpolator_UnitTest/gtest/gtest.h
@@ -343,11 +343,11 @@
 //                                        deprecated; calling a marked function
 //                                        should generate a compiler warning
 
-#include <ctype.h>   // for isspace, etc
-#include <stddef.h>  // for ptrdiff_t
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cctype>   // for isspace, etc
+#include <cstddef>  // for ptrdiff_t
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <memory>
 #include <type_traits>
 
@@ -2473,7 +2473,7 @@ const char* StringFromGTestEnv(const char* flag, const char* default_val);
 #endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
 
 #if GTEST_OS_LINUX
-# include <stdlib.h>
+# include <cstdlib>
 # include <sys/types.h>
 # include <sys/wait.h>
 # include <unistd.h>
@@ -2483,9 +2483,9 @@ const char* StringFromGTestEnv(const char* flag, const char* default_val);
 # include <stdexcept>
 #endif
 
-#include <ctype.h>
-#include <float.h>
-#include <string.h>
+#include <cctype>
+#include <cfloat>
+#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <map>
@@ -2801,7 +2801,7 @@ GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
 # include <mem.h>
 #endif
 
-#include <string.h>
+#include <cstring>
 #include <string>
 
 
@@ -9256,13 +9256,13 @@ class PolymorphicMatcher {
    public:
     explicit MonomorphicImpl(const Impl& impl) : impl_(impl) {}
 
-    virtual void DescribeTo(::std::ostream* os) const { impl_.DescribeTo(os); }
+    void DescribeTo(::std::ostream* os) const override { impl_.DescribeTo(os); }
 
-    virtual void DescribeNegationTo(::std::ostream* os) const {
+    void DescribeNegationTo(::std::ostream* os) const override {
       impl_.DescribeNegationTo(os);
     }
 
-    virtual bool MatchAndExplain(T x, MatchResultListener* listener) const {
+    bool MatchAndExplain(T x, MatchResultListener* listener) const override {
       return impl_.MatchAndExplain(x, listener);
     }
 
@@ -9531,7 +9531,7 @@ GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251 5046
 
 #endif  // GTEST_INCLUDE_GTEST_GTEST_MATCHERS_H_
 
-#include <stdio.h>
+#include <cstdio>
 #include <memory>
 
 namespace testing {
@@ -10312,7 +10312,7 @@ TEST_P(DerivedTest, DoesBlah) {
 #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
 #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
 
-#include <ctype.h>
+#include <cctype>
 
 #include <cassert>
 #include <iterator>
diff --git a/AppFwk/cafProjectDataModel/cafFactory.h b/AppFwk/cafProjectDataModel/cafFactory.h
index a4793bcd..d3c37102 100644
--- a/AppFwk/cafProjectDataModel/cafFactory.h
+++ b/AppFwk/cafProjectDataModel/cafFactory.h
@@ -135,7 +135,7 @@ class Factory
         }
         else
         {
-            return NULL;
+            return nullptr;
         }
     }
 
diff --git a/AppFwk/cafProjectDataModel/cafPdmCore/cafInternalPdmValueFieldSpecializations.h b/AppFwk/cafProjectDataModel/cafPdmCore/cafInternalPdmValueFieldSpecializations.h
index d4419451..241befd9 100644
--- a/AppFwk/cafProjectDataModel/cafPdmCore/cafInternalPdmValueFieldSpecializations.h
+++ b/AppFwk/cafProjectDataModel/cafPdmCore/cafInternalPdmValueFieldSpecializations.h
@@ -4,7 +4,7 @@
 #include "cafFilePath.h"
 #include "cafPdmPointer.h"
 
-#include <assert.h>
+#include <cassert>
 #include <type_traits>
 #include <vector>
 
diff --git a/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildField.h b/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildField.h
index 622af931..ed4da8fc 100644
--- a/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildField.h
+++ b/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildField.h
@@ -21,7 +21,7 @@ class PdmFieldXmlCap;
 class PdmChildFieldHandle : public PdmFieldHandle
 {
 public:
-    virtual void childObjects( std::vector<PdmObjectHandle*>* objects ) = 0;
+    void childObjects( std::vector<PdmObjectHandle*>* objects ) override = 0;
     virtual void setChildObject( PdmObjectHandle* object )              = 0;
 };
 
@@ -46,7 +46,7 @@ class PdmChildField<DataType*> : public PdmChildFieldHandle
     PdmChildField() {}
     explicit PdmChildField( const DataTypePtr& fieldValue );
     explicit PdmChildField( DataTypeUniquePtr fieldValue );
-    virtual ~PdmChildField();
+    ~PdmChildField() override;
 
     // Assignment
 
@@ -67,9 +67,9 @@ class PdmChildField<DataType*> : public PdmChildFieldHandle
     const PdmPointer<DataType>& v() const { return m_fieldValue; }
 
     // Child objects
-    virtual void childObjects( std::vector<PdmObjectHandle*>* objects ) override;
+    void childObjects( std::vector<PdmObjectHandle*>* objects ) override;
     void         setChildObject( PdmObjectHandle* object ) override;
-    virtual void removeChildObject( PdmObjectHandle* object ) override;
+    void removeChildObject( PdmObjectHandle* object ) override;
 
 private:
     PDM_DISABLE_COPY_AND_ASSIGN( PdmChildField );
diff --git a/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/Child.h b/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/Child.h
index 751aa988..f510b221 100644
--- a/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/Child.h
+++ b/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/Child.h
@@ -10,7 +10,7 @@ class Child : public caf::PdmObjectHandle
 {
 public:
     Child();
-    ~Child();
+    ~Child() override;
 
     caf::PdmChildField<TestObj*> m_testObj;
 };
diff --git a/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/Parent.h b/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/Parent.h
index fd53a292..a61272c4 100644
--- a/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/Parent.h
+++ b/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/Parent.h
@@ -10,7 +10,7 @@ class Parent : public caf::PdmObjectHandle
 {
 public:
     Parent();
-    ~Parent();
+    ~Parent() override;
 
     void doSome();
 
diff --git a/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/TestObj.h b/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/TestObj.h
index a2e176cc..e5c3d3aa 100644
--- a/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/TestObj.h
+++ b/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/TestObj.h
@@ -8,7 +8,7 @@ class TestObj : public caf::PdmObjectHandle
 {
 public:
     TestObj();
-    ~TestObj();
+    ~TestObj() override;
 
     caf::PdmDataValueField<double> m_position;
 };
diff --git a/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmCore_UnitTests.cpp b/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmCore_UnitTests.cpp
index 6a2bd2ed..9243817a 100644
--- a/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmCore_UnitTests.cpp
+++ b/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmCore_UnitTests.cpp
@@ -35,8 +35,8 @@
 //##################################################################################################
 
 #include "gtest/gtest.h"
+#include <cstdio>
 #include <iostream>
-#include <stdio.h>
 #include <string>
 
 //--------------------------------------------------------------------------------------------------
diff --git a/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/gtest/gtest.h b/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/gtest/gtest.h
index df1441aa..d4eabe9f 100644
--- a/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/gtest/gtest.h
+++ b/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/gtest/gtest.h
@@ -343,11 +343,11 @@
 //                                        deprecated; calling a marked function
 //                                        should generate a compiler warning
 
-#include <ctype.h>   // for isspace, etc
-#include <stddef.h>  // for ptrdiff_t
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cctype>   // for isspace, etc
+#include <cstddef>  // for ptrdiff_t
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <memory>
 #include <type_traits>
 
@@ -2473,7 +2473,7 @@ const char* StringFromGTestEnv(const char* flag, const char* default_val);
 #endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
 
 #if GTEST_OS_LINUX
-# include <stdlib.h>
+# include <cstdlib>
 # include <sys/types.h>
 # include <sys/wait.h>
 # include <unistd.h>
@@ -2483,9 +2483,9 @@ const char* StringFromGTestEnv(const char* flag, const char* default_val);
 # include <stdexcept>
 #endif
 
-#include <ctype.h>
-#include <float.h>
-#include <string.h>
+#include <cctype>
+#include <cfloat>
+#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <map>
@@ -2801,7 +2801,7 @@ GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
 # include <mem.h>
 #endif
 
-#include <string.h>
+#include <cstring>
 #include <string>
 
 
@@ -9256,13 +9256,13 @@ class PolymorphicMatcher {
    public:
     explicit MonomorphicImpl(const Impl& impl) : impl_(impl) {}
 
-    virtual void DescribeTo(::std::ostream* os) const { impl_.DescribeTo(os); }
+    void DescribeTo(::std::ostream* os) const override { impl_.DescribeTo(os); }
 
-    virtual void DescribeNegationTo(::std::ostream* os) const {
+    void DescribeNegationTo(::std::ostream* os) const override {
       impl_.DescribeNegationTo(os);
     }
 
-    virtual bool MatchAndExplain(T x, MatchResultListener* listener) const {
+    bool MatchAndExplain(T x, MatchResultListener* listener) const override {
       return impl_.MatchAndExplain(x, listener);
     }
 
@@ -9531,7 +9531,7 @@ GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251 5046
 
 #endif  // GTEST_INCLUDE_GTEST_GTEST_MATCHERS_H_
 
-#include <stdio.h>
+#include <cstdio>
 #include <memory>
 
 namespace testing {
@@ -10312,7 +10312,7 @@ TEST_P(DerivedTest, DoesBlah) {
 #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
 #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
 
-#include <ctype.h>
+#include <cctype>
 
 #include <cassert>
 #include <iterator>
diff --git a/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmFieldHandle.h b/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmFieldHandle.h
index 026919f6..e2aae5da 100644
--- a/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmFieldHandle.h
+++ b/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmFieldHandle.h
@@ -82,7 +82,7 @@ CapabilityType* PdmFieldHandle::capability()
         CapabilityType* capability = dynamic_cast<CapabilityType*>( m_capabilities[i].first );
         if ( capability ) return capability;
     }
-    return NULL;
+    return nullptr;
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmObjectHandle.h b/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmObjectHandle.h
index f94a7811..1c19c9af 100644
--- a/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmObjectHandle.h
+++ b/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmObjectHandle.h
@@ -24,7 +24,7 @@ class PdmObjectHandle : public SignalObserver, public SignalEmitter
 {
 public:
     PdmObjectHandle();
-    virtual ~PdmObjectHandle();
+    ~PdmObjectHandle() override;
 
     static QString classKeywordStatic(); // For PdmXmlFieldCap to be able to handle fields of PdmObjectHandle directly
     static std::vector<QString> classKeywordAliases();
diff --git a/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmProxyValueField.h b/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmProxyValueField.h
index ba76be2b..75d5ecef 100644
--- a/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmProxyValueField.h
+++ b/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmProxyValueField.h
@@ -48,8 +48,8 @@ class PdmProxyValueField : public PdmProxyFieldHandle
     typedef DataType FieldDataType;
     PdmProxyValueField()
     {
-        m_valueSetter = NULL;
-        m_valueGetter = NULL;
+        m_valueSetter = nullptr;
+        m_valueGetter = nullptr;
     }
     ~PdmProxyValueField() override
     {
@@ -139,7 +139,7 @@ class PdmProxyValueField : public PdmProxyFieldHandle
             m_obj          = obj;
         }
 
-        void setValue( const DataType& value ) { ( m_obj->*m_setterMethod )( value ); }
+        void setValue( const DataType& value ) override { ( m_obj->*m_setterMethod )( value ); }
 
     private:
         SetterMethodType       m_setterMethod;
@@ -165,7 +165,7 @@ class PdmProxyValueField : public PdmProxyFieldHandle
             m_obj          = obj;
         }
 
-        DataType getValue() const { return ( m_obj->*m_getterMethod )(); }
+        DataType getValue() const override { return ( m_obj->*m_getterMethod )(); }
 
     private:
         GetterMethodType       m_getterMethod;
diff --git a/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrArrayField.h b/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrArrayField.h
index 69348fe8..d00467ba 100644
--- a/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrArrayField.h
+++ b/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrArrayField.h
@@ -39,7 +39,7 @@ class PdmPtrArrayField<DataType*> : public PdmPtrArrayFieldHandle
         : m_isResolved( false )
     {
     }
-    virtual ~PdmPtrArrayField();
+    ~PdmPtrArrayField() override;
 
     PdmPtrArrayField& operator()() { return *this; }
 
@@ -50,11 +50,11 @@ class PdmPtrArrayField<DataType*> : public PdmPtrArrayFieldHandle
 
     // Reimplementation of PdmPointersFieldHandle methods
 
-    virtual size_t           size() const { return m_pointers.size(); }
-    virtual bool             empty() const { return m_pointers.empty(); }
-    virtual void             clear();
-    virtual void             insertAt( int indexAfter, PdmObjectHandle* obj );
-    virtual PdmObjectHandle* at( size_t index );
+    size_t           size() const override { return m_pointers.size(); }
+    bool             empty() const override { return m_pointers.empty(); }
+    void             clear() override;
+    void             insertAt( int indexAfter, PdmObjectHandle* obj ) override;
+    PdmObjectHandle* at( size_t index ) override;
 
     // std::vector-like access
 
@@ -66,7 +66,7 @@ class PdmPtrArrayField<DataType*> : public PdmPtrArrayFieldHandle
     void   insert( size_t indexAfter, const std::vector<PdmPointer<DataType>>& objects );
     size_t count( const DataType* pointer ) const;
 
-    void   erase( size_t index );
+    void   erase( size_t index ) override;
     size_t index( DataType* pointer );
     void   removePtr( PdmObjectHandle* object );
 
@@ -79,7 +79,7 @@ class PdmPtrArrayField<DataType*> : public PdmPtrArrayFieldHandle
     std::vector<DataType*> ptrReferencedObjects() const;
 
     // Child objects
-    virtual void ptrReferencedObjects( std::vector<PdmObjectHandle*>* );
+    void ptrReferencedObjects( std::vector<PdmObjectHandle*>* ) override;
 
 private: // To be disabled
     PDM_DISABLE_COPY_AND_ASSIGN( PdmPtrArrayField );
diff --git a/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrField.inl b/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrField.inl
index 70fa1f99..644a2260 100644
--- a/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrField.inl
+++ b/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrField.inl
@@ -41,7 +41,7 @@ template <typename DataType>
 caf::PdmPtrField<DataType*>::~PdmPtrField()
 {
     if ( !m_fieldValue.isNull() ) m_fieldValue.rawPtr()->removeReferencingPtrField( this );
-    m_fieldValue.setRawPtr( NULL );
+    m_fieldValue.setRawPtr( nullptr );
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -54,7 +54,7 @@ void PdmPtrField<DataType*>::setValue( const DataTypePtr& fieldValue )
 
     if ( m_fieldValue ) m_fieldValue->removeReferencingPtrField( this );
     m_fieldValue = fieldValue;
-    if ( m_fieldValue != NULL ) m_fieldValue->addReferencingPtrField( this );
+    if ( m_fieldValue != nullptr ) m_fieldValue->addReferencingPtrField( this );
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -80,7 +80,7 @@ caf::PdmPtrField<DataType*>& PdmPtrField<DataType*>::operator=( const DataTypePt
 
     if ( m_fieldValue ) m_fieldValue->removeReferencingPtrField( this );
     m_fieldValue = fieldValue;
-    if ( m_fieldValue != NULL ) m_fieldValue->addReferencingPtrField( this );
+    if ( m_fieldValue != nullptr ) m_fieldValue->addReferencingPtrField( this );
 
     return *this;
 }
@@ -95,7 +95,7 @@ caf::PdmPtrField<DataType*>& PdmPtrField<DataType*>::operator=( const FieldDataT
 
     if ( m_fieldValue ) m_fieldValue->removeReferencingPtrField( this );
     m_fieldValue = fieldValue;
-    if ( m_fieldValue != NULL ) m_fieldValue->addReferencingPtrField( this );
+    if ( m_fieldValue != nullptr ) m_fieldValue->addReferencingPtrField( this );
 
     return *this;
 }
diff --git a/AppFwk/cafProjectDataModel/cafPdmCore/cafSignal.h b/AppFwk/cafProjectDataModel/cafPdmCore/cafSignal.h
index 2fd7e3b4..2801505d 100644
--- a/AppFwk/cafProjectDataModel/cafPdmCore/cafSignal.h
+++ b/AppFwk/cafProjectDataModel/cafPdmCore/cafSignal.h
@@ -112,7 +112,7 @@ class Signal : public AbstractSignal
         m_emitter->addEmittedSignal( this );
     }
 
-    virtual ~Signal()
+    ~Signal() override
     {
         for ( auto observerCallbackPair : m_observerCallbacks )
         {
diff --git a/AppFwk/cafProjectDataModel/cafPdmUiCore/cafInternalPdmUiFieldCapability.h b/AppFwk/cafProjectDataModel/cafPdmUiCore/cafInternalPdmUiFieldCapability.h
index 9a056a28..4afda680 100644
--- a/AppFwk/cafProjectDataModel/cafPdmUiCore/cafInternalPdmUiFieldCapability.h
+++ b/AppFwk/cafProjectDataModel/cafPdmUiCore/cafInternalPdmUiFieldCapability.h
@@ -80,7 +80,7 @@ class PdmFieldUiCap<PdmChildArrayField<DataType*>> : public PdmUiFieldHandle
 template <typename FieldType>
 void AddUiCapabilityToField( FieldType* field )
 {
-    if ( field->template capability<PdmFieldUiCap<FieldType>>() == NULL )
+    if ( field->template capability<PdmFieldUiCap<FieldType>>() == nullptr )
     {
         new PdmFieldUiCap<FieldType>( field, true );
     }
diff --git a/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiItem.h b/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiItem.h
index e8c6b063..1ca82886 100644
--- a/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiItem.h
+++ b/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiItem.h
@@ -120,7 +120,7 @@ class PdmOptionItemInfo
                        T                   aValue,
                        bool                isReadOnly                         = false,
                        const IconProvider& anIcon                             = IconProvider(),
-                       typename std::enable_if<std::is_enum<T>::value>::type* = 0 )
+                       typename std::enable_if<std::is_enum<T>::value>::type* = nullptr )
         : PdmOptionItemInfo( anOptionUiText, QVariant( static_cast<int>( aValue ) ), isReadOnly, anIcon )
     {
     }
diff --git a/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmXmlFieldCapability.h b/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmXmlFieldCapability.h
index 7c49c7d3..c62d5b0a 100644
--- a/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmXmlFieldCapability.h
+++ b/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmXmlFieldCapability.h
@@ -190,7 +190,7 @@ class PdmFieldXmlCap<PdmField<std::vector<DataType>>> : public PdmXmlFieldHandle
 template <typename FieldType>
 void AddXmlCapabilityToField( FieldType* field )
 {
-    if ( field->template capability<PdmFieldXmlCap<FieldType>>() == NULL )
+    if ( field->template capability<PdmFieldXmlCap<FieldType>>() == nullptr )
     {
         new PdmFieldXmlCap<FieldType>( field, true );
     }
diff --git a/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmXmlFieldCapability.inl b/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmXmlFieldCapability.inl
index a79b8853..448daee7 100644
--- a/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmXmlFieldCapability.inl
+++ b/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmXmlFieldCapability.inl
@@ -90,7 +90,7 @@ void caf::PdmFieldXmlCap<caf::PdmPtrField<DataType*>>::readFieldData( QXmlStream
 
     m_isResolved      = false;
     m_referenceString = dataString;
-    m_field->setRawPtr( NULL );
+    m_field->setRawPtr( nullptr );
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -205,7 +205,7 @@ bool caf::PdmFieldXmlCap<PdmPtrArrayField<DataType*>>::resolveReferences()
             foundValidObjectFromString = false;
         }
 
-        m_field->m_pointers.push_back( NULL );
+        m_field->m_pointers.push_back( nullptr );
         m_field->m_pointers.back().setRawPtr( objHandle );
     }
 
@@ -242,15 +242,15 @@ void caf::PdmFieldXmlCap<caf::PdmChildField<DataType*>>::readFieldData( QXmlStre
     }
 
     QString          className = xmlStream.name().toString();
-    PdmObjectHandle* obj       = NULL;
+    PdmObjectHandle* obj       = nullptr;
 
     // Create an object if needed
-    if ( m_field->value() == NULL )
+    if ( m_field->value() == nullptr )
     {
         CAF_ASSERT( objectFactory );
         obj = objectFactory->create( className );
 
-        if ( obj == NULL )
+        if ( obj == nullptr )
         {
             std::cout << "Line " << xmlStream.lineNumber()
                       << ": Warning: Unknown object type with class name: " << className.toLatin1().data()
@@ -317,7 +317,7 @@ void caf::PdmFieldXmlCap<caf::PdmChildField<DataType*>>::readFieldData( QXmlStre
 template <typename DataType>
 void caf::PdmFieldXmlCap<caf::PdmChildField<DataType*>>::writeFieldData( QXmlStreamWriter& xmlStream ) const
 {
-    if ( m_field->m_fieldValue.rawPtr() == NULL ) return;
+    if ( m_field->m_fieldValue.rawPtr() == nullptr ) return;
 
     PdmXmlObjectHandle* xmlObject = xmlObj( m_field->m_fieldValue.rawPtr() );
     if ( xmlObject )
@@ -352,7 +352,7 @@ void caf::PdmFieldXmlCap<caf::PdmChildArrayField<DataType*>>::writeFieldData( QX
     typename std::vector<PdmPointer<DataType>>::iterator it;
     for ( it = m_field->m_pointers.begin(); it != m_field->m_pointers.end(); ++it )
     {
-        if ( it->rawPtr() == NULL ) continue;
+        if ( it->rawPtr() == nullptr ) continue;
 
         PdmXmlObjectHandle* xmlObject = xmlObj( it->rawPtr() );
         if ( xmlObject )
@@ -382,7 +382,7 @@ void caf::PdmFieldXmlCap<caf::PdmChildArrayField<DataType*>>::readFieldData( QXm
         CAF_ASSERT( objectFactory );
         PdmObjectHandle* obj = objectFactory->create( className );
 
-        if ( obj == NULL )
+        if ( obj == nullptr )
         {
             // Warning: Unknown className read
             // Skip to corresponding end element
diff --git a/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/cafPdmXml_UnitTests.cpp b/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/cafPdmXml_UnitTests.cpp
index 6a2bd2ed..9243817a 100644
--- a/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/cafPdmXml_UnitTests.cpp
+++ b/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/cafPdmXml_UnitTests.cpp
@@ -35,8 +35,8 @@
 //##################################################################################################
 
 #include "gtest/gtest.h"
+#include <cstdio>
 #include <iostream>
-#include <stdio.h>
 #include <string>
 
 //--------------------------------------------------------------------------------------------------
diff --git a/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/gtest/gtest.h b/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/gtest/gtest.h
index df1441aa..d4eabe9f 100644
--- a/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/gtest/gtest.h
+++ b/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/gtest/gtest.h
@@ -343,11 +343,11 @@
 //                                        deprecated; calling a marked function
 //                                        should generate a compiler warning
 
-#include <ctype.h>   // for isspace, etc
-#include <stddef.h>  // for ptrdiff_t
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cctype>   // for isspace, etc
+#include <cstddef>  // for ptrdiff_t
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <memory>
 #include <type_traits>
 
@@ -2473,7 +2473,7 @@ const char* StringFromGTestEnv(const char* flag, const char* default_val);
 #endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
 
 #if GTEST_OS_LINUX
-# include <stdlib.h>
+# include <cstdlib>
 # include <sys/types.h>
 # include <sys/wait.h>
 # include <unistd.h>
@@ -2483,9 +2483,9 @@ const char* StringFromGTestEnv(const char* flag, const char* default_val);
 # include <stdexcept>
 #endif
 
-#include <ctype.h>
-#include <float.h>
-#include <string.h>
+#include <cctype>
+#include <cfloat>
+#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <map>
@@ -2801,7 +2801,7 @@ GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
 # include <mem.h>
 #endif
 
-#include <string.h>
+#include <cstring>
 #include <string>
 
 
@@ -9256,13 +9256,13 @@ class PolymorphicMatcher {
    public:
     explicit MonomorphicImpl(const Impl& impl) : impl_(impl) {}
 
-    virtual void DescribeTo(::std::ostream* os) const { impl_.DescribeTo(os); }
+    void DescribeTo(::std::ostream* os) const override { impl_.DescribeTo(os); }
 
-    virtual void DescribeNegationTo(::std::ostream* os) const {
+    void DescribeNegationTo(::std::ostream* os) const override {
       impl_.DescribeNegationTo(os);
     }
 
-    virtual bool MatchAndExplain(T x, MatchResultListener* listener) const {
+    bool MatchAndExplain(T x, MatchResultListener* listener) const override {
       return impl_.MatchAndExplain(x, listener);
     }
 
@@ -9531,7 +9531,7 @@ GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251 5046
 
 #endif  // GTEST_INCLUDE_GTEST_GTEST_MATCHERS_H_
 
-#include <stdio.h>
+#include <cstdio>
 #include <memory>
 
 namespace testing {
@@ -10312,7 +10312,7 @@ TEST_P(DerivedTest, DoesBlah) {
 #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
 #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
 
-#include <ctype.h>
+#include <cctype>
 
 #include <cassert>
 #include <iterator>
diff --git a/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/Child.h b/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/Child.h
index d6034cd0..1792bf7b 100644
--- a/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/Child.h
+++ b/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/Child.h
@@ -13,7 +13,7 @@ class Child : public caf::PdmObject
 public:
     Child();
 
-    ~Child();
+    ~Child() override;
 
     caf::PdmChildField<TestObj*> m_testObj;
 };
diff --git a/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/Parent.h b/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/Parent.h
index fc497754..ad20d5e6 100644
--- a/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/Parent.h
+++ b/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/Parent.h
@@ -42,7 +42,7 @@ class Parent : public caf::PdmObject
 
 public:
     Parent();
-    ~Parent();
+    ~Parent() override;
 
     void doSome();
 
diff --git a/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/TestObj.h b/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/TestObj.h
index 44b5ec9d..187e130f 100644
--- a/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/TestObj.h
+++ b/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/TestObj.h
@@ -11,7 +11,7 @@ class TestObj : public caf::PdmObject
 public:
     TestObj();
 
-    ~TestObj();
+    ~TestObj() override;
 
     caf::PdmField<double> m_position;
 };
diff --git a/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/cafProjectDataModel_UnitTests.cpp b/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/cafProjectDataModel_UnitTests.cpp
index 6a2bd2ed..9243817a 100644
--- a/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/cafProjectDataModel_UnitTests.cpp
+++ b/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/cafProjectDataModel_UnitTests.cpp
@@ -35,8 +35,8 @@
 //##################################################################################################
 
 #include "gtest/gtest.h"
+#include <cstdio>
 #include <iostream>
-#include <stdio.h>
 #include <string>
 
 //--------------------------------------------------------------------------------------------------
diff --git a/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/gtest/gtest.h b/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/gtest/gtest.h
index df1441aa..d4eabe9f 100644
--- a/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/gtest/gtest.h
+++ b/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/gtest/gtest.h
@@ -343,11 +343,11 @@
 //                                        deprecated; calling a marked function
 //                                        should generate a compiler warning
 
-#include <ctype.h>   // for isspace, etc
-#include <stddef.h>  // for ptrdiff_t
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cctype>   // for isspace, etc
+#include <cstddef>  // for ptrdiff_t
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <memory>
 #include <type_traits>
 
@@ -2473,7 +2473,7 @@ const char* StringFromGTestEnv(const char* flag, const char* default_val);
 #endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
 
 #if GTEST_OS_LINUX
-# include <stdlib.h>
+# include <cstdlib>
 # include <sys/types.h>
 # include <sys/wait.h>
 # include <unistd.h>
@@ -2483,9 +2483,9 @@ const char* StringFromGTestEnv(const char* flag, const char* default_val);
 # include <stdexcept>
 #endif
 
-#include <ctype.h>
-#include <float.h>
-#include <string.h>
+#include <cctype>
+#include <cfloat>
+#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <map>
@@ -2801,7 +2801,7 @@ GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
 # include <mem.h>
 #endif
 
-#include <string.h>
+#include <cstring>
 #include <string>
 
 
@@ -9256,13 +9256,13 @@ class PolymorphicMatcher {
    public:
     explicit MonomorphicImpl(const Impl& impl) : impl_(impl) {}
 
-    virtual void DescribeTo(::std::ostream* os) const { impl_.DescribeTo(os); }
+    void DescribeTo(::std::ostream* os) const override { impl_.DescribeTo(os); }
 
-    virtual void DescribeNegationTo(::std::ostream* os) const {
+    void DescribeNegationTo(::std::ostream* os) const override {
       impl_.DescribeNegationTo(os);
     }
 
-    virtual bool MatchAndExplain(T x, MatchResultListener* listener) const {
+    bool MatchAndExplain(T x, MatchResultListener* listener) const override {
       return impl_.MatchAndExplain(x, listener);
     }
 
@@ -9531,7 +9531,7 @@ GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251 5046
 
 #endif  // GTEST_INCLUDE_GTEST_GTEST_MATCHERS_H_
 
-#include <stdio.h>
+#include <cstdio>
 #include <memory>
 
 namespace testing {
@@ -10312,7 +10312,7 @@ TEST_P(DerivedTest, DoesBlah) {
 #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
 #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
 
-#include <ctype.h>
+#include <cctype>
 
 #include <cassert>
 #include <iterator>
diff --git a/AppFwk/cafTests/cafTestApplication/TamComboBox.h b/AppFwk/cafTests/cafTestApplication/TamComboBox.h
index 33b3296f..c08e6f7d 100644
--- a/AppFwk/cafTests/cafTestApplication/TamComboBox.h
+++ b/AppFwk/cafTests/cafTestApplication/TamComboBox.h
@@ -18,19 +18,19 @@ class TamComboBox : public caf::PdmObject
 public:
     TamComboBox();
 
-    virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions,
+    QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions,
                                                                 bool*                      useOptionsOnly) override;
 
-    virtual void
+    void
         fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
 
 private:
     caf::PdmField<QString> m_name;
 
 protected:
-    virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
+    void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
 
-    virtual void defineEditorAttribute(const caf::PdmFieldHandle* field,
+    void defineEditorAttribute(const caf::PdmFieldHandle* field,
                                        QString                    uiConfigName,
                                        caf::PdmUiEditorAttribute* attribute) override;
 
diff --git a/AppFwk/cafUserInterface/cafPdmUiLineEditor.h b/AppFwk/cafUserInterface/cafPdmUiLineEditor.h
index 229f8315..30f96b3a 100644
--- a/AppFwk/cafUserInterface/cafPdmUiLineEditor.h
+++ b/AppFwk/cafUserInterface/cafPdmUiLineEditor.h
@@ -131,7 +131,7 @@ class PdmUiLineEditor : public PdmUiFieldEditorHandle
     void     configureAndUpdateUi( const QString& uiConfigName ) override;
     QMargins calculateLabelContentMargins() const override;
 
-    virtual bool eventFilter( QObject* watched, QEvent* event ) override;
+    bool eventFilter( QObject* watched, QEvent* event ) override;
 
 protected slots:
     void slotEditingFinished();
diff --git a/AppFwk/cafUserInterface/cafPdmUiPropertyView.h b/AppFwk/cafUserInterface/cafPdmUiPropertyView.h
index ed8b1fb7..758a3ef6 100644
--- a/AppFwk/cafUserInterface/cafPdmUiPropertyView.h
+++ b/AppFwk/cafUserInterface/cafPdmUiPropertyView.h
@@ -53,8 +53,8 @@ class QVerticalScrollArea : public QScrollArea
 public:
     explicit QVerticalScrollArea( QWidget* parent = nullptr );
 
-    virtual QSize sizeHint() const override;
-    virtual QSize minimumSizeHint() const override;
+    QSize sizeHint() const override;
+    QSize minimumSizeHint() const override;
 };
 
 namespace caf
diff --git a/AppFwk/cafUserInterface/cafUserInterface_UnitTests/cafUserInterface_UnitTests.cpp b/AppFwk/cafUserInterface/cafUserInterface_UnitTests/cafUserInterface_UnitTests.cpp
index 62a81562..a316ed3e 100644
--- a/AppFwk/cafUserInterface/cafUserInterface_UnitTests/cafUserInterface_UnitTests.cpp
+++ b/AppFwk/cafUserInterface/cafUserInterface_UnitTests/cafUserInterface_UnitTests.cpp
@@ -35,8 +35,8 @@
 //##################################################################################################
 
 #include "gtest/gtest.h"
+#include <cstdio>
 #include <iostream>
-#include <stdio.h>
 #include <string>
 
 #include <QApplication>
diff --git a/AppFwk/cafUserInterface/cafUserInterface_UnitTests/gtest/gtest.h b/AppFwk/cafUserInterface/cafUserInterface_UnitTests/gtest/gtest.h
index df1441aa..d4eabe9f 100644
--- a/AppFwk/cafUserInterface/cafUserInterface_UnitTests/gtest/gtest.h
+++ b/AppFwk/cafUserInterface/cafUserInterface_UnitTests/gtest/gtest.h
@@ -343,11 +343,11 @@
 //                                        deprecated; calling a marked function
 //                                        should generate a compiler warning
 
-#include <ctype.h>   // for isspace, etc
-#include <stddef.h>  // for ptrdiff_t
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cctype>   // for isspace, etc
+#include <cstddef>  // for ptrdiff_t
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <memory>
 #include <type_traits>
 
@@ -2473,7 +2473,7 @@ const char* StringFromGTestEnv(const char* flag, const char* default_val);
 #endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
 
 #if GTEST_OS_LINUX
-# include <stdlib.h>
+# include <cstdlib>
 # include <sys/types.h>
 # include <sys/wait.h>
 # include <unistd.h>
@@ -2483,9 +2483,9 @@ const char* StringFromGTestEnv(const char* flag, const char* default_val);
 # include <stdexcept>
 #endif
 
-#include <ctype.h>
-#include <float.h>
-#include <string.h>
+#include <cctype>
+#include <cfloat>
+#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <map>
@@ -2801,7 +2801,7 @@ GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
 # include <mem.h>
 #endif
 
-#include <string.h>
+#include <cstring>
 #include <string>
 
 
@@ -9256,13 +9256,13 @@ class PolymorphicMatcher {
    public:
     explicit MonomorphicImpl(const Impl& impl) : impl_(impl) {}
 
-    virtual void DescribeTo(::std::ostream* os) const { impl_.DescribeTo(os); }
+    void DescribeTo(::std::ostream* os) const override { impl_.DescribeTo(os); }
 
-    virtual void DescribeNegationTo(::std::ostream* os) const {
+    void DescribeNegationTo(::std::ostream* os) const override {
       impl_.DescribeNegationTo(os);
     }
 
-    virtual bool MatchAndExplain(T x, MatchResultListener* listener) const {
+    bool MatchAndExplain(T x, MatchResultListener* listener) const override {
       return impl_.MatchAndExplain(x, listener);
     }
 
@@ -9531,7 +9531,7 @@ GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251 5046
 
 #endif  // GTEST_INCLUDE_GTEST_GTEST_MATCHERS_H_
 
-#include <stdio.h>
+#include <cstdio>
 #include <memory>
 
 namespace testing {
@@ -10312,7 +10312,7 @@ TEST_P(DerivedTest, DoesBlah) {
 #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
 #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
 
-#include <ctype.h>
+#include <cctype>
 
 #include <cassert>
 #include <iterator>
diff --git a/VizFwk/LibCore/cvfBase.h b/VizFwk/LibCore/cvfBase.h
index 6b6e8bf6..b7b971d8 100644
--- a/VizFwk/LibCore/cvfBase.h
+++ b/VizFwk/LibCore/cvfBase.h
@@ -83,7 +83,7 @@
 
 #if defined(CVF_LINUX) || defined(CVF_IOS) || defined(CVF_OSX) || defined(CVF_ANDROID)
 // Used by int64_t on *nix below
-#include <stdint.h>     
+#include <cstdint>     
 #endif
 
 // Brings in size_t and definition of NULL
diff --git a/VizFwk/LibCore/cvfMatrix3.h b/VizFwk/LibCore/cvfMatrix3.h
index 06162d8d..d0339418 100644
--- a/VizFwk/LibCore/cvfMatrix3.h
+++ b/VizFwk/LibCore/cvfMatrix3.h
@@ -79,7 +79,7 @@ class Matrix3
     inline S            operator()(int row, int col) const;
 
     bool                invert();
-    const Matrix3       getInverted(bool* pInvertible = NULL) const;
+    const Matrix3       getInverted(bool* pInvertible = nullptr) const;
     S                   determinant() const;
     void                transpose();
 
diff --git a/VizFwk/LibCore/cvfMatrix4.h b/VizFwk/LibCore/cvfMatrix4.h
index 9e20dcc8..8d06e6e6 100644
--- a/VizFwk/LibCore/cvfMatrix4.h
+++ b/VizFwk/LibCore/cvfMatrix4.h
@@ -100,7 +100,7 @@ class Matrix4
     void                translatePostMultiply(const Vector3<S>& trans);
 
     bool                invert();
-    const Matrix4       getInverted(bool* pInvertible = NULL) const;
+    const Matrix4       getInverted(bool* pInvertible = nullptr) const;
     S                   determinant() const;
     void                transpose();
     const Matrix4       getTransposed() const;
diff --git a/VizFwk/LibCore/cvfVector2.h b/VizFwk/LibCore/cvfVector2.h
index 78d32293..736e2339 100644
--- a/VizFwk/LibCore/cvfVector2.h
+++ b/VizFwk/LibCore/cvfVector2.h
@@ -102,7 +102,7 @@ class Vector2
     inline bool     isUndefined() const;
 
     bool            normalize();
-    const Vector2   getNormalized(bool* normalizationOK = NULL) const;
+    const Vector2   getNormalized(bool* normalizationOK = nullptr) const;
 
     inline S        length() const;
     inline S        lengthSquared() const;
diff --git a/VizFwk/LibCore/cvfVector3.h b/VizFwk/LibCore/cvfVector3.h
index 762c9461..a728ae7a 100644
--- a/VizFwk/LibCore/cvfVector3.h
+++ b/VizFwk/LibCore/cvfVector3.h
@@ -115,7 +115,7 @@ class Vector3
     inline bool     isUndefined() const;
 
     bool            normalize();
-    const Vector3   getNormalized(bool* normalizationOK = NULL) const;
+    const Vector3   getNormalized(bool* normalizationOK = nullptr) const;
 
     inline S        length() const;
     inline S        lengthSquared() const;
@@ -133,7 +133,7 @@ class Vector3
     const Vector3   getTransformedVector(const Matrix3<S>& m) const;
 
     bool            createOrthonormalBasis(int mapToAxis, Vector3<S>* uAxis, Vector3<S>* vAxis, Vector3<S>* wAxis) const;
-    const Vector3   perpendicularVector(bool* perpendicularOK = NULL) const;
+    const Vector3   perpendicularVector(bool* perpendicularOK = nullptr) const;
 
 public:
     static const Vector3 X_AXIS;    ///< X axis vector <1, 0, 0>
diff --git a/VizFwk/LibCore/cvfVector4.h b/VizFwk/LibCore/cvfVector4.h
index 35f15862..94a0c0fc 100644
--- a/VizFwk/LibCore/cvfVector4.h
+++ b/VizFwk/LibCore/cvfVector4.h
@@ -105,7 +105,7 @@ class Vector4
     inline bool     isZero() const;
 
     bool            normalize();
-    const Vector4   getNormalized(bool* normalizationOK = NULL) const;
+    const Vector4   getNormalized(bool* normalizationOK = nullptr) const;
 
     inline S        length() const;
     inline S        lengthSquared() const;