10 files changed, 15 insertions, 11 deletions
diff --git a/include/llvm/ADT/FoldingSet.h b/include/llvm/ADT/FoldingSet.h
index 1a9407108f..e99cf6fb3d 100644
--- a/include/llvm/ADT/FoldingSet.h
+++ b/include/llvm/ADT/FoldingSet.h
@@ -16,7 +16,9 @@
 #ifndef LLVM_ADT_FOLDINGSET_H
 #define LLVM_ADT_FOLDINGSET_H
 
+#include "llvm/Support/DataTypes.h"
 #include "llvm/ADT/SmallVector.h"
+#include <string>
 
 namespace llvm {
 
diff --git a/include/llvm/Analysis/Dominators.h b/include/llvm/Analysis/Dominators.h
index 7cf825638d..939300f8ac 100644
--- a/include/llvm/Analysis/Dominators.h
+++ b/include/llvm/Analysis/Dominators.h
@@ -304,9 +304,9 @@ protected:
   Node *RootNode;
 public:
   class Node {
-    friend struct DominatorTree;
+    friend class DominatorTree;
     friend struct PostDominatorTree;
-    friend struct DominatorTreeBase;
+    friend class DominatorTreeBase;
     BasicBlock *TheBB;
     Node *IDom;
     std::vector<Node*> Children;
diff --git a/include/llvm/Analysis/LoopInfo.h b/include/llvm/Analysis/LoopInfo.h
index b2bdde07d5..2f3fc47b97 100644
--- a/include/llvm/Analysis/LoopInfo.h
+++ b/include/llvm/Analysis/LoopInfo.h
@@ -35,7 +35,7 @@
 
 namespace llvm {
 
-struct ETForest;
+class ETForest;
 class LoopInfo;
 class PHINode;
 class Instruction;
diff --git a/include/llvm/Bytecode/Archive.h b/include/llvm/Bytecode/Archive.h
index 72942423cc..59d825a722 100644
--- a/include/llvm/Bytecode/Archive.h
+++ b/include/llvm/Bytecode/Archive.h
@@ -95,7 +95,7 @@ class ArchiveMember {
 
     /// @returns the size of the archive member in bytes.
     /// @brief Get the size of the archive member.
-    unsigned getSize() const             { return info.getSize(); }
+    uint64_t getSize() const             { return info.getSize(); }
 
     /// This method returns the total size of the archive member as it
     /// appears on disk. This includes the file content, the header, the
diff --git a/include/llvm/CodeGen/MachineConstantPool.h b/include/llvm/CodeGen/MachineConstantPool.h
index 17ddcf1823..f45c8a7a8d 100644
--- a/include/llvm/CodeGen/MachineConstantPool.h
+++ b/include/llvm/CodeGen/MachineConstantPool.h
@@ -61,7 +61,8 @@ inline std::ostream &operator<<(std::ostream &OS,
 /// It contains a pointer to the value and an offset from the start of
 /// the constant pool.
 /// @brief An entry in a MachineConstantPool
-struct MachineConstantPoolEntry {
+class MachineConstantPoolEntry {
+public:
   /// The constant itself.
   union {
     Constant *ConstVal;
diff --git a/include/llvm/CodeGen/SelectionDAG.h b/include/llvm/CodeGen/SelectionDAG.h
index b64b9c2143..2448a65ee6 100644
--- a/include/llvm/CodeGen/SelectionDAG.h
+++ b/include/llvm/CodeGen/SelectionDAG.h
@@ -322,9 +322,9 @@ public:
 
   /// getStore - Helper function to build ISD::STORE nodes.
   ///
-  SDOperand getStore(SDOperand Chain, SDOperand Value, SDOperand Ptr,
+  SDOperand getStore(SDOperand Chain, SDOperand Val, SDOperand Ptr,
                      const Value *SV, int SVOffset, bool isVolatile=false);
-  SDOperand getTruncStore(SDOperand Chain, SDOperand Value, SDOperand Ptr,
+  SDOperand getTruncStore(SDOperand Chain, SDOperand Val, SDOperand Ptr,
                           const Value *SV, int SVOffset, MVT::ValueType TVT,
                           bool isVolatile=false);
   SDOperand getIndexedStore(SDOperand OrigStoe, SDOperand Base,
diff --git a/include/llvm/Support/Compressor.h b/include/llvm/Support/Compressor.h
index 5e51721e66..52fb5d5b51 100644
--- a/include/llvm/Support/Compressor.h
+++ b/include/llvm/Support/Compressor.h
@@ -16,6 +16,7 @@
 
 #include "llvm/Support/DataTypes.h"
 #include <iosfwd>
+#include <string>
 
 namespace llvm {
 
diff --git a/include/llvm/System/Path.h b/include/llvm/System/Path.h
index 77a5cc54e3..f6b2be0fdf 100644
--- a/include/llvm/System/Path.h
+++ b/include/llvm/System/Path.h
@@ -47,7 +47,7 @@ namespace sys {
                    group(999), isDir(false) { }
     
     TimeValue getTimestamp() const { return modTime; }
-    size_t getSize() const { return fileSize; }
+    uint64_t getSize() const { return fileSize; }
     uint32_t getMode() const { return mode; }
     uint32_t getUser() const { return user; }
     uint32_t getGroup() const { return group; }
diff --git a/include/llvm/Transforms/Utils/FunctionUtils.h b/include/llvm/Transforms/Utils/FunctionUtils.h
index d8610bba95..d6e486be99 100644
--- a/include/llvm/Transforms/Utils/FunctionUtils.h
+++ b/include/llvm/Transforms/Utils/FunctionUtils.h
@@ -18,7 +18,7 @@
 
 namespace llvm {
   class BasicBlock;
-  struct DominatorSet;
+  class DominatorSet;
   class Function;
   class Loop;
 
diff --git a/include/llvm/Transforms/Utils/PromoteMemToReg.h b/include/llvm/Transforms/Utils/PromoteMemToReg.h
index 8d886f5487..44b11d7203 100644
--- a/include/llvm/Transforms/Utils/PromoteMemToReg.h
+++ b/include/llvm/Transforms/Utils/PromoteMemToReg.h
@@ -20,8 +20,8 @@
 namespace llvm {
 
 class AllocaInst;
-struct DominatorTree;
-struct DominanceFrontier;
+class DominatorTree;
+class DominanceFrontier;
 class TargetData;
 class AliasSetTracker;