diff --git a/include/llvm/ADT/StringMap.h b/include/llvm/ADT/StringMap.h
index 3e7e9e625b8..f180b363606 100644
--- a/include/llvm/ADT/StringMap.h
+++ b/include/llvm/ADT/StringMap.h
@@ -130,10 +130,10 @@ class StringMapEntry : public StringMapEntryBase {
 public:
   ValueTy second;
 
-  explicit StringMapEntry(unsigned StrLen)
-    : StringMapEntryBase(StrLen), second() {}
-  StringMapEntry(unsigned StrLen, const ValueTy &V)
-    : StringMapEntryBase(StrLen), second(V) {}
+  explicit StringMapEntry(unsigned strLen)
+    : StringMapEntryBase(strLen), second() {}
+  StringMapEntry(unsigned strLen, const ValueTy &V)
+    : StringMapEntryBase(strLen), second(V) {}
 
   const ValueTy &getValue() const { return second; }
   ValueTy &getValue() { return second; }
diff --git a/include/llvm/CodeGen/SelectionDAGNodes.h b/include/llvm/CodeGen/SelectionDAGNodes.h
index f56863cd6ee..7261f4e102c 100644
--- a/include/llvm/CodeGen/SelectionDAGNodes.h
+++ b/include/llvm/CodeGen/SelectionDAGNodes.h
@@ -1449,9 +1449,9 @@ private:
   unsigned Alignment;
 
 public:
-  MemSDNode(unsigned Opc, SDVTList VTs, const Value *SrcValue,
-            unsigned Alignment)
-    : SDNode(Opc, VTs), SrcValue(SrcValue), Alignment(Alignment) {}
+  MemSDNode(unsigned Opc, SDVTList VTs, const Value *srcValue,
+            unsigned alignment)
+    : SDNode(Opc, VTs), SrcValue(srcValue), Alignment(alignment) {}
   
   virtual ~MemSDNode() {}
 
diff --git a/include/llvm/Support/Allocator.h b/include/llvm/Support/Allocator.h
index 14211488a59..ffe0d39e521 100644
--- a/include/llvm/Support/Allocator.h
+++ b/include/llvm/Support/Allocator.h
@@ -26,7 +26,7 @@ public:
   
   void Reset() {}
 
-  void *Allocate(size_t Size, size_t Alignment) { return malloc(Size); }
+  void *Allocate(size_t Size, size_t /*Alignment*/) { return malloc(Size); }
   
   template <typename T>
   T *Allocate() { return static_cast<T*>(malloc(sizeof(T))); }
@@ -55,7 +55,7 @@ public:
     return static_cast<T*>(Allocate(sizeof(T),AlignOf<T>::Alignment));
   }
   
-  void Deallocate(void *Ptr) {}
+  void Deallocate(void */*Ptr*/) {}
 
   void PrintStats() const;
 };