diff --git a/src/Fl.cxx b/src/Fl.cxx
index 4b6cba3cd..05970a8e9 100644
--- a/src/Fl.cxx
+++ b/src/Fl.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl.cxx,v 1.24.2.41.2.73 2004/12/06 03:31:54 easysw Exp $"
+// "$Id$"
 //
 // Main event handling code for the Fast Light Tool Kit (FLTK).
 //
@@ -308,8 +308,6 @@ int Fl::check() {
   return Fl_X::first != 0; // return true if there is a window
 }
 
-extern int fl_ready();
-
 int Fl::ready() {
   if (first_timeout) {
     elapse_timeouts();
@@ -1077,8 +1075,8 @@ static int		num_dwidgets = 0, alloc_dwidgets = 0;
 static Fl_Widget	**dwidgets = 0;
 
 void
-Fl::delete_widget(Fl_Widget *w) {
-  if (!w) return;
+Fl::delete_widget(Fl_Widget *wi) {
+  if (!wi) return;
 
   if (num_dwidgets >= alloc_dwidgets) {
     Fl_Widget	**temp;
@@ -1093,7 +1091,7 @@ Fl::delete_widget(Fl_Widget *w) {
     alloc_dwidgets += 10;
   }
 
-  dwidgets[num_dwidgets] = w;
+  dwidgets[num_dwidgets] = wi;
   num_dwidgets ++;
 }
 
@@ -1110,5 +1108,5 @@ Fl::do_widget_deletion() {
 
 
 //
-// End of "$Id: Fl.cxx,v 1.24.2.41.2.73 2004/12/06 03:31:54 easysw Exp $".
+// End of "$Id$".
 //
diff --git a/src/Fl_Choice.cxx b/src/Fl_Choice.cxx
index 7029d51c9..4935ad025 100644
--- a/src/Fl_Choice.cxx
+++ b/src/Fl_Choice.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Choice.cxx,v 1.10.2.5.2.18 2004/12/03 02:48:21 easysw Exp $"
+// "$Id$"
 //
 // Choice widget for the Fast Light Tool Kit (FLTK).
 //
@@ -31,8 +31,6 @@
 // as an Fl_Menu_Button.  The only difference is the appearance of the
 // button: it draws the text of the current pick and a down-arrow.
 
-extern char fl_draw_shortcut;
-
 void Fl_Choice::draw() {
   int dx = Fl::box_dx(FL_DOWN_BOX);
   int dy = Fl::box_dy(FL_DOWN_BOX);
@@ -159,5 +157,5 @@ int Fl_Choice::handle(int e) {
 }
 
 //
-// End of "$Id: Fl_Choice.cxx,v 1.10.2.5.2.18 2004/12/03 02:48:21 easysw Exp $".
+// End of "$Id$".
 //