4 files changed, 9 insertions, 13 deletions

diff --git a/clang/lib/Index/Analyzer.cpp b/clang/lib/Index/Analyzer.cpp
index 300a4692205..fb3529d5405 100644
--- a/clang/lib/Index/Analyzer.cpp
+++ b/clang/lib/Index/Analyzer.cpp
@@ -23,7 +23,6 @@
 #include "clang/AST/DeclObjC.h"
 #include "clang/AST/ExprObjC.h"
 #include "llvm/ADT/SmallSet.h"
-#include "llvm/Support/Compiler.h"
 using namespace clang;
 using namespace idx;
 
@@ -33,7 +32,7 @@ namespace  {
 // DeclEntityAnalyzer Implementation
 //===----------------------------------------------------------------------===//
 
-class VISIBILITY_HIDDEN DeclEntityAnalyzer : public TranslationUnitHandler {
+class DeclEntityAnalyzer : public TranslationUnitHandler {
   Entity Ent;
   TULocationHandler &TULocHandler;
 
@@ -57,7 +56,7 @@ public:
 // RefEntityAnalyzer Implementation
 //===----------------------------------------------------------------------===//
 
-class VISIBILITY_HIDDEN RefEntityAnalyzer : public TranslationUnitHandler {
+class RefEntityAnalyzer : public TranslationUnitHandler {
   Entity Ent;
   TULocationHandler &TULocHandler;
 
@@ -87,7 +86,7 @@ public:
 
 /// \brief Accepts an ObjC method and finds all message expressions that this
 /// method may respond to.
-class VISIBILITY_HIDDEN RefSelectorAnalyzer : public TranslationUnitHandler {
+class RefSelectorAnalyzer : public TranslationUnitHandler {
   Program &Prog;
   TULocationHandler &TULocHandler;
 
@@ -219,7 +218,7 @@ public:
 
 /// \brief Accepts an ObjC message expression and finds all methods that may
 /// respond to it.
-class VISIBILITY_HIDDEN MessageAnalyzer : public TranslationUnitHandler {
+class MessageAnalyzer : public TranslationUnitHandler {
   Program &Prog;
   TULocationHandler &TULocHandler;
 
diff --git a/clang/lib/Index/DeclReferenceMap.cpp b/clang/lib/Index/DeclReferenceMap.cpp
index 366cf1b1083..d6e30ab3965 100644
--- a/clang/lib/Index/DeclReferenceMap.cpp
+++ b/clang/lib/Index/DeclReferenceMap.cpp
@@ -15,13 +15,12 @@
 #include "clang/Index/DeclReferenceMap.h"
 #include "clang/Index/ASTLocation.h"
 #include "ASTVisitor.h"
-#include "llvm/Support/Compiler.h"
 using namespace clang;
 using namespace idx;
 
 namespace {
 
-class VISIBILITY_HIDDEN RefMapper : public ASTVisitor<RefMapper> {
+class RefMapper : public ASTVisitor<RefMapper> {
   DeclReferenceMap::MapTy &Map;
 
 public:
diff --git a/clang/lib/Index/ResolveLocation.cpp b/clang/lib/Index/ResolveLocation.cpp
index ed905f364f0..c7379f7a835 100644
--- a/clang/lib/Index/ResolveLocation.cpp
+++ b/clang/lib/Index/ResolveLocation.cpp
@@ -19,14 +19,13 @@
 #include "clang/AST/StmtVisitor.h"
 #include "clang/Lex/Lexer.h"
 #include "clang/Basic/SourceManager.h"
-#include "llvm/Support/Compiler.h"
 using namespace clang;
 using namespace idx;
 
 namespace {
 
 /// \brief Base for the LocResolver classes. Mostly does source range checking.
-class VISIBILITY_HIDDEN LocResolverBase {
+class LocResolverBase {
 protected:
   ASTContext &Ctx;
   SourceLocation Loc;
@@ -83,7 +82,7 @@ public:
 
 /// \brief Searches a statement for the ASTLocation that corresponds to a source
 /// location.
-class VISIBILITY_HIDDEN StmtLocResolver : public LocResolverBase,
+class StmtLocResolver : public LocResolverBase,
                                           public StmtVisitor<StmtLocResolver,
                                                              ASTLocation     > {
   Decl * const Parent;
@@ -100,7 +99,7 @@ public:
 
 /// \brief Searches a declaration for the ASTLocation that corresponds to a
 /// source location.
-class VISIBILITY_HIDDEN DeclLocResolver : public LocResolverBase,
+class DeclLocResolver : public LocResolverBase,
                                           public DeclVisitor<DeclLocResolver,
                                                              ASTLocation     > {
 public:
diff --git a/clang/lib/Index/SelectorMap.cpp b/clang/lib/Index/SelectorMap.cpp
index 325b3711e80..0f11e31a0de 100644
--- a/clang/lib/Index/SelectorMap.cpp
+++ b/clang/lib/Index/SelectorMap.cpp
@@ -14,13 +14,12 @@
 
 #include "clang/Index/SelectorMap.h"
 #include "ASTVisitor.h"
-#include "llvm/Support/Compiler.h"
 using namespace clang;
 using namespace idx;
 
 namespace {
 
-class VISIBILITY_HIDDEN SelMapper : public ASTVisitor<SelMapper> {
+class SelMapper : public ASTVisitor<SelMapper> {
   SelectorMap::SelMethMapTy &SelMethMap;
   SelectorMap::SelRefMapTy &SelRefMap;