-top_h = top.h
-inferior_h = inferior.h $(breakpoint_h)
-target_h = target.h $(bfd_h) $(symtab_h) $(dcache_h) $(memattr_h)
-memattr_h = memattr.h
-tracepoint_h = tracepoint.h
-ax_h = ax.h
+annotate_h = annotate.h $(symtab_h) $(gdbtypes_h)
+arch_utils_h = arch-utils.h
+ax_h = ax.h $(doublest_h)
+breakpoint_h = breakpoint.h $(frame_h) $(value_h)
+call_cmds_h = call-cmds.h
+cli_cmds_h = $(srcdir)/cli/cli-cmds.h
+cli_decode_h = $(srcdir)/cli/cli-decode.h
+cli_out_h = cli-out.h
+cli_script_h = $(srcdir)/cli/cli-script.h
+cli_setshow_h = $(srcdir)/cli/cli-setshow.h
+cli_utils_h = $(srcdir)/cli/cli-utils.h
+command_h = command.h
+completer_h = completer.h
+cp_abi_h = cp-abi.h
+dcache_h = dcache.h
+defs_h = defs.h $(xm_h) $(tm_h) $(nm_h) config.status config.h gdbarch.h ui-file.h
+doublest_h = doublest.h $(floatformat_h)