diff --git a/ChangeLog b/ChangeLog
index e5edb868f3..dd228bc2f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-10-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	[BZ #18822]
+	* include/plural-exp.h: New file.
+	* intl/plural-exp.c: Include <plural-exp.h> instead of
+	"plural-exp.h".
+
 2017-10-01  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #18822]
diff --git a/include/plural-exp.h b/include/plural-exp.h
new file mode 100644
index 0000000000..3b026f804d
--- /dev/null
+++ b/include/plural-exp.h
@@ -0,0 +1,8 @@
+#ifndef _PLURAL_EXP_H
+#include <intl/plural-exp.h>
+
+#ifndef _ISOMAC
+extern __typeof (__gettextparse) __gettextparse attribute_hidden;
+#endif /* !_ISOMAC */
+
+#endif
diff --git a/intl/plural-exp.c b/intl/plural-exp.c
index 8c15032631..f5249d5373 100644
--- a/intl/plural-exp.c
+++ b/intl/plural-exp.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "plural-exp.h"
+#include <plural-exp.h>
 
 #if (defined __GNUC__ && !(defined __APPLE_CC_ && __APPLE_CC__ > 1) && \
      !defined __cplusplus)					       \