diff --git a/gdb/tui/ChangeLog b/gdb/tui/ChangeLog
index 1f7eb18a48..287a939ed9 100644
--- a/gdb/tui/ChangeLog
+++ b/gdb/tui/ChangeLog
@@ -1,3 +1,10 @@
+2001-07-21  Stephane Carrez  <Stephane.Carrez@worldnet.fr>
+
+	* tuiStack.c (tuiSetLocatorInfo): Cleanup.
+	* tuiStack.h (tuiGetLocatorFilename): Declare.
+	* tuiRegs.h (tuiFirstRegElementNoInLine): Declare.
+	* tuiData.h (addToSourceWindows): Declare.
+
 2001-07-21  Stephane Carrez  <Stephane.Carrez@worldnet.fr>
 
 	* tui.c (tui_change_windows): New function.
diff --git a/gdb/tui/tuiData.h b/gdb/tui/tuiData.h
index 0f590e23c4..6fc4ca3617 100644
--- a/gdb/tui/tuiData.h
+++ b/gdb/tui/tuiData.h
@@ -367,4 +367,6 @@ extern void tuiSetWinResizedTo (int);
 extern TuiWinInfoPtr tuiNextWin (TuiWinInfoPtr);
 extern TuiWinInfoPtr tuiPrevWin (TuiWinInfoPtr);
 
+extern void addToSourceWindows (TuiWinInfoPtr winInfo);
+
 #endif /* TUI_DATA_H */
diff --git a/gdb/tui/tuiRegs.h b/gdb/tui/tuiRegs.h
index 7a78749900..8fbfbbf471 100644
--- a/gdb/tui/tuiRegs.h
+++ b/gdb/tui/tuiRegs.h
@@ -41,7 +41,7 @@ extern int tuiLastRegElementInLine (int);
 extern int tuiLineFromRegElementNo (int);
 extern void tuiToggleFloatRegs (void);
 extern int tuiCalculateRegsColumnCount (TuiRegisterDisplayType);
-
+extern int tuiFirstRegElementNoInLine (int lineno);
 
 #endif
 /*_TUI_REGS_H*/
diff --git a/gdb/tui/tuiStack.c b/gdb/tui/tuiStack.c
index b3e4931588..bf02dec77a 100644
--- a/gdb/tui/tuiStack.c
+++ b/gdb/tui/tuiStack.c
@@ -107,40 +107,18 @@ tuiShowLocatorContent (void)
 }				/* tuiShowLocatorContent */
 
 
-/*
-   ** tuiSetLocatorInfo().
-   **        Function to update the locator, with the provided arguments.
- */
+/* Update the locator, with the provided arguments.  */
 void
 tuiSetLocatorInfo (char *fname, char *procname, int lineNo,
                    CORE_ADDR addr, TuiLocatorElementPtr element)
 {
-#ifdef COMMENT
-  /* first free the old info */
-  if (element->fileName)
-    tuiFree (element->fileName);
-  if (element->procName)
-    tuiFree (element->procName);
-
-  if (fname == (char *) NULL)
-    element->fileName = fname;
-  else
-    element->fileName = tuiStrDup (fname);
-  if (procname == (char *) NULL)
-    element->procName = procname;
-  else
-    element->procName = tuiStrDup (procname);
-#else
   element->fileName[0] = (char) 0;
   element->procName[0] = (char) 0;
   strcat_to_buf (element->fileName, MAX_LOCATOR_ELEMENT_LEN, fname);
   strcat_to_buf (element->procName, MAX_LOCATOR_ELEMENT_LEN, procname);
-#endif
   element->lineNo = lineNo;
   element->addr = addr;
-
-  return;
-}				/* tuiSetLocatorInfo */
+}
 
 
 /*
diff --git a/gdb/tui/tuiStack.h b/gdb/tui/tuiStack.h
index 77d5b8528f..c348f6d341 100644
--- a/gdb/tui/tuiStack.h
+++ b/gdb/tui/tuiStack.h
@@ -34,6 +34,7 @@ extern void tuiUpdateLocatorDisplay (struct frame_info *);
 extern void tuiSetLocatorContent (struct frame_info *);
 extern void tuiShowLocatorContent (void);
 extern void tuiClearLocatorContent (void);
+extern void tuiClearLocatorDisplay (void);
 extern void tuiSwitchFilename (char *);
 extern void tuiShowFrameInfo (struct frame_info *);
 extern void tuiGetLocatorFilename (TuiGenWinInfoPtr, char **);