2 files changed, 8 insertions, 12 deletions
diff --git a/include/llvm/IR/Attributes.h b/include/llvm/IR/Attributes.h
index a95ede1760..ba46d205ca 100644
--- a/include/llvm/IR/Attributes.h
+++ b/include/llvm/IR/Attributes.h
@@ -19,7 +19,6 @@
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/FoldingSet.h"
-#include "llvm/Support/MathExtras.h"
 #include <cassert>
 #include <string>
 
@@ -27,7 +26,8 @@ namespace llvm {
 
 class AttrBuilder;
 class AttributeImpl;
-class Constant;
+class AttributeSetImpl;
+class AttributeSetNode;
 class LLVMContext;
 class Type;
 
@@ -161,14 +161,6 @@ public:
 };
 
 //===----------------------------------------------------------------------===//
-// AttributeSet Smart Pointer
-//===----------------------------------------------------------------------===//
-
-class AttrBuilder;
-class AttributeSetImpl;
-class AttributeSetNode;
-
-//===----------------------------------------------------------------------===//
 /// \class
 /// \brief This class manages the ref count for the opaque AttributeSetImpl
 /// object and provides accessors for it.
@@ -415,6 +407,7 @@ public:
 
   iterator begin()             { return Attrs.begin(); }
   iterator end()               { return Attrs.end(); }
+
   const_iterator begin() const { return Attrs.begin(); }
   const_iterator end() const   { return Attrs.end(); }
 
diff --git a/lib/IR/Attributes.cpp b/lib/IR/Attributes.cpp
index f56eb7be9c..0bc926271a 100644
--- a/lib/IR/Attributes.cpp
+++ b/lib/IR/Attributes.cpp
@@ -16,7 +16,6 @@
 #include "llvm/IR/Attributes.h"
 #include "AttributeImpl.h"
 #include "LLVMContextImpl.h"
-#include "llvm/ADT/FoldingSet.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/IR/Type.h"
 #include "llvm/Support/Atomic.h"
@@ -28,7 +27,7 @@
 using namespace llvm;
 
 //===----------------------------------------------------------------------===//
-// Attribute Implementation
+// Attribute Construction Methods
 //===----------------------------------------------------------------------===//
 
 Attribute Attribute::get(LLVMContext &Context, AttrKind Kind) {
@@ -72,6 +71,10 @@ Attribute Attribute::getWithStackAlignment(LLVMContext &Context,
   return get(Context, B.addStackAlignmentAttr(Align));
 }
 
+//===----------------------------------------------------------------------===//
+// Attribute Accessor Methods
+//===----------------------------------------------------------------------===//
+
 bool Attribute::hasAttribute(AttrKind Val) const {
   return pImpl && pImpl->hasAttribute(Val);
 }