diff --git a/freeglut/freeglut/progs/demos/CallbackMaker/CallbackMaker.c b/freeglut/freeglut/progs/demos/CallbackMaker/CallbackMaker.c
index deb8f4b..6c8730d 100644
--- a/freeglut/freeglut/progs/demos/CallbackMaker/CallbackMaker.c
+++ b/freeglut/freeglut/progs/demos/CallbackMaker/CallbackMaker.c
@@ -30,6 +30,8 @@ int mousewheel_number = -1, mousewheel_direction = -1, mousewheel_x = -1, mousew
 int motion_x = -1, motion_y = -1, motion_seq = -1 ;
 int passivemotion_x = -1, passivemotion_y = -1, passivemotion_seq = -1 ;
 
+#define STRING_LENGTH   10
+
 static void
 bitmapPrintf (const char *fmt, ...)
 {
@@ -143,7 +145,6 @@ Warning(const char *fmt, va_list ap)
 static void
 Error(const char *fmt, va_list ap)
 {
-#define STRING_LENGTH   10
     char dummy_string[STRING_LENGTH];
     printf("%6d Error callback:\n");
 
@@ -464,7 +465,6 @@ static void Idle ( void )
 int 
 main(int argc, char *argv[])
 {
-#define STRING_LENGTH   10
   int freeglut_window, aux_window ;
   char dummy_string[STRING_LENGTH];
 
diff --git a/freeglut/freeglut/src/mswin/fg_window_mswin.c b/freeglut/freeglut/src/mswin/fg_window_mswin.c
index 7af029d..2837c5c 100644
--- a/freeglut/freeglut/src/mswin/fg_window_mswin.c
+++ b/freeglut/freeglut/src/mswin/fg_window_mswin.c
@@ -888,6 +888,8 @@ void fgPlatformGlutSetWindowTitle( const char* title )
 
 /*
  * Set the current window's iconified title
+ * There really isn't a way to set the icon name separate from the
+ * windows name in Win32, so, just set the windows name.
  */
 void fgPlatformGlutSetIconTitle( const char* title )
 {