10 files changed, 23 insertions, 28 deletions
diff --git a/include/Support/Annotation.h b/include/Support/Annotation.h
index 90259536b8..d9c02db832 100644
--- a/include/Support/Annotation.h
+++ b/include/Support/Annotation.h
@@ -1,21 +1,19 @@
-//===-- llvm/Annotation.h - Annotation classes -------------------*- C++ -*--=//
+//===-- Support/Annotation.h - Annotation classes ---------------*- C++ -*-===//
 //
 // This file contains the declarations for two classes: Annotation & Annotable.
 // Using these two simple classes, anything that derives from Annotable can have
 // Annotation subclasses attached to them, ready for easy retrieval.
 //
-// Annotations are designed to be easily attachable to LLVM code (as all Value's
-// are Annotable), and can even be serialized to bytecode and to assembly.
+// Annotations are designed to be easily attachable to various classes.
 //
-// The AnnotationManager class (defined in AnnotationManager.h) is essential for
-// using these classes.  It is responsible for turning Annotation name strings
-// into tokens [unique id #'s] that may be used to search for and create
-// annotations.
+// The AnnotationManager class is essential for using these classes.  It is
+// responsible for turning Annotation name strings into tokens [unique id #'s]
+// that may be used to search for and create annotations.
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_ANNOTATION_H
-#define LLVM_ANNOTATION_H
+#ifndef SUPPORT_ANNOTATION_H
+#define SUPPORT_ANNOTATION_H
 
 #include <string>
 class AnnotationID;
diff --git a/include/llvm/CodeGen/MachineCodeForInstruction.h b/include/llvm/CodeGen/MachineCodeForInstruction.h
index 9894c94b10..ff171e9621 100644
--- a/include/llvm/CodeGen/MachineCodeForInstruction.h
+++ b/include/llvm/CodeGen/MachineCodeForInstruction.h
@@ -18,7 +18,7 @@
 #ifndef LLVM_CODEGEN_MACHINECODE_FOR_INSTRUCTION_H
 #define LLVM_CODEGEN_MACHINECODE_FOR_INSTRUCTION_H
 
-#include "llvm/Annotation.h"
+#include "Support/Annotation.h"
 #include <vector>
 class MachineInstr;
 class Instruction;
diff --git a/include/llvm/CodeGen/MachineFunction.h b/include/llvm/CodeGen/MachineFunction.h
index 56452f1048..db6c1ca378 100644
--- a/include/llvm/CodeGen/MachineFunction.h
+++ b/include/llvm/CodeGen/MachineFunction.h
@@ -12,7 +12,7 @@
 #define LLVM_CODEGEN_MACHINEFUNCTION_H
 
 #include "llvm/CodeGen/MachineBasicBlock.h"
-#include "llvm/Annotation.h"
+#include "Support/Annotation.h"
 #include "Support/ilist"
 
 class Function;
diff --git a/include/llvm/CodeGen/MachineInstr.h b/include/llvm/CodeGen/MachineInstr.h
index 5b75df7381..4fb23c0df7 100644
--- a/include/llvm/CodeGen/MachineInstr.h
+++ b/include/llvm/CodeGen/MachineInstr.h
@@ -9,11 +9,10 @@
 #ifndef LLVM_CODEGEN_MACHINEINSTR_H
 #define LLVM_CODEGEN_MACHINEINSTR_H
 
-#include "llvm/Annotation.h"
 #include "llvm/Target/MRegisterInfo.h"
-#include "Support/iterator"
+#include "Support/Annotation.h"
 #include "Support/NonCopyable.h"
-#include <vector>
+#include "Support/iterator"
 class Value;
 class Function;
 class MachineBasicBlock;
diff --git a/include/llvm/Support/Annotation.h b/include/llvm/Support/Annotation.h
index 90259536b8..d9c02db832 100644
--- a/include/llvm/Support/Annotation.h
+++ b/include/llvm/Support/Annotation.h
@@ -1,21 +1,19 @@
-//===-- llvm/Annotation.h - Annotation classes -------------------*- C++ -*--=//
+//===-- Support/Annotation.h - Annotation classes ---------------*- C++ -*-===//
 //
 // This file contains the declarations for two classes: Annotation & Annotable.
 // Using these two simple classes, anything that derives from Annotable can have
 // Annotation subclasses attached to them, ready for easy retrieval.
 //
-// Annotations are designed to be easily attachable to LLVM code (as all Value's
-// are Annotable), and can even be serialized to bytecode and to assembly.
+// Annotations are designed to be easily attachable to various classes.
 //
-// The AnnotationManager class (defined in AnnotationManager.h) is essential for
-// using these classes.  It is responsible for turning Annotation name strings
-// into tokens [unique id #'s] that may be used to search for and create
-// annotations.
+// The AnnotationManager class is essential for using these classes.  It is
+// responsible for turning Annotation name strings into tokens [unique id #'s]
+// that may be used to search for and create annotations.
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_ANNOTATION_H
-#define LLVM_ANNOTATION_H
+#ifndef SUPPORT_ANNOTATION_H
+#define SUPPORT_ANNOTATION_H
 
 #include <string>
 class AnnotationID;
diff --git a/include/llvm/Target/TargetData.h b/include/llvm/Target/TargetData.h
index b1ea6b9a17..bd60ff3652 100644
--- a/include/llvm/Target/TargetData.h
+++ b/include/llvm/Target/TargetData.h
@@ -13,8 +13,8 @@
 #ifndef LLVM_TARGET_TARGETDATA_H
 #define LLVM_TARGET_TARGETDATA_H
 
-#include "llvm/Annotation.h"
 #include "llvm/Pass.h"
+#include "Support/Annotation.h"
 #include "Support/DataTypes.h"
 #include <vector>
 class Value;
diff --git a/include/llvm/Value.h b/include/llvm/Value.h
index 9627a02ca0..f6bd144676 100644
--- a/include/llvm/Value.h
+++ b/include/llvm/Value.h
@@ -10,8 +10,8 @@
 #ifndef LLVM_VALUE_H
 #define LLVM_VALUE_H
 
-#include "llvm/Annotation.h"
 #include "llvm/AbstractTypeUser.h"
+#include "Support/Annotation.h"
 #include "Support/Casting.h"
 #include <iostream>
 #include <vector>
diff --git a/lib/Support/Annotation.cpp b/lib/Support/Annotation.cpp
index 96ead521f5..9f24607af7 100644
--- a/lib/Support/Annotation.cpp
+++ b/lib/Support/Annotation.cpp
@@ -5,7 +5,7 @@
 //===----------------------------------------------------------------------===//
 
 #include <map>
-#include "llvm/Annotation.h"
+#include "Support/Annotation.h"
 using std::string;
 using std::map;
 using std::pair;
diff --git a/lib/Target/SparcV9/MachineCodeForInstruction.h b/lib/Target/SparcV9/MachineCodeForInstruction.h
index 9894c94b10..ff171e9621 100644
--- a/lib/Target/SparcV9/MachineCodeForInstruction.h
+++ b/lib/Target/SparcV9/MachineCodeForInstruction.h
@@ -18,7 +18,7 @@
 #ifndef LLVM_CODEGEN_MACHINECODE_FOR_INSTRUCTION_H
 #define LLVM_CODEGEN_MACHINECODE_FOR_INSTRUCTION_H
 
-#include "llvm/Annotation.h"
+#include "Support/Annotation.h"
 #include <vector>
 class MachineInstr;
 class Instruction;
diff --git a/support/lib/Support/Annotation.cpp b/support/lib/Support/Annotation.cpp
index 96ead521f5..9f24607af7 100644
--- a/support/lib/Support/Annotation.cpp
+++ b/support/lib/Support/Annotation.cpp
@@ -5,7 +5,7 @@
 //===----------------------------------------------------------------------===//
 
 #include <map>
-#include "llvm/Annotation.h"
+#include "Support/Annotation.h"
 using std::string;
 using std::map;
 using std::pair;