2004-01-18 Andrew Cagney <cagney@redhat.com>

	* tui/tui-command.c: Rename tui/tuiCommand.c.
	* tui/tui-command.h: Rename tui/tuiCommand.h.
	* tui/tui-data.c: Rename tui/tuiData.c.
	* tui/tui-data.h: Rename tui/tuiData.h.
	* tui/tui-disasm.c: Rename tui/tuiDisassem.c.
	* tui/tui-disasm.h: Rename tui/tuiDisassem.h.
	* tui/tui-io.c: Rename tui/tuiIO.c.
	* tui/tui-io.h: Rename tui/tuiIO.h.
	* tui/tui-layout.c: Rename tui/tuiLayout.c.
	* tui/tui-layout.h: Rename tui/tuiLayout.h.
	* tui/tui-regs.c: Rename tui/tuiRegs.c.
	* tui/tui-regs.h: Rename tui/tuiRegs.h.
	* tui/tui-source.c: Rename tui/tuiSource.c.
	* tui/tui-source.h: Rename tui/tuiSource.h.
	* tui/tui-stack.c: Rename tui/tuiStack.c.
	* tui/tui-stack.h: Rename tui/tuiStack.h.
	* tui/tui-win.c: Rename tui/tuiWin.c.
	* tui/tui-win.h: Rename tui/tuiWin.h.
	* tui/tui-windata.c: Rename tui/tuiDataWin.c.
	* tui/tui-windata.h: Rename tui/tuiDataWin.h.
	* tui/tui-wingeneral.c: Rename tui/tuiGeneralWin.c.
	* tui/tui-wingeneral.h: Rename tui/tuiGeneralWin.h.
	* tui/tui-winsource.c: Rename tui/tuiSourceWin.c.
	* tui/tui-winsource.h: Rename tui/tuiSourceWin.h.
	* tui/tui-file.c: Update includes.
	* tui/tui-hooks.c: Update includes.
	* tui/tui-interp.c: Update includes.
	* tui/tui.c: Update includes.
	* Makefile.in: Update all tui/ dependencies.
	(SUBDIR_TUI_OBS, SUBDIR_TUI_SRCS): Update file names.

30 files changed, 231 insertions, 173 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d516387476c..c3ea431e6d4 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,36 @@
 2004-01-18  Andrew Cagney  <cagney@redhat.com>
 
+	* tui/tui-command.c: Rename tui/tuiCommand.c.
+	* tui/tui-command.h: Rename tui/tuiCommand.h.
+	* tui/tui-data.c: Rename tui/tuiData.c.
+	* tui/tui-data.h: Rename tui/tuiData.h.
+	* tui/tui-disasm.c: Rename tui/tuiDisassem.c.
+	* tui/tui-disasm.h: Rename tui/tuiDisassem.h.
+	* tui/tui-io.c: Rename tui/tuiIO.c.
+	* tui/tui-io.h: Rename tui/tuiIO.h.
+	* tui/tui-layout.c: Rename tui/tuiLayout.c.
+	* tui/tui-layout.h: Rename tui/tuiLayout.h.
+	* tui/tui-regs.c: Rename tui/tuiRegs.c.
+	* tui/tui-regs.h: Rename tui/tuiRegs.h.
+	* tui/tui-source.c: Rename tui/tuiSource.c.
+	* tui/tui-source.h: Rename tui/tuiSource.h.
+	* tui/tui-stack.c: Rename tui/tuiStack.c.
+	* tui/tui-stack.h: Rename tui/tuiStack.h.
+	* tui/tui-win.c: Rename tui/tuiWin.c.
+	* tui/tui-win.h: Rename tui/tuiWin.h.
+	* tui/tui-windata.c: Rename tui/tuiDataWin.c.
+	* tui/tui-windata.h: Rename tui/tuiDataWin.h.
+	* tui/tui-wingeneral.c: Rename tui/tuiGeneralWin.c.
+	* tui/tui-wingeneral.h: Rename tui/tuiGeneralWin.h.
+	* tui/tui-winsource.c: Rename tui/tuiSourceWin.c.
+	* tui/tui-winsource.h: Rename tui/tuiSourceWin.h.
+	* tui/tui-file.c: Update includes.
+	* tui/tui-hooks.c: Update includes.
+	* tui/tui-interp.c: Update includes.
+	* tui/tui.c: Update includes.
+	* Makefile.in: Update all tui/ dependencies.
+	(SUBDIR_TUI_OBS, SUBDIR_TUI_SRCS): Update file names.
+
 	* Makefile.in: Update copyright.  Update dependencies.
 
 	* tui/tuiSourceWin.c (tui_update_breakpoint_info): Fix compile
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index e2f1a795903..407391575c0 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -196,19 +196,40 @@ SUBDIR_MI_UNINSTALL=
 # TUI sub directory definitions
 #
 SUBDIR_TUI_OBS = \
-	tui-file.o tui.o tuiData.o tuiSource.o tuiStack.o tuiIO.o \
+	tui-command.o \
+	tui-data.o \
+	tui-disasm.o \
+	tui-file.o tui.o \
+	tui-hooks.o \
 	tui-interp.o \
-	tuiGeneralWin.o tuiLayout.o tuiWin.o tuiCommand.o \
-	tuiDisassem.o tuiSourceWin.o tuiRegs.o tuiDataWin.o \
-	tui-out.o tui-hooks.o
+	tui-io.o \
+	tui-layout.o \
+	tui-out.o \
+	tui-regs.o \
+	tui-source.o \
+	tui-stack.o \
+	tui-win.o \
+	tui-windata.o \
+	tui-wingeneral.o \
+	tui-winsource.o
 SUBDIR_TUI_SRCS = \
-	tui/tui-file.c tui/tui.c tui/tuiData.c tui/tuiSource.c \
+	tui/tui-command.c \
+	tui/tui-data.c \
+	tui/tui-disasm.c \
+	tui/tui-file.c \
+	tui/tui-hooks.c \
 	tui/tui-interp.c \
-	tui/tuiStack.c tui/tuiIO.c \
-	tui/tuiGeneralWin.c tui/tuiLayout.c \
-	tui/tuiWin.c tui/tuiCommand.c \
-	tui/tuiDisassem.c tui/tuiSourceWin.c \
-	tui/tuiRegs.c tui/tuiDataWin.c tui/tui-out.c tui/tui-hooks.c
+	tui/tui-io.c \
+	tui/tui-layout.c \
+	tui/tui-out.c \
+	tui/tui-regs.c \
+	tui/tui-source.c \
+	tui/tui-stack.c \
+	tui/tui-win.c \
+	tui/tui-windata.c \
+	tui/tui-wingeneral.c \
+	tui/tui-winsource.c \
+	tui/tui.c
 SUBDIR_TUI_DEPS =
 SUBDIR_TUI_INITS = \
 	$(SUBDIR_TUI_SRCS)
@@ -812,20 +833,20 @@ mi_parse_h = $(srcdir)/mi/mi-parse.h
 # gdb/tui/ headers
 #
 
-tuiCommand_h = $(srcdir)/tui/tuiCommand.h
-tuiDataWin_h = $(srcdir)/tui/tuiDataWin.h
-tuiData_h = $(srcdir)/tui/tuiData.h
-tuiDisassem_h = $(srcdir)/tui/tuiDisassem.h
-tuiGeneralWin_h = $(srcdir)/tui/tuiGeneralWin.h
-tuiIO_h = $(srcdir)/tui/tuiIO.h
-tuiLayout_h = $(srcdir)/tui/tuiLayout.h
-tuiRegs_h = $(srcdir)/tui/tuiRegs.h
-tuiSourceWin_h = $(srcdir)/tui/tuiSourceWin.h
-tuiSource_h = $(srcdir)/tui/tuiSource.h $(defs_h)
-tuiStack_h = $(srcdir)/tui/tuiStack.h
-tuiWin_h = $(srcdir)/tui/tuiWin.h
+tui_command_h = $(srcdir)/tui/tui-command.h
+tui_data_h = $(srcdir)/tui/tui-data.h
+tui_disasm_h = $(srcdir)/tui/tui-disasm.h
 tui_file_h = $(srcdir)/tui/tui-file.h
 tui_h = $(srcdir)/tui/tui.h $(ansidecl_h)
+tui_io_h = $(srcdir)/tui/tui-io.h
+tui_layout_h = $(srcdir)/tui/tui-layout.h
+tui_regs_h = $(srcdir)/tui/tui-regs.h
+tui_source_h = $(srcdir)/tui/tui-source.h $(defs_h)
+tui_stack_h = $(srcdir)/tui/tui-stack.h
+tui_windata_h = $(srcdir)/tui/tui-windata.h
+tui_wingeneral_h = $(srcdir)/tui/tui-wingeneral.h
+tui_win_h = $(srcdir)/tui/tui-win.h
+tui_winsource_h = $(srcdir)/tui/tui-winsource.h
 
 # Header files that need to have srcdir added.  Note that in the cases
 # where we use a macro like $(gdbcmd_h), things are carefully arranged
@@ -2785,80 +2806,86 @@ signals.o: $(srcdir)/signals/signals.c $(server_h) $(defs_h) $(target_h) \
 # Need to explicitly specify the compile rule as make will do nothing
 # or try to compile the object file into the sub-directory.
 
-tuiCommand.o: $(srcdir)/tui/tuiCommand.c $(defs_h) $(tui_h) $(tuiData_h) \
-	$(tuiWin_h) $(tuiIO_h)
-	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tuiCommand.c
-tuiDataWin.o: $(srcdir)/tui/tuiDataWin.c $(defs_h) $(tui_h) $(tuiData_h) \
-	$(tuiGeneralWin_h) $(tuiRegs_h)
-	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tuiDataWin.c
-tuiData.o: $(srcdir)/tui/tuiData.c $(defs_h) $(symtab_h) $(tui_h) \
-	$(tuiData_h) $(tuiGeneralWin_h)
-	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tuiData.c
-tuiDisassem.o: $(srcdir)/tui/tuiDisassem.c $(defs_h) $(symtab_h) \
-	$(breakpoint_h) $(frame_h) $(value_h) $(source_h) $(disasm_h) \
-	$(tui_h) $(tuiData_h) $(tuiWin_h) $(tuiLayout_h) $(tuiSourceWin_h) \
-	$(tuiStack_h) $(tui_file_h)
-	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tuiDisassem.c
-tuiGeneralWin.o: $(srcdir)/tui/tuiGeneralWin.c $(defs_h) $(tui_h) \
-	$(tuiData_h) $(tuiGeneralWin_h) $(tuiWin_h)
-	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tuiGeneralWin.c
-tuiIO.o: $(srcdir)/tui/tuiIO.c $(defs_h) $(terminal_h) $(target_h) \
-	$(event_loop_h) $(event_top_h) $(command_h) $(top_h) $(readline_h) \
-	$(tui_h) $(tuiData_h) $(tuiIO_h) $(tuiCommand_h) $(tuiWin_h) \
-	$(tuiGeneralWin_h) $(tui_file_h) $(ui_out_h) $(cli_out_h)
-	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tuiIO.c
-tuiLayout.o: $(srcdir)/tui/tuiLayout.c $(defs_h) $(command_h) $(symtab_h) \
-	$(frame_h) $(source_h) $(tui_h) $(tuiData_h) $(tuiDataWin_h) \
-	$(tuiGeneralWin_h) $(tuiStack_h) $(tuiRegs_h) $(tuiWin_h) \
-	$(tuiSourceWin_h) $(tuiDisassem_h)
-	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tuiLayout.c
-tuiRegs.o: $(srcdir)/tui/tuiRegs.c $(defs_h) $(tui_h) $(tuiData_h) \
-	$(symtab_h) $(gdbtypes_h) $(gdbcmd_h) $(frame_h) $(regcache_h) \
-	$(inferior_h) $(target_h) $(tuiLayout_h) $(tuiWin_h) $(tuiDataWin_h) \
-	$(tuiGeneralWin_h) $(tui_file_h)
-	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tuiRegs.c
 tuiSourceWin.o: $(srcdir)/tui/tuiSourceWin.c $(defs_h) $(symtab_h) \
 	$(frame_h) $(breakpoint_h) $(value_h) $(source_h) $(tui_h) \
 	$(tuiData_h) $(tuiStack_h) $(tuiWin_h) $(tuiGeneralWin_h) \
 	$(tuiSourceWin_h) $(tuiSource_h) $(tuiDisassem_h)
 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tuiSourceWin.c
-tuiSource.o: $(srcdir)/tui/tuiSource.c $(defs_h) $(symtab_h) $(frame_h) \
-	$(breakpoint_h) $(source_h) $(symtab_h) $(tui_h) $(tuiData_h) \
-	$(tuiStack_h) $(tuiSourceWin_h) $(tuiSource_h)
-	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tuiSource.c
-tuiStack.o: $(srcdir)/tui/tuiStack.c $(defs_h) $(symtab_h) $(breakpoint_h) \
-	$(frame_h) $(command_h) $(inferior_h) $(target_h) $(top_h) $(tui_h) \
-	$(tuiData_h) $(tuiStack_h) $(tuiGeneralWin_h) $(tuiSource_h) \
-	$(tuiSourceWin_h) $(tui_file_h)
-	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tuiStack.c
-tuiWin.o: $(srcdir)/tui/tuiWin.c $(defs_h) $(command_h) $(symtab_h) \
-	$(breakpoint_h) $(frame_h) $(cli_cmds_h) $(top_h) $(source_h) \
-	$(tui_h) $(tuiData_h) $(tuiGeneralWin_h) $(tuiStack_h) $(tuiRegs_h) \
-	$(tuiDisassem_h) $(tuiSource_h) $(tuiSourceWin_h) $(tuiDataWin_h)
-	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tuiWin.c
-tui.o: $(srcdir)/tui/tui.c $(defs_h) $(gdbcmd_h) $(tui_h) $(tuiData_h) \
-	$(tuiLayout_h) $(tuiIO_h) $(tuiRegs_h) $(tuiStack_h) $(tuiWin_h) \
-	$(tuiSourceWin_h) $(tuiDataWin_h) $(readline_h) $(target_h) \
-	$(frame_h) $(breakpoint_h) $(inferior_h) $(symtab_h) $(source_h)
+tui.o: $(srcdir)/tui/tui.c $(defs_h) $(gdbcmd_h) $(tui_h) $(tui_data_h) \
+	$(tui_layout_h) $(tui_io_h) $(tui_regs_h) $(tui_stack_h) \
+	$(tui_win_h) $(tui_winsource_h) $(tui_windata_h) $(readline_h) \
+	$(target_h) $(frame_h) $(breakpoint_h) $(inferior_h) $(symtab_h) \
+	$(source_h)
 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui.c
+tui-command.o: $(srcdir)/tui/tui-command.c $(defs_h) $(tui_h) $(tui_data_h) \
+	$(tui_win_h) $(tui_io_h)
+	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-command.c
+tui-data.o: $(srcdir)/tui/tui-data.c $(defs_h) $(symtab_h) $(tui_h) \
+	$(tui_data_h) $(tui_wingeneral_h)
+	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-data.c
+tui-disasm.o: $(srcdir)/tui/tui-disasm.c $(defs_h) $(symtab_h) \
+	$(breakpoint_h) $(frame_h) $(value_h) $(source_h) $(disasm_h) \
+	$(tui_h) $(tui_data_h) $(tui_win_h) $(tui_layout_h) \
+	$(tui_winsource_h) $(tui_stack_h) $(tui_file_h)
+	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-disasm.c
 tui-file.o: $(srcdir)/tui/tui-file.c $(defs_h) $(ui_file_h) $(tui_file_h) \
-	$(tui_tuiIO_h) $(tui_h)
+	$(tui_io_h) $(tui_h)
 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-file.c
 tui-hooks.o: $(srcdir)/tui/tui-hooks.c $(defs_h) $(symtab_h) $(inferior_h) \
 	$(command_h) $(bfd_h) $(symfile_h) $(objfiles_h) $(target_h) \
 	$(gdbcore_h) $(event_loop_h) $(event_top_h) $(frame_h) \
 	$(breakpoint_h) $(gdb_events_h) $(ui_out_h) $(top_h) $(tui_h) \
-	$(tuiData_h) $(tuiLayout_h) $(tuiIO_h) $(tuiRegs_h) $(tuiWin_h) \
-	$(tuiStack_h) $(tuiDataWin_h) $(tuiSourceWin_h)
+	$(tui_data_h) $(tui_layout_h) $(tui_io_h) $(tui_regs_h) $(tui_win_h) \
+	$(tui_stack_h) $(tui_windata_h) $(tui_winsource_h)
 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-hooks.c
 tui-interp.o: $(srcdir)/tui/tui-interp.c $(defs_h) $(interps_h) $(top_h) \
 	$(event_top_h) $(event_loop_h) $(ui_out_h) $(cli_out_h) \
-	$(tui_tuiData_h) $(readline_h) $(tui_tuiWin_h) $(tui_h) \
-	$(tui_tuiIO_h)
+	$(tui_data_h) $(readline_h) $(tui_win_h) $(tui_h) $(tui_io_h)
 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-interp.c
+tui-io.o: $(srcdir)/tui/tui-io.c $(defs_h) $(terminal_h) $(target_h) \
+	$(event_loop_h) $(event_top_h) $(command_h) $(top_h) $(readline_h) \
+	$(tui_h) $(tui_data_h) $(tui_io_h) $(tui_command_h) $(tui_win_h) \
+	$(tui_wingeneral_h) $(tui_file_h) $(ui_out_h) $(cli_out_h)
+	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-io.c
+tui-layout.o: $(srcdir)/tui/tui-layout.c $(defs_h) $(command_h) $(symtab_h) \
+	$(frame_h) $(source_h) $(tui_h) $(tui_data_h) $(tui_windata_h) \
+	$(tui_wingeneral_h) $(tui_stack_h) $(tui_regs_h) $(tui_win_h) \
+	$(tui_winsource_h) $(tui_disasm_h)
+	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-layout.c
 tui-out.o: $(srcdir)/tui/tui-out.c $(defs_h) $(ui_out_h) $(tui_h) \
 	$(gdb_string_h) $(gdb_assert_h)
 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-out.c
+tui-regs.o: $(srcdir)/tui/tui-regs.c $(defs_h) $(tui_h) $(tui_data_h) \
+	$(symtab_h) $(gdbtypes_h) $(gdbcmd_h) $(frame_h) $(regcache_h) \
+	$(inferior_h) $(target_h) $(tui_layout_h) $(tui_win_h) \
+	$(tui_windata_h) $(tui_wingeneral_h) $(tui_file_h)
+	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-regs.c
+tui-source.o: $(srcdir)/tui/tui-source.c $(defs_h) $(symtab_h) $(frame_h) \
+	$(breakpoint_h) $(source_h) $(symtab_h) $(tui_h) $(tui_data_h) \
+	$(tui_stack_h) $(tui_winsource_h) $(tui_source_h)
+	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-source.c
+tui-stack.o: $(srcdir)/tui/tui-stack.c $(defs_h) $(symtab_h) $(breakpoint_h) \
+	$(frame_h) $(command_h) $(inferior_h) $(target_h) $(top_h) $(tui_h) \
+	$(tui_data_h) $(tui_stack_h) $(tui_wingeneral_h) $(tui_source_h) \
+	$(tui_winsource_h) $(tui_file_h)
+	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-stack.c
+tui-win.o: $(srcdir)/tui/tui-win.c $(defs_h) $(command_h) $(symtab_h) \
+	$(breakpoint_h) $(frame_h) $(cli_cmds_h) $(top_h) $(source_h) \
+	$(tui_h) $(tui_data_h) $(tui_wingeneral_h) $(tui_stack_h) \
+	$(tui_regs_h) $(tui_disasm_h) $(tui_source_h) $(tui_winsource_h) \
+	$(tui_windata_h)
+	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-win.c
+tui-windata.o: $(srcdir)/tui/tui-windata.c $(defs_h) $(tui_h) $(tui_data_h) \
+	$(tui_wingeneral_h) $(tui_regs_h)
+	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-windata.c
+tui-wingeneral.o: $(srcdir)/tui/tui-wingeneral.c $(defs_h) $(tui_h) \
+	$(tui_data_h) $(tui_wingeneral_h) $(tui_win_h)
+	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-wingeneral.c
+tui-winsource.o: $(srcdir)/tui/tui-winsource.c $(defs_h) $(symtab_h) \
+	$(frame_h) $(breakpoint_h) $(value_h) $(source_h) $(tui_h) \
+	$(tui_data_h) $(tui_stack_h) $(tui_win_h) $(tui_wingeneral_h) \
+	$(tui_winsource_h) $(tui_source_h) $(tui_disasm_h)
+	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-winsource.c
 
 #
 # vx-share sub-directory
diff --git a/gdb/tui/tuiCommand.c b/gdb/tui/tui-command.c
index 675b34c5443..8fcf0dd183c 100644
--- a/gdb/tui/tuiCommand.c
+++ b/gdb/tui/tui-command.c
@@ -24,10 +24,10 @@
 
 #include "defs.h"
 #include <ctype.h>
-#include "tui.h"
-#include "tuiData.h"
-#include "tuiWin.h"
-#include "tuiIO.h"
+#include "tui/tui.h"
+#include "tui/tui-data.h"
+#include "tui/tui-win.h"
+#include "tui/tui-io.h"
 
 #ifdef HAVE_NCURSES_H       
 #include <ncurses.h>
diff --git a/gdb/tui/tuiCommand.h b/gdb/tui/tui-command.h
index 7afeb1bb395..7afeb1bb395 100644
--- a/gdb/tui/tuiCommand.h
+++ b/gdb/tui/tui-command.h
diff --git a/gdb/tui/tuiData.c b/gdb/tui/tui-data.c
index 5acc33cc67d..c6f4fb5dafc 100644
--- a/gdb/tui/tuiData.c
+++ b/gdb/tui/tui-data.c
@@ -24,9 +24,9 @@
 
 #include "defs.h"
 #include "symtab.h"
-#include "tui.h"
-#include "tuiData.h"
-#include "tuiGeneralWin.h"
+#include "tui/tui.h"
+#include "tui/tui-data.h"
+#include "tui/tui-wingeneral.h"
 
 #ifdef HAVE_NCURSES_H       
 #include <ncurses.h>
diff --git a/gdb/tui/tuiData.h b/gdb/tui/tui-data.h
index 6fcf875b457..6fcf875b457 100644
--- a/gdb/tui/tuiData.h
+++ b/gdb/tui/tui-data.h
diff --git a/gdb/tui/tuiDisassem.c b/gdb/tui/tui-disasm.c
index e36c5df521b..763d81eee2d 100644
--- a/gdb/tui/tuiDisassem.c
+++ b/gdb/tui/tui-disasm.c
@@ -30,13 +30,13 @@
 #include "source.h"
 #include "disasm.h"
 
-#include "tui.h"
-#include "tuiData.h"
-#include "tuiWin.h"
-#include "tuiLayout.h"
-#include "tuiSourceWin.h"
-#include "tuiStack.h"
-#include "tui-file.h"
+#include "tui/tui.h"
+#include "tui/tui-data.h"
+#include "tui/tui-win.h"
+#include "tui/tui-layout.h"
+#include "tui/tui-winsource.h"
+#include "tui/tui-stack.h"
+#include "tui/tui-file.h"
 
 #ifdef HAVE_NCURSES_H       
 #include <ncurses.h>
diff --git a/gdb/tui/tuiDisassem.h b/gdb/tui/tui-disasm.h
index 67284259bf0..67284259bf0 100644
--- a/gdb/tui/tuiDisassem.h
+++ b/gdb/tui/tui-disasm.h
diff --git a/gdb/tui/tui-file.c b/gdb/tui/tui-file.c
index 1a72d01f856..36fc097029c 100644
--- a/gdb/tui/tui-file.c
+++ b/gdb/tui/tui-file.c
@@ -21,7 +21,7 @@
 #include "defs.h"
 #include "ui-file.h"
 #include "tui/tui-file.h"
-#include "tui/tuiIO.h"
+#include "tui/tui-io.h"
 
 #include "tui.h"
 
diff --git a/gdb/tui/tui-hooks.c b/gdb/tui/tui-hooks.c
index e00ba857773..f0f2060d87b 100644
--- a/gdb/tui/tui-hooks.c
+++ b/gdb/tui/tui-hooks.c
@@ -39,15 +39,15 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "tui.h"
-#include "tuiData.h"
-#include "tuiLayout.h"
-#include "tuiIO.h"
-#include "tuiRegs.h"
-#include "tuiWin.h"
-#include "tuiStack.h"
-#include "tuiDataWin.h"
-#include "tuiSourceWin.h"
+#include "tui/tui.h"
+#include "tui/tui-data.h"
+#include "tui/tui-layout.h"
+#include "tui/tui-io.h"
+#include "tui/tui-regs.h"
+#include "tui/tui-win.h"
+#include "tui/tui-stack.h"
+#include "tui/tui-windata.h"
+#include "tui/tui-winsource.h"
 
 #ifdef HAVE_NCURSES_H
 #include <ncurses.h>
diff --git a/gdb/tui/tui-interp.c b/gdb/tui/tui-interp.c
index 986ebb3b133..82b4dcd27fb 100644
--- a/gdb/tui/tui-interp.c
+++ b/gdb/tui/tui-interp.c
@@ -26,11 +26,11 @@
 #include "event-loop.h"
 #include "ui-out.h"
 #include "cli-out.h"
-#include "tui/tuiData.h"
+#include "tui/tui-data.h"
 #include "readline/readline.h"
-#include "tui/tuiWin.h"
+#include "tui/tui-win.h"
 #include "tui/tui.h"
-#include "tui/tuiIO.h"
+#include "tui/tui-io.h"
 
 /* Set to 1 when the TUI mode must be activated when we first start gdb.  */
 static int tui_start_enabled = 0;
diff --git a/gdb/tui/tuiIO.c b/gdb/tui/tui-io.c
index 1a8bbc2037a..e17971fa059 100644
--- a/gdb/tui/tuiIO.c
+++ b/gdb/tui/tui-io.c
@@ -30,13 +30,13 @@
 #include "command.h"
 #include "top.h"
 #include "readline/readline.h"
-#include "tui.h"
-#include "tuiData.h"
-#include "tuiIO.h"
-#include "tuiCommand.h"
-#include "tuiWin.h"
-#include "tuiGeneralWin.h"
-#include "tui-file.h"
+#include "tui/tui.h"
+#include "tui/tui-data.h"
+#include "tui/tui-io.h"
+#include "tui/tui-command.h"
+#include "tui/tui-win.h"
+#include "tui/tui-wingeneral.h"
+#include "tui/tui-file.h"
 #include "ui-out.h"
 #include "cli-out.h"
 #include <fcntl.h>
diff --git a/gdb/tui/tuiIO.h b/gdb/tui/tui-io.h
index 40970b6b7e2..40970b6b7e2 100644
--- a/gdb/tui/tuiIO.h
+++ b/gdb/tui/tui-io.h
diff --git a/gdb/tui/tuiLayout.c b/gdb/tui/tui-layout.c
index b79bfcb8c28..c1694b231cf 100644
--- a/gdb/tui/tuiLayout.c
+++ b/gdb/tui/tui-layout.c
@@ -29,15 +29,15 @@
 #include "source.h"
 #include <ctype.h>
 
-#include "tui.h"
-#include "tuiData.h"
-#include "tuiDataWin.h"
-#include "tuiGeneralWin.h"
-#include "tuiStack.h"
-#include "tuiRegs.h"
-#include "tuiWin.h"
-#include "tuiSourceWin.h"
-#include "tuiDisassem.h"
+#include "tui/tui.h"
+#include "tui/tui-data.h"
+#include "tui/tui-windata.h"
+#include "tui/tui-wingeneral.h"
+#include "tui/tui-stack.h"
+#include "tui/tui-regs.h"
+#include "tui/tui-win.h"
+#include "tui/tui-winsource.h"
+#include "tui/tui-disasm.h"
 
 #ifdef HAVE_NCURSES_H       
 #include <ncurses.h>
diff --git a/gdb/tui/tuiLayout.h b/gdb/tui/tui-layout.h
index f6b0ed79c68..f6b0ed79c68 100644
--- a/gdb/tui/tuiLayout.h
+++ b/gdb/tui/tui-layout.h
diff --git a/gdb/tui/tuiRegs.c b/gdb/tui/tui-regs.c
index 3a0c4590c8c..588f5c36365 100644
--- a/gdb/tui/tuiRegs.c
+++ b/gdb/tui/tui-regs.c
@@ -23,8 +23,8 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
-#include "tui.h"
-#include "tuiData.h"
+#include "tui/tui.h"
+#include "tui/tui-data.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "gdbcmd.h"
@@ -32,11 +32,11 @@
 #include "regcache.h"
 #include "inferior.h"
 #include "target.h"
-#include "tuiLayout.h"
-#include "tuiWin.h"
-#include "tuiDataWin.h"
-#include "tuiGeneralWin.h"
-#include "tui-file.h"
+#include "tui/tui-layout.h"
+#include "tui/tui-win.h"
+#include "tui/tui-windata.h"
+#include "tui/tui-wingeneral.h"
+#include "tui/tui-file.h"
 
 #ifdef HAVE_NCURSES_H       
 #include <ncurses.h>
diff --git a/gdb/tui/tuiRegs.h b/gdb/tui/tui-regs.h
index 8fbfbbf471a..8fbfbbf471a 100644
--- a/gdb/tui/tuiRegs.h
+++ b/gdb/tui/tui-regs.h
diff --git a/gdb/tui/tuiSource.c b/gdb/tui/tui-source.c
index 6428130d780..f2d3762f8cd 100644
--- a/gdb/tui/tuiSource.c
+++ b/gdb/tui/tui-source.c
@@ -30,11 +30,11 @@
 #include "source.h"
 #include "symtab.h"
 
-#include "tui.h"
-#include "tuiData.h"
-#include "tuiStack.h"
-#include "tuiSourceWin.h"
-#include "tuiSource.h"
+#include "tui/tui.h"
+#include "tui/tui-data.h"
+#include "tui/tui-stack.h"
+#include "tui/tui-winsource.h"
+#include "tui/tui-source.h"
 
 #ifdef HAVE_NCURSES_H       
 #include <ncurses.h>
diff --git a/gdb/tui/tuiSource.h b/gdb/tui/tui-source.h
index 96cf8652aca..96cf8652aca 100644
--- a/gdb/tui/tuiSource.h
+++ b/gdb/tui/tui-source.h
diff --git a/gdb/tui/tuiStack.c b/gdb/tui/tui-stack.c
index a6ad07af1c3..6bf64bb4b19 100644
--- a/gdb/tui/tuiStack.c
+++ b/gdb/tui/tui-stack.c
@@ -31,13 +31,13 @@
 #include "target.h"
 #include "top.h"
 
-#include "tui.h"
-#include "tuiData.h"
-#include "tuiStack.h"
-#include "tuiGeneralWin.h"
-#include "tuiSource.h"
-#include "tuiSourceWin.h"
-#include "tui-file.h"
+#include "tui/tui.h"
+#include "tui/tui-data.h"
+#include "tui/tui-stack.h"
+#include "tui/tui-wingeneral.h"
+#include "tui/tui-source.h"
+#include "tui/tui-winsource.h"
+#include "tui/tui-file.h"
 
 #ifdef HAVE_NCURSES_H       
 #include <ncurses.h>
diff --git a/gdb/tui/tuiStack.h b/gdb/tui/tui-stack.h
index 14be4974bed..14be4974bed 100644
--- a/gdb/tui/tuiStack.h
+++ b/gdb/tui/tui-stack.h
diff --git a/gdb/tui/tuiWin.c b/gdb/tui/tui-win.c
index ecd4920601b..d0125c6494f 100644
--- a/gdb/tui/tuiWin.c
+++ b/gdb/tui/tui-win.c
@@ -36,15 +36,15 @@
 #include "top.h"
 #include "source.h"
 
-#include "tui.h"
-#include "tuiData.h"
-#include "tuiGeneralWin.h"
-#include "tuiStack.h"
-#include "tuiRegs.h"
-#include "tuiDisassem.h"
-#include "tuiSource.h"
-#include "tuiSourceWin.h"
-#include "tuiDataWin.h"
+#include "tui/tui.h"
+#include "tui/tui-data.h"
+#include "tui/tui-wingeneral.h"
+#include "tui/tui-stack.h"
+#include "tui/tui-regs.h"
+#include "tui/tui-disasm.h"
+#include "tui/tui-source.h"
+#include "tui/tui-winsource.h"
+#include "tui/tui-windata.h"
 
 #ifdef HAVE_NCURSES_H       
 #include <ncurses.h>
diff --git a/gdb/tui/tuiWin.h b/gdb/tui/tui-win.h
index bc260804888..bc260804888 100644
--- a/gdb/tui/tuiWin.h
+++ b/gdb/tui/tui-win.h
diff --git a/gdb/tui/tuiDataWin.c b/gdb/tui/tui-windata.c
index f3bedd2d6b9..b01acceb2bf 100644
--- a/gdb/tui/tuiDataWin.c
+++ b/gdb/tui/tui-windata.c
@@ -23,10 +23,10 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
-#include "tui.h"
-#include "tuiData.h"
-#include "tuiGeneralWin.h"
-#include "tuiRegs.h"
+#include "tui/tui.h"
+#include "tui/tui-data.h"
+#include "tui/tui-wingeneral.h"
+#include "tui/tui-regs.h"
 
 #ifdef HAVE_NCURSES_H       
 #include <ncurses.h>
diff --git a/gdb/tui/tuiDataWin.h b/gdb/tui/tui-windata.h
index 0b1e700f1bb..0b1e700f1bb 100644
--- a/gdb/tui/tuiDataWin.h
+++ b/gdb/tui/tui-windata.h
diff --git a/gdb/tui/tuiGeneralWin.c b/gdb/tui/tui-wingeneral.c
index 42faf756284..2f32f646c74 100644
--- a/gdb/tui/tuiGeneralWin.c
+++ b/gdb/tui/tui-wingeneral.c
@@ -23,10 +23,10 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
-#include "tui.h"
-#include "tuiData.h"
-#include "tuiGeneralWin.h"
-#include "tuiWin.h"
+#include "tui/tui.h"
+#include "tui/tui-data.h"
+#include "tui/tui-wingeneral.h"
+#include "tui/tui-win.h"
 
 #ifdef HAVE_NCURSES_H       
 #include <ncurses.h>
diff --git a/gdb/tui/tuiGeneralWin.h b/gdb/tui/tui-wingeneral.h
index 42d1ce46add..42d1ce46add 100644
--- a/gdb/tui/tuiGeneralWin.h
+++ b/gdb/tui/tui-wingeneral.h
diff --git a/gdb/tui/tuiSourceWin.c b/gdb/tui/tui-winsource.c
index 455bc7bda10..c799550d94c 100644
--- a/gdb/tui/tuiSourceWin.c
+++ b/gdb/tui/tui-winsource.c
@@ -30,14 +30,14 @@
 #include "value.h"
 #include "source.h"
 
-#include "tui.h"
-#include "tuiData.h"
-#include "tuiStack.h"
-#include "tuiWin.h"
-#include "tuiGeneralWin.h"
-#include "tuiSourceWin.h"
-#include "tuiSource.h"
-#include "tuiDisassem.h"
+#include "tui/tui.h"
+#include "tui/tui-data.h"
+#include "tui/tui-stack.h"
+#include "tui/tui-win.h"
+#include "tui/tui-wingeneral.h"
+#include "tui/tui-winsource.h"
+#include "tui/tui-source.h"
+#include "tui/tui-disasm.h"
 
 #ifdef HAVE_NCURSES_H       
 #include <ncurses.h>
diff --git a/gdb/tui/tuiSourceWin.h b/gdb/tui/tui-winsource.h
index cb00449ed2d..cb00449ed2d 100644
--- a/gdb/tui/tuiSourceWin.h
+++ b/gdb/tui/tui-winsource.h
diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c
index 601a5795e2d..5b9cff0e8c8 100644
--- a/gdb/tui/tui.c
+++ b/gdb/tui/tui.c
@@ -37,15 +37,15 @@
 #include <setjmp.h>
 #include "defs.h"
 #include "gdbcmd.h"
-#include "tui.h"
-#include "tuiData.h"
-#include "tuiLayout.h"
-#include "tuiIO.h"
-#include "tuiRegs.h"
-#include "tuiStack.h"
-#include "tuiWin.h"
-#include "tuiSourceWin.h"
-#include "tuiDataWin.h"
+#include "tui/tui.h"
+#include "tui/tui-data.h"
+#include "tui/tui-layout.h"
+#include "tui/tui-io.h"
+#include "tui/tui-regs.h"
+#include "tui/tui-stack.h"
+#include "tui/tui-win.h"
+#include "tui/tui-winsource.h"
+#include "tui/tui-windata.h"
 #include "readline/readline.h"
 #include "target.h"
 #include "frame.h"