118 files changed, 470 insertions, 196 deletions

diff --git a/include/clang/Analysis/DomainSpecific/CocoaConventions.h b/include/clang/Analysis/DomainSpecific/CocoaConventions.h
index 81b71a7bdc..0212cbfb8b 100644
--- a/include/clang/Analysis/DomainSpecific/CocoaConventions.h
+++ b/include/clang/Analysis/DomainSpecific/CocoaConventions.h
@@ -17,6 +17,7 @@
 #include "clang/AST/Type.h"
 
 namespace clang {
+namespace GR {
 namespace cocoa {
  
   enum NamingConvention { NoConvention, CreateRule, InitRule };
@@ -34,6 +35,6 @@ namespace cocoa {
   
   bool isCocoaObjectRef(QualType T);
 
-}}
+}}}
 
 #endif
diff --git a/include/clang/GR/AnalysisConsumer.h b/include/clang/GR/AnalysisConsumer.h
index c236766f0a..805638867f 100644
--- a/include/clang/GR/AnalysisConsumer.h
+++ b/include/clang/GR/AnalysisConsumer.h
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_CHECKER_ANALYSISCONSUMER_H
-#define LLVM_CLANG_CHECKER_ANALYSISCONSUMER_H
+#ifndef LLVM_CLANG_GR_ANALYSISCONSUMER_H
+#define LLVM_CLANG_GR_ANALYSISCONSUMER_H
 
 #include <string>
 
@@ -23,6 +23,8 @@ class AnalyzerOptions;
 class ASTConsumer;
 class Preprocessor;
 
+namespace GR {
+
 /// CreateAnalysisConsumer - Creates an ASTConsumer to run various code
 /// analysis passes.  (The set of analyses run is controlled by command-line
 /// options.)
@@ -30,6 +32,8 @@ ASTConsumer* CreateAnalysisConsumer(const Preprocessor &pp,
                                     const std::string &output,
                                     const AnalyzerOptions& Opts);
 
-}
+} // end GR namespace
+
+} // end clang namespace
 
 #endif
diff --git a/include/clang/GR/BugReporter/BugReporter.h b/include/clang/GR/BugReporter/BugReporter.h
index 0b23ae61e8..b0afc5fe7a 100644
--- a/include/clang/GR/BugReporter/BugReporter.h
+++ b/include/clang/GR/BugReporter/BugReporter.h
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_BUGREPORTER
-#define LLVM_CLANG_ANALYSIS_BUGREPORTER
+#ifndef LLVM_CLANG_GR_BUGREPORTER
+#define LLVM_CLANG_GR_BUGREPORTER
 
 #include "clang/Basic/SourceLocation.h"
 #include "clang/GR/PathSensitive/GRState.h"
@@ -25,20 +25,23 @@
 
 namespace clang {
 
+class ASTContext;
+class Diagnostic;
+class Stmt;
+class ParentMap;
+
+namespace GR {
+
 class PathDiagnostic;
 class PathDiagnosticPiece;
 class PathDiagnosticClient;
-class ASTContext;
-class Diagnostic;
 class ExplodedNode;
 class ExplodedGraph;
 class BugReporter;
 class BugReporterContext;
 class GRExprEngine;
 class GRState;
-class Stmt;
 class BugType;
-class ParentMap;
 
 //===----------------------------------------------------------------------===//
 // Interface for individual bug reports.
@@ -476,6 +479,8 @@ void registerVarDeclsLastStore(BugReporterContext &BRC, const void *stmt,
 
 //===----------------------------------------------------------------------===//
 
+} // end GR namespace
+
 } // end clang namespace
 
 #endif
diff --git a/include/clang/GR/BugReporter/BugType.h b/include/clang/GR/BugReporter/BugType.h
index 8d105bfc61..0ed03c5488 100644
--- a/include/clang/GR/BugReporter/BugType.h
+++ b/