diff --git a/clang-tools-extra/include-cleaner/lib/WalkAST.cpp b/clang-tools-extra/include-cleaner/lib/WalkAST.cpp
--- a/clang-tools-extra/include-cleaner/lib/WalkAST.cpp
+++ b/clang-tools-extra/include-cleaner/lib/WalkAST.cpp
@@ -11,6 +11,7 @@
 #include "clang/AST/DeclCXX.h"
 #include "clang/AST/Expr.h"
 #include "clang/AST/ExprCXX.h"
+#include "clang/AST/NestedNameSpecifier.h"
 #include "clang/AST/RecursiveASTVisitor.h"
 #include "clang/AST/TemplateName.h"
 #include "clang/AST/Type.h"
@@ -63,6 +64,27 @@
     return true;
   }
 
+  bool VisitCXXDependentScopeMemberExpr(CXXDependentScopeMemberExpr *E) {
+    QualType QT = E->getBaseType().getCanonicalType();
+    if (QT->isPointerType()) {
+      QT = QT->getPointeeType();
+    }
+
+    const Type *UnqualifiedType = QT.getTypePtr();
+    if (isa<DependentNameType>(QT)) {
+      const DependentNameType *DNT = cast<DependentNameType>(QT);
+      UnqualifiedType = DNT->getQualifier()->getAsType();
+    }
+
+    if (isa<TemplateSpecializationType>(UnqualifiedType)) {
+      const TemplateSpecializationType *TST =
+          cast<TemplateSpecializationType>(UnqualifiedType);
+      TemplateDecl *TD = TST->getTemplateName().getAsTemplateDecl();
+      report(E->getMemberLoc(), TD);
+    }
+    return true;
+  }
+
   bool VisitCXXConstructExpr(CXXConstructExpr *E) {
     report(E->getLocation(), E->getConstructor(),
            E->getParenOrBraceRange().isValid() ? RefType::Explicit
diff --git a/clang-tools-extra/include-cleaner/unittests/WalkASTTest.cpp b/clang-tools-extra/include-cleaner/unittests/WalkASTTest.cpp
--- a/clang-tools-extra/include-cleaner/unittests/WalkASTTest.cpp
+++ b/clang-tools-extra/include-cleaner/unittests/WalkASTTest.cpp
@@ -88,12 +88,10 @@
     auto RTStr = llvm::to_string(RT);
     for (auto Expected : Target.points(RTStr))
       if (!llvm::is_contained(ReferencedOffsets[RT], Expected))
-        DiagnosePoint("location not marked used with type " + RTStr,
-                      Expected);
+        DiagnosePoint("location not marked used with type " + RTStr, Expected);
     for (auto Actual : ReferencedOffsets[RT])
       if (!llvm::is_contained(Target.points(RTStr), Actual))
-        DiagnosePoint("location unexpectedly used with type " + RTStr,
-                      Actual);
+        DiagnosePoint("location unexpectedly used with type " + RTStr, Actual);
   }
 
   // If there were any differences, we print the entire referencing code once.
@@ -178,6 +176,42 @@
       "void foo() { X{}.^foo(); }");
 }
 
+TEST(WalkAST, CXXDependentScopeMemberExprs) {
+  testWalk("template<typename T> struct $explicit^Base { void method(); };",
+           "template<typename T> void k(Base<T> t) { t.^method(); }");
+  testWalk("template<typename T> struct $explicit^Base { void method(); };",
+           "template<typename T> void k(Base<T>& t) { t.^method(); }");
+  testWalk("template<typename T> struct $explicit^Base { void method(); };",
+           "template<typename T> void k(Base<T>* t) { t->^method(); }");
+  testWalk("template<typename T> struct $explicit^Base { void method(); };",
+           "template<typename T> void k() { Base<T> t; t.^method(); }");
+  testWalk("template<typename T> struct $explicit^Base { void method(); };",
+           "template<typename T> void k() { Base<T>* t; t->^method(); }");
+  testWalk("template<typename T> struct Base { void method(); }; "
+           "template<typename T> struct $explicit^Derived: Base<T> {};",
+           "template<typename T> void k(Derived<T> t) { t.^method(); }");
+  testWalk("template<typename T> struct $explicit^Base { struct Nested { void "
+           "method(); }; };",
+           "template<typename T> void k(typename Base<T>::Nested d) { "
+           "d.^method(); }");
+  testWalk("template<typename T> struct $explicit^Base { struct Nested { void "
+           "method(); }; };",
+           "template<typename T> void k(typename Base<T>::Nested& d) { "
+           "d.^method(); }");
+  testWalk("template<typename T> struct $explicit^Base { struct Nested { void "
+           "method(); }; };",
+           "template<typename T> void k(typename Base<T>::Nested* d) { "
+           "d->^method(); }");
+  testWalk("template<typename T> struct $explicit^Base { struct Nested { void "
+           "method(); }; };",
+           "template<typename T> void k() { "
+           "typename Base<T>::Nested d; d.^method(); }");
+  testWalk("template<typename T> struct $explicit^Base { struct Nested { void "
+           "method(); }; };",
+           "template<typename T> void k() { "
+           "typename Base<T>::Nested* d; d->^method(); }");
+}
+
 TEST(WalkAST, ConstructExprs) {
   testWalk("struct $implicit^S {};", "S ^t;");
   testWalk("struct S { $implicit^S(); };", "S ^t;");