diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index a287ad613..546aabe92 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1283,14 +1283,14 @@ void cmGlobalGenerator::FillLocalGeneratorToTargetMap()
           clg = clg->GetParent())
         {
         // This local generator includes the target.
-        std::set<cmTarget const*>& targetSet =
+        std::set<cmTarget*>& targetSet =
           this->LocalGeneratorToTargetMap[clg];
         targetSet.insert(&target);
 
         // Add dependencies of the included target.  An excluded
         // target may still be included if it is a dependency of a
         // non-excluded target.
-        TargetDependSet const& tgtdeps = this->GetTargetDirectDepends(target);
+        TargetDependSet & tgtdeps = this->GetTargetDirectDepends(target);
         for(TargetDependSet::const_iterator ti = tgtdeps.begin();
             ti != tgtdeps.end(); ++ti)
           {
@@ -1682,14 +1682,14 @@ void cmGlobalGenerator::AppendDirectoryForConfig(const char*, const char*,
 }
 
 //----------------------------------------------------------------------------
-cmGlobalGenerator::TargetDependSet const&
-cmGlobalGenerator::GetTargetDirectDepends(cmTarget const& target)
+cmGlobalGenerator::TargetDependSet &
+cmGlobalGenerator::GetTargetDirectDepends(cmTarget & target)
 {
   // Clarify the role of the input target.
-  cmTarget const* depender = &target;
+  cmTarget * depender = &target;
 
   // if the depends are already in the map then return
-  TargetDependMap::const_iterator tgtI =
+  TargetDependMap::iterator tgtI =
     this->TargetDependencies.find(depender);
   if(tgtI != this->TargetDependencies.end())
     {
@@ -1737,12 +1737,12 @@ cmGlobalGenerator::GetTargetDirectDepends(cmTarget const& target)
 
 //----------------------------------------------------------------------------
 bool
-cmGlobalGenerator::ConsiderTargetDepends(cmTarget const* depender,
+cmGlobalGenerator::ConsiderTargetDepends(cmTarget * depender,
                                          TargetDependSet& depender_depends,
                                          const char* dependee_name)
 {
   // Check the target's makefile first.
-  cmTarget const* dependee =
+  cmTarget * dependee =
     depender->GetMakefile()->FindTarget(dependee_name);
 
   // Then search globally.
@@ -1758,7 +1758,7 @@ cmGlobalGenerator::ConsiderTargetDepends(cmTarget const* depender,
     }
 
   // Check whether the depender is among the dependee's dependencies.
-  std::vector<cmTarget const*> steps;
+  std::vector<cmTarget *> steps;
   if(this->FindDependency(depender, dependee, steps))
     {
     // This creates a cyclic dependency.
@@ -1769,7 +1769,7 @@ cmGlobalGenerator::ConsiderTargetDepends(cmTarget const* depender,
     for(unsigned int i = static_cast<unsigned int>(steps.size());
         i > 0; --i)
       {
-      cmTarget const* step = steps[i-1];
+      cmTarget * step = steps[i-1];
       e << "    -> " << step->GetName() << "\n";
       isStatic = isStatic && step->GetType() == cmTarget::STATIC_LIBRARY;
       }
@@ -1799,21 +1799,21 @@ cmGlobalGenerator::ConsiderTargetDepends(cmTarget const* depender,
 //----------------------------------------------------------------------------
 bool
 cmGlobalGenerator
-::FindDependency(cmTarget const* goal, cmTarget const* current,
-                 std::vector<cmTarget const*>& steps)
+::FindDependency(cmTarget * goal, cmTarget * current,
+                 std::vector<cmTarget*>& steps)
 {
   if(current == goal)
     {
     steps.push_back(current);
     return true;
     }
-  TargetDependMap::const_iterator i = this->TargetDependencies.find(current);
+  TargetDependMap::iterator i = this->TargetDependencies.find(current);
   if(i == this->TargetDependencies.end())
     {
     return false;
     }
-  TargetDependSet const& depends = i->second;
-  for(TargetDependSet::const_iterator j = depends.begin();
+  TargetDependSet & depends = i->second;
+  for(TargetDependSet::iterator j = depends.begin();
       j != depends.end(); ++j)
     {
     if(this->FindDependency(goal, *j, steps))
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index b40b5d83a..bd5a8ee6d 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -232,11 +232,11 @@ public:
   virtual const char* GetCleanTargetName()        { return 0; }
 
   // Class to track a set of dependencies.
-  class TargetDependSet: public std::set<cmTarget const*> {};
+  class TargetDependSet: public std::set<cmTarget*> {};
 
   // what targets does the specified target depend on directly
   // via a target_link_libraries or add_dependencies
-  TargetDependSet const& GetTargetDirectDepends(cmTarget const& target);
+  TargetDependSet & GetTargetDirectDepends(cmTarget & target);
 
   const std::map<cmStdString, std::vector<cmLocalGenerator*> >& GetProjectMap()
                                                const {return this->ProjectMap;}
@@ -281,7 +281,7 @@ protected:
   cmLocalGenerator* CurrentLocalGenerator;
   // map from project name to vector of local generators in that project
   std::map<cmStdString, std::vector<cmLocalGenerator*> > ProjectMap;
-  std::map<cmLocalGenerator*, std::set<cmTarget const*> >
+  std::map<cmLocalGenerator*, std::set<cmTarget *> >
   LocalGeneratorToTargetMap;
 
   // Set of named installation components requested by the project.
@@ -314,12 +314,12 @@ private:
   std::vector<std::string> FilesReplacedDuringGenerate;
 
   // Track inter-target dependencies.
-  bool ConsiderTargetDepends(cmTarget const* depender,
+  bool ConsiderTargetDepends(cmTarget * depender,
                              TargetDependSet& depender_depends,
                              const char* dependee_name);
-  bool FindDependency(cmTarget const* goal, cmTarget const* current,
-                      std::vector<cmTarget const*>& steps);
-  typedef std::map<cmTarget const*, TargetDependSet> TargetDependMap;
+  bool FindDependency(cmTarget * goal, cmTarget * current,
+                      std::vector<cmTarget *>& steps);
+  typedef std::map<cmTarget *, TargetDependSet> TargetDependMap;
   TargetDependMap TargetDependencies;
 
   // Cache directory content and target files to be built.
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 746ddfa05..08adf0e7b 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -848,7 +848,7 @@ cmGlobalUnixMakefileGenerator3
 
 //----------------------------------------------------------------------------
 int cmGlobalUnixMakefileGenerator3
-::GetTargetTotalNumberOfActions(cmTarget const& target,
+::GetTargetTotalNumberOfActions(cmTarget & target,
                                 std::set<cmStdString> &emitted)
 {
   // do not double count
@@ -861,9 +861,9 @@ int cmGlobalUnixMakefileGenerator3
       (target.GetMakefile()->GetLocalGenerator());
     result = static_cast<int>(lg->ProgressFiles[target.GetName()].size());
     
-    TargetDependSet const& depends = this->GetTargetDirectDepends(target);
+    TargetDependSet & depends = this->GetTargetDirectDepends(target);
     
-    TargetDependSet::const_iterator i;
+    TargetDependSet::iterator i;
     for (i = depends.begin(); i != depends.end(); ++i)
       {
       result += this->GetTargetTotalNumberOfActions(**i, emitted);
@@ -877,11 +877,11 @@ unsigned long cmGlobalUnixMakefileGenerator3
 ::GetNumberOfProgressActionsInAll(cmLocalUnixMakefileGenerator3 *lg)
 {
   unsigned long result = 0;
-  std::set<cmTarget const*>& targets = this->LocalGeneratorToTargetMap[lg];
-  for(std::set<cmTarget const*>::iterator t = targets.begin();
+  std::set<cmTarget *>& targets = this->LocalGeneratorToTargetMap[lg];
+  for(std::set<cmTarget *>::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    cmTarget const* target = *t;
+    cmTarget * target = *t;
     cmLocalUnixMakefileGenerator3 *lg3 =
       static_cast<cmLocalUnixMakefileGenerator3 *>
       (target->GetMakefile()->GetLocalGenerator());
diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h
index 49c4689d8..4a6421ea5 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@ -114,7 +114,7 @@ public:
    const char* config, bool ignoreErrors, bool fast);
 
   // returns some progress informaiton
-  int GetTargetTotalNumberOfActions(cmTarget const& target,
+  int GetTargetTotalNumberOfActions(cmTarget & target,
                                     std::set<cmStdString> &emitted);
   unsigned long GetNumberOfProgressActionsInAll
   (cmLocalUnixMakefileGenerator3 *lg);