diff --git a/Source/cmGetPropertyCommand.cxx b/Source/cmGetPropertyCommand.cxx
index 3aef9cf9e0..8063328f10 100644
--- a/Source/cmGetPropertyCommand.cxx
+++ b/Source/cmGetPropertyCommand.cxx
@@ -253,7 +253,7 @@ bool cmGetPropertyCommand::HandleTargetMode()
       if (this->Makefile->IsAlias(this->Name)) {
         return this->StoreResult(target->GetName().c_str());
       }
-      return this->StoreResult(NULL);
+      return this->StoreResult(CM_NULLPTR);
     }
     return this->StoreResult(
       target->GetProperty(this->PropertyName, this->Makefile));
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
index f55fefba97..845036036e 100644
--- a/Source/cmInstallCommand.cxx
+++ b/Source/cmInstallCommand.cxx
@@ -1118,7 +1118,7 @@ bool cmInstallCommand::HandleExportAndroidMKMode(
   cmCAEnabler exportOld(&ica.Parser, "EXPORT_LINK_INTERFACE_LIBRARIES",
                         &ica.ArgumentGroup);
   cmCAString filename(&ica.Parser, "FILE", &ica.ArgumentGroup);
-  exp.Follows(0);
+  exp.Follows(CM_NULLPTR);
 
   ica.ArgumentGroup.Follows(&exp);
   std::vector<std::string> unknownArgs;
diff --git a/Source/cm_auto_ptr.hxx b/Source/cm_auto_ptr.hxx
index 2cd35c3301..f6c43624f8 100644
--- a/Source/cm_auto_ptr.hxx
+++ b/Source/cm_auto_ptr.hxx
@@ -12,7 +12,7 @@
 #ifndef CM_AUTO_PTR_HXX
 #define CM_AUTO_PTR_HXX
 
-#include <cmsys/Configure.hxx>
+#include <cmConfigure.h>
 
 // FIXME: Use std::auto_ptr on compilers that do not warn about it.
 #define CM_AUTO_PTR cm::auto_ptr
@@ -115,7 +115,7 @@ public:
    *
    *   auto_ptr<X> ptr(new X());
    */
-  explicit auto_ptr(X* p = 0) throw()
+  explicit auto_ptr(X* p = CM_NULLPTR) throw()
     : x_(p)
   {
   }
@@ -157,7 +157,7 @@ public:
   X* release() throw()
   {
     X* x = this->x_;
-    this->x_ = 0;
+    this->x_ = CM_NULLPTR;
     return x;
   }