diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index 86d238affd..c3e061bc2c 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -25,7 +25,7 @@ static std::string const kBUILDSYSTEM_TARGETS = "BUILDSYSTEM_TARGETS";
 static std::string const kSOURCE_DIR = "SOURCE_DIR";
 static std::string const kSUBDIRECTORIES = "SUBDIRECTORIES";
 
-struct cmState::SnapshotDataType
+struct cmStateDetail::SnapshotDataType
 {
   cmState::PositionType ScopeParent;
   cmState::PositionType DirectoryParent;
diff --git a/Source/cmState.h b/Source/cmState.h
index 24db08cfff..d733469a6d 100644
--- a/Source/cmState.h
+++ b/Source/cmState.h
@@ -25,15 +25,16 @@ class cmPropertyDefinition;
 
 namespace cmStateDetail {
 struct BuildsystemDirectoryStateType;
+struct SnapshotDataType;
 }
 
 class cmState
 {
-  struct SnapshotDataType;
   struct PolicyStackEntry;
-  typedef cmLinkedTree<SnapshotDataType>::iterator PositionType;
+  typedef cmLinkedTree<cmStateDetail::SnapshotDataType>::iterator PositionType;
   friend class Snapshot;
   friend struct cmStateDetail::BuildsystemDirectoryStateType;
+  friend struct cmStateDetail::SnapshotDataType;
 
 public:
   cmState();
@@ -341,7 +342,7 @@ private:
   cmLinkedTree<std::string> ExecutionListFiles;
 
   cmLinkedTree<PolicyStackEntry> PolicyStack;
-  cmLinkedTree<SnapshotDataType> SnapshotData;
+  cmLinkedTree<cmStateDetail::SnapshotDataType> SnapshotData;
   cmLinkedTree<cmDefinitions> VarTree;
 
   std::string SourceDirectory;