diff --git a/lib/Target/ARM/ARMFeatures.h b/lib/Target/ARM/ARMFeatures.h
index eaec0507410..dafc4b3a82b 100644
--- a/lib/Target/ARM/ARMFeatures.h
+++ b/lib/Target/ARM/ARMFeatures.h
@@ -16,10 +16,10 @@
 
 #include "ARM.h"
 
-using namespace llvm;
+namespace llvm {
 
 template<typename InstrType> // could be MachineInstr or MCInst
-bool isV8EligibleForIT(InstrType *Instr, int BLXOperandIndex=0) {
+inline bool isV8EligibleForIT(InstrType *Instr, int BLXOperandIndex = 0) {
   switch (Instr->getOpcode()) {
   default:
     return false;
@@ -88,4 +88,6 @@ bool isV8EligibleForIT(InstrType *Instr, int BLXOperandIndex=0) {
   }
 }
 
+}
+
 #endif