diff --git a/lib/VMCore/ConstantFold.cpp b/lib/VMCore/ConstantFold.cpp
index 2ae554ee114..45b021bb7dc 100644
--- a/lib/VMCore/ConstantFold.cpp
+++ b/lib/VMCore/ConstantFold.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/ConstantHandling.h"
+#include "ConstantHandling.h"
 #include "llvm/iPHINode.h"
 #include "llvm/InstrTypes.h"
 #include "llvm/DerivedTypes.h"
diff --git a/lib/VMCore/ConstantFold.h b/lib/VMCore/ConstantFold.h
index 8d2933621e6..8475e44f908 100644
--- a/lib/VMCore/ConstantFold.h
+++ b/lib/VMCore/ConstantFold.h
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CONSTANTHANDLING_H
-#define LLVM_CONSTANTHANDLING_H
+#ifndef CONSTANTHANDLING_H
+#define CONSTANTHANDLING_H
 
 #include "llvm/Constants.h"
 #include "llvm/Type.h"
diff --git a/lib/VMCore/ConstantFolding.h b/lib/VMCore/ConstantFolding.h
index 8d2933621e6..8475e44f908 100644
--- a/lib/VMCore/ConstantFolding.h
+++ b/lib/VMCore/ConstantFolding.h
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CONSTANTHANDLING_H
-#define LLVM_CONSTANTHANDLING_H
+#ifndef CONSTANTHANDLING_H
+#define CONSTANTHANDLING_H
 
 #include "llvm/Constants.h"
 #include "llvm/Type.h"
diff --git a/lib/VMCore/Constants.cpp b/lib/VMCore/Constants.cpp
index c1aa39db1c1..35681c0b654 100644
--- a/lib/VMCore/Constants.cpp
+++ b/lib/VMCore/Constants.cpp
@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Constants.h"
-#include "llvm/ConstantHandling.h"
+#include "ConstantHandling.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/iMemory.h"
 #include "llvm/SymbolTable.h"