diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bf0930fa62f..dde53bd91ae 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2017-01-13  Yao Qi  <yao.qi@linaro.org>
+
+	* Makefile.in (checker-headers): Use CXX and CXX_DIALET instead
+	of CC.  Pass "-x c++-header" instead of "-x c".
+
 2017-01-12  Simon Marchi  <simon.marchi@ericsson.com>
 
 	* remote.c (remote_can_async_p): Update comment.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index ae5a80e7c82..3ce7d69a049 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1988,8 +1988,8 @@ CHECK_HEADERS = $(HFILES_NO_SRCDIR)
 check-headers:
 	@echo Checking headers.
 	for i in $(CHECK_HEADERS) ; do \
-		$(CC) -x c -c -fsyntax-only $(INTERNAL_CFLAGS) \
-			-include defs.h $(srcdir)/$$i ; \
+		$(CXX) $(CXX_DIALECT) -x c++-header -c -fsyntax-only \
+		$(INTERNAL_CFLAGS) -include defs.h $(srcdir)/$$i ; \
 	done
 .PHONY: check-headers