* arch-utils.c (#include "gdbthread.h"): Removed.

(#include "symfile.h"): Removed.
(XMALLOC): Removed unused macro.
* breakpoint.c (tbreak_command): Removed local declaration.
(awatch_command, do_enable_breakpoint, set_breakpoint_count):
Remove duplicate declarations.
(bpstat_should_step, bpstat_have_active_hw_watchpoints)
(remove_solib_event_breakpoints): Fix indentation botch.
* c-typeprint.c (#include "command.h"): Removed.
(#include "gdbcmd.h"): Removed.
* ch-exp.c (ch_terminal_match_float_literal, parse_expr)
(parse_primval, parse_untyped_expr, parse_opt_untyped_expr):
Removed duplicate declarations.
* ch-typeprint.c (#include "command.h"): Removed.
(#include "gdbcmd.h"): Removed.
* corefile.c (#include "frame.h"): Removed
(#include "symfile.h"): Removed.
(#include "language.h"): Removed.
* dbxread.c (#include "command.h"): Removed.
* environ.c (#include "gdbcore.h"): Removed.
* event-loop.c (#include "top.h"): Removed.
* f-typeprint.c (#include "command.h"): Removed.
(#include "gdbcmd.h"): Removed.
(#include "language.h"): Removed.
(#include "typeprint.h"): Removed.
(#include "frame.h"): Removed.
* gdbtypes.h (print_type_scalar): Removed declaration.
* infcmd.c (#include "completer.h"): Removed.
* language.c (#include "frame.h"): Removed.
* m2-typeprint.c (#include "command.h"): Removed.
(#include "gdbcmd.h"): Removed.
(#include "language.h"): Removed.
* m2-valprint.c (#include "valprint.h"): Removed.
* p-typeprint.c (#include "command.h"): Removed.
(#include "gdbcmd.h"): Removed.
* p-valprint.c (#include "typeprint.h"): Removed.
* parse.c (#include "linespec.h"): Removed.
* regcache.c (#include "frame.h"): Removed.
* remote.c (#include "frame.h"): Removed.
(getpkt_sane): Make static.
* source.c (#include "completer.h"): Removed.
* stack.c (#include "symfile.h"): Removed.
(#include "objfiles.h"): Removed.
* symfile.c (#include "completer.h"): Removed.
* tracepoint.c (#include "completer.h"): Removed.
* values.c (#include "frame.h"): Removed.
* varobj.c (#include "valprint.h"): Removed.
* wrapper.c (#include "frame.h"): Removed.

* memattr.c (create_mem_region): Removed unused variable.
* remote-nrom.c: Removed spurious semicolon after init_nrom_ops.
-------------------------------------------------------------------

1 files changed, 2 insertions, 7 deletions

diff --git a/gdb/ch-exp.c b/gdb/ch-exp.c
index abd51878c28..c5d2fdaab35 100644
--- a/gdb/ch-exp.c
+++ b/gdb/ch-exp.c
@@ -148,13 +148,14 @@ static enum ch_terminal match_integer_literal (void);
 static enum ch_terminal match_character_literal (void);
 static enum ch_terminal match_string_literal (void);
 static enum ch_terminal match_float_literal (void);
-static enum ch_terminal match_float_literal (void);
 static int decode_integer_literal (LONGEST *, char **);
 static int decode_integer_value (int, char **, LONGEST *);
 static char *match_simple_name_string (void);
 static void growbuf_by_size (int);
+static void parse_case_label (void);
 static void parse_untyped_expr (void);
 static void parse_if_expression (void);
+static void parse_if_expression_body (void);
 static void parse_else_alternative (void);
 static void parse_then_alternative (void);
 static void parse_expr (void);
@@ -177,13 +178,7 @@ static struct type *parse_mode_call (void);
 #endif
 static void parse_unary_call (void);
 static int parse_opt_untyped_expr (void);
-static void parse_case_label (void);
 static int expect (enum ch_terminal, char *);
-static void parse_expr (void);
-static void parse_primval (void);
-static void parse_untyped_expr (void);
-static int parse_opt_untyped_expr (void);
-static void parse_if_expression_body (void);
 static enum ch_terminal ch_lex (void);
 INLINE static enum ch_terminal PEEK_TOKEN (void);
 static enum ch_terminal peek_token_ (int);