--- gen-psqr.c	(revision 1)
+++ gen-psqr.c	(working copy)
@@ -17,9 +17,6 @@
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "dumbmp.c"
 
 
--- gen-fac_ui.c	(revision 1)
+++ gen-fac_ui.c	(working copy)
@@ -17,9 +17,6 @@
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "dumbmp.c"
 
 
--- gen-fib.c	(revision 1)
+++ gen-fib.c	(working copy)
@@ -17,7 +17,6 @@
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#include <stdio.h>
 #include "dumbmp.c"
 
 mpz_t  *f;
--- gmp-impl.h	(revision 1)
+++ gmp-impl.h	(working copy)
@@ -96,7 +96,7 @@
 #define DECL_submul_1(name) \
   DECL_addmul_1 (name)
 
-#if ! __GMP_WITHIN_CONFIGURE
+#if ! defined (__GMP_WITHIN_CONFIGURE)
 #include "config.h"
 #include "gmp-mparam.h"
 #include "fib_table.h"
--- mpn/generic/addsub_n.c	(revision 1)
+++ mpn/generic/addsub_n.c	(working copy)
@@ -35,8 +35,14 @@
 mp_limb_t
 mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp_srcptr s1p, mp_srcptr s2p, mp_size_t n)
 {
-  mp_limb_t acyn, acyo;		/* carry for add */
-  mp_limb_t scyn, scyo;		/* carry for subtract */
+  mp_limb_t acyo;		/* carry for add */
+#if ! HAVE_NATIVE_mpn_add_nc
+  mp_limb_t acyn;
+#endif
+  mp_limb_t scyo;		/* carry for subtract */
+#if ! HAVE_NATIVE_mpn_sub_nc
+  mp_limb_t scyn;
+#endif
   mp_size_t off;		/* offset in operands */
   mp_size_t this_n;		/* size of current chunk */
 
--- mpz/get_str.c	(revision 1)
+++ mpz/get_str.c	(working copy)
@@ -36,7 +36,7 @@
   char *return_str;
   size_t str_size;
   size_t alloc_size = 0;
-  char *num_to_text;
+  const char *num_to_text;
   int i;
   TMP_DECL;
 
Index: mpz/out_str.c
===================================================================
--- mpz/out_str.c	(revision 1)
+++ mpz/out_str.c	(working copy)
@@ -31,7 +31,7 @@
   size_t str_size;
   size_t i;
   size_t written;
-  char *num_to_text;
+  const char *num_to_text;
   TMP_DECL;
 
   if (stream == 0)
--- demos/pexpr.c	(revision 1)
+++ demos/pexpr.c	(working copy)
@@ -124,13 +124,13 @@
 void mpz_eval_expr __GMP_PROTO ((mpz_ptr, expr_t));
 void mpz_eval_mod_expr __GMP_PROTO ((mpz_ptr, expr_t, mpz_ptr));
 
-char *error;
+const char *error;
 int flag_print = 1;
 int print_timing = 0;
 int flag_html = 0;
 int flag_wml = 0;
 int flag_splitup_output = 0;
-char *newline = "";
+const char *newline = "";
 gmp_randstate_t rstate;