Change _PROTO => __GMP_PROTO.

41 files changed, 328 insertions, 355 deletions

diff --git a/memory.c b/memory.c
index df8edfe19..42a9834da 100644
--- a/memory.c
+++ b/memory.c
@@ -24,10 +24,10 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #include "gmp-impl.h"
 
 
-void *	(*__gmp_allocate_func) _PROTO ((size_t)) = __gmp_default_allocate;
-void *	(*__gmp_reallocate_func) _PROTO ((void *, size_t, size_t))
+void *	(*__gmp_allocate_func) __GMP_PROTO ((size_t)) = __gmp_default_allocate;
+void *	(*__gmp_reallocate_func) __GMP_PROTO ((void *, size_t, size_t))
      = __gmp_default_reallocate;
-void	(*__gmp_free_func) _PROTO ((void *, size_t)) = __gmp_default_free;
+void	(*__gmp_free_func) __GMP_PROTO ((void *, size_t)) = __gmp_default_free;
 
 
 /* Default allocation functions.  In case of failure to allocate/reallocate
diff --git a/mpf/ceilfloor.c b/mpf/ceilfloor.c
index 468dac58c..a0c5d77de 100644
--- a/mpf/ceilfloor.c
+++ b/mpf/ceilfloor.c
@@ -26,7 +26,7 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
    Notice the use of prec+1 ensures mpf_ceil and mpf_floor are equivalent to
    mpf_set if u is already an integer.  */
 
-static void __gmpf_ceil_or_floor _PROTO ((REGPARM_2_1 (mpf_ptr r, mpf_srcptr u, int dir))) REGPARM_ATTR (1);
+static void __gmpf_ceil_or_floor __GMP_PROTO ((REGPARM_2_1 (mpf_ptr, mpf_srcptr, int))) REGPARM_ATTR (1);
 #define mpf_ceil_or_floor(r,u,dir)  __gmpf_ceil_or_floor (REGPARM_2_1 (r, u, dir))
 
 REGPARM_ATTR (1) static void
diff --git a/mpn/generic/dc_divrem_n.c b/mpn/generic/dc_divrem_n.c
index 3688d61a9..61ddde72c 100644
--- a/mpn/generic/dc_divrem_n.c
+++ b/mpn/generic/dc_divrem_n.c
@@ -34,9 +34,9 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 */
 
 static mp_limb_t mpn_dc_div_3_by_2
-  _PROTO ((mp_ptr qp, mp_ptr np, mp_srcptr dp, mp_size_t n, mp_ptr scratch));
+  __GMP_PROTO ((mp_ptr qp, mp_ptr np, mp_srcptr dp, mp_size_t n, mp_ptr scratch));
 static mp_limb_t mpn_dc_div_2_by_1
-  _PROTO ((mp_ptr qp, mp_ptr np, mp_srcptr dp, mp_size_t n, mp_ptr scratch));
+  __GMP_PROTO ((mp_ptr qp, mp_ptr np, mp_srcptr dp, mp_size_t n, mp_ptr scratch));
 
 /* mpn_dc_divrem_n - Implements algorithm of page 8 in [1]: divides (np,2n)
    by (dp,n) and puts the quotient in (qp,n), the remainder in (np,n).
diff --git a/mpn/generic/mul_fft.c b/mpn/generic/mul_fft.c
index 6d42d7949..be06dc31b 100644
--- a/mpn/generic/mul_fft.c
+++ b/mpn/generic/mul_fft.c
@@ -65,9 +65,9 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #endif
 
 static void mpn_mul_fft_internal
-_PROTO ((mp_ptr, mp_srcptr, mp_srcptr, mp_size_t, int, int, mp_ptr *, mp_ptr *,
-	 mp_ptr, mp_ptr, mp_size_t, mp_size_t, mp_size_t, int **, mp_ptr,
-	 int));
+__GMP_PROTO ((mp_ptr, mp_srcptr, mp_srcptr, mp_size_t, int, int, mp_ptr *, mp_ptr *,
+	      mp_ptr, mp_ptr, mp_size_t, mp_size_t, mp_size_t, int **, mp_ptr,
+	      int));
 
 
 /* Find the best k to use for a mod 2^(m*GMP_NUMB_BITS)+1 FFT for m >= n.
diff --git a/mpn/generic/random2.c b/mpn/generic/random2.c
index 3f3d3212a..e29238c51 100644
--- a/mpn/generic/random2.c
+++ b/mpn/generic/random2.c
@@ -22,7 +22,7 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #include "gmp.h"
 #include "gmp-impl.h"
 
-static void gmp_rrandomb _PROTO ((mp_ptr rp, gmp_randstate_t rstate, unsigned long int nbits));
+static void gmp_rrandomb __GMP_PROTO ((mp_ptr, gmp_randstate_t, unsigned long int));
 
 /* Ask _gmp_rand for 32 bits per call unless that's more than a limb can hold.
    Thus, we get the same random number sequence in the common cases.
diff --git a/mpn/generic/set_str.c b/mpn/generic/set_str.c
index 5760e7479..3afbb0b92 100644
--- a/mpn/generic/set_str.c
+++ b/mpn/generic/set_str.c
@@ -58,11 +58,12 @@ the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #include "longlong.h"
 
 
-/* FIXME: These should be static, except that libspeed needs them.  */
-mp_size_t mpn_bc_set_str (mp_ptr, const unsigned char *, size_t, int);
-mp_size_t mpn_dc_set_str (mp_ptr, const unsigned char *, size_t,
-			  const powers_t *, mp_ptr);
-void mpn_set_str_compute_powtab (powers_t *, mp_ptr, mp_size_t, int);
+mp_size_t mpn_bc_set_str
+  __GMP_PROTO ((mp_ptr, const unsigned char *, size_t, int));
+mp_size_t mpn_dc_set_str
+  __GMP_PROTO ((mp_ptr, const unsigned char *, size_t, const powers_t *, mp_ptr));
+void mpn_set_str_compute_powtab
+  __GMP_PROTO ((powers_t *, mp_ptr, mp_size_t, int));
 
 
 mp_size_t
diff --git a/mpq/aors.c b/mpq/aors.c
index 382177d39..5e09de533 100644
--- a/mpq/aors.c
+++ b/mpq/aors.c
@@ -22,12 +22,12 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #include "gmp-impl.h"
 
 
-static void __gmpq_aors _PROTO ((REGPARM_3_1 (mpq_ptr w, mpq_srcptr x, mpq_srcptr y, void (*fun) _PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr))))) REGPARM_ATTR (1);
+static void __gmpq_aors __GMP_PROTO ((REGPARM_3_1 (mpq_ptr, mpq_srcptr, mpq_srcptr, void (*) __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr))))) REGPARM_ATTR (1);
 #define mpq_aors(w,x,y,fun)  __gmpq_aors (REGPARM_3_1 (w, x, y, fun))
 
 REGPARM_ATTR (1) static void
 mpq_aors (mpq_ptr rop, mpq_srcptr op1, mpq_srcptr op2,
-          void (*fun) _PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr)))
+          void (*fun) __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr)))
 {
   mpz_t gcd;
   mpz_t tmp1, tmp2;
diff --git a/mpz/aorsmul.c b/mpz/aorsmul.c
index 1b16a9b80..8b145b309 100644
--- a/mpz/aorsmul.c
+++ b/mpz/aorsmul.c
@@ -34,7 +34,7 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
    The sign of w is retained for the result, unless the absolute value
    submul underflows, in which case it flips.  */
 
-static void __gmpz_aorsmul _PROTO ((REGPARM_3_1 (mpz_ptr w, mpz_srcptr x, mpz_srcptr y, mp_size_t sub))) REGPARM_ATTR (1);
+static void __gmpz_aorsmul __GMP_PROTO ((REGPARM_3_1 (mpz_ptr w, mpz_srcptr x, mpz_srcptr y, mp_size_t sub))) REGPARM_ATTR (1);
 #define mpz_aorsmul(w,x,y,sub)  __gmpz_aorsmul (REGPARM_3_1 (w, x, y, sub))
 
 REGPARM_ATTR (1) static void
diff --git a/mpz/cfdiv_q_2exp.c b/mpz/cfdiv_q_2exp.c
index f50edf910..a54ce2d33 100644
--- a/mpz/cfdiv_q_2exp.c
+++ b/mpz/cfdiv_q_2exp.c
@@ -24,7 +24,7 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
 /* dir==1 for ceil, dir==-1 for floor */
 
-static void __gmpz_cfdiv_q_2exp _PROTO ((REGPARM_3_1 (mpz_ptr w, mpz_srcptr u, unsigned long cnt, int dir))) REGPARM_ATTR (1);
+static void __gmpz_cfdiv_q_2exp __GMP_PROTO ((REGPARM_3_1 (mpz_ptr w, mpz_srcptr u, unsigned long cnt, int dir))) REGPARM_ATTR (1);
 #define cfdiv_q_2exp(w,u,cnt,dir)  __gmpz_cfdiv_q_2exp (REGPARM_3_1 (w,u,cnt,dir))
 
 REGPARM_ATTR (1) static void
diff --git a/mpz/cfdiv_r_2exp.c b/mpz/cfdiv_r_2exp.c
index a15414a82..005779f15 100644
--- a/mpz/cfdiv_r_2exp.c
+++ b/mpz/cfdiv_r_2exp.c
@@ -27,7 +27,7 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
 /* dir==1 for ceil, dir==-1 for floor */
 
-static void __gmpz_cfdiv_r_2exp _PROTO ((REGPARM_3_1 (mpz_ptr w, mpz_srcptr u, unsigned long cnt, int dir))) REGPARM_ATTR (1);
+static void __gmpz_cfdiv_r_2exp __GMP_PROTO ((REGPARM_3_1 (mpz_ptr w, mpz_srcptr u, unsigned long cnt, int dir))) REGPARM_ATTR (1);
 #define cfdiv_r_2exp(w,u,cnt,dir)  __gmpz_cfdiv_r_2exp (REGPARM_3_1 (w, u, cnt, dir))
 
 REGPARM_ATTR (1) static void
diff --git a/mpz/fac_ui.c b/mpz/fac_ui.c
index a70348d6e..7e394fcb1 100644
--- a/mpz/fac_ui.c
+++ b/mpz/fac_ui.c
@@ -25,8 +25,8 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #include "fac_ui.h"
 
 
-static void odd_product _PROTO ((unsigned long low, unsigned long high, mpz_t * st));
-static void ap_product_small _PROTO ((mpz_t ret, mp_limb_t start, mp_limb_t step, unsigned long count, unsigned long nm));
+static void odd_product __GMP_PROTO ((unsigned long, unsigned long, mpz_t *));
+static void ap_product_small __GMP_PROTO ((mpz_t, mp_limb_t, mp_limb_t, unsigned long, unsigned long));
 
 
 /* must be >=2	*/
diff --git a/mpz/millerrabin.c b/mpz/millerrabin.c
index 1fd778121..f717278b0 100644
--- a/mpz/millerrabin.c
+++ b/mpz/millerrabin.c
@@ -30,9 +30,9 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #include "gmp.h"
 #include "gmp-impl.h"
 
-static int millerrabin _PROTO ((mpz_srcptr n, mpz_srcptr nm1,
-                                mpz_ptr x, mpz_ptr y,
-                                mpz_srcptr q, unsigned long int k));
+static int millerrabin __GMP_PROTO ((mpz_srcptr, mpz_srcptr,
+				     mpz_ptr, mpz_ptr,
+				     mpz_srcptr, unsigned long int));
 
 int
 mpz_millerrabin (mpz_srcptr n, int reps)
diff --git a/mpz/perfpow.c b/mpz/perfpow.c
index 485a50af6..93ec4cd31 100644
--- a/mpz/perfpow.c
+++ b/mpz/perfpow.c
@@ -40,8 +40,8 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #include "gmp-impl.h"
 #include "longlong.h"
 
-static unsigned long int gcd _PROTO ((unsigned long int a, unsigned long int b));
-static int isprime _PROTO ((unsigned long int t));
+static unsigned long int gcd __GMP_PROTO ((unsigned long int, unsigned long int));
+static int isprime __GMP_PROTO ((unsigned long int));
 
 static const unsigned short primes[] =
 {  2,  3,  5,  7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53,
diff --git a/mpz/pprime_p.c b/mpz/pprime_p.c
index 2e7b3103b..766155fa8 100644
--- a/mpz/pprime_p.c
+++ b/mpz/pprime_p.c
@@ -28,7 +28,7 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #include "gmp-impl.h"
 #include "longlong.h"
 
-static int isprime _PROTO ((unsigned long int t));
+static int isprime __GMP_PROTO ((unsigned long int));
 
 
 /* MPN_MOD_OR_MODEXACT_1_ODD can be used instead of mpn_mod_1 for the trial
diff --git a/mpz/rrandomb.c b/mpz/rrandomb.c
index 25975ab7f..f34aaec7a 100644
--- a/mpz/rrandomb.c
+++ b/mpz/rrandomb.c
@@ -22,7 +22,7 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #include "gmp.h"
 #include "gmp-impl.h"
 
-static void gmp_rrandomb _PROTO ((mp_ptr rp, gmp_randstate_t rstate, unsigned long int nbits));
+static void gmp_rrandomb __GMP_PROTO ((mp_ptr, gmp_randstate_t, unsigned long int));
 
 void
 mpz_rrandomb (mpz_ptr x, gmp_randstate_t rstate, unsigned long int nbits)
diff --git a/printf/printffuns.c b/printf/printffuns.c
index 22c96c55e..4f4e74d98 100644
--- a/printf/printffuns.c
+++ b/printf/printffuns.c
@@ -37,7 +37,7 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
 /* SunOS 4 stdio.h doesn't provide a prototype for this */
 #if ! HAVE_DECL_VFPRINTF
-int vfprintf _PROTO ((FILE *fp, const char *fmt, va_list ap));
+int vfprintf __GMP_PROTO ((FILE *, const char *, va_list));
 #endif
 
 
diff --git a/scanf/fscanffuns.c b/scanf/fscanffuns.c
index a71a9ee11..236aec663 100644
--- a/scanf/fscanffuns.c
+++ b/scanf/fscanffuns.c
@@ -28,13 +28,13 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
 /* SunOS 4 stdio.h doesn't provide prototypes for these */
 #if ! HAVE_DECL_FGETC
-int fgetc _PROTO ((FILE *fp));
+int fgetc __GMP_PROTO ((FILE *fp));
 #endif
 #if ! HAVE_DECL_FSCANF
-int fscanf _PROTO ((FILE *fp, const char *fmt, ...));
+int fscanf __GMP_PROTO ((FILE *fp, const char *fmt, ...));
 #endif
 #if ! HAVE_DECL_UNGETC
-int ungetc _PROTO ((int c, FILE *fp));
+int ungetc __GMP_PROTO ((int c, FILE *fp));
 #endif
 
 
diff --git a/tests/devel/try.c b/tests/devel/try.c
index e9cb8f9c2..e3dc75074 100644
--- a/tests/devel/try.c
+++ b/tests/devel/try.c
@@ -288,7 +288,7 @@ struct each_t  fun = { "Fun" };
 
 #define SRC_SIZE(n)  ((n) == 1 && tr->size2 ? size2 : size)
 
-void validate_fail _PROTO ((void));
+void validate_fail __GMP_PROTO ((void));
 
 
 #if HAVE_TRY_NEW_C
@@ -296,7 +296,7 @@ void validate_fail _PROTO ((void));
 #endif
 
 
-typedef mp_limb_t (*tryfun_t) _PROTO ((ANYARGS));
+typedef mp_limb_t (*tryfun_t) __GMP_PROTO ((ANYARGS));
 
 struct try_t {
   char  retval;
@@ -367,7 +367,7 @@ struct try_t {
   tryfun_t    reference;
   const char  *reference_name;
 
-  void        (*validate) _PROTO ((void));
+  void        (*validate) __GMP_PROTO ((void));
   const char  *validate_name;
 };
 
diff --git a/tests/misc.c b/tests/misc.c
index 4aa9bdf1d..19c657c7f 100644
--- a/tests/misc.c
+++ b/tests/misc.c
@@ -123,7 +123,7 @@ tests_rand_end (void)
 
 
 /* Only used if CPU calling conventions checking is available. */
-mp_limb_t (*calling_conventions_function) _PROTO ((ANYARGS));
+mp_limb_t (*calling_conventions_function) __GMP_PROTO ((ANYARGS));
 
 
 /* Return p advanced to the next multiple of "align" bytes.  "align" must be
diff --git a/tests/misc/t-scanf.c b/tests/misc/t-scanf.c
index e4709e52f..5a9eda1fc 100644
--- a/tests/misc/t-scanf.c
+++ b/tests/misc/t-scanf.c
@@ -63,7 +63,7 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
 int   option_libc_scanf = 0;
 
-typedef int (*fun_t) _PROTO ((const char *, const char *, void *, void *));
+typedef int (*fun_t) __GMP_PROTO ((const char *, const char *, void *, void *));
 
 
 /* This problem was seen on powerpc7450-apple-darwin7.0.0, sscanf returns 0
diff --git a/tests/mpf/reuse.c b/tests/mpf/reuse.c
index 3d7c5dba2..f373ac700 100644
--- a/tests/mpf/reuse.c
+++ b/tests/mpf/reuse.c
@@ -50,9 +50,9 @@ main (void)
 #define EXPO 32
 #endif
 
-void dump_abort _PROTO ((char *name, mpf_t res1, mpf_t res2));
+void dump_abort __GMP_PROTO ((char *, mpf_t, mpf_t));
 
-typedef void (*dss_func) _PROTO ((mpf_ptr, mpf_srcptr, mpf_srcptr));
+typedef void (*dss_func) __GMP_PROTO ((mpf_ptr, mpf_srcptr, mpf_srcptr));
 
 dss_func dss_funcs[] =
 {
@@ -64,7 +64,7 @@ char *dss_func_names[] =
   "mpf_div", "mpf_add", "mpf_mul", "mpf_sub",
 };
 
-typedef void (*dsi_func) _PROTO ((mpf_ptr, mpf_srcptr, unsigned long int));
+typedef void (*dsi_func) __GMP_PROTO ((mpf_ptr, mpf_srcptr, unsigned long int));
 
 dsi_func dsi_funcs[] =
 {
@@ -78,7 +78,7 @@ char *dsi_func_names[] =
   "mpf_mul_2exp", "mpf_div_2exp"
 };
 
-typedef void (*dis_func) _PROTO ((mpf_ptr, unsigned long int, mpf_srcptr));
+typedef void (*dis_func) __GMP_PROTO ((mpf_ptr, unsigned long int, mpf_srcptr));
 
 dis_func dis_funcs[] =
 {
@@ -203,9 +203,9 @@ dump_abort (char *name, mpf_t res1, mpf_t res2)
 }
 
 #if 0
-void mpf_abs		_PROTO ((mpf_ptr, mpf_srcptr));
-void mpf_sqrt		_PROTO ((mpf_ptr, mpf_srcptr));
-void mpf_neg		_PROTO ((mpf_ptr, mpf_srcptr));
+void mpf_abs		__GMP_PROTO ((mpf_ptr, mpf_srcptr));
+void mpf_sqrt		__GMP_PROTO ((mpf_ptr, mpf_srcptr));
+void mpf_neg		__GMP_PROTO ((mpf_ptr, mpf_srcptr));
 #endif
 
 #endif /* ! DLL_EXPORT */
diff --git a/tests/mpn/t-aors_1.c b/tests/mpn/t-aors_1.c
index be9391b48..a1878bb84 100644
--- a/tests/mpn/t-aors_1.c
+++ b/tests/mpn/t-aors_1.c
@@ -49,8 +49,8 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
   } while (0)
 
 typedef mp_limb_t (*mpn_aors_1_t)
-     _PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_limb_t));
-mpn_aors_1_t fudge _PROTO ((mpn_aors_1_t));
+     __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_limb_t));
+mpn_aors_1_t fudge __GMP_PROTO ((mpn_aors_1_t));
 
 
 void
diff --git a/tests/mpq/t-get_d.c b/tests/mpq/t-get_d.c
index cae4da93b..f11618901 100644
--- a/tests/mpq/t-get_d.c
+++ b/tests/mpq/t-get_d.c
@@ -39,7 +39,7 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #define EPSIZE SIZE
 #endif
 
-void dump _PROTO ((mpq_t));
+void dump __GMP_PROTO ((mpq_t));
 
 void
 check_monotonic (int argc, char **argv)
diff --git a/tests/mpq/t-md_2exp.c b/tests/mpq/t-md_2exp.c
index 6c80ce8d9..3c1f9f44b 100644
--- a/tests/mpq/t-md_2exp.c
+++ b/tests/mpq/t-md_2exp.c
@@ -96,7 +96,7 @@ main (void)
     { {"1","0x10000000000000000"}, 3, {"1","0x2000000000000000"} },
   };
 
-  void (*fun) _PROTO ((mpq_ptr, mpq_srcptr, unsigned long));
+  void (*fun) __GMP_PROTO ((mpq_ptr, mpq_srcptr, unsigned long));
   const struct pair_t  *p_start, *p_want;
   const char  *name;
   mpq_t    sep, got, want;
diff --git a/tests/mpz/convert.c b/tests/mpz/convert.c
index 6a4a3ce60..bfe8b70b3 100644
--- a/tests/mpz/convert.c
+++ b/tests/mpz/convert.c
@@ -26,7 +26,7 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #include "gmp-impl.h"
 #include "tests.h"
 
-void debug_mp _PROTO ((mpz_t, int));
+void debug_mp __GMP_PROTO ((mpz_t, int));
 
 
 void
diff --git a/tests/mpz/logic.c b/tests/mpz/logic.c
index 76cbefaf1..faa140684 100644
--- a/tests/mpz/logic.c
+++ b/tests/mpz/logic.c
@@ -24,8 +24,8 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #include "gmp-impl.h"
 #include "tests.h"
 
-void dump_abort _PROTO (());
-void debug_mp _PROTO ((mpz_t, int));
+void dump_abort __GMP_PROTO (());
+void debug_mp __GMP_PROTO ((mpz_t, int));
 
 int
 main (int argc, char **argv)
diff --git a/tests/mpz/reuse.c b/tests/mpz/reuse.c
index 5362fdcca..cbd4d3da8 100644
--- a/tests/mpz/reuse.c
+++ b/tests/mpz/reuse.c
@@ -48,14 +48,14 @@ main (void)
 
 #else /* ! DLL_EXPORT */
 
-void dump _PROTO ((char *, mpz_t, mpz_t, mpz_t));
-
-typedef void (*dss_func) _PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-typedef void (*dsi_func) _PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-typedef unsigned long int (*dsi_div_func) _PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-typedef unsigned long int (*ddsi_div_func) _PROTO ((mpz_ptr, mpz_ptr, mpz_srcptr, unsigned long int));
-typedef void (*ddss_div_func) _PROTO ((mpz_ptr, mpz_ptr, mpz_srcptr, mpz_srcptr));
-typedef void (*ds_func) _PROTO ((mpz_ptr, mpz_srcptr));
+void dump __GMP_PROTO ((char *, mpz_t, mpz_t, mpz_t));
+
+typedef void (*dss_func) __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
+typedef void (*dsi_func) __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
+typedef unsigned long int (*dsi_div_func) __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
+typedef unsigned long int (*ddsi_div_func) __GMP_PROTO ((mpz_ptr, mpz_ptr, mpz_srcptr, unsigned long int));
+typedef void (*ddss_div_func) __GMP_PROTO ((mpz_ptr, mpz_ptr, mpz_srcptr, mpz_srcptr));
+typedef void (*ds_func) __GMP_PROTO ((mpz_ptr, mpz_srcptr));
 
 
 void
diff --git a/tests/mpz/t-addsub.c b/tests/mpz/t-addsub.c
index b0e23f602..815a83973 100644
--- a/tests/mpz/t-addsub.c
+++ b/tests/mpz/t-addsub.c
@@ -25,8 +25,8 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #include "longlong.h"
 #include "tests.h"
 
-void debug_mp _PROTO ((mpz_t, int));
-void dump_abort _PROTO ((int, char *, mpz_t, mpz_t));
+void debug_mp __GMP_PROTO ((mpz_t, int));
+void dump_abort __GMP_PROTO ((int, char *, mpz_t, mpz_t));
 
 int
 main (int argc, char **argv)
diff --git a/tests/mpz/t-cdiv_ui.c b/tests/mpz/t-cdiv_ui.c
index 1899ae757..1f6be7fe7 100644
--- a/tests/mpz/t-cdiv_ui.c
+++ b/tests/mpz/t-cdiv_ui.c
@@ -25,8 +25,8 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #include "gmp-impl.h"
 #include "tests.h"
 
-void dump_abort _PROTO ((char *, mpz_t, unsigned long));
-void debug_mp _PROTO ((mpz_t, int));
+void dump_abort __GMP_PROTO ((char *, mpz_t, unsigned long));
+void debug_mp __GMP_PROTO ((mpz_t, int));
 
 int
 main (int argc, char **argv)
diff --git a/tests/mpz/t-fdiv.c b/tests/mpz/t-fdiv.c
index 876251dcf..2e9ef7551 100644
--- a/tests/mpz/t-fdiv.c
+++ b/tests/mpz/t-fdiv.c
@@ -25,8 +25,8 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #include "gmp-impl.h"
 #include "tests.h"
 
-void dump_abort _PROTO ((mpz_t, mpz_t));
-void debug_mp _PROTO ((mpz_t, int));
+void dump_abort __GMP_PROTO ((mpz_t, mpz_t));
+void debug_mp __GMP_PROTO ((mpz_t, int));
 
 int
 main (int argc, char **argv)
diff --git a/tests/mpz/t-fdiv_ui.c b/tests/mpz/t-fdiv_ui.c
index ab3673407..3012d9b11 100644
--- a/tests/mpz/t-fdiv_ui.c
+++ b/tests/mpz/t-fdiv_ui.c
@@ -25,8 +25,8 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #include "gmp-impl.h"
 #include "tests.h"
 
-void dump_abort _PROTO ((char *, mpz_t, unsigned long));
-void debug_mp _PROTO ((mpz_t, int));
+void dump_abort __GMP_PROTO ((char *, mpz_t, unsigned long));
+void debug_mp __GMP_PROTO ((mpz_t, int));
 
 int
 main (int argc, char **argv)
diff --git a/tests/mpz/t-mul.c b/tests/mpz/t-mul.c
index 24beb5c1f..b67ae3ecf 100644
--- a/tests/mpz/t-mul.c
+++ b/tests/mpz/t-mul.c
@@ -26,10 +26,10 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #include "longlong.h"
 #include "tests.h"
 
-void debug_mp _PROTO ((mpz_t));
-static void ref_mpn_mul _PROTO ((mp_ptr,mp_srcptr,mp_size_t,mp_srcptr,mp_size_t));
-static void ref_mpz_mul _PROTO ((mpz_t, const mpz_t, const mpz_t));
-void dump_abort _PROTO ((int, char *, mpz_t, mpz_t, mpz_t, mpz_t));
+void debug_mp __GMP_PROTO ((mpz_t));
+static void ref_mpn_mul __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t));
+static void ref_mpz_mul __GMP_PROTO ((mpz_t, const mpz_t, const mpz_t));
+void dump_abort __GMP_PROTO ((int, char *, mpz_t, mpz_t, mpz_t, mpz_t));
 
 #define FFT_MIN_BITSIZE 100000
 
diff --git a/tests/mpz/t-powm.c b/tests/mpz/t-powm.c
index a334f1dec..ec92422cc 100644
--- a/tests/mpz/t-powm.c
+++ b/tests/mpz/t-powm.c
@@ -25,7 +25,7 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #include "gmp-impl.h"
 #include "tests.h"
 
-void debug_mp _PROTO ((mpz_t, int));
+void debug_mp __GMP_PROTO ((mpz_t, int));
 
 int
 main (int argc, char **argv)
diff --git a/tests/mpz/t-powm_ui.c b/tests/mpz/t-powm_ui.c
index 91914a445..82b2e5030 100644
--- a/tests/mpz/t-powm_ui.c
+++ b/tests/mpz/t-powm_ui.c
@@ -25,8 +25,8 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #include "gmp-impl.h"
 #include "tests.h"
 
-void dump_abort _PROTO ((mpz_t, mpz_t));
-void debug_mp _PROTO ((mpz_t, int));
+void dump_abort __GMP_PROTO ((mpz_t, mpz_t));
+void debug_mp __GMP_PROTO ((mpz_t, int));
 
 int
 main (int argc, char **argv)
diff --git a/tests/mpz/t-root.c b/tests/mpz/t-root.c
index e31af2cae..f5b9d0c85 100644
--- a/tests/mpz/t-root.c
+++ b/tests/mpz/t-root.c
@@ -24,7 +24,7 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #include "gmp-impl.h"
 #include "tests.h"
 
-void debug_mp _PROTO ((mpz_t, int));
+void debug_mp __GMP_PROTO ((mpz_t, int));
 
 int
 main (int argc, char **argv)
diff --git a/tests/mpz/t-sqrtrem.c b/tests/mpz/t-sqrtrem.c
index 752c98cba..8f375d30b 100644
--- a/tests/mpz/t-sqrtrem.c
+++ b/tests/mpz/t-sqrtrem.c
@@ -25,8 +25,8 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #include "gmp-impl.h"
 #include "tests.h"
 
-void dump_abort _PROTO ((mpz_t, mpz_t, mpz_t));
-void debug_mp _PROTO ((mpz_t, int));
+void dump_abort __GMP_PROTO ((mpz_t, mpz_t, mpz_t));
+void debug_mp __GMP_PROTO ((mpz_t, int));
 
 int
 main (int argc, char **argv)
diff --git a/tests/mpz/t-tdiv.c b/tests/mpz/t-tdiv.c
index e19ab9921..7a2da7278 100644
--- a/tests/mpz/t-tdiv.c
+++ b/tests/mpz/t-tdiv.c
@@ -25,8 +25,8 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #include "gmp-impl.h"
 #include "tests.h"
 
-void dump_abort _PROTO ((mpz_t, mpz_t));
-void debug_mp _PROTO ((mpz_t, int));
+void dump_abort __GMP_PROTO ((mpz_t, mpz_t));
+void debug_mp __GMP_PROTO ((mpz_t, int));
 
 int
 main (int argc, char **argv)
diff --git a/tests/mpz/t-tdiv_ui.c b/tests/mpz/t-tdiv_ui.c
index 0c4bd54d0..64847f4d6 100644
--- a/tests/mpz/t-tdiv_ui.c
+++ b/tests/mpz/t-tdiv_ui.c
@@ -25,8 +25,8 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #include "gmp-impl.h"
 #include "tests.h"
 
-void dump_abort _PROTO ((char *, mpz_t, unsigned long));
-void debug_mp _PROTO ((mpz_t, int));
+void dump_abort __GMP_PROTO ((char *, mpz_t, unsigned long));
+void debug_mp __GMP_PROTO ((mpz_t, int));
 
 int
 main (int argc, char **argv)
diff --git a/tune/speed.h b/tune/speed.h
index de7b89b2f..ca021409e 100644
--- a/tune/speed.h
+++ b/tune/speed.h
@@ -87,13 +87,13 @@ extern double  speed_unittime;
 extern double  speed_cycletime;
 extern int     speed_precision;
 extern char    speed_time_string[];
-void speed_time_init _PROTO ((void));
-void speed_cycletime_fail _PROTO ((const char *str));
-void speed_cycletime_init _PROTO ((void));
-void speed_cycletime_need_cycles _PROTO ((void));
-void speed_cycletime_need_seconds _PROTO ((void));
-void speed_starttime _PROTO ((void));
-double speed_endtime _PROTO ((void));
+void speed_time_init __GMP_PROTO ((void));
+void speed_cycletime_fail __GMP_PROTO ((const char *str));
+void speed_cycletime_init __GMP_PROTO ((void));
+void speed_cycletime_need_cycles __GMP_PROTO ((void));
+void speed_cycletime_need_seconds __GMP_PROTO ((void));
+void speed_starttime __GMP_PROTO ((void));
+double speed_endtime __GMP_PROTO ((void));
 
 
 struct speed_params {
@@ -120,191 +120,191 @@ struct speed_params {
   } src[2], dst[3];
 };
 
-typedef double (*speed_function_t) _PROTO ((struct speed_params *s));
+typedef double (*speed_function_t) __GMP_PROTO ((struct speed_params *s));
 
-double speed_measure _PROTO ((speed_function_t fun, struct speed_params *s));
+double speed_measure __GMP_PROTO ((speed_function_t fun, struct speed_params *s));
 
 /* Prototypes for speed measuring routines */
 
-double speed_back_to_back _PROTO ((struct speed_params *s));
-double speed_count_leading_zeros _PROTO ((struct speed_params *s));
-double speed_count_trailing_zeros _PROTO ((struct speed_params *s));
-double speed_find_a _PROTO ((struct speed_params *s));
-double speed_gmp_allocate_free _PROTO ((struct speed_params *s));
-double speed_gmp_allocate_reallocate_free _PROTO ((struct speed_params *s));
-double speed_invert_limb _PROTO ((struct speed_params *s));
-double speed_malloc_free _PROTO ((struct speed_params *s));
-double speed_malloc_realloc_free _PROTO ((struct speed_params *s));
-double speed_memcpy _PROTO ((struct speed_params *s));
-double speed_binvert_limb _PROTO ((struct speed_params *s));
-double speed_binvert_limb_mul1 _PROTO ((struct speed_params *s));
-double speed_binvert_limb_loop _PROTO ((struct speed_params *s));
-double speed_binvert_limb_cond _PROTO ((struct speed_params *s));
-double speed_binvert_limb_arith _PROTO ((struct speed_params *s));
-
-double speed_mpf_init_clear _PROTO ((struct speed_params *s));
-
-double speed_mpn_add_n _PROTO ((struct speed_params *s));
-double speed_mpn_addlsh1_n _PROTO ((struct speed_params *s));
-double speed_mpn_addsub_n _PROTO ((struct speed_params *s));
-double speed_mpn_and_n _PROTO ((struct speed_params *s));
-double speed_mpn_andn_n _PROTO ((struct speed_params *s));
-double speed_mpn_addmul_1 _PROTO ((struct speed_params *s));
-double speed_mpn_addmul_2 _PROTO ((struct speed_params *s));
-double speed_mpn_addmul_3 _PROTO ((struct speed_params *s));
-double speed_mpn_addmul_4 _PROTO ((struct speed_params *s));
-double speed_mpn_addmul_5 _PROTO ((struct speed_params *s));
-double speed_mpn_addmul_6 _PROTO ((struct speed_params *s));
-double speed_mpn_addmul_7 _PROTO ((struct speed_params *s));
-double speed_mpn_addmul_8 _PROTO ((struct speed_params *s));
-double speed_mpn_com_n _PROTO ((struct speed_params *s));
-double speed_mpn_copyd _PROTO ((struct speed_params *s));
-double speed_mpn_copyi _PROTO ((struct speed_params *s));
-double speed_mpn_dc_divrem_n _PROTO ((struct speed_params *s));
-double speed_mpn_dc_divrem_sb _PROTO ((struct speed_params *s));
-double speed_mpn_dc_divrem_sb_div _PROTO ((struct speed_params *s));
-double speed_mpn_dc_divrem_sb_inv _PROTO ((struct speed_params *s));
-double speed_mpn_dc_tdiv_qr _PROTO ((struct speed_params *s));
-double speed_MPN_COPY _PROTO ((struct speed_params *s));
-double speed_MPN_COPY_DECR _PROTO ((struct speed_params *s));
-double speed_MPN_COPY_INCR _PROTO ((struct speed_params *s));
-double speed_mpn_divexact_1 _PROTO ((struct speed_params *s));
-double speed_mpn_divexact_by3 _PROTO ((struct speed_params *s));
-double speed_mpn_bdiv_dbm1c _PROTO ((struct speed_params *s));
-double speed_mpn_divrem_1 _PROTO ((struct speed_params *s));
-double speed_mpn_divrem_1f _PROTO ((struct speed_params *s));
-double speed_mpn_divrem_1c _PROTO ((struct speed_params *s));
-double speed_mpn_divrem_1cf _PROTO ((struct speed_params *s));
-double speed_mpn_divrem_1_div _PROTO ((struct speed_params *s));
-double speed_mpn_divrem_1f_div _PROTO ((struct speed_params *s));
-double speed_mpn_divrem_1_inv _PROTO ((struct speed_params *s));
-double speed_mpn_divrem_1f_inv _PROTO ((struct speed_params *s));
-double speed_mpn_divrem_2 _PROTO ((struct speed_params *s));
-double speed_mpn_divrem_2_div _PROTO ((struct speed_params *s));
-double speed_mpn_divrem_2_inv _PROTO ((struct speed_params *s));
-double speed_mpn_fib2_ui _PROTO ((struct speed_params *s));
-double speed_mpn_matrix22_mul _PROTO ((struct speed_params *s));
-double speed_mpn_hgcd _PROTO ((struct speed_params *s));
-double speed_mpn_hgcd_lehmer _PROTO ((struct speed_params *s));
-double speed_mpn_gcd _PROTO ((struct speed_params *s));
-double speed_mpn_gcd_1 _PROTO ((struct speed_params *s));
-double speed_mpn_gcd_1N _PROTO ((struct speed_params *s));
-double speed_mpn_gcd_binary _PROTO ((struct speed_params *s));
-double speed_mpn_gcd_accel _PROTO ((struct speed_params *s));
-double speed_mpn_gcdext _PROTO ((struct speed_params *s));
-double speed_mpn_gcdext_double _PROTO ((struct speed_params *s));
-double speed_mpn_gcdext_one_double _PROTO ((struct speed_params *s));
-double speed_mpn_gcdext_one_single _PROTO ((struct speed_params *s));
-double speed_mpn_gcdext_single _PROTO ((struct speed_params *s));
-double speed_mpn_get_str _PROTO ((struct speed_params *s));
-double speed_mpn_hamdist _PROTO ((struct speed_params *s));
-double speed_mpn_ior_n _PROTO ((struct speed_params *s));
-double speed_mpn_iorn_n _PROTO ((struct speed_params *s));
-double speed_mpn_jacobi_base _PROTO ((struct speed_params *s));
-double speed_mpn_jacobi_base_1 _PROTO ((struct speed_params *s));
-double speed_mpn_jacobi_base_2 _PROTO ((struct speed_params *s));
-double speed_mpn_jacobi_base_3 _PROTO ((struct speed_params *s));
-double speed_mpn_kara_mul_n _PROTO ((struct speed_params *s));
-double speed_mpn_kara_sqr_n _PROTO ((struct speed_params *s));
-double speed_mpn_lshift _PROTO ((struct speed_params *s));
-double speed_mpn_mod_1 _PROTO ((struct speed_params *s));
-double speed_mpn_mod_1c _PROTO ((struct speed_params *s));
-double speed_mpn_mod_1_div _PROTO ((struct speed_params *s));
-double speed_mpn_mod_1_inv _PROTO ((struct speed_params *s));
-double speed_mpn_mod_34lsub1 _PROTO ((struct speed_params *s));
-double speed_mpn_modexact_1_odd _PROTO ((struct speed_params *s));
-double speed_mpn_modexact_1c_odd _PROTO ((struct speed_params *s));
-double speed_mpn_mul_1 _PROTO ((struct speed_params *s));
-double speed_mpn_mul_1_inplace _PROTO ((struct speed_params *s));
-double speed_mpn_mul_2 _PROTO ((struct speed_params *s));
-double speed_mpn_mul_3 _PROTO ((struct speed_params *s));
-double speed_mpn_mul_4 _PROTO ((struct speed_params *s));
-double speed_mpn_mul _PROTO ((struct speed_params *s));
-double speed_mpn_mul_basecase _PROTO ((struct speed_params *s));
-double speed_mpn_mul_fft _PROTO ((struct speed_params *s));
-double speed_mpn_mul_fft_sqr _PROTO ((struct speed_params *s));
-double speed_mpn_mul_fft_full _PROTO ((struct speed_params *s));
-double speed_mpn_mul_fft_full_sqr _PROTO ((struct speed_params *s));
-double speed_mpn_mul_n _PROTO ((struct speed_params *s));
-double speed_mpn_mul_n_sqr _PROTO ((struct speed_params *s));
-double speed_mpn_mullow_n _PROTO ((struct speed_params *s));
-double speed_mpn_mullow_basecase _PROTO ((struct speed_params *s));
-double speed_mpn_nand_n _PROTO ((struct speed_params *s));
-double speed_mpn_nior_n _PROTO ((struct speed_params *s));
-double speed_mpn_popcount _PROTO ((struct speed_params *s));
-double speed_mpn_preinv_divrem_1 _PROTO ((struct speed_params *s));
-double speed_mpn_preinv_divrem_1f _PROTO ((struct speed_params *s));
-double speed_mpn_preinv_mod_1 _PROTO ((struct speed_params *s));
-double speed_mpn_redc_1 _PROTO ((struct speed_params *s));
-double speed_mpn_rsh1add_n _PROTO ((struct speed_params *s));
-double speed_mpn_rsh1sub_n _PROTO ((struct speed_params *s));
-double speed_mpn_rshift _PROTO ((struct speed_params *s));
-double speed_mpn_sb_divrem_m3 _PROTO ((struct speed_params *s));
-double speed_mpn_sb_divrem_m3_div _PROTO ((struct speed_params *s));
-double speed_mpn_sb_divrem_m3_inv _PROTO ((struct speed_params *s));
-double speed_mpn_set_str _PROTO ((struct speed_params *s));
-double speed_mpn_bc_set_str _PROTO ((struct speed_params *s));
-double speed_mpn_dc_set_str _PROTO ((struct speed_params *s));
-double speed_mpn_set_str_pre _PROTO ((struct speed_params *s));
-double speed_mpn_sqr_basecase _PROTO ((struct speed_params *s));
-double speed_mpn_sqr_diagonal _PROTO ((struct speed_params *s));
-double speed_mpn_sqr_n _PROTO ((struct speed_params *s));
-double speed_mpn_sqrtrem _PROTO ((struct speed_params *s));
-double speed_mpn_rootrem _PROTO ((struct speed_params *s));
-double speed_mpn_sub_n _PROTO ((struct speed_params *s));
-double speed_mpn_sublsh1_n _PROTO ((struct speed_params *s));
-double speed_mpn_submul_1 _PROTO ((struct speed_params *s));
-double speed_mpn_toom3_mul_n _PROTO ((struct speed_params *s));
-double speed_mpn_toom3_sqr_n _PROTO ((struct speed_params *s));
-double speed_mpn_udiv_qrnnd _PROTO ((struct speed_params *s));
-double speed_mpn_udiv_qrnnd_r _PROTO ((struct speed_params *s));
-double speed_mpn_umul_ppmm _PROTO ((struct speed_params *s));
-double speed_mpn_umul_ppmm_r _PROTO ((struct speed_params *s));
-double speed_mpn_xnor_n _PROTO ((struct speed_params *s));
-double speed_mpn_xor_n _PROTO ((struct speed_params *s));
-double speed_MPN_ZERO _PROTO ((struct speed_params *s));
-
-double speed_mpq_init_clear _PROTO ((struct speed_params *s));
-
-double speed_mpz_add _PROTO ((struct speed_params *s));
-double speed_mpz_bin_uiui _PROTO ((struct speed_params *s));
-double speed_mpz_fac_ui _PROTO ((struct speed_params *s));
-double speed_mpz_fib_ui _PROTO ((struct speed_params *s));
-double speed_mpz_fib2_ui _PROTO ((struct speed_params *s));
-double speed_mpz_init_clear _PROTO ((struct speed_params *s));
-double speed_mpz_init_realloc_clear _PROTO ((struct speed_params *s));
-double speed_mpz_jacobi _PROTO ((struct speed_params *s));
-double speed_mpz_lucnum_ui _PROTO ((struct speed_params *s));
-double speed_mpz_lucnum2_ui _PROTO ((struct speed_params *s));
-double speed_mpz_mod _PROTO ((struct speed_params *s));
-double speed_mpz_powm _PROTO ((struct speed_params *s));
-double speed_mpz_powm_mod _PROTO ((struct speed_params *s));
-double speed_mpz_powm_redc _PROTO ((struct speed_params *s));
-double speed_mpz_powm_ui _PROTO ((struct speed_params *s));
-double speed_mpz_urandomb _PROTO ((struct speed_params *s));
-
-double speed_gmp_randseed _PROTO ((struct speed_params *s));
-double speed_gmp_randseed_ui _PROTO ((struct speed_params *s));
-
-double speed_noop _PROTO ((struct speed_params *s));
-double speed_noop_wxs _PROTO ((struct speed_params *s));
-double speed_noop_wxys _PROTO ((struct speed_params *s));
-
-double speed_operator_div _PROTO ((struct speed_params *s));
-double speed_operator_mod _PROTO ((struct speed_params *s));
-
-double speed_udiv_qrnnd _PROTO ((struct speed_params *s));
-double speed_udiv_qrnnd_preinv1 _PROTO ((struct speed_params *s));
-double speed_udiv_qrnnd_preinv2 _PROTO ((struct speed_params *s));
-double speed_udiv_qrnnd_c _PROTO ((struct speed_params *s));
-double speed_umul_ppmm _PROTO ((struct speed_params *s));
+double speed_back_to_back __GMP_PROTO ((struct speed_params *s));
+double speed_count_leading_zeros __GMP_PROTO ((struct speed_params *s));
+double speed_count_trailing_zeros __GMP_PROTO ((struct speed_params *s));
+double speed_find_a __GMP_PROTO ((struct speed_params *s));
+double speed_gmp_allocate_free __GMP_PROTO ((struct speed_params *s));
+double speed_gmp_allocate_reallocate_free __GMP_PROTO ((struct speed_params *s));
+double speed_invert_limb __GMP_PROTO ((struct speed_params *s));
+double speed_malloc_free __GMP_PROTO ((struct speed_params *s));
+double speed_malloc_realloc_free __GMP_PROTO ((struct speed_params *s));
+double speed_memcpy __GMP_PROTO ((struct speed_params *s));
+double speed_binvert_limb __GMP_PROTO ((struct speed_params *s));
+double speed_binvert_limb_mul1 __GMP_PROTO ((struct speed_params *s));
+double speed_binvert_limb_loop __GMP_PROTO ((struct speed_params *s));
+double speed_binvert_limb_cond __GMP_PROTO ((struct speed_params *s));
+double speed_binvert_limb_arith __GMP_PROTO ((struct speed_params *s));
+
+double speed_mpf_init_clear __GMP_PROTO ((struct speed_params *s));
+
+double speed_mpn_add_n __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_addlsh1_n __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_addsub_n __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_and_n __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_andn_n __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_addmul_1 __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_addmul_2 __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_addmul_3 __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_addmul_4 __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_addmul_5 __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_addmul_6 __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_addmul_7 __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_addmul_8 __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_com_n __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_copyd __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_copyi __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_dc_divrem_n __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_dc_divrem_sb __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_dc_divrem_sb_div __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_dc_divrem_sb_inv __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_dc_tdiv_qr __GMP_PROTO ((struct speed_params *s));
+double speed_MPN_COPY __GMP_PROTO ((struct speed_params *s));
+double speed_MPN_COPY_DECR __GMP_PROTO ((struct speed_params *s));
+double speed_MPN_COPY_INCR __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_divexact_1 __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_divexact_by3 __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_bdiv_dbm1c __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_divrem_1 __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_divrem_1f __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_divrem_1c __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_divrem_1cf __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_divrem_1_div __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_divrem_1f_div __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_divrem_1_inv __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_divrem_1f_inv __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_divrem_2 __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_divrem_2_div __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_divrem_2_inv __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_fib2_ui __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_matrix22_mul __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_hgcd __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_hgcd_lehmer __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_gcd __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_gcd_1 __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_gcd_1N __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_gcd_binary __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_gcd_accel __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_gcdext __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_gcdext_double __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_gcdext_one_double __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_gcdext_one_single __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_gcdext_single __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_get_str __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_hamdist __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_ior_n __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_iorn_n __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_jacobi_base __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_jacobi_base_1 __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_jacobi_base_2 __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_jacobi_base_3 __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_kara_mul_n __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_kara_sqr_n __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_lshift __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_mod_1 __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_mod_1c __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_mod_1_div __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_mod_1_inv __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_mod_34lsub1 __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_modexact_1_odd __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_modexact_1c_odd __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_mul_1 __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_mul_1_inplace __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_mul_2 __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_mul_3 __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_mul_4 __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_mul __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_mul_basecase __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_mul_fft __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_mul_fft_sqr __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_mul_fft_full __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_mul_fft_full_sqr __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_mul_n __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_mul_n_sqr __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_mullow_n __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_mullow_basecase __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_nand_n __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_nior_n __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_popcount __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_preinv_divrem_1 __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_preinv_divrem_1f __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_preinv_mod_1 __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_redc_1 __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_rsh1add_n __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_rsh1sub_n __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_rshift __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_sb_divrem_m3 __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_sb_divrem_m3_div __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_sb_divrem_m3_inv __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_set_str __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_bc_set_str __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_dc_set_str __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_set_str_pre __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_sqr_basecase __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_sqr_diagonal __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_sqr_n __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_sqrtrem __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_rootrem __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_sub_n __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_sublsh1_n __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_submul_1 __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_toom3_mul_n __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_toom3_sqr_n __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_udiv_qrnnd __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_udiv_qrnnd_r __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_umul_ppmm __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_umul_ppmm_r __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_xnor_n __GMP_PROTO ((struct speed_params *s));
+double speed_mpn_xor_n __GMP_PROTO ((struct speed_params *s));
+double speed_MPN_ZERO __GMP_PROTO ((struct speed_params *s));
+
+double speed_mpq_init_clear __GMP_PROTO ((struct speed_params *s));
+
+double speed_mpz_add __GMP_PROTO ((struct speed_params *s));
+double speed_mpz_bin_uiui __GMP_PROTO ((struct speed_params *s));
+double speed_mpz_fac_ui __GMP_PROTO ((struct speed_params *s));
+double speed_mpz_fib_ui __GMP_PROTO ((struct speed_params *s));
+double speed_mpz_fib2_ui __GMP_PROTO ((struct speed_params *s));
+double speed_mpz_init_clear __GMP_PROTO ((struct speed_params *s));
+double speed_mpz_init_realloc_clear __GMP_PROTO ((struct speed_params *s));
+double speed_mpz_jacobi __GMP_PROTO ((struct speed_params *s));
+double speed_mpz_lucnum_ui __GMP_PROTO ((struct speed_params *s));
+double speed_mpz_lucnum2_ui __GMP_PROTO ((struct speed_params *s));
+double speed_mpz_mod __GMP_PROTO ((struct speed_params *s));
+double speed_mpz_powm __GMP_PROTO ((struct speed_params *s));
+double speed_mpz_powm_mod __GMP_PROTO ((struct speed_params *s));
+double speed_mpz_powm_redc __GMP_PROTO ((struct speed_params *s));
+double speed_mpz_powm_ui __GMP_PROTO ((struct speed_params *s));
+double speed_mpz_urandomb __GMP_PROTO ((struct speed_params *s));
+
+double speed_gmp_randseed __GMP_PROTO ((struct speed_params *s));
+double speed_gmp_randseed_ui __GMP_PROTO ((struct speed_params *s));
+
+double speed_noop __GMP_PROTO ((struct speed_params *s));
+double speed_noop_wxs __GMP_PROTO ((struct speed_params *s));
+double speed_noop_wxys __GMP_PROTO ((struct speed_params *s));
+
+double speed_operator_div __GMP_PROTO ((struct speed_params *s));
+double speed_operator_mod __GMP_PROTO ((struct speed_params *s));
+
+double speed_udiv_qrnnd __GMP_PROTO ((struct speed_params *s));
+double speed_udiv_qrnnd_preinv1 __GMP_PROTO ((struct speed_params *s));
+double speed_udiv_qrnnd_preinv2 __GMP_PROTO ((struct speed_params *s));
+double speed_udiv_qrnnd_c __GMP_PROTO ((struct speed_params *s));
+double speed_umul_ppmm __GMP_PROTO ((struct speed_params *s));
 
 /* Prototypes for other routines */
 
 /* low 32-bits in p[0], high 32-bits in p[1] */
-void speed_cyclecounter _PROTO ((unsigned p[2]));
+void speed_cyclecounter __GMP_PROTO ((unsigned p[2]));
 
-void mftb_function _PROTO ((unsigned p[2]));
+void mftb_function __GMP_PROTO ((unsigned p[2]));
 
 /* In i386 gcc -fPIC, ebx is a fixed register and can't be declared a dummy
    output or a clobber for the cpuid, hence an explicit save and restore.  A
@@ -342,99 +342,71 @@ void mftb_function _PROTO ((unsigned p[2]));
 #endif
 #endif
 
-double speed_cyclecounter_diff _PROTO ((const unsigned end[2],
-					const unsigned start[2]));
-int gettimeofday_microseconds_p _PROTO ((void));
-int getrusage_microseconds_p _PROTO ((void));
-int cycles_works_p _PROTO ((void));
-long clk_tck _PROTO ((void));
-double freq_measure _PROTO ((const char *, double (*)(void)));
-
-int double_cmp_ptr _PROTO ((const double *p, const double *q));
-void pentium_wbinvd _PROTO ((void));
-typedef int (*qsort_function_t) _PROTO ((const void *, const void *));
-
-void noop _PROTO ((void));
-void noop_1 _PROTO ((mp_limb_t n));
-void noop_wxs _PROTO ((mp_ptr wp, mp_srcptr xp, mp_size_t size));
-void noop_wxys _PROTO ((mp_ptr wp, mp_srcptr xp, mp_srcptr yp,
-			mp_size_t size));
-void mpn_cache_fill _PROTO ((mp_srcptr ptr, mp_size_t size));
-void mpn_cache_fill_dummy _PROTO ((mp_limb_t n));
-void speed_cache_fill _PROTO ((struct speed_params *s));
-void speed_operand_src _PROTO ((struct speed_params *s,
-				mp_ptr ptr, mp_size_t size));
-void speed_operand_dst _PROTO ((struct speed_params *s,
-				mp_ptr ptr, mp_size_t size));
+double speed_cyclecounter_diff __GMP_PROTO ((const unsigned [2], const unsigned [2]));
+int gettimeofday_microseconds_p __GMP_PROTO ((void));
+int getrusage_microseconds_p __GMP_PROTO ((void));
+int cycles_works_p __GMP_PROTO ((void));
+long clk_tck __GMP_PROTO ((void));
+double freq_measure __GMP_PROTO ((const char *, double (*)(void)));
+
+int double_cmp_ptr __GMP_PROTO ((const double *, const double *));
+void pentium_wbinvd __GMP_PROTO ((void));
+typedef int (*qsort_function_t) __GMP_PROTO ((const void *, const void *));
+
+void noop __GMP_PROTO ((void));
+void noop_1 __GMP_PROTO ((mp_limb_t));
+void noop_wxs __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t));
+void noop_wxys __GMP_PROTO ((mp_ptr, mp_srcptr, mp_srcptr, mp_size_t));
+void mpn_cache_fill __GMP_PROTO ((mp_srcptr, mp_size_t));
+void mpn_cache_fill_dummy __GMP_PROTO ((mp_limb_t));
+void speed_cache_fill __GMP_PROTO ((struct speed_params *));
+void speed_operand_src __GMP_PROTO ((struct speed_params *, mp_ptr, mp_size_t));
+void speed_operand_dst __GMP_PROTO ((struct speed_params *, mp_ptr, mp_size_t));
 
 extern int  speed_option_addrs;
 extern int  speed_option_verbose;
-void speed_option_set _PROTO((const char *s));
-
-mp_limb_t mpn_divrem_1_div _PROTO ((mp_ptr qp, mp_size_t xsize,
-				    mp_srcptr ap, mp_size_t size,
-				    mp_limb_t d));
-mp_limb_t mpn_divrem_1_inv _PROTO ((mp_ptr qp, mp_size_t xsize,
-				    mp_srcptr ap, mp_size_t size,
-				    mp_limb_t d));
-mp_limb_t mpn_divrem_2_div _PROTO ((mp_ptr qp, mp_size_t qxn,
-				    mp_ptr np, mp_size_t nsize,
-				    mp_srcptr dp));
-mp_limb_t mpn_divrem_2_inv _PROTO ((mp_ptr qp, mp_size_t qxn,
-				    mp_ptr np, mp_size_t nsize,
-				    mp_srcptr dp));
-
-int mpn_jacobi_base_1 _PROTO ((mp_limb_t a, mp_limb_t b, int result_bit1));
-int mpn_jacobi_base_2 _PROTO ((mp_limb_t a, mp_limb_t b, int result_bit1));
-int mpn_jacobi_base_3 _PROTO ((mp_limb_t a, mp_limb_t b, int result_bit1));
-
-mp_limb_t mpn_mod_1_div _PROTO ((mp_srcptr ap, mp_size_t size, mp_limb_t d));
-mp_limb_t mpn_mod_1_inv _PROTO ((mp_srcptr ap, mp_size_t size, mp_limb_t d));
+void speed_option_set __GMP_PROTO((const char *));
+
+mp_limb_t mpn_divrem_1_div __GMP_PROTO ((mp_ptr, mp_size_t, mp_srcptr, mp_size_t, mp_limb_t));
+mp_limb_t mpn_divrem_1_inv __GMP_PROTO ((mp_ptr, mp_size_t, mp_srcptr, mp_size_t, mp_limb_t));
+mp_limb_t mpn_divrem_2_div __GMP_PROTO ((mp_ptr, mp_size_t, mp_ptr, mp_size_t, mp_srcptr));
+mp_limb_t mpn_divrem_2_inv __GMP_PROTO ((mp_ptr, mp_size_t, mp_ptr, mp_size_t, mp_srcptr));
+
+int mpn_jacobi_base_1 __GMP_PROTO ((mp_limb_t, mp_limb_t, int));
+int mpn_jacobi_base_2 __GMP_PROTO ((mp_limb_t, mp_limb_t, int));
+int mpn_jacobi_base_3 __GMP_PROTO ((mp_limb_t, mp_limb_t, int));
+
+mp_limb_t mpn_mod_1_div __GMP_PROTO ((mp_srcptr, mp_size_t, mp_limb_t));
+mp_limb_t mpn_mod_1_inv __GMP_PROTO ((mp_srcptr, mp_size_t, mp_limb_t));
 
 mp_size_t mpn_gcd_binary
-  _PROTO ((mp_ptr gp, mp_ptr up, mp_size_t usize, mp_ptr vp, mp_size_t vsize));
+  __GMP_PROTO ((mp_ptr, mp_ptr, mp_size_t, mp_ptr, mp_size_t));
 mp_size_t mpn_gcd_accel
-  _PROTO ((mp_ptr gp, mp_ptr up, mp_size_t usize, mp_ptr vp, mp_size_t vsize));
+  __GMP_PROTO ((mp_ptr, mp_ptr, mp_size_t, mp_ptr, mp_size_t));
 mp_size_t mpn_gcdext_one_double
-  _PROTO ((mp_ptr gp, mp_ptr s0p, mp_size_t *s0size,
-	   mp_ptr up, mp_size_t size, mp_ptr vp, mp_size_t vsize));
+  __GMP_PROTO ((mp_ptr, mp_ptr, mp_size_t *, mp_ptr, mp_size_t, mp_ptr, mp_size_t));
 mp_size_t mpn_gcdext_one_single
-  _PROTO ((mp_ptr gp, mp_ptr s0p, mp_size_t *s0size,
-	   mp_ptr up, mp_size_t size, mp_ptr vp, mp_size_t vsize));
+  __GMP_PROTO ((mp_ptr, mp_ptr, mp_size_t *, mp_ptr, mp_size_t, mp_ptr, mp_size_t));
 mp_size_t mpn_gcdext_single
-  _PROTO ((mp_ptr gp, mp_ptr s0p, mp_size_t *s0size,
-	   mp_ptr up, mp_size_t size, mp_ptr vp, mp_size_t vsize));
+  __GMP_PROTO ((mp_ptr, mp_ptr, mp_size_t *, mp_ptr, mp_size_t, mp_ptr, mp_size_t));
 mp_size_t mpn_gcdext_double
-  _PROTO ((mp_ptr gp, mp_ptr s0p, mp_size_t *s0size,
-	   mp_ptr up, mp_size_t size, mp_ptr vp, mp_size_t vsize));
-
-mp_limb_t mpn_sb_divrem_mn_div _PROTO ((mp_ptr qp,
-					mp_ptr np,    mp_size_t nsize,
-					mp_srcptr dp, mp_size_t dsize));
-mp_limb_t mpn_sb_divrem_mn_inv _PROTO ((mp_ptr qp,
-					mp_ptr np,    mp_size_t nsize,
-					mp_srcptr dp, mp_size_t dsize));
-
-mp_size_t mpn_set_str_basecase _PROTO ((mp_ptr, const unsigned char *, size_t, int));
-mp_size_t mpn_set_str_subquad _PROTO ((mp_ptr, const unsigned char *, size_t, int));
-
-void mpn_toom3_mul_n_open _PROTO ((mp_ptr, mp_srcptr, mp_srcptr, mp_size_t,
-				   mp_ptr));
-void mpn_toom3_sqr_n_open _PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_ptr));
-void mpn_toom3_mul_n_mpn _PROTO ((mp_ptr, mp_srcptr, mp_srcptr, mp_size_t,
-				  mp_ptr));
-void mpn_toom3_sqr_n_mpn _PROTO((mp_ptr, mp_srcptr, mp_size_t, mp_ptr));
-
-void mpz_powm_mod _PROTO ((mpz_ptr res, mpz_srcptr base, mpz_srcptr e,
-			   mpz_srcptr mod));
-void mpz_powm_redc _PROTO ((mpz_ptr res, mpz_srcptr base, mpz_srcptr e,
-			    mpz_srcptr mod));
-void redc _PROTO ((mp_ptr cp, mp_srcptr mp, mp_size_t n, mp_limb_t Nprim,
-		   mp_ptr tp));
-
-int speed_routine_count_zeros_setup _PROTO ((struct speed_params *s,
-					     mp_ptr xp, int leading,
-					     int zero));
+  __GMP_PROTO ((mp_ptr, mp_ptr, mp_size_t *, mp_ptr, mp_size_t, mp_ptr, mp_size_t));
+
+mp_limb_t mpn_sb_divrem_mn_div __GMP_PROTO ((mp_ptr, mp_ptr, mp_size_t, mp_srcptr, mp_size_t));
+mp_limb_t mpn_sb_divrem_mn_inv __GMP_PROTO ((mp_ptr, mp_ptr, mp_size_t, mp_srcptr, mp_size_t));
+
+mp_size_t mpn_set_str_basecase __GMP_PROTO ((mp_ptr, const unsigned char *, size_t, int));
+
+void mpn_toom3_mul_n_open __GMP_PROTO ((mp_ptr, mp_srcptr, mp_srcptr, mp_size_t, mp_ptr));
+void mpn_toom3_sqr_n_open __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_ptr));
+void mpn_toom3_mul_n_mpn __GMP_PROTO ((mp_ptr, mp_srcptr, mp_srcptr, mp_size_t, mp_ptr));
+void mpn_toom3_sqr_n_mpn __GMP_PROTO((mp_ptr, mp_srcptr, mp_size_t, mp_ptr));
+
+void mpz_powm_mod __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr, mpz_srcptr));
+void mpz_powm_redc __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr, mpz_srcptr));
+
+int speed_routine_count_zeros_setup
+  __GMP_PROTO ((struct speed_params *, mp_ptr, int, int));
 
 
 /* "get" is called repeatedly until it ticks over, just in case on a fast
diff --git a/tune/time.c b/tune/time.c
index e52b62a90..865a92c75 100644
--- a/tune/time.c
+++ b/tune/time.c
@@ -458,7 +458,7 @@ cycles_works_p (void)
 
 #ifdef SIGILL
   {
-    RETSIGTYPE (*old_handler) _PROTO ((int));
+    RETSIGTYPE (*old_handler) __GMP_PROTO ((int));
     unsigned  cycles[2];
 
     old_handler = signal (SIGILL, cycles_works_handler);
diff --git a/tune/tuneup.c b/tune/tuneup.c
index bae48b35c..c48644f05 100644
--- a/tune/tuneup.c
+++ b/tune/tuneup.c
@@ -326,10 +326,10 @@ analyze_dat (int final)
 
 /* Measuring for recompiled mpn/generic/divrem_1.c and mpn/generic/mod_1.c */
 
-mp_limb_t mpn_divrem_1_tune _PROTO ((mp_ptr qp, mp_size_t xsize,
-                                    mp_srcptr ap, mp_size_t size,
-                                    mp_limb_t d));
-mp_limb_t mpn_mod_1_tune _PROTO ((mp_srcptr ap, mp_size_t size, mp_limb_t d));
+mp_limb_t mpn_divrem_1_tune
+  __GMP_PROTO ((mp_ptr, mp_size_t, mp_srcptr, mp_size_t, mp_limb_t));
+mp_limb_t mpn_mod_1_tune
+   __GMP_PROTO ((mp_srcptr, mp_size_t, mp_limb_t));
 
 double
 speed_mpn_mod_1_tune (struct speed_params *s)
@@ -1082,7 +1082,7 @@ tune_gcdext_dc (void)
   param.stop_factor = 2.0;
 
 
-double (*tuned_speed_mpn_divrem_1) _PROTO ((struct speed_params *s));
+double (*tuned_speed_mpn_divrem_1) __GMP_PROTO ((struct speed_params *));
 
 void
 tune_divrem_1 (void)
@@ -1136,7 +1136,7 @@ tune_divrem_1 (void)
 }
 
 
-double (*tuned_speed_mpn_mod_1) _PROTO ((struct speed_params *s));
+double (*tuned_speed_mpn_mod_1) __GMP_PROTO ((struct speed_params *));
 
 void
 tune_mod_1 (void)