diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5836d7c23a..de51252cdf 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-17  Joel Brobecker  <brobecker@adacore.com>
+
+	* language.h (enum exp_opcode): Add forward declaration.
+	(language_string_char_type, language_lookup_primitive_type_by_name):
+	Move declaration past declaration of language_defn.
+
 2007-12-16  Daniel Jacobowitz  <dan@codesourcery.com>
             Joseph Myers  <joseph@codesourcery.com>
 
diff --git a/gdb/language.h b/gdb/language.h
index fc1a99d9ca..22e6a46b5d 100644
--- a/gdb/language.h
+++ b/gdb/language.h
@@ -30,8 +30,7 @@ struct objfile;
 struct frame_info;
 struct expression;
 struct ui_file;
-
-/* enum exp_opcode;     ANSI's `wisdom' didn't include forward enum decls. */
+enum exp_opcode;
 
 /* This used to be included to configure GDB for one or more specific
    languages.  Now it is left out to configure for all of them.  FIXME.  */
@@ -129,13 +128,6 @@ struct language_arch_info
   struct type *string_char_type;
 };
 
-struct type *language_string_char_type (const struct language_defn *l,
-					struct gdbarch *gdbarch);
-
-struct type *language_lookup_primitive_type_by_name (const struct language_defn *l,
-						     struct gdbarch *gdbarch,
-						     const char *name);
-
 /* Structure tying together assorted information about a language.  */
 
 struct language_defn
@@ -314,6 +306,14 @@ extern enum language_mode
     language_mode_auto, language_mode_manual
   }
 language_mode;
+
+struct type *language_string_char_type (const struct language_defn *l,
+					struct gdbarch *gdbarch);
+
+struct type *language_lookup_primitive_type_by_name (const struct language_defn *l,
+						     struct gdbarch *gdbarch,
+						     const char *name);
+
 
 /* These macros define the behaviour of the expression 
    evaluator.  */