diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6ad3267ebe..e580925606 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2003-06-01  Richard Henderson  <rth@redhat.com>
+
+        * Makefile.in (ALLDEPFILES): Add alpha-mdebug-tdep.c.
+        (alpha-linux-tdep.o): Update dependencies.
+        (alpha-nat.o, alpha-tdep.o, alpha-mdebug-tdep.o): Likewise.
+        * alpha-mdebug-tdep.c: Remove unneeded includes.
+
 2003-06-01  Richard Henderson  <rth@redhat.com>
 
         * alpha-tdep.c (alpha_register_reggroup_p): New.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 55e02041c6..93ab6ca6f9 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1356,7 +1356,7 @@ ALLDEPFILES = \
 	aix-thread.c \
 	alpha-nat.c alphabsd-nat.c \
 	alpha-tdep.c alpha-linux-tdep.c alphabsd-tdep.c alphanbsd-tdep.c \
-	alpha-osf1-tdep.c alphafbsd-tdep.c \
+	alpha-osf1-tdep.c alphafbsd-tdep.c alpha-mdebug-tdep.c \
 	arm-linux-nat.c arm-linux-tdep.c arm-tdep.c \
 	armnbsd-nat.c armnbsd-tdep.c \
 	avr-tdep.c \
@@ -1509,17 +1509,22 @@ ada-valprint.o: ada-valprint.c $(defs_h) $(symtab_h) $(gdbtypes_h) \
 aix-thread.o: aix-thread.c $(defs_h) $(gdb_assert_h) $(gdbthread_h) \
 	$(target_h) $(inferior_h) $(regcache_h) $(gdbcmd_h) $(language_h) \
 	$(ppc_tdep_h)
-alpha-linux-tdep.o: alpha-linux-tdep.c $(defs_h) $(frame_h) $(gdbcore_h) \
-	$(value_h) $(alpha_tdep_h) $(osabi_h)
-alpha-nat.o: alpha-nat.c $(defs_h) $(inferior_h) $(gdbcore_h) $(target_h) \
-	$(regcache_h) $(alpha_tdep_h) $(gregset_h) $(gdb_string_h)
+alpha-linux-tdep.o: alpha-linux-tdep.c $(defs_h) $(frame_h) $(frame_base_h) \
+	$(frame_unwind_h) $(dwarf2_frame_h) $(gdbcore_h) $(gdb_assert_h) \
+	$(osabi_h) $(symtab_h) $(symfile_h) $(value_h) $(alpha_tdep_h) 
+alpha-nat.o: alpha-nat.c $(defs_h) $(gdb_string_h) $(inferior_h) $(gdbcore_h) \
+	$(target_h) $(regcache_h) $(alpha_tdep_h) $(gregset_h) 
 alpha-osf1-tdep.o: alpha-osf1-tdep.c $(defs_h) $(frame_h) $(gdbcore_h) \
 	$(value_h) $(osabi_h) $(gdb_string_h) $(alpha_tdep_h)
-alpha-tdep.o: alpha-tdep.c $(defs_h) $(frame_h) $(inferior_h) $(symtab_h) \
+alpha-tdep.o: alpha-tdep.c $(defs_h) $(doublest_h) $(frame_h) \
+	$(frame_unwind_h) $(frame_base_h) $(inferior_h) $(symtab_h) \
 	$(value_h) $(gdbcmd_h) $(gdbcore_h) $(dis_asm_h) $(symfile_h) \
 	$(objfiles_h) $(gdb_string_h) $(linespec_h) $(regcache_h) \
-	$(doublest_h) $(arch_utils_h) $(elf_bfd_h) $(alpha_tdep_h) \
-	$(osabi_h) $(block_h)
+	$(reggroups_h) $(arch_utils_h) $(osabi_h) $(block_h) $(gdb_assert_h) \
+	$(elf_bfd_h) $(alpha_tdep_h)
+alpha-mdebug-tdep.o: alpha-mdebug-tdep.c $(defs_h) $(frame_h) \
+	$(frame_unwind_h) $(frame_base_h) $(symtab_h) $(gdbcore_h) \
+	$(block_h) $(gdb_assert_h) $(alpha_tdep_h)
 alphabsd-nat.o: alphabsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) \
 	$(alpha_tdep_h) $(alphabsd_tdep_h) $(gregset_h)
 alphabsd-tdep.o: alphabsd-tdep.c $(defs_h) $(regcache_h) $(alpha_tdep_h) \
diff --git a/gdb/alpha-mdebug-tdep.c b/gdb/alpha-mdebug-tdep.c
index 2f49e08260..4baae9752f 100644
--- a/gdb/alpha-mdebug-tdep.c
+++ b/gdb/alpha-mdebug-tdep.c
@@ -23,25 +23,11 @@
 #include "frame.h"
 #include "frame-unwind.h"
 #include "frame-base.h"
-#include "inferior.h"
 #include "symtab.h"
-#include "value.h"
-#include "gdbcmd.h"
 #include "gdbcore.h"
-#include "dis-asm.h"
-#include "symfile.h"
-#include "objfiles.h"
-#include "gdb_string.h"
-#include "linespec.h"
-#include "regcache.h"
-#include "doublest.h"
-#include "arch-utils.h"
-#include "osabi.h"
 #include "block.h"
 #include "gdb_assert.h"
 
-#include "elf-bfd.h"
-
 #include "alpha-tdep.h"
 
 /* FIXME: Some of this code should perhaps be merged with mips.  */