diff --git a/llvm/include/llvm/AbstractTypeUser.h b/llvm/include/llvm/AbstractTypeUser.h
index c083366d3f2c..ee3fde033eb0 100644
--- a/llvm/include/llvm/AbstractTypeUser.h
+++ b/llvm/include/llvm/AbstractTypeUser.h
@@ -14,6 +14,10 @@
 #ifndef LLVM_ABSTRACT_TYPE_USER_H
 #define LLVM_ABSTRACT_TYPE_USER_H
 
+// IMPORTANT: Do not include this file directly.  Include Type.h instead.
+// Some versions of GCC can't handle the inlined method PATypeHolder::dropRef()
+// correctly otherwise.
+
 // This is the "master" include for <cassert> Whether this file needs it or not,
 // it must always include <cassert> for the files which include
 // llvm/AbstractTypeUser.h
diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.h b/llvm/lib/Bitcode/Reader/BitcodeReader.h
index a92f0ac4c7dc..7a69333e1000 100644
--- a/llvm/lib/Bitcode/Reader/BitcodeReader.h
+++ b/llvm/lib/Bitcode/Reader/BitcodeReader.h
@@ -14,7 +14,7 @@
 #ifndef BITCODE_READER_H
 #define BITCODE_READER_H
 
-#include "llvm/AbstractTypeUser.h"
+#include "llvm/Type.h"
 #include "llvm/ModuleProvider.h"
 #include "../LLVMBitCodes.h"
 #include <vector>