diff --git a/fluid/Makefile b/fluid/Makefile
index 04d3814e1..cd4703988 100644
--- a/fluid/Makefile
+++ b/fluid/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.3 1998/10/21 14:19:53 mike Exp $"
+# "$Id: Makefile,v 1.4 1998/10/21 17:20:07 mike Exp $"
 #
 # Fluid makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -49,7 +49,7 @@ OBJECTS = $(CPPFILES:.C=.o)
 
 include ../makeinclude
 
-.SUFFIXES : .C .c .o .do .fl .H
+.SUFFIXES : .C .c .o
 
 .C.o :
 	@echo $<:
@@ -61,13 +61,6 @@ include ../makeinclude
 	@echo $@:
 	@$(CXX) -I.. $(CXXFLAGS) -o $@ $< -L../lib -lfltk $(LDLIBS)
 
-.fl.C .fl.H :
-	-fluid -c $<
-
-# better way to do this for gnu make:
-# %.H %.C: %.fl
-#	fluid -c $<
-
 $(PROGRAM) : $(OBJECTS) ../lib/$(LIBNAME)
 	@echo linking $@:
 	@$(CXX) $(CXXFLAGS) -o $(PROGRAM) $(OBJECTS) -L../lib -lfltk $(LDLIBS)
@@ -90,5 +83,5 @@ uninstall:
 	-@ rm -f $(bindir)/$(PROGRAM)
 
 #
-# End of "$Id: Makefile,v 1.3 1998/10/21 14:19:53 mike Exp $".
+# End of "$Id: Makefile,v 1.4 1998/10/21 17:20:07 mike Exp $".
 #
diff --git a/test/Makefile b/test/Makefile
index 2c6449f1c..b0dfb329f 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.7 1998/10/21 17:15:44 mike Exp $"
+# "$Id: Makefile,v 1.8 1998/10/21 17:20:08 mike Exp $"
 #
 # Test/example program makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -49,12 +49,16 @@ include ../makeinclude
 
 ${ALL} :  ../lib/$(LIBNAME)
 
-.SUFFIXES : .C .c .o .do
+.SUFFIXES : .C .c .o .fl .H
 
 .C:
 	@echo $@:
 	@$(CXX) -I.. $(CXXFLAGS) $< -L../lib -lfltk ${LDLIBS} -o $@
 
+.fl.C .fl.H :
+	@echo $@:
+	@../fluid/fluid -c $<
+
 # Programs needing the OpenGL libraries:
 cube: cube.C
 	@echo $@:
@@ -102,5 +106,5 @@ clean:
 	-@ rm -f ${ALL} jpeg_image *.o core *~
 
 #
-# End of "$Id: Makefile,v 1.7 1998/10/21 17:15:44 mike Exp $".
+# End of "$Id: Makefile,v 1.8 1998/10/21 17:20:08 mike Exp $".
 #
diff --git a/test/fast_slow.C b/test/fast_slow.C
deleted file mode 100644
index 42fdff135..000000000
--- a/test/fast_slow.C
+++ /dev/null
@@ -1,50 +0,0 @@
-// generated by Fast Light User Interface Designer (fluid) version 0.99
-
-#include "fast_slow.H"
-
-Fl_Slider *control;
-
-static void cb_control(Fl_Slider* o, void*) {
-  fast->value(o->value());
-if (!Fl::pushed()) slow->value(o->value());
-}
-
-Fl_Slider *fast;
-
-Fl_Slider *slow;
-
-int main(int argc, char **argv) {
-  Fl_Window *w;
-  { Fl_Window* o = new Fl_Window(318, 443);
-    w = o;
-    Fl_Group::current()->resizable(o);
-    { Fl_Slider* o = new Fl_Slider(90, 200, 30, 200, "move\nthis");
-      control = o;
-      o->callback((Fl_Callback*)cb_control);
-      o->when(FL_WHEN_CHANGED|FL_WHEN_RELEASE|FL_WHEN_NOT_CHANGED);
-    }
-    { Fl_Slider* o = new Fl_Slider(140, 200, 30, 200, "fast\nredraw");
-      fast = o;
-      o->set_output();
-    }
-    { Fl_Slider* o = new Fl_Slider(190, 200, 30, 200, "slow\nredraw");
-      slow = o;
-      o->set_output();
-    }
-    { Fl_Box* o = new Fl_Box(10, 10, 300, 180, "The left slider has changed( FL_WHEN_CHANGED | FL_WHEN_RELEASE | FL_WHEN_N\
-OT_CHANGED) so it produces a callback on both drag and release mouse events\
-.\nThe middle slider (representing a widget with low overhead) is changed o\
-n every mouse movement.\nThe right slider (representing a widget with high \
-overhead) is only updated when the mouse is released, by checking if Fl::pu\
-shed() is zero.");
-      o->box(FL_DOWN_BOX);
-      o->color(53);
-      o->labelfont(4);
-      o->labelsize(12);
-      o->align(148);
-    }
-    w->end();
-  }
-  w->show(argc, argv);
-  return Fl::run();
-}
diff --git a/test/fast_slow.H b/test/fast_slow.H
deleted file mode 100644
index 233a9e649..000000000
--- a/test/fast_slow.H
+++ /dev/null
@@ -1,9 +0,0 @@
-// generated by Fast Light User Interface Designer (fluid) version 0.99
-
-#include <FL/Fl.H>
-#include <FL/Fl_Box.H>
-#include <FL/Fl_Slider.H>
-#include <FL/Fl_Window.H>
-extern Fl_Slider *control;
-extern Fl_Slider *fast;
-extern Fl_Slider *slow;
diff --git a/test/inactive.C b/test/inactive.C
deleted file mode 100644
index f78782124..000000000
--- a/test/inactive.C
+++ /dev/null
@@ -1,99 +0,0 @@
-// generated by Fast Light User Interface Designer (fluid) version 0.99
-
-#include "inactive.H"
-
-Fl_Group *the_group;
-
-Fl_Menu_Item menu_menu[] = {
- {"item", 0,  0, 0, 0, 0, 3, 14, 0},
- {"item", 0,  0, 0, 0, 0, 3, 14, 0},
- {"item", 0,  0, 0, 0, 0, 3, 14, 0},
- {"item", 0,  0, 0, 0, 0, 3, 14, 0},
- {"item", 0,  0, 0, 0, 0, 3, 14, 0},
- {0}
-};
-
-static void cb_active(Fl_Button*, void*) {
-  the_group->activate();
-}
-
-static void cb_inactive(Fl_Button*, void*) {
-  the_group->deactivate();
-}
-
-int main(int argc, char **argv) {
-  Fl_Window *w;
-  { Fl_Window* o = w = new Fl_Window(420, 295);
-    { Fl_Group* o = the_group = new Fl_Group(25, 25, 375, 235, "activate()/deactivate() called on this Fl_Group");
-      o->box(FL_ENGRAVED_FRAME);
-      o->align(17);
-      new Fl_Button(50, 50, 105, 25, "button");
-      { Fl_Group* o = new Fl_Group(50, 100, 105, 85, "Child group");
-        o->box(FL_DOWN_FRAME);
-        { Fl_Check_Button* o = new Fl_Check_Button(50, 100, 105, 25, "red");
-          o->type(102);
-          o->down_box(FL_DIAMOND_DOWN_BOX);
-          o->labelcolor(1);
-        }
-        { Fl_Check_Button* o = new Fl_Check_Button(50, 120, 105, 25, "green");
-          o->type(102);
-          o->down_box(FL_DIAMOND_DOWN_BOX);
-          o->selection_color(2);
-          o->labelcolor(2);
-        }
-        { Fl_Check_Button* o = new Fl_Check_Button(50, 140, 105, 25, "blue");
-          o->type(102);
-          o->down_box(FL_DIAMOND_DOWN_BOX);
-          o->selection_color(4);
-          o->labelcolor(4);
-        }
-        { Fl_Check_Button* o = new Fl_Check_Button(50, 160, 105, 25, "white");
-          o->type(102);
-          o->down_box(FL_DIAMOND_DOWN_BOX);
-          o->selection_color(7);
-          o->labelcolor(7);
-        }
-        o->end();
-      }
-      { Fl_Slider* o = new Fl_Slider(165, 50, 24, 150, "Fl_Slider");
-        o->value(0.5);
-      }
-      { Fl_Input* o = new Fl_Input(195, 50, 195, 30);
-        o->static_value("Fl_Input");
-      }
-      { Fl_Menu_Button* o = new Fl_Menu_Button(235, 105, 110, 30, "menu");
-        o->menu(menu_menu);
-      }
-      { Fl_Box* o = new Fl_Box(240, 205, 145, 50, "Fl_Box");
-        o->box(FL_EMBOSSED_FRAME);
-        o->labeltype(FL_SHADOW_LABEL);
-        o->labelfont(3);
-        o->labelsize(38);
-      }
-      { Fl_Value_Output* o = new Fl_Value_Output(255, 165, 130, 30, "value:");
-        o->maximum(10000);
-        o->step(1);
-        o->textfont(5);
-        o->textsize(24);
-        o->textcolor(4);
-      }
-      { Fl_Scrollbar* o = new Fl_Scrollbar(40, 220, 180, 20, "scrollbar");
-        o->type(1);
-        o->maximum(100);
-      }
-      o->end();
-    }
-    { Fl_Button* o = new Fl_Button(25, 265, 185, 25, "active");
-      o->type(102);
-      o->value(1);
-      o->callback((Fl_Callback*)cb_active);
-    }
-    { Fl_Button* o = new Fl_Button(220, 265, 180, 25, "inactive");
-      o->type(102);
-      o->callback((Fl_Callback*)cb_inactive);
-    }
-    o->end();
-  }
-  w->show(argc, argv);
-  return Fl::run();
-}
diff --git a/test/inactive.H b/test/inactive.H
deleted file mode 100644
index c811f6c2f..000000000
--- a/test/inactive.H
+++ /dev/null
@@ -1,15 +0,0 @@
-// generated by Fast Light User Interface Designer (fluid) version 0.99
-
-#include <FL/Fl.H>
-#include <FL/Fl_Box.H>
-#include <FL/Fl_Button.H>
-#include <FL/Fl_Check_Button.H>
-#include <FL/Fl_Group.H>
-#include <FL/Fl_Input.H>
-#include <FL/Fl_Menu_Button.H>
-#include <FL/Fl_Scrollbar.H>
-#include <FL/Fl_Slider.H>
-#include <FL/Fl_Value_Output.H>
-#include <FL/Fl_Window.H>
-extern Fl_Group *the_group;
-extern Fl_Menu_Item menu_menu[];
diff --git a/test/keyboard_ui.C b/test/keyboard_ui.C
deleted file mode 100644
index cf35760bd..000000000
--- a/test/keyboard_ui.C
+++ /dev/null
@@ -1,558 +0,0 @@
-// generated by Fast Light User Interface Designer (fluid) version 0.99
-#include "keyboard_ui.H"
-Fl_Output *key_output;
-Fl_Output *text_output;
-
-Fl_Window* make_window() {
- Fl_Window *w;
- {Fl_Window* o = new Fl_Window(494, 193);
-  w = o;
- {Fl_Button* o = new Fl_Button(15, 50, 20, 20, "Esc ");
-  o->labelsize(8);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_Escape));
- }
- {Fl_Button* o = new Fl_Button(50, 50, 20, 20, "F1");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_F+1));
- }
- {Fl_Button* o = new Fl_Button(70, 50, 20, 20, "F2");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_F+2));
- }
- {Fl_Button* o = new Fl_Button(90, 50, 20, 20, "F3");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_F+3));
- }
- {Fl_Button* o = new Fl_Button(110, 50, 20, 20, "F4");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_F+4));
- }
- {Fl_Button* o = new Fl_Button(140, 50, 20, 20, "F5");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_F+5));
- }
- {Fl_Button* o = new Fl_Button(160, 50, 20, 20, "F6");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_F+6));
- }
- {Fl_Button* o = new Fl_Button(180, 50, 20, 20, "F7");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_F+7));
- }
- {Fl_Button* o = new Fl_Button(200, 50, 20, 20, "F8");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_F+8));
- }
- {Fl_Button* o = new Fl_Button(230, 50, 20, 20, "F9");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_F+9));
- }
- {Fl_Button* o = new Fl_Button(250, 50, 20, 20, "F10");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_F+10));
- }
- {Fl_Button* o = new Fl_Button(270, 50, 20, 20, "F11");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_F+11));
- }
- {Fl_Button* o = new Fl_Button(290, 50, 20, 20, "F12");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_F+12));
- }
- {Fl_Button* o = new Fl_Button(325, 50, 20, 20, "Print ");
-  o->labelsize(8);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_Print));
- }
- {Fl_Button* o = new Fl_Button(345, 50, 20, 20, "Sclk ");
-  o->labelsize(8);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_Scroll_Lock));
- }
- {Fl_Button* o = new Fl_Button(365, 50, 20, 20, "Paus ");
-  o->labelsize(8);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_Pause));
- }
- {Fl_Button* o = new Fl_Button(15, 80, 20, 20, "`");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(35, 80, 20, 20, "1");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(55, 80, 20, 20, "2");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(75, 80, 20, 20, "3");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(95, 80, 20, 20, "4");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(115, 80, 20, 20, "5");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(135, 80, 20, 20, "6");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(155, 80, 20, 20, "7");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(175, 80, 20, 20, "8");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(195, 80, 20, 20, "9");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(215, 80, 20, 20, "0");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(235, 80, 20, 20, "-");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(255, 80, 20, 20, "=");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(275, 80, 35, 20, "Bksp");
-  o->labeltype(FL_SYMBOL_LABEL);
-  o->labelsize(8);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_BackSpace));
-  o->align(20);
- }
- {Fl_Button* o = new Fl_Button(325, 80, 20, 20, "Ins ");
-  o->labelsize(8);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_Insert));
- }
- {Fl_Button* o = new Fl_Button(345, 80, 20, 20, "Home");
-  o->labelsize(8);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_Home));
- }
- {Fl_Button* o = new Fl_Button(365, 80, 20, 20, "pgup ");
-  o->labelsize(8);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_Page_Up));
- }
- {Fl_Button* o = new Fl_Button(400, 80, 20, 20, "Num");
-  o->labelsize(8);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_Num_Lock));
- }
- {Fl_Button* o = new Fl_Button(420, 80, 20, 20, "/");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_KP+'/'));
- }
- {Fl_Button* o = new Fl_Button(440, 80, 20, 20, "*");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_KP+'*'));
- }
- {Fl_Button* o = new Fl_Button(460, 80, 20, 20, "-");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_KP+'-'));
- }
- {Fl_Button* o = new Fl_Button(15, 100, 27, 20, "Tab");
-  o->labelsize(8);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_Tab));
-  o->align(20);
- }
- {Fl_Button* o = new Fl_Button(42, 100, 20, 20, "Q");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(62, 100, 20, 20, "W");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(82, 100, 20, 20, "E");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(102, 100, 20, 20, "R");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(122, 100, 20, 20, "T");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(142, 100, 20, 20, "Y");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(162, 100, 20, 20, "U");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(182, 100, 20, 20, "I");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(202, 100, 20, 20, "O");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(222, 100, 20, 20, "P");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(242, 100, 20, 20, "[");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(262, 100, 20, 20, "]");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(282, 100, 28, 20, "\\");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb, (void*)('|'));
-  o->align(20);
- }
- {Fl_Button* o = new Fl_Button(325, 100, 20, 20, "Del ");
-  o->labelsize(8);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_Delete));
- }
- {Fl_Button* o = new Fl_Button(345, 100, 20, 20, "End ");
-  o->labelsize(8);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_End));
- }
- {Fl_Button* o = new Fl_Button(365, 100, 20, 20, "pgdn ");
-  o->labelsize(8);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_Page_Down));
- }
- {Fl_Button* o = new Fl_Button(400, 100, 20, 20, "7");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_KP+'7'));
- }
- {Fl_Button* o = new Fl_Button(420, 100, 20, 20, "8");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_KP+'8'));
- }
- {Fl_Button* o = new Fl_Button(440, 100, 20, 20, "9");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_KP+'9'));
- }
- {Fl_Button* o = new Fl_Button(460, 100, 20, 40, "+");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_KP+'+'));
-  o->align(17);
- }
- {Fl_Button* o = new Fl_Button(15, 120, 36, 20, "Lock");
-  o->labelsize(8);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_Caps_Lock));
-  o->align(20);
- }
- {Fl_Button* o = new Fl_Button(51, 120, 20, 20, "A");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(71, 120, 20, 20, "S");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(91, 120, 20, 20, "D");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(111, 120, 20, 20, "F");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(131, 120, 20, 20, "G");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(151, 120, 20, 20, "H");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(171, 120, 20, 20, "J");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(191, 120, 20, 20, "K");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(211, 120, 20, 20, "L");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(231, 120, 20, 20, ";");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(251, 120, 20, 20, "\'");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(271, 120, 39, 20, "Enter");
-  o->labelsize(8);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_Enter));
-  o->align(20);
- }
- {Fl_Button* o = new Fl_Button(400, 120, 20, 20, "4");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_KP+'4'));
- }
- {Fl_Button* o = new Fl_Button(420, 120, 20, 20, "5");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_KP+'5'));
- }
- {Fl_Button* o = new Fl_Button(440, 120, 20, 20, "6");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_KP+'6'));
- }
- {Fl_Button* o = new Fl_Button(15, 140, 45, 20, "Shift");
-  o->labelsize(8);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_Shift_L));
-  o->align(20);
- }
- {Fl_Button* o = new Fl_Button(60, 140, 20, 20, "Z");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(80, 140, 20, 20, "X");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(100, 140, 20, 20, "C");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(120, 140, 20, 20, "V");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(140, 140, 20, 20, "B");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(160, 140, 20, 20, "N");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(180, 140, 20, 20, "M");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(200, 140, 20, 20, ",");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(220, 140, 20, 20, ".");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(240, 140, 20, 20, "/");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb);
- }
- {Fl_Button* o = new Fl_Button(260, 140, 50, 20, "Shift");
-  o->labelsize(8);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_Shift_R));
-  o->align(20);
- }
- {Fl_Button* o = new Fl_Button(345, 140, 20, 20, "@8->");
-  o->labeltype(FL_SYMBOL_LABEL);
-  o->labelsize(10);
-  o->labelcolor(47);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_Up));
- }
- {Fl_Button* o = new Fl_Button(400, 140, 20, 20, "1");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_KP+'1'));
- }
- {Fl_Button* o = new Fl_Button(420, 140, 20, 20, "2");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_KP+'2'));
- }
- {Fl_Button* o = new Fl_Button(440, 140, 20, 20, "3");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_KP+'3'));
- }
- {Fl_Button* o = new Fl_Button(460, 140, 20, 40);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_KP_Enter));
- }
- {Fl_Button* o = new Fl_Button(15, 160, 30, 20, "Ctrl");
-  o->labelsize(8);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_Control_L));
-  o->align(20);
- }
- {Fl_Button* o = new Fl_Button(45, 160, 30, 20, "Meta ");
-  o->labelsize(8);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_Meta_L));
- }
- {Fl_Button* o = new Fl_Button(75, 160, 30, 20, "Alt ");
-  o->labelsize(8);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_Alt_L));
- }
- {Fl_Button* o = new Fl_Button(105, 160, 85, 20);
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb, (void*)(' '));
- }
- {Fl_Button* o = new Fl_Button(190, 160, 30, 20, "Alt ");
-  o->labelsize(8);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_Alt_R));
- }
- {Fl_Button* o = new Fl_Button(220, 160, 30, 20, "Meta ");
-  o->labelsize(8);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_Meta_R));
- }
- {Fl_Button* o = new Fl_Button(250, 160, 30, 20, "Menu ");
-  o->labelsize(8);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_Menu));
- }
- {Fl_Button* o = new Fl_Button(280, 160, 30, 20, "Ctrl");
-  o->labelsize(8);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_Control_R));
-  o->align(20);
- }
- {Fl_Button* o = new Fl_Button(325, 160, 20, 20, "@4->");
-  o->labeltype(FL_SYMBOL_LABEL);
-  o->labelsize(10);
-  o->labelcolor(47);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_Left));
- }
- {Fl_Button* o = new Fl_Button(345, 160, 20, 20, "@2->");
-  o->labeltype(FL_SYMBOL_LABEL);
-  o->labelsize(10);
-  o->labelcolor(47);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_Down));
- }
- {Fl_Button* o = new Fl_Button(365, 160, 20, 20, "@6->");
-  o->labeltype(FL_SYMBOL_LABEL);
-  o->labelsize(10);
-  o->labelcolor(47);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_Right));
- }
- {Fl_Button* o = new Fl_Button(400, 160, 40, 20, "0");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_KP+'0'));
-  o->align(20);
- }
- {Fl_Button* o = new Fl_Button(440, 160, 20, 20, ".");
-  o->labelsize(10);
-  o->callback((Fl_Callback*)key_cb, (void*)(FL_KP+'.'));
- }
- {Fl_Button* o = new Fl_Button(400, 15, 20, 10, "shift ");
-  o->box(FL_THIN_UP_BOX);
-  o->color2(3);
-  o->labelsize(8);
-  o->callback((Fl_Callback*)shift_cb, (void*)(FL_SHIFT));
- }
- {Fl_Button* o = new Fl_Button(420, 15, 20, 10, "lock ");
-  o->box(FL_THIN_UP_BOX);
-  o->color2(3);
-  o->labelsize(8);
-  o->callback((Fl_Callback*)shift_cb, (void*)(FL_CAPS_LOCK));
- }
- {Fl_Button* o = new Fl_Button(440, 15, 20, 10, "ctrl");
-  o->box(FL_THIN_UP_BOX);
-  o->color2(3);
-  o->labelsize(8);
-  o->callback((Fl_Callback*)shift_cb, (void*)(FL_CTRL));
- }
- {Fl_Button* o = new Fl_Button(460, 15, 20, 10, "alt");
-  o->box(FL_THIN_UP_BOX);
-  o->color2(3);
-  o->labelsize(8);
-  o->callback((Fl_Callback*)shift_cb, (void*)(FL_ALT));
- }
- {Fl_Button* o = new Fl_Button(400, 25, 20, 10, "num");
-  o->box(FL_THIN_UP_BOX);
-  o->color2(3);
-  o->labelsize(8);
-  o->callback((Fl_Callback*)shift_cb, (void*)(FL_NUM_LOCK));
- }
- {Fl_Button* o = new Fl_Button(420, 25, 20, 10, "?");
-  o->box(FL_THIN_UP_BOX);
-  o->color2(3);
-  o->labelsize(8);
-  o->callback((Fl_Callback*)shift_cb, (void*)(0x20));
- }
- {Fl_Button* o = new Fl_Button(440, 25, 20, 10, "meta ");
-  o->box(FL_THIN_UP_BOX);
-  o->color2(3);
-  o->labelsize(8);
-  o->callback((Fl_Callback*)shift_cb, (void*)(FL_META));
- }
- {Fl_Button* o = new Fl_Button(460, 25, 20, 10, "sclk");
-  o->box(FL_THIN_UP_BOX);
-  o->color2(3);
-  o->labelsize(8);
-  o->callback((Fl_Callback*)shift_cb, (void*)(FL_SCROLL_LOCK));
- }
- {Fl_Button* o = new Fl_Button(400, 35, 20, 10, "b1");
-  o->box(FL_THIN_UP_BOX);
-  o->color2(3);
-  o->labelsize(8);
-  o->callback((Fl_Callback*)shift_cb, (void*)(FL_BUTTON1));
- }
- {Fl_Button* o = new Fl_Button(420, 35, 20, 10, "b2");
-  o->box(FL_THIN_UP_BOX);
-  o->color2(3);
-  o->labelsize(8);
-  o->callback((Fl_Callback*)shift_cb, (void*)(FL_BUTTON2));
- }
- {Fl_Button* o = new Fl_Button(440, 35, 20, 10, "b3");
-  o->box(FL_THIN_UP_BOX);
-  o->color2(3);
-  o->labelsize(8);
-  o->callback((Fl_Callback*)shift_cb, (void*)(FL_BUTTON3));
- }
- {Fl_Button* o = new Fl_Button(460, 35, 20, 10, "?");
-  o->box(FL_THIN_UP_BOX);
-  o->color2(3);
-  o->labelsize(8);
-  o->callback((Fl_Callback*)shift_cb, (void*)(0x800));
- }
- {Fl_Button* o = new Fl_Button(400, 45, 20, 10, "?");
-  o->box(FL_THIN_UP_BOX);
-  o->color2(3);
-  o->labelsize(8);
-  o->callback((Fl_Callback*)shift_cb, (void*)(0x1000));
- }
- {Fl_Button* o = new Fl_Button(420, 45, 20, 10, "?");
-  o->box(FL_THIN_UP_BOX);
-  o->color2(3);
-  o->labelsize(8);
-  o->callback((Fl_Callback*)shift_cb, (void*)(0x2000));
- }
- {Fl_Button* o = new Fl_Button(440, 45, 20, 10, "?");
-  o->box(FL_THIN_UP_BOX);
-  o->color2(3);
-  o->labelsize(8);
-  o->callback((Fl_Callback*)shift_cb, (void*)(0x4000));
- }
- {Fl_Button* o = new Fl_Button(460, 45, 20, 10, "?");
-  o->box(FL_THIN_UP_BOX);
-  o->color2(3);
-  o->labelsize(8);
-  o->callback((Fl_Callback*)shift_cb, (void*)(0x8000));
- }
- {Fl_Output* o = new Fl_Output(15, 15, 170, 30, "Fl::event_key():");
-  key_output = o;
-  o->labelsize(8);
-  o->align(5);
- }
- {Fl_Box* o = new Fl_Box(395, 15, 85, 40, "Fl::event_state():");
-  o->labelsize(8);
-  o->align(5);
- }
- {Fl_Output* o = new Fl_Output(195, 15, 190, 30, "Fl::event_text():");
-  text_output = o;
-  o->labelsize(8);
-  o->align(5);
- }
- w->end();
- }
- return w;
-}
diff --git a/test/keyboard_ui.H b/test/keyboard_ui.H
deleted file mode 100644
index 365d2dbc5..000000000
--- a/test/keyboard_ui.H
+++ /dev/null
@@ -1,11 +0,0 @@
-// generated by Fast Light User Interface Designer (fluid) version 0.99
-#include <FL/Fl.H>
-#include <FL/Fl_Box.H>
-#include <FL/Fl_Button.H>
-#include <FL/Fl_Output.H>
-#include <FL/Fl_Window.H>
-extern void key_cb(Fl_Button*, void*);
-extern void shift_cb(Fl_Button*, void*);
-extern Fl_Output *key_output;
-extern Fl_Output *text_output;
-Fl_Window* make_window();
diff --git a/test/mandelbrot_ui.C b/test/mandelbrot_ui.C
deleted file mode 100644
index 4e81970ac..000000000
--- a/test/mandelbrot_ui.C
+++ /dev/null
@@ -1,87 +0,0 @@
-// generated by Fast Light User Interface Designer (fluid) version 0.99
-#include "mandelbrot_ui.H"
-
-Fl_Window* make_window(Drawing_Window& s) {
- Fl_Window *w;
- {Fl_Window* o = new Fl_Window(429, 510);
-  w = s.window = o;
- {Drawing_Area* o = new Drawing_Area(10, 70, 410, 430);
-  s.d = o;
-  o->box(FL_DOWN_BOX);
-  o->color(0);
-  o->user_data((void*)(&s));
-  Fl_Group::current()->resizable(o);
- }
- {Fl_Input* o = new Fl_Input(20, 5, 125, 30, "x:");
-  s.x_input = o;
-  o->type(1);
-  o->box(FL_THIN_DOWN_BOX);
-  o->color(8);
-  o->color2(7);
-  o->labelfont(11);
-  o->labelsize(20);
-  o->textfont(11);
-  o->textsize(20);
-  o->callback((Fl_Callback*)x_callback, (void*)(&s));
-  o->when(FL_WHEN_ENTER_KEY|FL_WHEN_RELEASE);
- }
- {Fl_Input* o = new Fl_Input(165, 5, 125, 30, "y:");
-  s.y_input = o;
-  o->type(1);
-  o->box(FL_THIN_DOWN_BOX);
-  o->color(8);
-  o->color2(7);
-  o->labelfont(11);
-  o->labelsize(20);
-  o->textfont(11);
-  o->textsize(20);
-  o->callback((Fl_Callback*)y_callback, (void*)(&s));
-  o->when(FL_WHEN_ENTER_KEY|FL_WHEN_RELEASE);
- }
- {Fl_Input* o = new Fl_Input(315, 5, 105, 30, "w:");
-  s.w_input = o;
-  o->type(1);
-  o->box(FL_THIN_DOWN_BOX);
-  o->color(8);
-  o->color2(7);
-  o->labelfont(11);
-  o->labelsize(20);
-  o->textfont(11);
-  o->textsize(20);
-  o->callback((Fl_Callback*)w_callback, (void*)(&s));
-  o->when(FL_WHEN_ENTER_KEY|FL_WHEN_RELEASE);
- }
- {Fl_Slider* o = new Fl_Slider(70, 40, 160, 15, "brightness:");
-  o->type(1);
-  o->box(FL_THIN_DOWN_BOX);
-  o->labelsize(10);
-  o->step(1);
-  o->slider_size(0.1);
-  o->callback((Fl_Callback*)brightness_slider_cb, (void*)(&s));
-  o->align(4);
-  o->bounds(0,s.d->MAX_BRIGHTNESS);
-  o->value(s.d->DEFAULT_BRIGHTNESS);
-  o->slider(FL_UP_BOX);
- }
- {Fl_Box* o = new Fl_Box(230, 40, 190, 30, "left: click = zoom out, drag = zoom in\nright click: Julia set");
-  o->labelsize(10);
-  o->align(24);
-  o->deactivate();
- }
- {Fl_Slider* o = new Fl_Slider(70, 55, 160, 15, "iterations:");
-  o->type(1);
-  o->box(FL_THIN_DOWN_BOX);
-  o->labelsize(10);
-  o->step(1);
-  o->slider_size(0.1);
-  o->callback((Fl_Callback*)iterations_slider_cb, (void*)(&s));
-  o->align(4);
-  o->bounds(1,s.d->MAX_ITERATIONS);
-  o->value(s.d->DEFAULT_ITERATIONS);
-  o->slider(FL_UP_BOX);
- }
- w->end();
-  o->size_range(220,220);
- }
- return w;
-}
diff --git a/test/mandelbrot_ui.H b/test/mandelbrot_ui.H
deleted file mode 100644
index 7cac8ea28..000000000
--- a/test/mandelbrot_ui.H
+++ /dev/null
@@ -1,13 +0,0 @@
-// generated by Fast Light User Interface Designer (fluid) version 0.99
-#include "mandelbrot.H"
-#include <FL/Fl.H>
-#include <FL/Fl_Box.H>
-#include <FL/Fl_Input.H>
-#include <FL/Fl_Slider.H>
-#include <FL/Fl_Window.H>
-extern void brightness_slider_cb(Fl_Slider*, Drawing_Window*);
-extern void iterations_slider_cb(Fl_Slider*, Drawing_Window*);
-extern void w_callback(Fl_Input*, Drawing_Window*);
-extern void x_callback(Fl_Input*, Drawing_Window*);
-extern void y_callback(Fl_Input*, Drawing_Window*);
-Fl_Window* make_window(Drawing_Window& s);
diff --git a/test/radio.C b/test/radio.C
deleted file mode 100644
index ab15d3e8f..000000000
--- a/test/radio.C
+++ /dev/null
@@ -1,67 +0,0 @@
-// generated by Fast Light User Interface Designer (fluid) version 0.99
-#include "radio.H"
-
-int main(int argc, char **argv) {
- Fl_Window *w;
- {Fl_Window* o = new Fl_Window(462, 453);
-  w = o;
- new Fl_Button(20, 10, 160, 30, "Fl_Button");
- new Fl_Return_Button(20, 50, 160, 30, "Fl_Return_Button");
- new Fl_Light_Button(20, 90, 160, 30, "Fl_Light_Button");
- {Fl_Check_Button* o = new Fl_Check_Button(20, 130, 160, 30, "Fl_Check_Button");
-  o->box(FL_UP_BOX);
-  o->down_box(FL_DIAMOND_DOWN_BOX);
- }
- {Fl_Round_Button* o = new Fl_Round_Button(20, 170, 160, 30, "Fl_Round_Button");
-  o->box(FL_UP_BOX);
-  o->down_box(FL_ROUND_DOWN_BOX);
- }
- {Fl_Group* o = new Fl_Group(190, 10, 70, 120);
-  o->box(FL_THIN_UP_FRAME);
- {Fl_Check_Button* o = new Fl_Check_Button(190, 10, 70, 30, "radio");
-  o->type(102);
-  o->down_box(FL_DIAMOND_DOWN_BOX);
- }
- {Fl_Check_Button* o = new Fl_Check_Button(190, 40, 70, 30, "radio");
-  o->type(102);
-  o->down_box(FL_DIAMOND_DOWN_BOX);
- }
- {Fl_Check_Button* o = new Fl_Check_Button(190, 70, 70, 30, "radio");
-  o->type(102);
-  o->down_box(FL_DIAMOND_DOWN_BOX);
- }
- {Fl_Check_Button* o = new Fl_Check_Button(190, 100, 70, 30, "radio");
-  o->type(102);
-  o->down_box(FL_DIAMOND_DOWN_BOX);
- }
-  o->end();
- }
- {Fl_Group* o = new Fl_Group(270, 10, 90, 115);
-  o->box(FL_THIN_UP_BOX);
- {Fl_Button* o = new Fl_Button(280, 20, 20, 20, "radio");
-  o->type(102);
-  o->color2(1);
-  o->align(8);
- }
- {Fl_Button* o = new Fl_Button(280, 45, 20, 20, "radio");
-  o->type(102);
-  o->color2(1);
-  o->align(8);
- }
- {Fl_Button* o = new Fl_Button(280, 70, 20, 20, "radio");
-  o->type(102);
-  o->color2(1);
-  o->align(8);
- }
- {Fl_Button* o = new Fl_Button(280, 95, 20, 20, "radio");
-  o->type(102);
-  o->color2(1);
-  o->align(8);
- }
-  o->end();
- }
- w->end();
- }
- w->show(argc, argv);
- return Fl::run();
-}
diff --git a/test/radio.H b/test/radio.H
deleted file mode 100644
index 534a8870a..000000000
--- a/test/radio.H
+++ /dev/null
@@ -1,9 +0,0 @@
-// generated by Fast Light User Interface Designer (fluid) version 0.99
-#include <FL/Fl.H>
-#include <FL/Fl_Button.H>
-#include <FL/Fl_Check_Button.H>
-#include <FL/Fl_Group.H>
-#include <FL/Fl_Light_Button.H>
-#include <FL/Fl_Return_Button.H>
-#include <FL/Fl_Round_Button.H>
-#include <FL/Fl_Window.H>
diff --git a/test/resize.C b/test/resize.C
deleted file mode 100644
index 11185a2d0..000000000
--- a/test/resize.C
+++ /dev/null
@@ -1,71 +0,0 @@
-// generated by Fast Light User Interface Designer (fluid) version 0.99
-#include "resize.H"
-
-static void callback_1008ed30(Fl_Button* o, void*) {
-Fl_Window* w = o->window();
-w->position(w->x()-50,w->y());
-}
-
-static void callback_1008ee58(Fl_Button* o, void*) {
-Fl_Window* w = o->window();
-w->position(w->x(),w->y()+50);
-}
-
-static void callback_1008ef40(Fl_Button* o, void*) {
-Fl_Window* w = o->window();
-w->position(w->x()+50,w->y());
-}
-
-static void callback_1008f048(Fl_Button* o, void*) {
-Fl_Window* w = o->window();
-w->position(w->x(),w->y()-50);
-}
-
-static void callback_1008f130(Fl_Button* o, void*) {
-Fl_Window* w = o->window();
-w->size(w->w()+50, w->h()+50);
-}
-
-static void callback_1008f360(Fl_Button* o, void*) {
-Fl_Window* w = o->window();
-w->size(w->w()/2+1, w->h()/2+1);
-}
-
-int main(int argc, char **argv) {
- Fl_Window *w;
- {Fl_Window* o = new Fl_Window(366, 261);
-  w = o;
-  Fl_Group::current()->resizable(o);
- {Fl_Button* o = new Fl_Button(20, 40, 40, 40, "@<-");
-  o->labeltype(FL_SYMBOL_LABEL);
-  o->callback((Fl_Callback*)callback_1008ed30);
- }
- {Fl_Button* o = new Fl_Button(60, 80, 40, 40, "@2->");
-  o->labeltype(FL_SYMBOL_LABEL);
-  o->callback((Fl_Callback*)callback_1008ee58);
- }
- {Fl_Button* o = new Fl_Button(100, 40, 40, 40, "@->");
-  o->labeltype(FL_SYMBOL_LABEL);
-  o->callback((Fl_Callback*)callback_1008ef40);
- }
- {Fl_Button* o = new Fl_Button(60, 0, 40, 40, "@8->");
-  o->labeltype(FL_SYMBOL_LABEL);
-  o->callback((Fl_Callback*)callback_1008f048);
- }
- {Fl_Button* o = new Fl_Button(30, 130, 110, 40, "grow");
-  o->labeltype(FL_SYMBOL_LABEL);
-  o->labelfont(1);
-  o->labelsize(18);
-  o->callback((Fl_Callback*)callback_1008f130);
- }
- {Fl_Button* o = new Fl_Button(30, 190, 110, 40, "shrink");
-  o->labeltype(FL_SYMBOL_LABEL);
-  o->labelfont(1);
-  o->labelsize(18);
-  o->callback((Fl_Callback*)callback_1008f360);
- }
- w->end();
- }
- w->show(argc, argv);
- return Fl::run();
-}
diff --git a/test/resize.H b/test/resize.H
deleted file mode 100644
index e728ef05f..000000000
--- a/test/resize.H
+++ /dev/null
@@ -1,4 +0,0 @@
-// generated by Fast Light User Interface Designer (fluid) version 0.99
-#include <FL/Fl.H>
-#include <FL/Fl_Button.H>
-#include <FL/Fl_Window.H>
diff --git a/test/shiny_panel.C b/test/shiny_panel.C
deleted file mode 100644
index f568a7d90..000000000
--- a/test/shiny_panel.C
+++ /dev/null
@@ -1,103 +0,0 @@
-// generated by Fast Light User Interface Designer (fluid) version 0.99
-#include "shiny_panel.H"
-Fl_Box *test_box[3];
-Fl_Value_Slider *color_slider[4];
-Fl_Slider *thickness_slider;
-
-Fl_Window* make_panels() {
- Fl_Window *w;
- {Fl_Window* o = new Fl_Window(452, 320);
-  w = o;
- {Fl_Box* o = new Fl_Box(130, 80, 180, 30, "label");
-  test_box[0] = o;
-  o->box(FL_UP_BOX);
- }
- {Fl_Box* o = new Fl_Box(130, 120, 180, 30, "label");
-  test_box[1] = o;
-  o->box(FL_UP_BOX);
- }
- {Fl_Box* o = new Fl_Box(130, 150, 180, 70, "label");
-  test_box[2] = o;
-  o->box(FL_UP_BOX);
-  Fl_Group::current()->resizable(o);
- }
- {Fl_Group* o = new Fl_Group(10, 70, 80, 80);
- {Fl_Button* o = new Fl_Button(10, 70, 40, 40, "@7->");
-  o->type(102);
-  o->labeltype(FL_SYMBOL_LABEL);
-  o->callback((Fl_Callback*)which_cb, (void*)(3));
- }
- {Fl_Button* o = new Fl_Button(50, 70, 40, 40, "@9->");
-  o->type(102);
-  o->labeltype(FL_SYMBOL_LABEL);
-  o->callback((Fl_Callback*)which_cb, (void*)(2));
- }
- {Fl_Button* o = new Fl_Button(10, 110, 40, 40, "@1->");
-  o->type(102);
-  o->labeltype(FL_SYMBOL_LABEL);
-  o->callback((Fl_Callback*)which_cb, (void*)(0));
-  o->set();
- }
- {Fl_Button* o = new Fl_Button(50, 110, 40, 40, "@3->");
-  o->type(102);
-  o->labeltype(FL_SYMBOL_LABEL);
-  o->callback((Fl_Callback*)which_cb, (void*)(1));
- }
-  o->end();
- }
- {Fl_Button* o = new Fl_Button(10, 150, 80, 40, "INSIDE");
-  o->type(1);
-  o->callback((Fl_Callback*)inside_cb);
- }
- {Fl_Value_Slider* o = new Fl_Value_Slider(320, 0, 30, 320);
-  color_slider[0] = o;
-  o->type(4);
-  o->box(FL_FLAT_BOX);
-  o->color(7);
-  o->callback((Fl_Callback*)color_slider_cb, (void*)(0));
-  o->minimum(255); o->maximum(0);;
-  o->precision(0);
- }
- {Fl_Value_Slider* o = new Fl_Value_Slider(350, 0, 30, 320);
-  color_slider[1] = o;
-  o->type(4);
-  o->box(FL_FLAT_BOX);
-  o->color(9);
-  o->callback((Fl_Callback*)color_slider_cb, (void*)(1));
-  o->minimum(255); o->maximum(0);;
-  o->precision(0);
- }
- {Fl_Value_Slider* o = new Fl_Value_Slider(380, 0, 30, 320);
-  color_slider[2] = o;
-  o->type(4);
-  o->box(FL_FLAT_BOX);
-  o->color(10);
-  o->callback((Fl_Callback*)color_slider_cb, (void*)(2));
-  o->minimum(255); o->maximum(0);;
-  o->precision(0);
- }
- {Fl_Value_Slider* o = new Fl_Value_Slider(410, 0, 30, 320);
-  color_slider[3] = o;
-  o->type(4);
-  o->box(FL_FLAT_BOX);
-  o->color(12);
-  o->callback((Fl_Callback*)color_slider_cb, (void*)(3));
-  o->minimum(255); o->maximum(0);;
-  o->precision(0);
- }
- {Fl_Slider* o = new Fl_Slider(130, 240, 180, 30, "thickness");
-  thickness_slider = o;
-  o->type(5);
-  o->box(FL_FLAT_BOX);
-  o->callback((Fl_Callback*)thickness_cb);
-  o->minimum(1);
-  o->maximum(10);
-  o->step(1);
- }
- {Fl_Button* o = new Fl_Button(10, 230, 80, 30, "dump");
-  o->callback((Fl_Callback*)dump_cb);
- }
- w->end();
- }
- return w;
-}
diff --git a/test/shiny_panel.H b/test/shiny_panel.H
deleted file mode 100644
index 9e86fc52f..000000000
--- a/test/shiny_panel.H
+++ /dev/null
@@ -1,17 +0,0 @@
-// generated by Fast Light User Interface Designer (fluid) version 0.99
-#include <FL/Fl.H>
-#include <FL/Fl_Box.H>
-#include <FL/Fl_Button.H>
-#include <FL/Fl_Group.H>
-#include <FL/Fl_Slider.H>
-#include <FL/Fl_Value_Slider.H>
-#include <FL/Fl_Window.H>
-extern void color_slider_cb(Fl_Value_Slider*, long);
-extern void dump_cb(Fl_Button*, void*);
-extern void inside_cb(Fl_Button*, void*);
-extern void thickness_cb(Fl_Slider*, void*);
-extern void which_cb(Fl_Button*, long);
-extern Fl_Box *test_box[3];
-extern Fl_Value_Slider *color_slider[4];
-extern Fl_Slider *thickness_slider;
-Fl_Window* make_panels();
diff --git a/test/style_ui.C b/test/style_ui.C
deleted file mode 100644
index 657ca7014..000000000
--- a/test/style_ui.C
+++ /dev/null
@@ -1,271 +0,0 @@
-// generated by Fast Light User Interface Designer (fluid) version 0.99
-
-#include "style_ui.H"
-
-Fl_Double_Window *style_panel;
-
-static void cb_OK(Fl_Return_Button* o, void*) {
-  o->window()->hide();
-}
-
-static void cb_Quit(Fl_Menu_*, void*) {
-  exit(0);
-}
-
-Fl_Menu_Item menu_[] = {
- {"File", 0,  0, 0, 64, 0, 0, 14, 0},
- {"Open", 0x8006f,  0, 0, 0, 0, 0, 14, 0},
- {"Save", 0x80073,  0, 0, 0, 0, 0, 14, 0},
- {"Merge", 0,  0, 0, 0, 0, 0, 14, 0},
- {"Quit", 0x80071,  (Fl_Callback*)cb_Quit, 0, 0, 0, 0, 14, 0},
- {0},
- {"Edit", 0,  0, 0, 64, 0, 0, 14, 0},
- {"Undo", 0x8007a,  0, 0, 0, 0, 0, 14, 0},
- {"Cut", 0x80078,  0, 0, 0, 0, 0, 14, 0},
- {"Copy", 0x80076,  0, 0, 0, 0, 0, 14, 0},
- {"Paste", 0x80076,  0, 0, 0, 0, 0, 14, 0},
- {0},
- {"Font", 0,  0, 0, 64, 0, 0, 14, 0},
- {"Normal", 0,  0, 0, 0, 0, 0, 14, 0},
- {"Bold", 0,  0, 0, 0, 0, 1, 14, 0},
- {"Italic", 0,  0, 0, 0, 0, 2, 14, 0},
- {"Bold Italic", 0,  0, 0, 0, 0, 0, 14, 0},
- {"Engrave", 0,  0, 0, 0, 4, 0, 14, 0},
- {"Emboss", 0,  0, 0, 0, 5, 0, 14, 0},
- {"@->", 0,  0, 0, 0, 2, 0, 14, 0},
- {"Small", 0,  0, 0, 0, 0, 0, 10, 0},
- {0},
- {"Other", 0,  0, 0, 64, 0, 0, 14, 0},
- {"help!", 0,  0, 0, 0, 0, 0, 14, 0},
- {0},
- {0}
-};
-
-static void cb_click(Fl_Button*, void*) {
-  show_style_panel();
-}
-static Fl_Menu_Item* font_menu();
-
-Fl_Double_Window* show_style_panel() {
-  Fl_Double_Window* w;
-  if (!style_panel) {
-    { Fl_Double_Window* o = style_panel = w = new Fl_Double_Window(335, 425, "style");
-      { Fl_Choice* o = new Fl_Choice(60, 155, 220, 25, "labels:");
-        o->callback((Fl_Callback*)font_cb, (void*)(0));
-        o->menu(font_menu());
-      }
-      { Fl_Value_Input* o = new Fl_Value_Input(280, 155, 50, 25);
-        o->minimum(1);
-        o->maximum(128);
-        o->step(1);
-        o->value(14);
-        o->callback((Fl_Callback*)font_size_cb, (void*)(0));
-        o->when(4);
-      }
-      { Fl_Choice* o = new Fl_Choice(60, 190, 220, 25, "text:");
-        o->callback((Fl_Callback*)font_cb, (void*)(1));
-        o->menu(font_menu());
-      }
-      { Fl_Value_Input* o = new Fl_Value_Input(280, 190, 50, 25);
-        o->minimum(1);
-        o->maximum(128);
-        o->step(1);
-        o->value(14);
-        o->callback((Fl_Callback*)font_size_cb, (void*)(1));
-        o->when(4);
-      }
-      { Fl_Choice* o = new Fl_Choice(60, 225, 220, 25, "menus:");
-        o->callback((Fl_Callback*)font_cb, (void*)(2));
-        o->menu(font_menu());
-      }
-      { Fl_Value_Input* o = new Fl_Value_Input(280, 225, 50, 25);
-        o->minimum(1);
-        o->maximum(128);
-        o->step(1);
-        o->value(14);
-        o->callback((Fl_Callback*)font_size_cb, (void*)(2));
-        o->when(4);
-      }
-      { Fl_Button* o = new Fl_Button(255, 30, 75, 25, "background:");
-        o->box(FL_ENGRAVED_BOX);
-        o->callback((Fl_Callback*)color_button_cb);
-        o->align(4);
-      }
-      { Fl_Button* o = new Fl_Button(255, 60, 75, 25, "foreground:");
-        o->box(FL_ENGRAVED_BOX);
-        o->color(0);
-        o->callback((Fl_Callback*)color_button_cb);
-        o->align(4);
-      }
-      { Fl_Button* o = new Fl_Button(255, 90, 75, 25, "text background:");
-        o->box(FL_ENGRAVED_BOX);
-        o->color(7);
-        o->callback((Fl_Callback*)color_button_cb);
-        o->align(4);
-      }
-      { Fl_Button* o = new Fl_Button(255, 120, 75, 25, "selection:");
-        o->box(FL_ENGRAVED_BOX);
-        o->color(15);
-        o->callback((Fl_Callback*)color_button_cb);
-        o->align(4);
-      }
-      { Fl_Return_Button* o = new Fl_Return_Button(260, 395, 70, 25, "OK");
-        o->callback((Fl_Callback*)cb_OK);
-      }
-      { Fl_Button* o = new Fl_Button(175, 395, 70, 25, "defaults");
-        o->callback((Fl_Callback*)defaults_cb);
-      }
-      { Fl_Value_Slider* o = new Fl_Value_Slider(235, 260, 95, 25, "box thickness:");
-        o->type(1);
-        o->minimum(1);
-        o->maximum(3);
-        o->step(1);
-        o->value(3);
-        o->slider_size(0.3333);
-        o->callback((Fl_Callback*)box_thickness_cb);
-        o->align(4);
-      }
-      { Fl_Value_Slider* o = new Fl_Value_Slider(235, 295, 95, 25, "text box thickness:");
-        o->type(1);
-        o->maximum(2);
-        o->step(1);
-        o->value(2);
-        o->slider_size(0.3333);
-        o->callback((Fl_Callback*)text_box_thickness_cb);
-        o->align(4);
-      }
-      { Fl_Value_Slider* o = new Fl_Value_Slider(235, 335, 95, 25, "scrollbar thickness:");
-        o->type(1);
-        o->minimum(3);
-        o->maximum(30);
-        o->step(1);
-        o->value(17);
-        o->callback((Fl_Callback*)scrollbar_thickness_cb);
-        o->align(4);
-      }
-      o->end();
-    }
-      }
-      style_panel->show();
-  return w;
-}
-
-int main(int argc, char **argv) {
-  Fl_Double_Window* w;
-  { Fl_Double_Window* o = w = new Fl_Double_Window(445, 435);
-    { Fl_Group* o = new Fl_Group(270, 35, 140, 75, "Packed buttons:");
-      o->align(4);
-      { Fl_Button* o = new Fl_Button(270, 35, 35, 25, "A");
-        o->type(102);
-      }
-      { Fl_Button* o = new Fl_Button(305, 35, 35, 25, "A");
-        o->type(102);
-      }
-      { Fl_Button* o = new Fl_Button(340, 35, 35, 25, "A");
-        o->type(102);
-      }
-      { Fl_Button* o = new Fl_Button(375, 35, 35, 25, "A");
-        o->type(102);
-      }
-      { Fl_Button* o = new Fl_Button(270, 60, 35, 25, "A");
-        o->type(102);
-      }
-      { Fl_Button* o = new Fl_Button(305, 60, 35, 25, "A");
-        o->type(102);
-      }
-      { Fl_Button* o = new Fl_Button(340, 60, 35, 25, "A");
-        o->type(102);
-      }
-      { Fl_Button* o = new Fl_Button(375, 60, 35, 25, "A");
-        o->type(102);
-      }
-      { Fl_Button* o = new Fl_Button(270, 85, 35, 25, "A");
-        o->type(102);
-      }
-      { Fl_Button* o = new Fl_Button(305, 85, 35, 25, "A");
-        o->type(102);
-      }
-      { Fl_Button* o = new Fl_Button(340, 85, 35, 25, "A");
-        o->type(102);
-      }
-      { Fl_Button* o = new Fl_Button(375, 85, 35, 25, "A");
-        o->type(102);
-      }
-      o->end();
-    }
-    { Fl_Adjuster* o = new Fl_Adjuster(105, 90, 75, 25);
-      o->labeltype(FL_ENGRAVED_LABEL);
-      o->align(4);
-    }
-    new Fl_Counter(20, 120, 170, 25, "counter");
-    { Fl_Adjuster* o = new Fl_Adjuster(80, 40, 25, 75, "adjuster:");
-      o->labeltype(FL_SYMBOL_LABEL);
-      o->align(4);
-    }
-    { Fl_Group* o = new Fl_Group(270, 130, 140, 75, "Inactive buttons:");
-      o->align(4);
-      o->deactivate();
-      { Fl_Button* o = new Fl_Button(270, 130, 35, 25, "A");
-        o->type(102);
-      }
-      { Fl_Button* o = new Fl_Button(305, 130, 35, 25, "A");
-        o->type(102);
-      }
-      { Fl_Button* o = new Fl_Button(340, 130, 35, 25, "A");
-        o->type(102);
-      }
-      { Fl_Button* o = new Fl_Button(375, 130, 35, 25, "A");
-        o->type(102);
-      }
-      { Fl_Button* o = new Fl_Button(270, 155, 35, 25, "A");
-        o->type(102);
-      }
-      { Fl_Button* o = new Fl_Button(305, 155, 35, 25, "A");
-        o->type(102);
-      }
-      { Fl_Button* o = new Fl_Button(340, 155, 35, 25, "A");
-        o->type(102);
-      }
-      { Fl_Button* o = new Fl_Button(375, 155, 35, 25, "A");
-        o->type(102);
-      }
-      { Fl_Button* o = new Fl_Button(270, 180, 35, 25, "A");
-        o->type(102);
-      }
-      { Fl_Button* o = new Fl_Button(305, 180, 35, 25, "A");
-        o->type(102);
-      }
-      { Fl_Button* o = new Fl_Button(340, 180, 35, 25, "A");
-        o->type(102);
-      }
-      { Fl_Button* o = new Fl_Button(375, 180, 35, 25, "A");
-        o->type(102);
-      }
-      o->end();
-    }
-    { Fl_Input* o = new Fl_Input(65, 175, 200, 25, "input:");
-      o->static_value("This is a text input field");
-    }
-    { Fl_Output* o = new Fl_Output(65, 200, 200, 25, "output:");
-      o->static_value("This is a text output field");
-    }
-    { Fl_Menu_Bar* o = new Fl_Menu_Bar(0, 0, 445, 30);
-      o->menu(menu_);
-    }
-    { Fl_Browser* o = new Fl_Browser(0, 235, 440, 200);
-      o->type(3);
-      Fl_Group::current()->resizable(o);
-      o->load("browser.C");
-      o->position(0);
-    }
-    { Fl_Button* o = new Fl_Button(235, 2, 170, 25, "click this to set style");
-      o->color(12);
-      o->selection_color(12);
-      o->callback((Fl_Callback*)cb_click);
-    }
-    o->end();
-  }
-  Fl::visual(FL_RGB);
-  w->show(argc, argv);
-  return Fl::run();
-}
diff --git a/test/style_ui.H b/test/style_ui.H
deleted file mode 100644
index 4d245ee3d..000000000
--- a/test/style_ui.H
+++ /dev/null
@@ -1,27 +0,0 @@
-// generated by Fast Light User Interface Designer (fluid) version 0.99
-
-#include <FL/Fl.H>
-#include <FL/Fl_Adjuster.H>
-#include <FL/Fl_Browser.H>
-#include <FL/Fl_Button.H>
-#include <FL/Fl_Choice.H>
-#include <FL/Fl_Counter.H>
-#include <FL/Fl_Double_Window.H>
-#include <FL/Fl_Group.H>
-#include <FL/Fl_Input.H>
-#include <FL/Fl_Menu_Bar.H>
-#include <FL/Fl_Output.H>
-#include <FL/Fl_Return_Button.H>
-#include <FL/Fl_Value_Input.H>
-#include <FL/Fl_Value_Slider.H>
-#include <stdlib.h>
-extern void box_thickness_cb(Fl_Value_Slider*, void*);
-extern void color_button_cb(Fl_Button*, void*);
-extern void defaults_cb(Fl_Button*, void*);
-extern void font_cb(Fl_Choice*, long);
-extern void font_size_cb(Fl_Value_Input*, long);
-extern void scrollbar_thickness_cb(Fl_Value_Slider*, void*);
-extern void text_box_thickness_cb(Fl_Value_Slider*, void*);
-extern Fl_Double_Window *style_panel;
-Fl_Double_Window* show_style_panel();
-extern Fl_Menu_Item menu_[];
diff --git a/test/tabs.C b/test/tabs.C
deleted file mode 100644
index 239510458..000000000
--- a/test/tabs.C
+++ /dev/null
@@ -1,84 +0,0 @@
-// generated by Fast Light User Interface Designer (fluid) version 0.99
-
-#include "tabs.H"
-
-Fl_Window *foo_window;
-
-static void cb_cancel(Fl_Button*, void*) {
-  exit(1);
-}
-
-static void cb_OK(Fl_Return_Button*, void*) {
-  exit(0);
-}
-
-int main(int argc, char **argv) {
-  Fl_Window *w;
-  { Fl_Window* o = new Fl_Window(321, 324);
-    w = foo_window = o;
-    Fl_Group::current()->resizable(o);
-    { Fl_Tabs* o = new Fl_Tabs(10, 10, 300, 200);
-      o->color2(15);
-      Fl_Group::current()->resizable(o);
-      { Fl_Group* o = new Fl_Group(10, 30, 300, 180, "Label1");
-        o->hide();
-        Fl_Group::current()->resizable(o);
-        new Fl_Input(60, 50, 240, 40, "input:");
-        new Fl_Input(60, 90, 240, 30, "input2:");
-        new Fl_Input(60, 120, 240, 80, "input3:");
-        o->end();
-        Fl_Group::current()->resizable(o);
-      }
-      { Fl_Group* o = new Fl_Group(10, 30, 300, 180, "tab2");
-        o->hide();
-        new Fl_Button(20, 60, 100, 30, "button1");
-        new Fl_Input(140, 100, 100, 30, "input in box2");
-        new Fl_Button(30, 140, 260, 30, "This is stuff inside the Fl_Group \"tab2\"");
-        o->end();
-      }
-      { Fl_Group* o = new Fl_Group(10, 30, 300, 180, "tab3");
-        o->hide();
-        new Fl_Button(20, 60, 60, 80, "button2");
-        new Fl_Button(80, 60, 60, 80, "button");
-        new Fl_Button(140, 60, 60, 80, "button");
-        o->end();
-      }
-      { Fl_Group* o = new Fl_Group(10, 30, 300, 180, "tab4");
-        o->labelfont(2);
-        o->hide();
-        new Fl_Button(20, 50, 60, 110, "button2");
-        new Fl_Button(80, 50, 60, 110, "button");
-        new Fl_Button(140, 50, 60, 110, "button");
-        o->end();
-      }
-      { Fl_Group* o = new Fl_Group(10, 30, 300, 180, "     tab5      ");
-        o->labeltype(FL_ENGRAVED_LABEL);
-        new Fl_Button(20, 80, 60, 80, "button2");
-        new Fl_Button(90, 90, 60, 80, "button");
-        { Fl_Clock* o = new Fl_Clock(160, 50, 100, 100, "Make sure this clock does not use processor time when this tab is hidden o\
-r window is iconized");
-          o->box(FL_OSHADOW_BOX);
-          o->color(238);
-          o->color2(0);
-          o->labelfont(8);
-          o->labelsize(10);
-          o->align(130);
-        }
-        o->end();
-      }
-      o->end();
-      Fl_Group::current()->resizable(o);
-    }
-    new Fl_Input(60, 220, 130, 30, "inputA:");
-    new Fl_Input(60, 250, 250, 30, "inputB:");
-    { Fl_Button* o = new Fl_Button(180, 290, 60, 30, "cancel");
-      o->callback((Fl_Callback*)cb_cancel);
-    }
-    { Fl_Return_Button* o = new Fl_Return_Button(250, 290, 60, 30, "OK");
-      o->callback((Fl_Callback*)cb_OK);
-    }
-    w->end();
-  }
-  w->show(argc, argv);
-  return Fl::run();
-}
diff --git a/test/tabs.H b/test/tabs.H
deleted file mode 100644
index 2ec7bc12c..000000000
--- a/test/tabs.H
+++ /dev/null
@@ -1,12 +0,0 @@
-// generated by Fast Light User Interface Designer (fluid) version 0.99
-
-#include <FL/Fl.H>
-#include <FL/Fl_Button.H>
-#include <FL/Fl_Clock.H>
-#include <FL/Fl_Group.H>
-#include <FL/Fl_Input.H>
-#include <FL/Fl_Return_Button.H>
-#include <FL/Fl_Tabs.H>
-#include <FL/Fl_Window.H>
-#include <stdlib.h>
-extern Fl_Window *foo_window;
diff --git a/test/valuators.C b/test/valuators.C
deleted file mode 100644
index b71c932d4..000000000
--- a/test/valuators.C
+++ /dev/null
@@ -1,358 +0,0 @@
-// generated by Fast Light User Interface Designer (fluid) version 0.99
-
-#include "valuators.H"
-
-static void cb_0(Fl_Slider* o, void*) {
-  printf("%g      \r",o->value());
-fflush(stdout);
-}
-
-static void cb_FL_VERT_FILL_SLIDER(Fl_Slider* o, void*) {
-  printf("%g      \r",o->value());
-fflush(stdout);
-}
-
-static void cb_FL_VERT_NICE_SLIDER(Fl_Slider* o, void*) {
-  printf("%g      \r",o->value());
-fflush(stdout);
-}
-
-static void cb_01(Fl_Value_Slider* o, void*) {
-  printf("%g      \r",o->value());
-fflush(stdout);
-}
-
-static void cb_FL_VERT_FILL_SLIDER1(Fl_Value_Slider* o, void*) {
-  printf("%g      \r",o->value());
-fflush(stdout);
-}
-
-static void cb_FL_VERT_NICE_SLIDER1(Fl_Value_Slider* o, void*) {
-  printf("%g      \r",o->value());
-fflush(stdout);
-}
-
-static void cb_FL_HORIZONTAL(Fl_Slider* o, void*) {
-  printf("%g      \r",o->value());
-fflush(stdout);
-}
-
-static void cb_FL_HOR_FILL_SLIDER(Fl_Slider* o, void*) {
-  printf("%g      \r",o->value());
-fflush(stdout);
-}
-
-static void cb_FL_HOR_NICE_SLIDER(Fl_Slider* o, void*) {
-  printf("%g      \r",o->value());
-fflush(stdout);
-}
-
-static void cb_FL_HOR_SLIDER(Fl_Value_Slider* o, void*) {
-  printf("%g      \r",o->value());
-fflush(stdout);
-}
-
-static void cb_FL_HOR_FILL_SLIDER1(Fl_Value_Slider* o, void*) {
-  printf("%g      \r",o->value());
-fflush(stdout);
-}
-
-static void cb_FL_HOR_NICE_SLIDER1(Fl_Value_Slider* o, void*) {
-  printf("%g      \r",o->value());
-fflush(stdout);
-}
-
-static void cb_w(Fl_Adjuster* o, void*) {
-  printf("%g      \r",o->value());
-fflush(stdout);
-}
-
-static void cb_w1(Fl_Adjuster* o, void*) {
-  printf("%g      \r",o->value());
-fflush(stdout);
-}
-
-static void cb_02(Fl_Counter* o, void*) {
-  printf("%g      \r",o->value());
-fflush(stdout);
-}
-
-static void cb_FL_SIMPLE_COUNTER(Fl_Counter* o, void*) {
-  printf("%g      \r",o->value());
-fflush(stdout);
-}
-
-static void cb_03(Fl_Dial* o, void*) {
-  printf("%g      \r",o->value());
-fflush(stdout);
-}
-
-static void cb_FL_LINE_DIAL(Fl_Dial* o, void*) {
-  printf("%g      \r",o->value());
-fflush(stdout);
-}
-
-static void cb_FL_FILL_DIAL(Fl_Dial* o, void*) {
-  printf("%g      \r",o->value());
-fflush(stdout);
-}
-
-static void cb_04(Fl_Roller* o, void*) {
-  printf("%g      \r",o->value());
-fflush(stdout);
-}
-
-static void cb_FL_HORIZONTAL1(Fl_Roller* o, void*) {
-  printf("%g      \r",o->value());
-fflush(stdout);
-}
-
-static void cb_05(Fl_Value_Input* o, void*) {
-  printf("%g      \r",o->value());
-fflush(stdout);
-}
-
-static void cb_06(Fl_Value_Output* o, void*) {
-  printf("%g      \r",o->value());
-fflush(stdout);
-}
-
-static void cb_07(Fl_Scrollbar* o, void*) {
-  printf("%d      \r",o->value());
-fflush(stdout);
-}
-
-static void cb_FL_HORIZONTAL2(Fl_Scrollbar* o, void*) {
-  printf("%d      \r",o->value());
-fflush(stdout);
-}
-
-int main(int argc, char **argv) {
-  Fl_Window *w;
-  { Fl_Window* o = w = new Fl_Window(567, 506, "Valuator classes, showing values for type()");
-    o->color(43);
-    o->selection_color(43);
-    { Fl_Box* o = new Fl_Box(10, 10, 280, 210, "Fl_Slider");
-      o->box(FL_ENGRAVED_BOX);
-      o->labelfont(1);
-      o->labelsize(12);
-      o->align(17);
-    }
-    { Fl_Slider* o = new Fl_Slider(30, 45, 20, 145, "0");
-      o->selection_color(1);
-      o->labelsize(8);
-      o->callback((Fl_Callback*)cb_0);
-      o->align(1);
-    }
-    { Fl_Slider* o = new Fl_Slider(70, 55, 20, 145, "FL_VERT_FILL_SLIDER");
-      o->type(2);
-      o->selection_color(1);
-      o->labelsize(8);
-      o->callback((Fl_Callback*)cb_FL_VERT_FILL_SLIDER);
-    }
-    { Fl_Slider* o = new Fl_Slider(105, 45, 20, 145, "FL_VERT_NICE_SLIDER");
-      o->type(4);
-      o->box(FL_FLAT_BOX);
-      o->color(10);
-      o->selection_color(1);
-      o->labelsize(8);
-      o->callback((Fl_Callback*)cb_FL_VERT_NICE_SLIDER);
-      o->align(1);
-    }
-    { Fl_Box* o = new Fl_Box(10, 230, 280, 205, "Fl_Value_Slider");
-      o->box(FL_ENGRAVED_BOX);
-      o->labelfont(1);
-      o->labelsize(12);
-      o->align(17);
-    }
-    { Fl_Value_Slider* o = new Fl_Value_Slider(30, 260, 30, 145, "0");
-      o->selection_color(1);
-      o->labelsize(8);
-      o->callback((Fl_Callback*)cb_01);
-      o->align(1);
-    }
-    { Fl_Value_Slider* o = new Fl_Value_Slider(70, 275, 30, 140, "FL_VERT_FILL_SLIDER");
-      o->type(2);
-      o->selection_color(1);
-      o->labelsize(8);
-      o->callback((Fl_Callback*)cb_FL_VERT_FILL_SLIDER1);
-    }
-    { Fl_Value_Slider* o = new Fl_Value_Slider(110, 260, 20, 145, "FL_VERT_NICE_SLIDER");
-      o->type(4);
-      o->box(FL_FLAT_BOX);
-      o->color(10);
-      o->selection_color(1);
-      o->labelsize(8);
-      o->callback((Fl_Callback*)cb_FL_VERT_NICE_SLIDER1);
-      o->align(1);
-    }
-    { Fl_Slider* o = new Fl_Slider(140, 80, 130, 20, "FL_HORIZONTAL");
-      o->type(1);
-      o->selection_color(1);
-      o->labelsize(8);
-      o->callback((Fl_Callback*)cb_FL_HORIZONTAL);
-    }
-    { Fl_Slider* o = new Fl_Slider(140, 120, 130, 20, "FL_HOR_FILL_SLIDER");
-      o->type(3);
-      o->selection_color(1);
-      o->labelsize(8);
-      o->callback((Fl_Callback*)cb_FL_HOR_FILL_SLIDER);
-    }
-    { Fl_Slider* o = new Fl_Slider(140, 160, 130, 20, "FL_HOR_NICE_SLIDER");
-      o->type(5);
-      o->box(FL_FLAT_BOX);
-      o->color(10);
-      o->selection_color(1);
-      o->labelsize(8);
-      o->callback((Fl_Callback*)cb_FL_HOR_NICE_SLIDER);
-    }
-    { Fl_Value_Slider* o = new Fl_Value_Slider(140, 290, 130, 20, "FL_HOR_SLIDER");
-      o->type(1);
-      o->selection_color(1);
-      o->labelsize(8);
-      o->callback((Fl_Callback*)cb_FL_HOR_SLIDER);
-    }
-    { Fl_Value_Slider* o = new Fl_Value_Slider(140, 330, 130, 20, "FL_HOR_FILL_SLIDER");
-      o->type(3);
-      o->selection_color(1);
-      o->labelsize(8);
-      o->callback((Fl_Callback*)cb_FL_HOR_FILL_SLIDER1);
-    }
-    { Fl_Box* o = new Fl_Box(430, 10, 125, 120, "Fl_Adjuster");
-      o->box(FL_ENGRAVED_BOX);
-      o->labelfont(1);
-      o->labelsize(12);
-      o->align(17);
-    }
-    { Fl_Value_Slider* o = new Fl_Value_Slider(140, 370, 130, 20, "FL_HOR_NICE_SLIDER");
-      o->type(5);
-      o->box(FL_FLAT_BOX);
-      o->color(10);
-      o->selection_color(1);
-      o->labelsize(8);
-      o->callback((Fl_Callback*)cb_FL_HOR_NICE_SLIDER1);
-    }
-    { Fl_Adjuster* o = new Fl_Adjuster(440, 60, 75, 25, "w()>h()");
-      o->labelsize(8);
-      o->callback((Fl_Callback*)cb_w);
-    }
-    { Fl_Adjuster* o = new Fl_Adjuster(520, 35, 25, 75, "w()<h()");
-      o->labelsize(8);
-      o->callback((Fl_Callback*)cb_w1);
-    }
-    { Fl_Box* o = new Fl_Box(345, 135, 210, 115, "Fl_Counter");
-      o->box(FL_ENGRAVED_BOX);
-      o->labelfont(1);
-      o->labelsize(12);
-      o->align(17);
-    }
-    { Fl_Counter* o = new Fl_Counter(360, 160, 180, 30, "0");
-      o->labelsize(8);
-      o->minimum(-1e+06);
-      o->maximum(1e+06);
-      o->callback((Fl_Callback*)cb_02);
-    }
-    { Fl_Counter* o = new Fl_Counter(360, 205, 180, 30, "FL_SIMPLE_COUNTER");
-      o->type(1);
-      o->labelsize(8);
-      o->minimum(-1e+06);
-      o->maximum(1e+06);
-      o->callback((Fl_Callback*)cb_FL_SIMPLE_COUNTER);
-    }
-    { Fl_Box* o = new Fl_Box(300, 260, 255, 105, "Fl_Dial");
-      o->box(FL_ENGRAVED_BOX);
-      o->labelfont(1);
-      o->labelsize(12);
-      o->align(17);
-    }
-    { Fl_Dial* o = new Fl_Dial(315, 280, 65, 65, "0");
-      o->color(10);
-      o->selection_color(1);
-      o->labelsize(8);
-      o->callback((Fl_Callback*)cb_03);
-    }
-    { Fl_Dial* o = new Fl_Dial(395, 280, 65, 65, "FL_LINE_DIAL");
-      o->type(1);
-      o->color(10);
-      o->selection_color(1);
-      o->labelsize(8);
-      o->callback((Fl_Callback*)cb_FL_LINE_DIAL);
-    }
-    { Fl_Dial* o = new Fl_Dial(475, 280, 65, 65, "FL_FILL_DIAL");
-      o->type(2);
-      o->color(10);
-      o->selection_color(1);
-      o->labelsize(8);
-      o->callback((Fl_Callback*)cb_FL_FILL_DIAL);
-    }
-    { Fl_Box* o = new Fl_Box(300, 375, 145, 120, "Fl_Roller");
-      o->box(FL_ENGRAVED_BOX);
-      o->labelfont(1);
-      o->labelsize(12);
-      o->align(17);
-    }
-    { Fl_Roller* o = new Fl_Roller(315, 390, 20, 95, "0");
-      o->labelsize(8);
-      o->callback((Fl_Callback*)cb_04);
-    }
-    { Fl_Roller* o = new Fl_Roller(340, 430, 90, 20, "FL_HORIZONTAL");
-      o->type(1);
-      o->labelsize(8);
-      o->callback((Fl_Callback*)cb_FL_HORIZONTAL1);
-    }
-    { Fl_Box* o = new Fl_Box(10, 445, 140, 50, "Fl_Value_Input");
-      o->box(FL_ENGRAVED_BOX);
-      o->labelfont(1);
-      o->labelsize(12);
-      o->align(17);
-    }
-    { Fl_Box* o = new Fl_Box(455, 375, 100, 120, "Some widgets have color(FL_GREEN) and color2(FL_RED) to show the areas the\
-se effect.");
-      o->box(FL_BORDER_FRAME);
-      o->color(0);
-      o->selection_color(0);
-      o->labelsize(10);
-      o->align(128);
-    }
-    { Fl_Box* o = new Fl_Box(155, 445, 135, 50, "Fl_Value_Output");
-      o->box(FL_ENGRAVED_BOX);
-      o->labelfont(1);
-      o->labelsize(12);
-      o->align(17);
-    }
-    { Fl_Value_Input* o = new Fl_Value_Input(30, 460, 110, 30, "0");
-      o->labelsize(8);
-      o->maximum(100);
-      o->step(0.1);
-      o->callback((Fl_Callback*)cb_05);
-      o->when(4);
-    }
-    { Fl_Value_Output* o = new Fl_Value_Output(170, 460, 110, 30, "0");
-      o->labelsize(8);
-      o->maximum(100);
-      o->step(0.1);
-      o->callback((Fl_Callback*)cb_06);
-    }
-    { Fl_Box* o = new Fl_Box(295, 10, 130, 120, "   Fl_Scrollbar");
-      o->box(FL_ENGRAVED_BOX);
-      o->labelfont(1);
-      o->labelsize(12);
-      o->align(21);
-    }
-    { Fl_Scrollbar* o = new Fl_Scrollbar(395, 20, 20, 105, "0");
-      o->labelsize(8);
-      o->maximum(100);
-      o->callback((Fl_Callback*)cb_07);
-      o->align(1);
-    }
-    { Fl_Scrollbar* o = new Fl_Scrollbar(300, 65, 95, 20, "FL_HORIZONTAL");
-      o->type(1);
-      o->labelsize(8);
-      o->maximum(100);
-      o->callback((Fl_Callback*)cb_FL_HORIZONTAL2);
-    }
-    o->end();
-  }
-  w->show(argc, argv);
-  return Fl::run();
-}
diff --git a/test/valuators.H b/test/valuators.H
deleted file mode 100644
index acd872b9b..000000000
--- a/test/valuators.H
+++ /dev/null
@@ -1,15 +0,0 @@
-// generated by Fast Light User Interface Designer (fluid) version 0.99
-
-#include <FL/Fl.H>
-#include <FL/Fl_Adjuster.H>
-#include <FL/Fl_Box.H>
-#include <FL/Fl_Counter.H>
-#include <FL/Fl_Dial.H>
-#include <FL/Fl_Roller.H>
-#include <FL/Fl_Scrollbar.H>
-#include <FL/Fl_Slider.H>
-#include <FL/Fl_Value_Input.H>
-#include <FL/Fl_Value_Output.H>
-#include <FL/Fl_Value_Slider.H>
-#include <FL/Fl_Window.H>
-#include <stdio.h>