4 files changed, 7 insertions, 7 deletions
diff --git a/include/llvm/Analysis/AliasSetTracker.h b/include/llvm/Analysis/AliasSetTracker.h
index fe3e60c62b..91c822b503 100644
--- a/include/llvm/Analysis/AliasSetTracker.h
+++ b/include/llvm/Analysis/AliasSetTracker.h
@@ -34,7 +34,7 @@ class AliasSet;
 class AliasSet {
   friend class AliasSetTracker;
 
-  struct PointerRec;
+  class PointerRec;
   typedef std::pair<Value* const, PointerRec> HashNodePair;
 
   class PointerRec {
@@ -116,7 +116,7 @@ class AliasSet {
   // Volatile - True if this alias set contains volatile loads or stores.
   bool Volatile : 1;
 
-  friend class ilist_traits<AliasSet>;
+  friend struct ilist_traits<AliasSet>;
   AliasSet *getPrev() const { return Prev; }
   AliasSet *getNext() const { return Next; }
   void setPrev(AliasSet *P) { Prev = P; }
diff --git a/include/llvm/Analysis/DataStructure/DSNode.h b/include/llvm/Analysis/DataStructure/DSNode.h
index 27ae67ee1d..3cdc0a6420 100644
--- a/include/llvm/Analysis/DataStructure/DSNode.h
+++ b/include/llvm/Analysis/DataStructure/DSNode.h
@@ -47,7 +47,7 @@ class DSNode {
   /// doubly-linked ilist in the DSGraph.
   ///
   DSNode *Next, *Prev;
-  friend class ilist_traits<DSNode>;
+  friend struct ilist_traits<DSNode>;
 
   /// Size - The current size of the node.  This should be equal to the size of
   /// the current type record.
diff --git a/include/llvm/Analysis/Dominators.h b/include/llvm/Analysis/Dominators.h
index 11d4b98cdd..c1cdae50f2 100644
--- a/include/llvm/Analysis/Dominators.h
+++ b/include/llvm/Analysis/Dominators.h
@@ -287,9 +287,9 @@ protected:
   Node *RootNode;
 public:
   class Node {
-    friend class DominatorTree;
-    friend class PostDominatorTree;
-    friend class DominatorTreeBase;
+    friend struct DominatorTree;
+    friend struct PostDominatorTree;
+    friend struct DominatorTreeBase;
     BasicBlock *TheBB;
     Node *IDom;
     std::vector<Node*> Children;
diff --git a/include/llvm/Analysis/LoopInfo.h b/include/llvm/Analysis/LoopInfo.h
index c5eec83428..32351ea55c 100644
--- a/include/llvm/Analysis/LoopInfo.h
+++ b/include/llvm/Analysis/LoopInfo.h
@@ -35,7 +35,7 @@
 
 namespace llvm {
 
-class DominatorSet;
+struct DominatorSet;
 class LoopInfo;
 class PHINode;
 class Instruction;