diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bfe5163e3b..d27c6260c0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2002-11-30  Andrew Cagney  <cagney@redhat.com>
+
+	* exec.c (xfer_memory): Replace boolean with int.
+	* p-exp.y: Use 0 instead of false.
+	* corelow.c (gdb_check_format): Change return type to int from
+	boolean.
+	* utils.c: Don't include <curses.h> or <term.h> first.
+
 2002-11-29  Stephane Carrez  <stcarrez@nerim.fr>
 
 	* m68hc11-tdep.c (m68hc11_register_raw_size): Remove.
diff --git a/gdb/corelow.c b/gdb/corelow.c
index 8b172b7d9c..edcf46e26b 100644
--- a/gdb/corelow.c
+++ b/gdb/corelow.c
@@ -62,7 +62,7 @@ static int solib_add_stub (PTR);
 
 static struct core_fns *sniff_core_bfd (bfd *);
 
-static boolean gdb_check_format (bfd *);
+static int gdb_check_format (bfd *);
 
 static void core_open (char *, int);
 
@@ -160,7 +160,7 @@ default_check_format (bfd *abfd)
 
 /* Attempt to recognize core file formats that BFD rejects. */
 
-static boolean 
+static int
 gdb_check_format (bfd *abfd)
 {
   struct core_fns *cf;
diff --git a/gdb/exec.c b/gdb/exec.c
index 6ac7bd0724..edb730802d 100644
--- a/gdb/exec.c
+++ b/gdb/exec.c
@@ -481,10 +481,10 @@ xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
 	     struct mem_attrib *attrib,
 	     struct target_ops *target)
 {
-  boolean res;
+  int res;
   struct section_table *p;
   CORE_ADDR nextsectaddr, memend;
-  boolean (*xfer_fn) (bfd *, sec_ptr, PTR, file_ptr, bfd_size_type);
+  int (*xfer_fn) (bfd *, sec_ptr, PTR, file_ptr, bfd_size_type);
   asection *section = NULL;
 
   if (len <= 0)
diff --git a/gdb/p-exp.y b/gdb/p-exp.y
index f15c217383..4e924b8e75 100644
--- a/gdb/p-exp.y
+++ b/gdb/p-exp.y
@@ -293,7 +293,7 @@ exp	:	exp '.' { search_field = 1; }
 			    { while (TYPE_CODE (current_type) == TYPE_CODE_PTR)
 				current_type = TYPE_TARGET_TYPE (current_type);
 			      current_type = lookup_struct_elt_type (
-				current_type, $4.ptr, false); };
+				current_type, $4.ptr, 0); };
 			 } ; 
 exp	:	exp '['
 			/* We need to save the current_type value */
@@ -677,7 +677,7 @@ variable:	name_not_typename
 			      if (this_type)
 				current_type = lookup_struct_elt_type (
 				  this_type,
-				  copy_name($1.stoken), false);
+				  copy_name ($1.stoken), 0);
 			      else
 				current_type = NULL; 
 			    }
diff --git a/gdb/utils.c b/gdb/utils.c
index 06fb5938d5..58af78ac9a 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -20,23 +20,6 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-/* FIXME: cagney/2002-02-28: The GDB coding standard indicates that
-   "defs.h" should be included first.  Unfortunatly some systems
-   (currently Debian GNU/Linux) include the <stdbool.h> via <curses.h>
-   and they clash with "bfd.h"'s definiton of true/false.  The correct
-   fix is to remove true/false from "bfd.h", however, until that
-   happens, hack around it by including "config.h" and <curses.h>
-   first.  */
-
-#include "config.h"
-
-#ifdef HAVE_CURSES_H
-#include <curses.h>
-#endif
-#ifdef HAVE_TERM_H
-#include <term.h>
-#endif
-
 #include "defs.h"
 #include "gdb_assert.h"
 #include <ctype.h>
@@ -68,6 +51,13 @@
 
 #include <sys/param.h>		/* For MAXPATHLEN */
 
+#ifdef HAVE_CURSES_H
+#include <curses.h>
+#endif
+#ifdef HAVE_TERM_H
+#include <term.h>
+#endif
+
 #include <readline/readline.h>
 
 #ifdef USE_MMALLOC