diff --git a/include/llvm/ADT/APInt.h b/include/llvm/ADT/APInt.h
index c6055dfc27c..97fe4e9201a 100644
--- a/include/llvm/ADT/APInt.h
+++ b/include/llvm/ADT/APInt.h
@@ -1160,10 +1160,8 @@ public:
   static void tcSetLeastSignificantBits(integerPart *, unsigned int,
 					unsigned int bits);
 
-#ifndef NDEBUG
   /// @brief debug method
   void dump() const;
-#endif
 
   /// @}
 };
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
index 5a518994a01..3744c4ad663 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
@@ -3720,9 +3720,7 @@ void SDNode::dump(const SelectionDAG *G) const {
       cerr << "<" << CSDN->getValueAPF().convertToDouble() << ">";
     else {
       cerr << "<APFloat(";
-#ifndef NDEBUG
       CSDN->getValueAPF().convertToAPInt().dump();
-#endif
       cerr << ")>";
     }
   } else if (const GlobalAddressSDNode *GADN =
diff --git a/lib/Support/APInt.cpp b/lib/Support/APInt.cpp
index 15de08ed055..4a4474dbe7e 100644
--- a/lib/Support/APInt.cpp
+++ b/lib/Support/APInt.cpp
@@ -21,9 +21,7 @@
 #include <limits>
 #include <cstring>
 #include <cstdlib>
-#ifndef NDEBUG
 #include <iomanip>
-#endif
 
 using namespace llvm;
 
@@ -1999,7 +1997,6 @@ std::string APInt::toString(uint8_t radix, bool wantSigned) const {
   return result;
 }
 
-#ifndef NDEBUG
 void APInt::dump() const
 {
   cerr << "APInt(" << BitWidth << ")=" << std::setbase(16);
@@ -2011,7 +2008,6 @@ void APInt::dump() const
   cerr << " U(" << this->toStringUnsigned(10) << ") S("
        << this->toStringSigned(10) << ")" << std::setbase(10);
 }
-#endif
 
 // This implements a variety of operations on a representation of
 // arbitrary precision, two's-complement, bignum integer values.