diff --git a/elfcpp/ChangeLog b/elfcpp/ChangeLog
index 1ca1df17f80..fc864bf6fad 100644
--- a/elfcpp/ChangeLog
+++ b/elfcpp/ChangeLog
@@ -1,6 +1,7 @@
 2017-07-03  Alan Modra  <amodra@gmail.com>
 
-	* dwarf.h (DW_FIRST_IDX, DW_IDX, DW_IDX_DUP, DW_END_IDX): Define.
+	* dwarf.h (DW_FIRST_IDX, DW_IDX, DW_IDX_DUP, DW_END_IDX): Define,
+	and undefine after using.
 
 2017-06-21  Alan Modra  <amodra@gmail.com>
 
diff --git a/elfcpp/dwarf.h b/elfcpp/dwarf.h
index 85004a4ba9c..e5053c4444d 100644
--- a/elfcpp/dwarf.h
+++ b/elfcpp/dwarf.h
@@ -110,6 +110,11 @@ namespace elfcpp
 #undef DW_CFA
 #undef DW_END_CFA
 
+#undef DW_FIRST_IDX
+#undef DW_IDX
+#undef DW_IDX_DUP
+#undef DW_END_IDX
+
 // Frame unwind information.
 
 enum DW_EH_PE