diff --git a/clang/lib/Driver/Types.cpp b/clang/lib/Driver/Types.cpp
index 750286b66c96..339767722716 100644
--- a/clang/lib/Driver/Types.cpp
+++ b/clang/lib/Driver/Types.cpp
@@ -135,6 +135,7 @@ types::ID types::lookupTypeForExtension(const char *Ext) {
            .Case("CC", TY_CXX)
            .Case("cp", TY_CXX)
            .Case("hh", TY_CXXHeader)
+           .Case("hpp", TY_CXXHeader)
            .Case("ads", TY_Ada)
            .Case("adb", TY_Ada)
            .Case("ast", TY_AST)