diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b5a802a773..30511b4dfb 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-19  Joel Brobecker  <brobecker@adacore.com>
+
+	* symtab.h: #include "defs.h".
+	(enum language): Remove opaque declaration.
+	* Makefile.in (symtab_h): Update dependencies.
+
 2007-12-19  Joel Brobecker  <brobecker@adacore.com>
 
 	* language.h (enum exp_opcode): Remove commented out forward
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index a46c9d45c9..f1ec06a4e6 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -885,7 +885,7 @@ srec_h = srec.h
 stabsread_h = stabsread.h
 stack_h = stack.h
 symfile_h = symfile.h $(symtab_h)
-symtab_h = symtab.h
+symtab_h = symtab.h $(defs_h)
 target_h = target.h $(bfd_h) $(symtab_h) $(dcache_h) $(memattr_h) $(vec_h)
 target_descriptions_h = target-descriptions.h
 terminal_h = terminal.h
diff --git a/gdb/symtab.h b/gdb/symtab.h
index da35b29484..6b4b120937 100644
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -22,6 +22,8 @@
 #if !defined (SYMTAB_H)
 #define SYMTAB_H 1
 
+#include "defs.h"
+
 /* Opaque declarations.  */
 struct ui_file;
 struct frame_info;
@@ -32,7 +34,6 @@ struct block;
 struct blockvector;
 struct axs_value;
 struct agent_expr;
-enum language;
 
 /* Some of the structures in this file are space critical.
    The space-critical structures are: