diff --git a/include/llvm/Support/MathExtras.h b/include/llvm/Support/MathExtras.h
index 228d35ceff5..e6a544dc77a 100644
--- a/include/llvm/Support/MathExtras.h
+++ b/include/llvm/Support/MathExtras.h
@@ -307,7 +307,4 @@ int IsInf (double d);
 
 } // End llvm namespace
 
-FORCE_DEFINING_FILE_TO_BE_LINKED(SupportIsInf)
-FORCE_DEFINING_FILE_TO_BE_LINKED(SupportIsNAN)
-
 #endif
diff --git a/lib/Support/IsInf.cpp b/lib/Support/IsInf.cpp
index 9b0556fcb09..52c7d4204b3 100644
--- a/lib/Support/IsInf.cpp
+++ b/lib/Support/IsInf.cpp
@@ -6,9 +6,12 @@
 // the University of Illinois Open Source License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// Platform-independent wrapper around C99 isinf()
+//
+//===----------------------------------------------------------------------===//
 
 #include "llvm/Config/config.h"
-#include "llvm/System/IncludeFile.h"
 
 #if HAVE_ISINF_IN_MATH_H
 # include <math.h>
@@ -33,16 +36,14 @@ static int isinf(double x) { return !finite(x) && x==x; }
 #elif defined(__hpux)
 // HP-UX is "special"
 #include <math.h>
-static int isinf(double x) { return ((x)==INFINITY)||((x)==-INFINITY); }
+static int isinf(double x) { return ((x) == INFINITY) || ((x) == -INFINITY); }
 #else
 # error "Don't know how to get isinf()"
 #endif
 
 namespace llvm {
 
-int IsInf (float f)  { return isinf (f); }
-int IsInf (double d) { return isinf (d); }
+int IsInf(float f)  { return isinf(f); }
+int IsInf(double d) { return isinf(d); }
 
 } // end namespace llvm;
-
-DEFINING_FILE_FOR(SupportIsInf)
diff --git a/lib/Support/IsNAN.cpp b/lib/Support/IsNAN.cpp
index 5ed3971254b..4e6c849fbb4 100644
--- a/lib/Support/IsNAN.cpp
+++ b/lib/Support/IsNAN.cpp
@@ -12,7 +12,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Config/config.h"
-#include "llvm/System/IncludeFile.h"
 
 #if HAVE_ISNAN_IN_MATH_H
 # include <math.h>
@@ -29,10 +28,6 @@ using std::isnan;
 #endif
 
 namespace llvm {
-
-int IsNAN (float f)  { return isnan (f); }
-int IsNAN (double d) { return isnan (d); }
-
+  int IsNAN(float f)  { return isnan(f); }
+  int IsNAN(double d) { return isnan(d); }
 } // end namespace llvm;
-
-DEFINING_FILE_FOR(SupportIsNAN)