diff --git a/ChangeLog b/ChangeLog
index 9924187478..0e2eb34e0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-14  Alexandre Oliva  <aoliva@redhat.com>
+
+	* include/gmp.h: Include/gmp-mparam.h.
+	* stdlib/strtod.c: Include gmp-mparam.h before gmp.h and
+	gmp-impl.h.
+
 2003-03-14  Alexandre Oliva  <aoliva@redhat.com>
 
 	* elf/dl-conflict.c: Don't compile _dl_resolve_conflicts if
diff --git a/include/gmp.h b/include/gmp.h
index ff26658d93..b74167097d 100644
--- a/include/gmp.h
+++ b/include/gmp.h
@@ -1,3 +1,7 @@
+/* Include gmp-mparam.h first, such that definitions of _SHORT_LIMB
+   and _LONG_LONG_LIMB in it can take effect into gmp.h.  */
+#include <gmp-mparam.h>
+
 #ifndef __GMP_H__
 
 #include <stdlib/gmp.h>
diff --git a/stdlib/strtod.c b/stdlib/strtod.c
index ef74b3d9f5..820307a0ec 100644
--- a/stdlib/strtod.c
+++ b/stdlib/strtod.c
@@ -64,9 +64,11 @@
 /* The gmp headers need some configuration frobs.  */
 #define HAVE_ALLOCA 1
 
+/* Include gmp-mparam.h first, such that definitions of _SHORT_LIMB
+   and _LONG_LONG_LIMB in it can take effect into gmp.h.  */
+#include <gmp-mparam.h>
 #include <gmp.h>
 #include <gmp-impl.h>
-#include <gmp-mparam.h>
 #include <longlong.h>
 #include "fpioconst.h"