diff --git a/FL/Fl_Window.H b/FL/Fl_Window.H
index 05ebb9508..e4b72bc6b 100644
--- a/FL/Fl_Window.H
+++ b/FL/Fl_Window.H
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Window.H,v 1.12.2.5 2001/01/22 15:13:38 easysw Exp $"
+// "$Id: Fl_Window.H,v 1.12.2.6 2001/05/11 18:37:08 easysw Exp $"
 //
 // Window header file for the Fast Light Tool Kit (FLTK).
 //
@@ -30,9 +30,12 @@
 
 #define FL_WINDOW 0xF0	// all subclasses have type() >= this
 
+class Fl_X;
+
 class Fl_Window : public Fl_Group {
 
-  friend class Fl_X; Fl_X *i; // points at the system-specific stuff
+  friend class Fl_X;
+  Fl_X *i; // points at the system-specific stuff
 
   const char* iconlabel_;
   const char* xclass_;
@@ -113,5 +116,5 @@ public:
 #endif
 
 //
-// End of "$Id: Fl_Window.H,v 1.12.2.5 2001/01/22 15:13:38 easysw Exp $".
+// End of "$Id: Fl_Window.H,v 1.12.2.6 2001/05/11 18:37:08 easysw Exp $".
 //
diff --git a/FL/fl_ask.H b/FL/fl_ask.H
index 59067375d..86d06d083 100644
--- a/FL/fl_ask.H
+++ b/FL/fl_ask.H
@@ -1,5 +1,5 @@
 //
-// "$Id: fl_ask.H,v 1.7.2.3 2001/01/22 15:13:38 easysw Exp $"
+// "$Id: fl_ask.H,v 1.7.2.4 2001/05/11 18:37:08 easysw Exp $"
 //
 // Standard dialog header file for the Fast Light Tool Kit (FLTK).
 //
@@ -34,8 +34,8 @@ FL_EXPORT void fl_message(const char *,...);
 FL_EXPORT void fl_alert(const char *,...);
 FL_EXPORT int fl_ask(const char *,...);
 FL_EXPORT int fl_choice(const char *q,const char *b0,const char *b1,const char *b2,...);
-FL_EXPORT const char *fl_input(const char *label, const char *deflt = 0, ...);
-FL_EXPORT const char *fl_password(const char *label, const char *deflt = 0, ...);
+FL_EXPORT const char *fl_input(const char *label, const char *deflt, ...);
+FL_EXPORT const char *fl_password(const char *label, const char *deflt, ...);
 
 FL_EXPORT Fl_Widget *fl_message_icon();
 extern FL_EXPORT unsigned char fl_message_font_;
@@ -52,5 +52,5 @@ extern FL_EXPORT const char* fl_cancel;
 #endif
 
 //
-// End of "$Id: fl_ask.H,v 1.7.2.3 2001/01/22 15:13:38 easysw Exp $".
+// End of "$Id: fl_ask.H,v 1.7.2.4 2001/05/11 18:37:08 easysw Exp $".
 //
diff --git a/src/filename_list.cxx b/src/filename_list.cxx
index cc87ea44f..12ca53f3e 100644
--- a/src/filename_list.cxx
+++ b/src/filename_list.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: filename_list.cxx,v 1.10.2.10 2001/04/13 19:13:14 easysw Exp $"
+// "$Id: filename_list.cxx,v 1.10.2.11 2001/05/11 18:37:08 easysw Exp $"
 //
 // Filename list routines for the Fast Light Tool Kit (FLTK).
 //
@@ -46,7 +46,7 @@ int filename_list(const char *d, dirent ***list) {
 #elif defined(__osf__)
   // OSF, DU 4.0x
   return scandir(d, list, 0, (int(*)(dirent **, dirent **))numericsort);
-#elif defined(__aix)
+#elif defined(_AIX)
   // AIX is almost standard...
   return scandir(d, list, 0, (int(*)(void*, void*))numericsort);
 #elif HAVE_SCANDIR && !defined(__sgi)
@@ -62,5 +62,5 @@ int filename_list(const char *d, dirent ***list) {
 }
 
 //
-// End of "$Id: filename_list.cxx,v 1.10.2.10 2001/04/13 19:13:14 easysw Exp $".
+// End of "$Id: filename_list.cxx,v 1.10.2.11 2001/05/11 18:37:08 easysw Exp $".
 //