diff --git a/c-src/Fl_AdjusterC.h b/c-src/Fl_AdjusterC.h
--- a/c-src/Fl_AdjusterC.h
+++ b/c-src/Fl_AdjusterC.h
@@ -29,125 +29,125 @@
     ~Fl_DerivedAdjuster();
   };
 #endif
-  FL_EXPORT_C(fl_Group,     Fl_Adjuster_parent)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,         Fl_Adjuster_set_parent)(fl_Adjuster adjuster, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Adjuster_type)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,         Fl_Adjuster_set_type)(fl_Adjuster adjuster, uchar t);
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Adjuster_parent,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_set_parent,(fl_Adjuster adjuster, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Adjuster_type,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_set_type,(fl_Adjuster adjuster, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Adjuster_x)(fl_Adjuster adjuster);
-  FL_EXPORT_C(int,          Fl_Adjuster_y)(fl_Adjuster adjuster);
-  FL_EXPORT_C(int,          Fl_Adjuster_w)(fl_Adjuster adjuster);
-  FL_EXPORT_C(int,          Fl_Adjuster_h)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,         Fl_Adjuster_set_align)(fl_Adjuster adjuster, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Adjuster_align)(fl_Adjuster adjuster);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Adjuster_box)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,         Fl_Adjuster_set_box)(fl_Adjuster adjuster, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Adjuster_color)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,         Fl_Adjuster_set_color)(fl_Adjuster adjuster, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Adjuster_set_color_with_bg_sel)(fl_Adjuster adjuster,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Adjuster_selection_color)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,         Fl_Adjuster_set_selection_color)(fl_Adjuster adjuster, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Adjuster_label)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,         Fl_Adjuster_copy_label)(fl_Adjuster adjuster, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Adjuster_set_label)(fl_Adjuster adjuster, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Adjuster_labeltype)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,         Fl_Adjuster_set_labeltype)(fl_Adjuster adjuster, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Adjuster_labelcolor)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,         Fl_Adjuster_set_labelcolor)(fl_Adjuster adjuster, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Adjuster_labelfont)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,         Fl_Adjuster_set_labelfont)(fl_Adjuster adjuster, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Adjuster_labelsize)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,         Fl_Adjuster_set_labelsize)(fl_Adjuster adjuster, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Adjuster_image)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,         Fl_Adjuster_set_image)(fl_Adjuster adjuster, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Adjuster_deimage)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,         Fl_Adjuster_set_deimage)(fl_Adjuster adjuster, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Adjuster_tooltip)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,         Fl_Adjuster_copy_tooltip)(fl_Adjuster adjuster, const char* text);
-  FL_EXPORT_C(void,         Fl_Adjuster_set_tooltip)(fl_Adjuster adjuster, const char* text);
-  FL_EXPORT_C(void,         Fl_Adjuster_set_callback_with_user_data)(fl_Adjuster adjuster, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Adjuster_set_callback)(fl_Adjuster adjuster, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Adjuster_other_data)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,         Fl_Adjuster_set_other_data)(fl_Adjuster adjuster, void* v);
-  FL_EXPORT_C(void*,        Fl_Adjuster_user_data)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,         Fl_Adjuster_set_user_data)(fl_Adjuster adjuster, void* v);
-  FL_EXPORT_C(long,         Fl_Adjuster_argument)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,         Fl_Adjuster_set_argument)(fl_Adjuster adjuster, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Adjuster_when)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,         Fl_Adjuster_set_when)(fl_Adjuster adjuster, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Adjuster_visible)(fl_Adjuster adjuster);
-  FL_EXPORT_C(int,          Fl_Adjuster_visible_r)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,         Fl_Adjuster_set_visible)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,         Fl_Adjuster_clear_visible)(fl_Adjuster adjuster);
-  FL_EXPORT_C(unsigned int, Fl_Adjuster_active)(fl_Adjuster adjuster);
-  FL_EXPORT_C(int,          Fl_Adjuster_active_r)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,         Fl_Adjuster_activate)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,         Fl_Adjuster_deactivate)(fl_Adjuster adjuster);
-  FL_EXPORT_C(unsigned int, Fl_Adjuster_output)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,         Fl_Adjuster_set_output)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,         Fl_Adjuster_clear_output)(fl_Adjuster adjuster);
-  FL_EXPORT_C(unsigned int, Fl_Adjuster_takesevents)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,         Fl_Adjuster_set_changed)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,         Fl_Adjuster_clear_changed)(fl_Adjuster adjuster);
-  FL_EXPORT_C(int,          Fl_Adjuster_take_focus)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,         Fl_Adjuster_set_visible_focus)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,         Fl_Adjuster_clear_visible_focus)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,         Fl_Adjuster_modify_visible_focus)(fl_Adjuster adjuster, int v);
-  FL_EXPORT_C(unsigned int, Fl_Adjuster_visible_focus)(fl_Adjuster adjuster);
-  FL_EXPORT_C(int,          Fl_Adjuster_contains)(fl_Adjuster adjuster, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Adjuster_inside)(fl_Adjuster adjuster, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Adjuster_redraw)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,         Fl_Adjuster_redraw_label)(fl_Adjuster adjuster);
-  FL_EXPORT_C(uchar,        Fl_Adjuster_damage)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,         Fl_Adjuster_clear_damage_with_bitmask)(fl_Adjuster adjuster, uchar c);
-  FL_EXPORT_C(void,         Fl_Adjuster_clear_damage)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,         Fl_Adjuster_damage_with_text)(fl_Adjuster adjuster, uchar c);
-  FL_EXPORT_C(void,         Fl_Adjuster_damage_inside_widget)(fl_Adjuster adjuster, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Adjuster_draw_label_with_xywh_alignment)(fl_Adjuster adjuster, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Adjuster_measure_label)(fl_Adjuster adjuster, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Adjuster_window)(fl_Adjuster adjuster);
-  FL_EXPORT_C(fl_Window,    Fl_Adjuster_top_window)(fl_Adjuster adjuster);
-  FL_EXPORT_C(fl_Window ,   Fl_Adjuster_top_window_offset)(fl_Adjuster adjuster, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Adjuster_as_gl_window)(fl_Adjuster adjuster);
+  FL_EXPORT_C_HEADER(int,Fl_Adjuster_x,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(int,Fl_Adjuster_y,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(int,Fl_Adjuster_w,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(int,Fl_Adjuster_h,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_set_align,(fl_Adjuster adjuster, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Adjuster_align,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Adjuster_box,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_set_box,(fl_Adjuster adjuster, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Adjuster_color,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_set_color,(fl_Adjuster adjuster, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_set_color_with_bg_sel,(fl_Adjuster adjuster,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Adjuster_selection_color,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_set_selection_color,(fl_Adjuster adjuster, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Adjuster_label,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_copy_label,(fl_Adjuster adjuster, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_set_label,(fl_Adjuster adjuster, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Adjuster_labeltype,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_set_labeltype,(fl_Adjuster adjuster, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Adjuster_labelcolor,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_set_labelcolor,(fl_Adjuster adjuster, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Adjuster_labelfont,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_set_labelfont,(fl_Adjuster adjuster, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Adjuster_labelsize,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_set_labelsize,(fl_Adjuster adjuster, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Adjuster_image,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_set_image,(fl_Adjuster adjuster, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Adjuster_deimage,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_set_deimage,(fl_Adjuster adjuster, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Adjuster_tooltip,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_copy_tooltip,(fl_Adjuster adjuster, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_set_tooltip,(fl_Adjuster adjuster, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_set_callback_with_user_data,(fl_Adjuster adjuster, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_set_callback,(fl_Adjuster adjuster, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Adjuster_other_data,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_set_other_data,(fl_Adjuster adjuster, void* v));
+  FL_EXPORT_C_HEADER(void*,Fl_Adjuster_user_data,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_set_user_data,(fl_Adjuster adjuster, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Adjuster_argument,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_set_argument,(fl_Adjuster adjuster, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Adjuster_when,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_set_when,(fl_Adjuster adjuster, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Adjuster_visible,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(int,Fl_Adjuster_visible_r,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_set_visible,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_clear_visible,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Adjuster_active,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(int,Fl_Adjuster_active_r,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_activate,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_deactivate,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Adjuster_output,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_set_output,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_clear_output,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Adjuster_takesevents,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_set_changed,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_clear_changed,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(int,Fl_Adjuster_take_focus,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_set_visible_focus,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_clear_visible_focus,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_modify_visible_focus,(fl_Adjuster adjuster, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Adjuster_visible_focus,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(int,Fl_Adjuster_contains,(fl_Adjuster adjuster, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Adjuster_inside,(fl_Adjuster adjuster, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_redraw,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_redraw_label,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(uchar,Fl_Adjuster_damage,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_clear_damage_with_bitmask,(fl_Adjuster adjuster, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_clear_damage,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_damage_with_text,(fl_Adjuster adjuster, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_damage_inside_widget,(fl_Adjuster adjuster, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_draw_label_with_xywh_alignment,(fl_Adjuster adjuster, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_measure_label,(fl_Adjuster adjuster, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Adjuster_window,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Adjuster_top_window,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Adjuster_top_window_offset,(fl_Adjuster adjuster, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Adjuster_as_gl_window,(fl_Adjuster adjuster));
 
   /* Inherited from Fl_Valuator */
-  FL_EXPORT_C(void, Fl_Adjuster_bounds)(fl_Adjuster adjuster, double a, double b);
-  FL_EXPORT_C(double, Fl_Adjuster_minimum)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void, Fl_Adjuster_set_minimum)(fl_Adjuster adjuster, double a);
-  FL_EXPORT_C(double, Fl_Adjuster_maximum)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void, Fl_Adjuster_set_maximum)(fl_Adjuster adjuster, double a);
-  FL_EXPORT_C(void, Fl_Adjuster_range)(fl_Adjuster adjuster, double a, double b);
-  FL_EXPORT_C(void, Fl_Adjuster_set_step)(fl_Adjuster adjuster, int a);
-  FL_EXPORT_C(void, Fl_Adjuster_set_step_with_a_b)(fl_Adjuster adjuster, double a, int b);
-  FL_EXPORT_C(void, Fl_Adjuster_step_with_s)(fl_Adjuster adjuster, double s);
-  FL_EXPORT_C(double, Fl_Adjuster_step)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void, Fl_Adjuster_precision)(fl_Adjuster adjuster, int precision);
-  FL_EXPORT_C(double, Fl_Adjuster_value)(fl_Adjuster adjuster);
-  FL_EXPORT_C(int, Fl_Adjuster_set_value)(fl_Adjuster adjuster, double v);
-  FL_EXPORT_C(int, Fl_Adjuster_format)(fl_Adjuster adjuster, char* format);
-  FL_EXPORT_C(double, Fl_Adjuster_round)(fl_Adjuster adjuster, double v);
-  FL_EXPORT_C(double, Fl_Adjuster_clamp)(fl_Adjuster adjuster, double v);
-  FL_EXPORT_C(double, Fl_Adjuster_increment)(fl_Adjuster adjuster, double v, int n);
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_bounds,(fl_Adjuster adjuster, double a, double b));
+  FL_EXPORT_C_HEADER(double,Fl_Adjuster_minimum,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_set_minimum,(fl_Adjuster adjuster, double a));
+  FL_EXPORT_C_HEADER(double,Fl_Adjuster_maximum,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_set_maximum,(fl_Adjuster adjuster, double a));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_range,(fl_Adjuster adjuster, double a, double b));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_set_step,(fl_Adjuster adjuster, int a));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_set_step_with_a_b,(fl_Adjuster adjuster, double a, int b));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_step_with_s,(fl_Adjuster adjuster, double s));
+  FL_EXPORT_C_HEADER(double,Fl_Adjuster_step,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_precision,(fl_Adjuster adjuster, int precision));
+  FL_EXPORT_C_HEADER(double,Fl_Adjuster_value,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(int,Fl_Adjuster_set_value,(fl_Adjuster adjuster, double v));
+  FL_EXPORT_C_HEADER(int,Fl_Adjuster_format,(fl_Adjuster adjuster, char* format));
+  FL_EXPORT_C_HEADER(double,Fl_Adjuster_round,(fl_Adjuster adjuster, double v));
+  FL_EXPORT_C_HEADER(double,Fl_Adjuster_clamp,(fl_Adjuster adjuster, double v));
+  FL_EXPORT_C_HEADER(double,Fl_Adjuster_increment,(fl_Adjuster adjuster, double v, int n));
 
   /* Fl_Adjuster specific */
-  FL_EXPORT_C(fl_Adjuster,    Fl_Adjuster_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Adjuster   , Fl_Adjuster_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(void,      Fl_Adjuster_Destroy)(fl_Adjuster adjuster);
-  FL_EXPORT_C(int,      Fl_Adjuster_soft)(fl_Adjuster adjuster);
-  FL_EXPORT_C(void,      Fl_Adjuster_set_soft)(fl_Adjuster adjuster, int soft);
+  FL_EXPORT_C_HEADER(fl_Adjuster,Fl_Adjuster_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Adjuster   ,Fl_Adjuster_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_Destroy,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(int,Fl_Adjuster_soft,(fl_Adjuster adjuster));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_set_soft,(fl_Adjuster adjuster, int soft));
 
-  FL_EXPORT_C(fl_Adjuster,    Fl_OverriddenAdjuster_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Adjuster,    Fl_OverriddenAdjuster_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Adjuster_draw)(fl_Adjuster o);
-  FL_EXPORT_C(void, Fl_Adjuster_draw_super)(fl_Adjuster o);
-  FL_EXPORT_C(int, Fl_Adjuster_handle)(fl_Adjuster o, int event);
-  FL_EXPORT_C(int, Fl_Adjuster_handle_super)(fl_Adjuster o, int event);
-  FL_EXPORT_C(void, Fl_Adjuster_resize)(fl_Adjuster o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Adjuster_resize_super)(fl_Adjuster o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Adjuster_show)(fl_Adjuster o);
-  FL_EXPORT_C(void, Fl_Adjuster_show_super)(fl_Adjuster o);
-  FL_EXPORT_C(void, Fl_Adjuster_hide)(fl_Adjuster o);
-  FL_EXPORT_C(void, Fl_Adjuster_hide_super)(fl_Adjuster o);
+  FL_EXPORT_C_HEADER(fl_Adjuster,Fl_OverriddenAdjuster_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Adjuster,Fl_OverriddenAdjuster_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_draw,(fl_Adjuster o));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_draw_super,(fl_Adjuster o));
+  FL_EXPORT_C_HEADER(int,Fl_Adjuster_handle,(fl_Adjuster o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Adjuster_handle_super,(fl_Adjuster o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_resize,(fl_Adjuster o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_resize_super,(fl_Adjuster o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_show,(fl_Adjuster o));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_show_super,(fl_Adjuster o));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_hide,(fl_Adjuster o));
+  FL_EXPORT_C_HEADER(void,Fl_Adjuster_hide_super,(fl_Adjuster o));
 
 #ifdef __cplusplus
 }
diff --git a/c-src/Fl_AskC.h b/c-src/Fl_AskC.h
--- a/c-src/Fl_AskC.h
+++ b/c-src/Fl_AskC.h
@@ -21,22 +21,22 @@
   } Fl_Beep;
 #endif
 
-  FL_EXPORT_C(void,flc_beep)();
-  FL_EXPORT_C(void,flc_beep_with_type)(int type);
-  FL_EXPORT_C(void,flc_message)(const char* message);
-  FL_EXPORT_C(void,flc_message_with_args)(const char* fmt,const char* arg1,const char* arg2,const char* arg3,const char* arg4,const char* arg5,const char* arg6,const char* arg7,const char* arg8,const char* arg9,const char* arg10);
-  FL_EXPORT_C(void,flc_alert)(const char* alert);
-  FL_EXPORT_C(void,flc_alert_with_args)(const char* fmt,const char* arg1,const char* arg2,const char* arg3,const char* arg4,const char* arg5,const char* arg6,const char* arg7,const char* arg8,const char* arg9,const char* arg10);
-  FL_EXPORT_C(int,flc_choice)(const char *q,const char *b0,const char *b1,const char *b2);
-  FL_EXPORT_C(int,flc_choice_with_args)(const char *q,const char *b0,const char *b1,const char *b2,const char* arg1,const char* arg2,const char* arg3,const char* arg4,const char* arg5,const char* arg6,const char* arg7,const char* arg8,const char* arg9,const char* arg10);
-  FL_EXPORT_C(const char*,flc_input)(const char *label);
-  FL_EXPORT_C(const char*,flc_input_with_deflt)(const char *label,const char* deflt);
-  FL_EXPORT_C(const char*,flc_input_with_args)(const char *label,const char* arg1,const char* arg2,const char* arg3,const char* arg4,const char* arg5,const char* arg6,const char* arg7,const char* arg8,const char* arg9,const char* arg10);
-  FL_EXPORT_C(const char *,flc_input_with_args_deflt)(const char *label,const char *deflt,const char* arg1,const char* arg2,const char* arg3,const char* arg4,const char* arg5,const char* arg6,const char* arg7,const char* arg8,const char* arg9,const char* arg10);
-  FL_EXPORT_C(const char *,flc_password)(const char *label);
-  FL_EXPORT_C(const char *,flc_password_with_deflt)(const char *label,const char* deflt);
-  FL_EXPORT_C(const char *,flc_password_with_args)(const char *label,const char* arg1,const char* arg2,const char* arg3,const char* arg4,const char* arg5,const char* arg6,const char* arg7,const char* arg8,const char* arg9,const char* arg10);
-  FL_EXPORT_C(const char *,flc_password_with_args_deflt)(const char *label,const char *deflt,const char* arg1,const char* arg2,const char* arg3,const char* arg4,const char* arg5,const char* arg6,const char* arg7,const char* arg8,const char* arg9,const char* arg10);
+  FL_EXPORT_C_HEADER(void,flc_beep,());
+  FL_EXPORT_C_HEADER(void,flc_beep_with_type,(int type));
+  FL_EXPORT_C_HEADER(void,flc_message,(const char* message));
+  FL_EXPORT_C_HEADER(void,flc_message_with_args,(const char* fmt,const char* arg1,const char* arg2,const char* arg3,const char* arg4,const char* arg5,const char* arg6,const char* arg7,const char* arg8,const char* arg9,const char* arg10));
+  FL_EXPORT_C_HEADER(void,flc_alert,(const char* alert));
+  FL_EXPORT_C_HEADER(void,flc_alert_with_args,(const char* fmt,const char* arg1,const char* arg2,const char* arg3,const char* arg4,const char* arg5,const char* arg6,const char* arg7,const char* arg8,const char* arg9,const char* arg10));
+  FL_EXPORT_C_HEADER(int,flc_choice,(const char *q,const char *b0,const char *b1,const char *b2));
+  FL_EXPORT_C_HEADER(int,flc_choice_with_args,(const char *q,const char *b0,const char *b1,const char *b2,const char* arg1,const char* arg2,const char* arg3,const char* arg4,const char* arg5,const char* arg6,const char* arg7,const char* arg8,const char* arg9,const char* arg10));
+  FL_EXPORT_C_HEADER(const char*,flc_input,(const char *label));
+  FL_EXPORT_C_HEADER(const char*,flc_input_with_deflt,(const char *label,const char* deflt));
+  FL_EXPORT_C_HEADER(const char*,flc_input_with_args,(const char *label,const char* arg1,const char* arg2,const char* arg3,const char* arg4,const char* arg5,const char* arg6,const char* arg7,const char* arg8,const char* arg9,const char* arg10));
+  FL_EXPORT_C_HEADER(const char *,flc_input_with_args_deflt,(const char *label,const char *deflt,const char* arg1,const char* arg2,const char* arg3,const char* arg4,const char* arg5,const char* arg6,const char* arg7,const char* arg8,const char* arg9,const char* arg10));
+  FL_EXPORT_C_HEADER(const char *,flc_password,(const char *label));
+  FL_EXPORT_C_HEADER(const char *,flc_password_with_deflt,(const char *label,const char* deflt));
+  FL_EXPORT_C_HEADER(const char *,flc_password_with_args,(const char *label,const char* arg1,const char* arg2,const char* arg3,const char* arg4,const char* arg5,const char* arg6,const char* arg7,const char* arg8,const char* arg9,const char* arg10));
+  FL_EXPORT_C_HEADER(const char *,flc_password_with_args_deflt,(const char *label,const char *deflt,const char* arg1,const char* arg2,const char* arg3,const char* arg4,const char* arg5,const char* arg6,const char* arg7,const char* arg8,const char* arg9,const char* arg10));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_BMP_ImageC.h b/c-src/Fl_BMP_ImageC.h
--- a/c-src/Fl_BMP_ImageC.h
+++ b/c-src/Fl_BMP_ImageC.h
@@ -6,7 +6,7 @@
 #include "Fl_CallbackC.h"
 EXPORT {
 #endif
-  FL_EXPORT_C(fl_BMP_Image, Fl_BMP_Image_New)(const char* filename);
+  FL_EXPORT_C_HEADER(fl_BMP_Image,Fl_BMP_Image_New,(const char* filename));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_BitmapC.h b/c-src/Fl_BitmapC.h
--- a/c-src/Fl_BitmapC.h
+++ b/c-src/Fl_BitmapC.h
@@ -9,29 +9,29 @@
 #include "Fl_CallbackC.h"
 EXPORT {
 #endif
-  FL_EXPORT_C(void*, Fl_Bitmap_other_data)(fl_Bitmap bitmap);
-  FL_EXPORT_C(void, Fl_Bitmap_set_other_data)(fl_Bitmap bitmap, void* v);
-  FL_EXPORT_C(fl_Bitmap, Fl_Bitmap_New)(const char* bits, int H, int D);
-  FL_EXPORT_C(fl_Bitmap, Fl_Bitmap_New_WithUchar)(const uchar* bits, int H, int D);
-  FL_EXPORT_C(void, Fl_Bitmap_Destroy)(fl_Bitmap bitmap);
-  FL_EXPORT_C(int, Fl_Bitmap_w)(fl_Bitmap bitmap);
-  FL_EXPORT_C(int, Fl_Bitmap_h)(fl_Bitmap bitmap);
-  FL_EXPORT_C(int, Fl_Bitmap_d)(fl_Bitmap bitmap);
-  FL_EXPORT_C(int, Fl_Bitmap_ld)(fl_Bitmap bitmap);
-  FL_EXPORT_C(int, Fl_Bitmap_count)(fl_Bitmap bitmap);
-  FL_EXPORT_C(fl_Bitmap, Fl_Bitmap_copy_with_w_h)(fl_Bitmap bitmap,int W, int H);
-  FL_EXPORT_C(fl_Bitmap, Fl_Bitmap_copy)(fl_Bitmap bitmap);
-  FL_EXPORT_C(void, Fl_Bitmap_color_average)(fl_Bitmap bitmap,Fl_Color c, float i);
-  FL_EXPORT_C(void, Fl_Bitmap_inactive)(fl_Bitmap bitmap);
-  FL_EXPORT_C(void, Fl_Bitmap_desaturate)(fl_Bitmap bitmap);
-  FL_EXPORT_C(void, Fl_Bitmap_label)(fl_Bitmap bitmap,fl_Widget w);
-  FL_EXPORT_C(void, Fl_Bitmap_label_with_menu_item)(fl_Bitmap bitmap,fl_Menu_Item m);
-  FL_EXPORT_C(void, Fl_Bitmap_draw_with_cx_cy)(fl_Bitmap bitmap,int X, int Y, int W, int H, int cx, int cy);
-  FL_EXPORT_C(void, Fl_Bitmap_draw_with_cx)(fl_Bitmap bitmap,int X, int Y, int W, int H, int cx);
-  FL_EXPORT_C(void, Fl_Bitmap_draw_with_cy)(fl_Bitmap bitmap,int X, int Y, int W, int H, int cy);
-  FL_EXPORT_C(void, Fl_Bitmap_draw_with)(fl_Bitmap bitmap,int X,int Y,int W,int H);
-  FL_EXPORT_C(void, Fl_Bitmap_draw)(fl_Bitmap bitmap,int X, int Y);
-  FL_EXPORT_C(void, Fl_Bitmap_uncache)(fl_Bitmap bitmap);
+  FL_EXPORT_C_HEADER(void*,Fl_Bitmap_other_data,(fl_Bitmap bitmap));
+  FL_EXPORT_C_HEADER(void,Fl_Bitmap_set_other_data,(fl_Bitmap bitmap, void* v));
+  FL_EXPORT_C_HEADER(fl_Bitmap,Fl_Bitmap_New,(const char* bits, int H, int D));
+  FL_EXPORT_C_HEADER(fl_Bitmap,Fl_Bitmap_New_WithUchar,(const uchar* bits, int H, int D));
+  FL_EXPORT_C_HEADER(void,Fl_Bitmap_Destroy,(fl_Bitmap bitmap));
+  FL_EXPORT_C_HEADER(int,Fl_Bitmap_w,(fl_Bitmap bitmap));
+  FL_EXPORT_C_HEADER(int,Fl_Bitmap_h,(fl_Bitmap bitmap));
+  FL_EXPORT_C_HEADER(int,Fl_Bitmap_d,(fl_Bitmap bitmap));
+  FL_EXPORT_C_HEADER(int,Fl_Bitmap_ld,(fl_Bitmap bitmap));
+  FL_EXPORT_C_HEADER(int,Fl_Bitmap_count,(fl_Bitmap bitmap));
+  FL_EXPORT_C_HEADER(fl_Bitmap,Fl_Bitmap_copy_with_w_h,(fl_Bitmap bitmap,int W, int H));
+  FL_EXPORT_C_HEADER(fl_Bitmap,Fl_Bitmap_copy,(fl_Bitmap bitmap));
+  FL_EXPORT_C_HEADER(void,Fl_Bitmap_color_average,(fl_Bitmap bitmap,Fl_Color c, float i));
+  FL_EXPORT_C_HEADER(void,Fl_Bitmap_inactive,(fl_Bitmap bitmap));
+  FL_EXPORT_C_HEADER(void,Fl_Bitmap_desaturate,(fl_Bitmap bitmap));
+  FL_EXPORT_C_HEADER(void,Fl_Bitmap_label,(fl_Bitmap bitmap,fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Bitmap_label_with_menu_item,(fl_Bitmap bitmap,fl_Menu_Item m));
+  FL_EXPORT_C_HEADER(void,Fl_Bitmap_draw_with_cx_cy,(fl_Bitmap bitmap,int X, int Y, int W, int H, int cx, int cy));
+  FL_EXPORT_C_HEADER(void,Fl_Bitmap_draw_with_cx,(fl_Bitmap bitmap,int X, int Y, int W, int H, int cx));
+  FL_EXPORT_C_HEADER(void,Fl_Bitmap_draw_with_cy,(fl_Bitmap bitmap,int X, int Y, int W, int H, int cy));
+  FL_EXPORT_C_HEADER(void,Fl_Bitmap_draw_with,(fl_Bitmap bitmap,int X,int Y,int W,int H));
+  FL_EXPORT_C_HEADER(void,Fl_Bitmap_draw,(fl_Bitmap bitmap,int X, int Y));
+  FL_EXPORT_C_HEADER(void,Fl_Bitmap_uncache,(fl_Bitmap bitmap));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_BoxC.h b/c-src/Fl_BoxC.h
--- a/c-src/Fl_BoxC.h
+++ b/c-src/Fl_BoxC.h
@@ -38,112 +38,112 @@
     ~Fl_DerivedBox();
   };
 #endif
-  FL_EXPORT_C(void, Fl_Box_draw_super)(fl_Box box);
-  FL_EXPORT_C(int,Fl_Box_handle)(fl_Widget self, int event);
-  FL_EXPORT_C(int,Fl_Box_handle_super)(fl_Widget self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Box_parent)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_set_parent)(fl_Box box, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Box_type)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_set_type)(fl_Box box, uchar t);
+  FL_EXPORT_C_HEADER(void,Fl_Box_draw_super,(fl_Box box));
+  FL_EXPORT_C_HEADER(int,Fl_Box_handle,(fl_Widget self, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Box_handle_super,(fl_Widget self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Box_parent,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_set_parent,(fl_Box box, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Box_type,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_set_type,(fl_Box box, uchar t));
 
-FL_EXPORT_C(void, Fl_Box_draw_box)(fl_Box Box);
-FL_EXPORT_C(void, Fl_Box_draw_box_with_tc)(fl_Box Box,Fl_Boxtype t, Fl_Color c);
-FL_EXPORT_C(void, Fl_Box_draw_box_with_txywhc)(fl_Box Box,Fl_Boxtype t, int x,int y,int w,int h, Fl_Color c);
-FL_EXPORT_C(void, Fl_Box_draw_backdrop)(fl_Box Box);
-FL_EXPORT_C(void, Fl_Box_draw_focus)(fl_Box Box);
-FL_EXPORT_C(void, Fl_Box_draw_focus_with_txywh)(fl_Box Box,Fl_Boxtype t, int x,int y,int w,int h);
-FL_EXPORT_C(void, Fl_Box_draw_label)(fl_Box Box);
-  FL_EXPORT_C(int,          Fl_Box_x)(fl_Box box);
-  FL_EXPORT_C(int,          Fl_Box_y)(fl_Box box);
-  FL_EXPORT_C(int,          Fl_Box_w)(fl_Box box);
-  FL_EXPORT_C(int,          Fl_Box_h)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_set_align)(fl_Box box, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Box_align)(fl_Box box);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Box_box)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_set_box)(fl_Box box, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Box_color)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_set_color)(fl_Box box, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Box_set_color_with_bg_sel)(fl_Box box,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Box_selection_color)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_set_selection_color)(fl_Box box, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Box_label)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_copy_label)(fl_Box box, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Box_set_label)(fl_Box box, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Box_labeltype)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_set_labeltype)(fl_Box box, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Box_labelcolor)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_set_labelcolor)(fl_Box box, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Box_labelfont)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_set_labelfont)(fl_Box box, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Box_labelsize)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_set_labelsize)(fl_Box box, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Box_image)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_set_image)(fl_Box box, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Box_deimage)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_set_deimage)(fl_Box box, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Box_tooltip)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_copy_tooltip)(fl_Box box, const char* text);
-  FL_EXPORT_C(void,         Fl_Box_set_tooltip)(fl_Box box, const char* text);
-  FL_EXPORT_C(void,         Fl_Box_set_callback_with_user_data)(fl_Box box, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Box_set_callback)(fl_Box box, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Box_other_data)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_set_other_data)(fl_Box box, void* v);
-  FL_EXPORT_C(void*,        Fl_Box_user_data)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_set_user_data)(fl_Box box, void* v);
-  FL_EXPORT_C(long,         Fl_Box_argument)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_set_argument)(fl_Box box, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Box_when)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_set_when)(fl_Box box, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Box_visible)(fl_Box box);
-  FL_EXPORT_C(int,          Fl_Box_visible_r)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_show_super)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_show)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_hide_super)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_hide)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_set_visible)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_clear_visible)(fl_Box box);
-  FL_EXPORT_C(unsigned int, Fl_Box_active)(fl_Box box);
-  FL_EXPORT_C(int,          Fl_Box_active_r)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_activate)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_deactivate)(fl_Box box);
-  FL_EXPORT_C(unsigned int, Fl_Box_output)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_set_output)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_clear_output)(fl_Box box);
-  FL_EXPORT_C(unsigned int, Fl_Box_takesevents)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_set_changed)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_clear_changed)(fl_Box box);
-  FL_EXPORT_C(int,          Fl_Box_take_focus)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_set_visible_focus)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_clear_visible_focus)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_modify_visible_focus)(fl_Box box, int v);
-  FL_EXPORT_C(unsigned int, Fl_Box_visible_focus)(fl_Box box);
-  FL_EXPORT_C(int,          Fl_Box_contains)(fl_Box box, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Box_inside)(fl_Box box, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Box_redraw)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_redraw_label)(fl_Box box);
-  FL_EXPORT_C(uchar,        Fl_Box_damage)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_clear_damage_with_bitmask)(fl_Box box, uchar c);
-  FL_EXPORT_C(void,         Fl_Box_clear_damage)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_damage_with_text)(fl_Box box, uchar c);
-  FL_EXPORT_C(void,         Fl_Box_damage_inside_widget)(fl_Box box, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Box_draw_label_with_xywh_alignment)(fl_Box box, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Box_measure_label)(fl_Box box, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Box_window)(fl_Box box);
-  FL_EXPORT_C(fl_Window,    Fl_Box_top_window)(fl_Box box);
-  FL_EXPORT_C(fl_Window ,   Fl_Box_top_window_offset)(fl_Box box, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Box_as_gl_window_super)(fl_Box box);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Box_as_gl_window)(fl_Box box);
-  FL_EXPORT_C(void,         Fl_Box_resize_super)(fl_Table table,int X, int Y, int W, int H);
-  FL_EXPORT_C(void,         Fl_Box_resize)(fl_Table table,int X, int Y, int W, int H);
+FL_EXPORT_C_HEADER(void,Fl_Box_draw_box,(fl_Box Box));
+FL_EXPORT_C_HEADER(void,Fl_Box_draw_box_with_tc,(fl_Box Box,Fl_Boxtype t, Fl_Color c));
+FL_EXPORT_C_HEADER(void,Fl_Box_draw_box_with_txywhc,(fl_Box Box,Fl_Boxtype t, int x,int y,int w,int h, Fl_Color c));
+FL_EXPORT_C_HEADER(void,Fl_Box_draw_backdrop,(fl_Box Box));
+FL_EXPORT_C_HEADER(void,Fl_Box_draw_focus,(fl_Box Box));
+FL_EXPORT_C_HEADER(void,Fl_Box_draw_focus_with_txywh,(fl_Box Box,Fl_Boxtype t, int x,int y,int w,int h));
+FL_EXPORT_C_HEADER(void,Fl_Box_draw_label,(fl_Box Box));
+  FL_EXPORT_C_HEADER(int,Fl_Box_x,(fl_Box box));
+  FL_EXPORT_C_HEADER(int,Fl_Box_y,(fl_Box box));
+  FL_EXPORT_C_HEADER(int,Fl_Box_w,(fl_Box box));
+  FL_EXPORT_C_HEADER(int,Fl_Box_h,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_set_align,(fl_Box box, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Box_align,(fl_Box box));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Box_box,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_set_box,(fl_Box box, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Box_color,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_set_color,(fl_Box box, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Box_set_color_with_bg_sel,(fl_Box box,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Box_selection_color,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_set_selection_color,(fl_Box box, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Box_label,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_copy_label,(fl_Box box, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Box_set_label,(fl_Box box, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Box_labeltype,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_set_labeltype,(fl_Box box, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Box_labelcolor,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_set_labelcolor,(fl_Box box, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Box_labelfont,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_set_labelfont,(fl_Box box, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Box_labelsize,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_set_labelsize,(fl_Box box, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Box_image,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_set_image,(fl_Box box, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Box_deimage,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_set_deimage,(fl_Box box, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Box_tooltip,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_copy_tooltip,(fl_Box box, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Box_set_tooltip,(fl_Box box, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Box_set_callback_with_user_data,(fl_Box box, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Box_set_callback,(fl_Box box, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Box_other_data,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_set_other_data,(fl_Box box, void* v));
+  FL_EXPORT_C_HEADER(void*,Fl_Box_user_data,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_set_user_data,(fl_Box box, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Box_argument,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_set_argument,(fl_Box box, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Box_when,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_set_when,(fl_Box box, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Box_visible,(fl_Box box));
+  FL_EXPORT_C_HEADER(int,Fl_Box_visible_r,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_show_super,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_show,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_hide_super,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_hide,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_set_visible,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_clear_visible,(fl_Box box));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Box_active,(fl_Box box));
+  FL_EXPORT_C_HEADER(int,Fl_Box_active_r,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_activate,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_deactivate,(fl_Box box));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Box_output,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_set_output,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_clear_output,(fl_Box box));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Box_takesevents,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_set_changed,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_clear_changed,(fl_Box box));
+  FL_EXPORT_C_HEADER(int,Fl_Box_take_focus,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_set_visible_focus,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_clear_visible_focus,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_modify_visible_focus,(fl_Box box, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Box_visible_focus,(fl_Box box));
+  FL_EXPORT_C_HEADER(int,Fl_Box_contains,(fl_Box box, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Box_inside,(fl_Box box, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Box_redraw,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_redraw_label,(fl_Box box));
+  FL_EXPORT_C_HEADER(uchar,Fl_Box_damage,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_clear_damage_with_bitmask,(fl_Box box, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Box_clear_damage,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_damage_with_text,(fl_Box box, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Box_damage_inside_widget,(fl_Box box, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Box_draw_label_with_xywh_alignment,(fl_Box box, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Box_measure_label,(fl_Box box, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Box_window,(fl_Box box));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Box_top_window,(fl_Box box));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Box_top_window_offset,(fl_Box box, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Box_as_gl_window_super,(fl_Box box));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Box_as_gl_window,(fl_Box box));
+  FL_EXPORT_C_HEADER(void,Fl_Box_resize_super,(fl_Table table,int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(void,Fl_Box_resize,(fl_Table table,int X, int Y, int W, int H));
 
-  FL_EXPORT_C(fl_Box_Virtual_Funcs*, Fl_Box_default_virtual_funcs)();
-  FL_EXPORT_C(fl_Box,    Fl_Box_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Box,    Fl_OverriddenBox_New_WithLabel)(int x, int y, int w, int h, const char* label, fl_Box_Virtual_Funcs* funcs);
-  FL_EXPORT_C(fl_Box   , Fl_Box_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(fl_Box   , Fl_OverriddenBox_New)(int x, int y, int w, int h, fl_Box_Virtual_Funcs* funcs);
-  FL_EXPORT_C(fl_Box,    Fl_Box_New_WithBoxtype)(Fl_Boxtype b, int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Box,    Fl_OverriddenBox_New_WithBoxtype)(Fl_Boxtype b, int x, int y, int w, int h, const char* label, fl_Box_Virtual_Funcs* funcs);
-  FL_EXPORT_C(void,      Fl_Box_Destroy)(fl_Box box);
+  FL_EXPORT_C_HEADER(fl_Box_Virtual_Funcs*,Fl_Box_default_virtual_funcs,());
+  FL_EXPORT_C_HEADER(fl_Box,Fl_Box_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Box,Fl_OverriddenBox_New_WithLabel,(int x, int y, int w, int h, const char* label, fl_Box_Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(fl_Box   ,Fl_Box_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(fl_Box   ,Fl_OverriddenBox_New,(int x, int y, int w, int h, fl_Box_Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(fl_Box,Fl_Box_New_WithBoxtype,(Fl_Boxtype b, int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Box,Fl_OverriddenBox_New_WithBoxtype,(Fl_Boxtype b, int x, int y, int w, int h, const char* label, fl_Box_Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(void,Fl_Box_Destroy,(fl_Box box));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_BrowserC.cpp b/c-src/Fl_BrowserC.cpp
--- a/c-src/Fl_BrowserC.cpp
+++ b/c-src/Fl_BrowserC.cpp
@@ -523,7 +523,7 @@
   }
   FL_EXPORT_C(void,Fl_Browser_lineposition)(fl_Browser browser,int line,Fl_Line_Position pos){
     Fl_Browser::Fl_Line_Position p = (Fl_Browser::Fl_Line_Position)-1;
-    switch(p){
+    switch(pos){
     case TOP :    {p = Fl_Browser::TOP; break;}
     case BOTTOM : {p = Fl_Browser::BOTTOM; break;}
     case MIDDLE : {p = Fl_Browser::MIDDLE; break;}
diff --git a/c-src/Fl_BrowserC.h b/c-src/Fl_BrowserC.h
--- a/c-src/Fl_BrowserC.h
+++ b/c-src/Fl_BrowserC.h
@@ -40,202 +40,202 @@
 #endif
 
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int ,         Fl_Browser_handle_super)(fl_Browser browser,int event);
-  FL_EXPORT_C(int ,         Fl_Browser_handle )(fl_Browser browser,int event);
-  FL_EXPORT_C(void,         Fl_Browser_resize_super)(fl_Browser browser,int x, int y, int w, int h);
-  FL_EXPORT_C(void,         Fl_Browser_resize )(fl_Browser browser,int x, int y, int w, int h);
-  FL_EXPORT_C(void,         Fl_Browser_show_super)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_show )(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_hide_super)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_hide )(fl_Browser browser);
-  FL_EXPORT_C(fl_Window,    Fl_Browser_as_window_super)(fl_Browser browser);
-  FL_EXPORT_C(fl_Window,    Fl_Browser_as_window )(fl_Browser browser);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Browser_as_gl_window_super)(fl_Browser browser);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Browser_as_gl_window)(fl_Browser browser);
-  FL_EXPORT_C(fl_Group,     Fl_Browser_parent)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_set_parent)(fl_Browser browser, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Browser_type)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_set_type)(fl_Browser browser, uchar t);
+  FL_EXPORT_C_HEADER(int ,Fl_Browser_handle_super,(fl_Browser browser,int event));
+  FL_EXPORT_C_HEADER(int ,Fl_Browser_handle ,(fl_Browser browser,int event));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_resize_super,(fl_Browser browser,int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_resize ,(fl_Browser browser,int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_show_super,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_show ,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_hide_super,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_hide ,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Browser_as_window_super,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Browser_as_window ,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Browser_as_gl_window_super,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Browser_as_gl_window,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Browser_parent,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_parent,(fl_Browser browser, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Browser_type,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_type,(fl_Browser browser, uchar t));
 
-FL_EXPORT_C(void, Fl_Browser_draw_box)(fl_Browser Browser);
-FL_EXPORT_C(void, Fl_Browser_draw_box_with_tc)(fl_Browser Browser,Fl_Boxtype t, Fl_Color c);
-FL_EXPORT_C(void, Fl_Browser_draw_box_with_txywhc)(fl_Browser Browser,Fl_Boxtype t, int x,int y,int w,int h, Fl_Color c);
-FL_EXPORT_C(void, Fl_Browser_draw_backdrop)(fl_Browser Browser);
-FL_EXPORT_C(void, Fl_Browser_draw_focus)(fl_Browser Browser);
-FL_EXPORT_C(void, Fl_Browser_draw_focus_with_txywh)(fl_Browser Browser,Fl_Boxtype t, int x,int y,int w,int h);
-FL_EXPORT_C(void, Fl_Browser_draw_label)(fl_Browser Browser);
-  FL_EXPORT_C(int,          Fl_Browser_x)(fl_Browser browser);
-  FL_EXPORT_C(int,          Fl_Browser_y)(fl_Browser browser);
-  FL_EXPORT_C(int,          Fl_Browser_w)(fl_Browser browser);
-  FL_EXPORT_C(int,          Fl_Browser_h)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_set_align)(fl_Browser browser, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Browser_align)(fl_Browser browser);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Browser_box)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_set_box)(fl_Browser browser, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Browser_color)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_set_color)(fl_Browser browser, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Browser_set_color_with_bg_sel)(fl_Browser browser,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Browser_selection_color)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_set_selection_color)(fl_Browser browser, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Browser_label)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_copy_label)(fl_Browser browser, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Browser_set_label)(fl_Browser browser, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Browser_labeltype)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_set_labeltype)(fl_Browser browser, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Browser_labelcolor)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_set_labelcolor)(fl_Browser browser, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Browser_labelfont)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_set_labelfont)(fl_Browser browser, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Browser_labelsize)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_set_labelsize)(fl_Browser browser, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Browser_image)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_set_image)(fl_Browser browser, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Browser_deimage)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_set_deimage)(fl_Browser browser, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Browser_tooltip)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_copy_tooltip)(fl_Browser browser, const char* text);
-  FL_EXPORT_C(void,         Fl_Browser_set_tooltip)(fl_Browser browser, const char* text);
-  FL_EXPORT_C(void,         Fl_Browser_set_callback_with_user_data)(fl_Browser browser, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Browser_set_callback)(fl_Browser browser, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Browser_user_data)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_set_user_data)(fl_Browser browser, void* v);
-  FL_EXPORT_C(long,         Fl_Browser_argument)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_set_argument)(fl_Browser browser, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Browser_when)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_set_when)(fl_Browser browser, uchar i);
-  FL_EXPORT_C(int,          Fl_Browser_visible_r)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_set_visible)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_clear_visible)(fl_Browser browser);
-  FL_EXPORT_C(unsigned int, Fl_Browser_active)(fl_Browser browser);
-  FL_EXPORT_C(int,          Fl_Browser_active_r)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_activate)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_deactivate)(fl_Browser browser);
-  FL_EXPORT_C(unsigned int, Fl_Browser_output)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_set_output)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_clear_output)(fl_Browser browser);
-  FL_EXPORT_C(unsigned int, Fl_Browser_takesevents)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_set_changed)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_clear_changed)(fl_Browser browser);
-  FL_EXPORT_C(int,          Fl_Browser_take_focus)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_set_visible_focus)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_clear_visible_focus)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_modify_visible_focus)(fl_Browser browser, int v);
-  FL_EXPORT_C(unsigned int, Fl_Browser_visible_focus)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_do_callback)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_do_callback_with_widget_and_user_data)(fl_Browser browser, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Browser_do_callback_with_widget_and_default_user_data)(fl_Browser browser, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Browser_contains)(fl_Browser browser, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Browser_inside)(fl_Browser browser, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Browser_redraw)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_redraw_label)(fl_Browser browser);
-  FL_EXPORT_C(uchar,        Fl_Browser_damage)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_clear_damage_with_bitmask)(fl_Browser browser, uchar c);
-  FL_EXPORT_C(void,         Fl_Browser_clear_damage)(fl_Browser browser);
-  FL_EXPORT_C(void,         Fl_Browser_damage_with_text)(fl_Browser browser, uchar c);
-  FL_EXPORT_C(void,         Fl_Browser_damage_inside_widget)(fl_Browser browser, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Browser_draw_label_with_xywh_alignment)(fl_Browser browser, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Browser_measure_label)(fl_Browser browser, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Browser_window)(fl_Browser browser);
-  FL_EXPORT_C(fl_Window,    Fl_Browser_top_window)(fl_Browser browser);
-  FL_EXPORT_C(fl_Window ,   Fl_Browser_top_window_offset)(fl_Browser browser, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Browser_as_group)(fl_Browser browser);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Browser_as_gl_window)(fl_Browser browser);
+FL_EXPORT_C_HEADER(void,Fl_Browser_draw_box,(fl_Browser Browser));
+FL_EXPORT_C_HEADER(void,Fl_Browser_draw_box_with_tc,(fl_Browser Browser,Fl_Boxtype t, Fl_Color c));
+FL_EXPORT_C_HEADER(void,Fl_Browser_draw_box_with_txywhc,(fl_Browser Browser,Fl_Boxtype t, int x,int y,int w,int h, Fl_Color c));
+FL_EXPORT_C_HEADER(void,Fl_Browser_draw_backdrop,(fl_Browser Browser));
+FL_EXPORT_C_HEADER(void,Fl_Browser_draw_focus,(fl_Browser Browser));
+FL_EXPORT_C_HEADER(void,Fl_Browser_draw_focus_with_txywh,(fl_Browser Browser,Fl_Boxtype t, int x,int y,int w,int h));
+FL_EXPORT_C_HEADER(void,Fl_Browser_draw_label,(fl_Browser Browser));
+  FL_EXPORT_C_HEADER(int,Fl_Browser_x,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(int,Fl_Browser_y,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(int,Fl_Browser_w,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(int,Fl_Browser_h,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_align,(fl_Browser browser, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Browser_align,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Browser_box,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_box,(fl_Browser browser, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Browser_color,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_color,(fl_Browser browser, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_color_with_bg_sel,(fl_Browser browser,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Browser_selection_color,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_selection_color,(fl_Browser browser, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Browser_label,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_copy_label,(fl_Browser browser, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_label,(fl_Browser browser, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Browser_labeltype,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_labeltype,(fl_Browser browser, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Browser_labelcolor,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_labelcolor,(fl_Browser browser, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Browser_labelfont,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_labelfont,(fl_Browser browser, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Browser_labelsize,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_labelsize,(fl_Browser browser, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Browser_image,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_image,(fl_Browser browser, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Browser_deimage,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_deimage,(fl_Browser browser, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Browser_tooltip,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_copy_tooltip,(fl_Browser browser, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_tooltip,(fl_Browser browser, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_callback_with_user_data,(fl_Browser browser, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_callback,(fl_Browser browser, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Browser_user_data,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_user_data,(fl_Browser browser, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Browser_argument,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_argument,(fl_Browser browser, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Browser_when,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_when,(fl_Browser browser, uchar i));
+  FL_EXPORT_C_HEADER(int,Fl_Browser_visible_r,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_visible,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_clear_visible,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Browser_active,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(int,Fl_Browser_active_r,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_activate,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_deactivate,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Browser_output,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_output,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_clear_output,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Browser_takesevents,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_changed,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_clear_changed,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(int,Fl_Browser_take_focus,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_visible_focus,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_clear_visible_focus,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_modify_visible_focus,(fl_Browser browser, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Browser_visible_focus,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_do_callback,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_do_callback_with_widget_and_user_data,(fl_Browser browser, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_do_callback_with_widget_and_default_user_data,(fl_Browser browser, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Browser_contains,(fl_Browser browser, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Browser_inside,(fl_Browser browser, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_redraw,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_redraw_label,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(uchar,Fl_Browser_damage,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_clear_damage_with_bitmask,(fl_Browser browser, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_clear_damage,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_damage_with_text,(fl_Browser browser, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_damage_inside_widget,(fl_Browser browser, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_draw_label_with_xywh_alignment,(fl_Browser browser, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_measure_label,(fl_Browser browser, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Browser_window,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Browser_top_window,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Browser_top_window_offset,(fl_Browser browser, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Browser_as_group,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Browser_as_gl_window,(fl_Browser browser));
   /* Inherited from Fl_Group */
-  FL_EXPORT_C(void,         Fl_Browser_begin)(fl_Browser self);
-  FL_EXPORT_C(void,         Fl_Browser_end)(fl_Browser self);
-  FL_EXPORT_C(int,          Fl_Browser_find)(fl_Browser self, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Browser_remove_index)(fl_Browser self, int index);
-  FL_EXPORT_C(void,         Fl_Browser_remove_widget)(fl_Browser self, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Browser_clear)(fl_Browser self);
-  FL_EXPORT_C(void,         Fl_Browser_set_resizable_by_reference)(fl_Browser self,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Browser_set_resizable)(fl_Browser self,fl_Widget o);
-  FL_EXPORT_C(fl_Widget,    Fl_Browser_resizable)(fl_Browser self);
-  FL_EXPORT_C(void,         Fl_Browser_add_resizable)(fl_Browser self,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Browser_init_sizes)(fl_Browser self);
-  FL_EXPORT_C(int,          Fl_Browser_children)(fl_Browser self);
-  FL_EXPORT_C(void,         Fl_Browser_set_clip_children)(fl_Browser self,int c);
-  FL_EXPORT_C(unsigned int, Fl_Browser_clip_children)(fl_Browser self);
-  FL_EXPORT_C(void,         Fl_Browser_focus)(fl_Browser self,fl_Widget W);
-  FL_EXPORT_C(fl_Widget,    Fl_Browser__ddfdesign_kludge)(fl_Browser self);
-  FL_EXPORT_C(void,         Fl_Browser_insert_with_before)(fl_Browser self, fl_Widget w, fl_Widget before);
-  FL_EXPORT_C(fl_Widget*,   Fl_Browser_array)(fl_Browser self);
-  FL_EXPORT_C(fl_Widget,    Fl_Browser_child)(fl_Browser self, int n);
-  FL_EXPORT_C(void,         Fl_Browser_forms_end)(fl_Browser self);
+  FL_EXPORT_C_HEADER(void,Fl_Browser_begin,(fl_Browser self));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_end,(fl_Browser self));
+  FL_EXPORT_C_HEADER(int,Fl_Browser_find,(fl_Browser self, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_remove_index,(fl_Browser self, int index));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_remove_widget,(fl_Browser self, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_clear,(fl_Browser self));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_resizable_by_reference,(fl_Browser self,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_resizable,(fl_Browser self,fl_Widget o));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Browser_resizable,(fl_Browser self));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_add_resizable,(fl_Browser self,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_init_sizes,(fl_Browser self));
+  FL_EXPORT_C_HEADER(int,Fl_Browser_children,(fl_Browser self));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_clip_children,(fl_Browser self,int c));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Browser_clip_children,(fl_Browser self));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_focus,(fl_Browser self,fl_Widget W));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Browser__ddfdesign_kludge,(fl_Browser self));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_insert_with_before,(fl_Browser self, fl_Widget w, fl_Widget before));
+  FL_EXPORT_C_HEADER(fl_Widget*,Fl_Browser_array,(fl_Browser self));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Browser_child,(fl_Browser self, int n));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_forms_end,(fl_Browser self));
 
   /* Fl_Browser specific functions */
-  FL_EXPORT_C(void*, Fl_Browser_other_data)(fl_Browser browser);
-  FL_EXPORT_C(void, Fl_Browser_set_other_data)(fl_Browser browser, void* v);
-  FL_EXPORT_C(fl_Browser_Virtual_Funcs*, Fl_Browser_default_virtual_funcs)();
-  FL_EXPORT_C(fl_Browser, Fl_Browser_New_WithLabel)(int x, int y, int w, int h, const char* label); 
-  FL_EXPORT_C(fl_Browser, Fl_Browser_New)(int x, int y, int w, int h); 
-  FL_EXPORT_C(fl_Browser, Fl_OverriddenBrowser_New_WithLabel)(int x, int y, int w, int h, const char* label, fl_Browser_Virtual_Funcs* funcs); 
-  FL_EXPORT_C(fl_Browser, Fl_OverriddenBrowser_New)(int x, int y, int w, int h, fl_Browser_Virtual_Funcs* funcs); 
-  FL_EXPORT_C(void,Fl_Browser_Destroy)(fl_Browser browser);
-  FL_EXPORT_C(void,Fl_Browser_remove)(fl_Browser browser, int line);
-  FL_EXPORT_C(void, Fl_Browser_add)(fl_Browser browser, const char* newtext);
-  FL_EXPORT_C(void, Fl_Browser_add_with_d)(fl_Browser browser, const char* newtext, void* d);
-  FL_EXPORT_C(void, Fl_Browser_insert)(fl_Browser browser, int line, const char* newtext);
-  FL_EXPORT_C(void, Fl_Browser_insert_with_d)(fl_Browser browser, int line, const char* newtext, void* d);
-  FL_EXPORT_C(void, Fl_Browser_move)(fl_Browser browser, int to, int from);
-  FL_EXPORT_C(int , Fl_Browser_load)(fl_Browser browser, const char* filename);
-  FL_EXPORT_C(void, Fl_Browser_swap)(fl_Browser browser, int a, int b);
-  FL_EXPORT_C(void, Fl_Browser_clear)(fl_Browser browser);
-  FL_EXPORT_C(int, Fl_Browser_size)(fl_Browser browser);
-  FL_EXPORT_C(void, Fl_Browser_set_size)(fl_Browser browser, int W, int H);
-  FL_EXPORT_C(int, Fl_Browser_topline)(fl_Browser browser);
-  FL_EXPORT_C(void, Fl_Browser_lineposition)(fl_Browser browser, int line, Fl_Line_Position pos);
-  FL_EXPORT_C(void, Fl_Browser_set_topline)(fl_Browser browser, int line);
-  FL_EXPORT_C(void, Fl_Browser_bottomline)(fl_Browser browser, int line);
-  FL_EXPORT_C(void, Fl_Browser_middleline)(fl_Browser browser, int line);
-  FL_EXPORT_C(int, Fl_Browser_select)(fl_Browser browser, int line);
-  FL_EXPORT_C(int, Fl_Browser_select_with_val)(fl_Browser browser, int line, int val);
-  FL_EXPORT_C(int, Fl_Browser_selected)(fl_Browser browser, int line);
-  FL_EXPORT_C(void, Fl_Browser_show_with_line)(fl_Browser browser, int line);
-  FL_EXPORT_C(void, Fl_Browser_show)(fl_Browser browser);
-  FL_EXPORT_C(void, Fl_Browser_hide_with_line)(fl_Browser browser, int line);
-  FL_EXPORT_C(void, Fl_Browser_hide)(fl_Browser browser);
-  FL_EXPORT_C(int, Fl_Browser_visible)(fl_Browser browser, int line);
-  FL_EXPORT_C(int, Fl_Browser_value)(fl_Browser browser);
-  FL_EXPORT_C(void, Fl_Browser_set_value)(fl_Browser browser, int line);
-  FL_EXPORT_C(const char*, Fl_Browser_text)(fl_Browser browser, int line);
-  FL_EXPORT_C(void, Fl_Browser_set_text)(fl_Browser browser, int line, const char* newtext);
-  FL_EXPORT_C(void*, Fl_Browser_data)(fl_Browser browser, int line);
-  FL_EXPORT_C(void, Fl_Browser_set_data)(fl_Browser browser, int line, void* d);
-  FL_EXPORT_C(char, Fl_Browser_format_char)(fl_Browser browser);
-  FL_EXPORT_C(void, Fl_Browser_set_format_char)(fl_Browser browser, char c);
-  FL_EXPORT_C(char, Fl_Browser_column_char)(fl_Browser browser);
-  FL_EXPORT_C(void, Fl_Browser_set_column_char)(fl_Browser browser, char c);
-  FL_EXPORT_C(const int*, Fl_Browser_column_widths)(fl_Browser browser);
-  FL_EXPORT_C(void, Fl_Browser_set_column_widths)(fl_Browser browser, const int* arr);
-  FL_EXPORT_C(int, Fl_Browser_displayed)(fl_Browser browser, int line);
-  FL_EXPORT_C(void, Fl_Browser_make_visible)(fl_Browser browser, int line);
-  FL_EXPORT_C(void, Fl_Browser_set_icon)(fl_Browser browser, int line, fl_Image icon);
-  FL_EXPORT_C(fl_Image, Fl_Browser_icon)(fl_Browser browser, int line);
-  FL_EXPORT_C(void, Fl_Browser_remove_icon)(fl_Browser browser, int line);
-  FL_EXPORT_C(int, Fl_Browser_select_only)(fl_Browser browser,void *item);
-  FL_EXPORT_C(int, Fl_Browser_select_only_with_docallbacks)(fl_Browser browser,void *item,int docallbacks);
-  FL_EXPORT_C(int, Fl_Browser_deselect)(fl_Browser browser);
-  FL_EXPORT_C(int, Fl_Browser_deselect_with_docallbacks)(fl_Browser browser,int docallbacks);
-  FL_EXPORT_C(int, Fl_Browser_position)(fl_Browser browser); 
+  FL_EXPORT_C_HEADER(void*,Fl_Browser_other_data,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_other_data,(fl_Browser browser, void* v));
+  FL_EXPORT_C_HEADER(fl_Browser_Virtual_Funcs*,Fl_Browser_default_virtual_funcs,());
+  FL_EXPORT_C(fl_Browser, Fl_Browser_New_WithLabel)(int x, int y, int w, int h, const char* label);
+  FL_EXPORT_C(fl_Browser, Fl_Browser_New)(int x, int y, int w, int h);
+  FL_EXPORT_C(fl_Browser, Fl_OverriddenBrowser_New_WithLabel)(int x, int y, int w, int h, const char* label, fl_Browser_Virtual_Funcs* funcs);
+  FL_EXPORT_C(fl_Browser, Fl_OverriddenBrowser_New)(int x, int y, int w, int h, fl_Browser_Virtual_Funcs* funcs);
+  FL_EXPORT_C_HEADER(void,Fl_Browser_Destroy,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_remove,(fl_Browser browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_add,(fl_Browser browser, const char* newtext));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_add_with_d,(fl_Browser browser, const char* newtext, void* d));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_insert,(fl_Browser browser, int line, const char* newtext));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_insert_with_d,(fl_Browser browser, int line, const char* newtext, void* d));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_move,(fl_Browser browser, int to, int from));
+  FL_EXPORT_C_HEADER(int ,Fl_Browser_load,(fl_Browser browser, const char* filename));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_swap,(fl_Browser browser, int a, int b));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_clear,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(int,Fl_Browser_size,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_size,(fl_Browser browser, int W, int H));
+  FL_EXPORT_C_HEADER(int,Fl_Browser_topline,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_lineposition,(fl_Browser browser, int line, Fl_Line_Position pos));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_topline,(fl_Browser browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_bottomline,(fl_Browser browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_middleline,(fl_Browser browser, int line));
+  FL_EXPORT_C_HEADER(int,Fl_Browser_select,(fl_Browser browser, int line));
+  FL_EXPORT_C_HEADER(int,Fl_Browser_select_with_val,(fl_Browser browser, int line, int val));
+  FL_EXPORT_C_HEADER(int,Fl_Browser_selected,(fl_Browser browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_show_with_line,(fl_Browser browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_show,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_hide_with_line,(fl_Browser browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_hide,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(int,Fl_Browser_visible,(fl_Browser browser, int line));
+  FL_EXPORT_C_HEADER(int,Fl_Browser_value,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_value,(fl_Browser browser, int line));
+  FL_EXPORT_C_HEADER(const char*,Fl_Browser_text,(fl_Browser browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_text,(fl_Browser browser, int line, const char* newtext));
+  FL_EXPORT_C_HEADER(void*,Fl_Browser_data,(fl_Browser browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_data,(fl_Browser browser, int line, void* d));
+  FL_EXPORT_C_HEADER(char,Fl_Browser_format_char,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_format_char,(fl_Browser browser, char c));
+  FL_EXPORT_C_HEADER(char,Fl_Browser_column_char,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_column_char,(fl_Browser browser, char c));
+  FL_EXPORT_C_HEADER(const int*,Fl_Browser_column_widths,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_column_widths,(fl_Browser browser, const int* arr));
+  FL_EXPORT_C_HEADER(int,Fl_Browser_displayed,(fl_Browser browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_make_visible,(fl_Browser browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_icon,(fl_Browser browser, int line, fl_Image icon));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Browser_icon,(fl_Browser browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_remove_icon,(fl_Browser browser, int line));
+  FL_EXPORT_C_HEADER(int,Fl_Browser_select_only,(fl_Browser browser,void *item));
+  FL_EXPORT_C_HEADER(int,Fl_Browser_select_only_with_docallbacks,(fl_Browser browser,void *item,int docallbacks));
+  FL_EXPORT_C_HEADER(int,Fl_Browser_deselect,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(int,Fl_Browser_deselect_with_docallbacks,(fl_Browser browser,int docallbacks));
+  FL_EXPORT_C(int, Fl_Browser_position)(fl_Browser browser);
   FL_EXPORT_C(void, Fl_Browser_set_position)(fl_Browser browser,int pos); // scroll to here
-  FL_EXPORT_C(int, Fl_Browser_hposition)(fl_Browser browser); 
+  FL_EXPORT_C(int, Fl_Browser_hposition)(fl_Browser browser);
   FL_EXPORT_C(void, Fl_Browser_set_hposition)(fl_Browser browser,int); // pan to here
-  FL_EXPORT_C(uchar, Fl_Browser_has_scrollbar)(fl_Browser browser);
-  FL_EXPORT_C(void, Fl_Browser_set_has_scrollbar)(fl_Browser browser,uchar mode); 
-  FL_EXPORT_C(Fl_Font, Fl_Browser_textfont)(fl_Browser browser); 
-  FL_EXPORT_C(void, Fl_Browser_set_textfont)(fl_Browser browser,Fl_Font font); 
-  FL_EXPORT_C(Fl_Fontsize, Fl_Browser_textsize)(fl_Browser browser);  
-  FL_EXPORT_C(void, Fl_Browser_set_textsize)(fl_Browser browser,Fl_Fontsize newSize); 
-  FL_EXPORT_C(Fl_Color, Fl_Browser_textcolor)(fl_Browser browser); 
-  FL_EXPORT_C(void, Fl_Browser_set_textcolor)(fl_Browser browser,Fl_Color col); 
-  FL_EXPORT_C(int, Fl_Browser_scrollbar_size)(fl_Browser browser); 
-  FL_EXPORT_C(void, Fl_Browser_set_scrollbar_size)(fl_Browser browser,int newSize); 
-  FL_EXPORT_C(int, Fl_Browser_scrollbar_width)(fl_Browser browser); 
-  FL_EXPORT_C(void, Fl_Browser_set_scrollbar_width)(fl_Browser browser,int width); 
-  FL_EXPORT_C(void, Fl_Browser_scrollbar_right)(fl_Browser browser); 
-  FL_EXPORT_C(void, Fl_Browser_set_scrollbar_left)(fl_Browser browser);
-  FL_EXPORT_C(void, Fl_Browser_sort)(fl_Browser browser);
-  FL_EXPORT_C(void, Fl_Browser_sort_with_flags)(fl_Browser browser,int flags);
+  FL_EXPORT_C_HEADER(uchar,Fl_Browser_has_scrollbar,(fl_Browser browser));
+  FL_EXPORT_C(void, Fl_Browser_set_has_scrollbar)(fl_Browser browser,uchar mode);
+  FL_EXPORT_C(Fl_Font, Fl_Browser_textfont)(fl_Browser browser);
+  FL_EXPORT_C(void, Fl_Browser_set_textfont)(fl_Browser browser,Fl_Font font);
+  FL_EXPORT_C(Fl_Fontsize, Fl_Browser_textsize)(fl_Browser browser);
+  FL_EXPORT_C(void, Fl_Browser_set_textsize)(fl_Browser browser,Fl_Fontsize newSize);
+  FL_EXPORT_C(Fl_Color, Fl_Browser_textcolor)(fl_Browser browser);
+  FL_EXPORT_C(void, Fl_Browser_set_textcolor)(fl_Browser browser,Fl_Color col);
+  FL_EXPORT_C(int, Fl_Browser_scrollbar_size)(fl_Browser browser);
+  FL_EXPORT_C(void, Fl_Browser_set_scrollbar_size)(fl_Browser browser,int newSize);
+  FL_EXPORT_C(int, Fl_Browser_scrollbar_width)(fl_Browser browser);
+  FL_EXPORT_C(void, Fl_Browser_set_scrollbar_width)(fl_Browser browser,int width);
+  FL_EXPORT_C(void, Fl_Browser_scrollbar_right)(fl_Browser browser);
+  FL_EXPORT_C_HEADER(void,Fl_Browser_set_scrollbar_left,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_sort,(fl_Browser browser));
+  FL_EXPORT_C_HEADER(void,Fl_Browser_sort_with_flags,(fl_Browser browser,int flags));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_ButtonC.h b/c-src/Fl_ButtonC.h
--- a/c-src/Fl_ButtonC.h
+++ b/c-src/Fl_ButtonC.h
@@ -10,110 +10,110 @@
 EXPORT {
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(void,         Fl_Button_draw_super)(fl_Button button);
-  FL_EXPORT_C(int ,         Fl_Button_handle_super)(fl_Button button,int event);
-  FL_EXPORT_C(int ,         Fl_Button_handle)(fl_Button button,int event);
-  FL_EXPORT_C(void,         Fl_Button_resize_super)(fl_Button button,int x, int y, int w, int h);
-  FL_EXPORT_C(void,         Fl_Button_resize )(fl_Button button,int x, int y, int w, int h);
-  FL_EXPORT_C(void,         Fl_Button_show_super)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_show )(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_hide_super)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_hide )(fl_Button button);
-  FL_EXPORT_C(fl_Window,    Fl_Button_as_window_super)(fl_Button button);
-  FL_EXPORT_C(fl_Window,    Fl_Button_as_window )(fl_Button button);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Button_as_gl_window_super)(fl_Button button);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Button_as_gl_window)(fl_Button button);
-  FL_EXPORT_C(fl_Group,     Fl_Button_parent)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_set_parent)(fl_Button button, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Button_type)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_set_type)(fl_Button button, uchar t);
+  FL_EXPORT_C_HEADER(void,Fl_Button_draw_super,(fl_Button button));
+  FL_EXPORT_C_HEADER(int ,Fl_Button_handle_super,(fl_Button button,int event));
+  FL_EXPORT_C_HEADER(int ,Fl_Button_handle,(fl_Button button,int event));
+  FL_EXPORT_C_HEADER(void,Fl_Button_resize_super,(fl_Button button,int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Button_resize ,(fl_Button button,int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Button_show_super,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_show ,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_hide_super,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_hide ,(fl_Button button));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Button_as_window_super,(fl_Button button));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Button_as_window ,(fl_Button button));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Button_as_gl_window_super,(fl_Button button));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Button_as_gl_window,(fl_Button button));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Button_parent,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_set_parent,(fl_Button button, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Button_type,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_set_type,(fl_Button button, uchar t));
 
-FL_EXPORT_C(void, Fl_Button_draw_box)(fl_Button Button);
-FL_EXPORT_C(void, Fl_Button_draw_box_with_tc)(fl_Button Button,Fl_Boxtype t, Fl_Color c);
-FL_EXPORT_C(void, Fl_Button_draw_box_with_txywhc)(fl_Button Button,Fl_Boxtype t, int x,int y,int w,int h, Fl_Color c);
-FL_EXPORT_C(void, Fl_Button_draw_backdrop)(fl_Button Button);
-FL_EXPORT_C(void, Fl_Button_draw_focus)(fl_Button Button);
-FL_EXPORT_C(void, Fl_Button_draw_focus_with_txywh)(fl_Button Button,Fl_Boxtype t, int x,int y,int w,int h);
-FL_EXPORT_C(void, Fl_Button_draw_label)(fl_Button Button);
-  FL_EXPORT_C(int,          Fl_Button_x)(fl_Button button);
-  FL_EXPORT_C(int,          Fl_Button_y)(fl_Button button);
-  FL_EXPORT_C(int,          Fl_Button_w)(fl_Button button);
-  FL_EXPORT_C(int,          Fl_Button_h)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_set_align)(fl_Button button, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Button_align)(fl_Button button);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Button_box)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_set_box)(fl_Button button, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Button_color)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_set_color)(fl_Button button, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Button_set_color_with_bg_sel)(fl_Button button,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Button_selection_color)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_set_selection_color)(fl_Button button, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Button_label)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_copy_label)(fl_Button button, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Button_set_label)(fl_Button button, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Button_labeltype)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_set_labeltype)(fl_Button button, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Button_labelcolor)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_set_labelcolor)(fl_Button button, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Button_labelfont)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_set_labelfont)(fl_Button button, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Button_labelsize)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_set_labelsize)(fl_Button button, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Button_image)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_set_image)(fl_Button button, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Button_deimage)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_set_deimage)(fl_Button button, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Button_tooltip)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_copy_tooltip)(fl_Button button, const char* text);
-  FL_EXPORT_C(void,         Fl_Button_set_tooltip)(fl_Button button, const char* text);
-  FL_EXPORT_C(void,         Fl_Button_set_callback_with_user_data)(fl_Button button, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Button_set_callback)(fl_Button button, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Button_user_data)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_set_user_data)(fl_Button button, void* v);
-  FL_EXPORT_C(long,         Fl_Button_argument)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_set_argument)(fl_Button button, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Button_when)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_set_when)(fl_Button button, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Button_visible)(fl_Button button);
-  FL_EXPORT_C(int,          Fl_Button_visible_r)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_set_visible)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_clear_visible)(fl_Button button);
-  FL_EXPORT_C(unsigned int, Fl_Button_active)(fl_Button button);
-  FL_EXPORT_C(int,          Fl_Button_active_r)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_activate)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_deactivate)(fl_Button button);
-  FL_EXPORT_C(unsigned int, Fl_Button_output)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_set_output)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_clear_output)(fl_Button button);
-  FL_EXPORT_C(unsigned int, Fl_Button_takesevents)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_set_changed)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_clear_changed)(fl_Button button);
-  FL_EXPORT_C(int,          Fl_Button_take_focus)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_set_visible_focus)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_clear_visible_focus)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_modify_visible_focus)(fl_Button button, int v);
-  FL_EXPORT_C(unsigned int, Fl_Button_visible_focus)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_do_callback)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_do_callback_with_widget_and_user_data)(fl_Button button, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Button_do_callback_with_widget_and_default_user_data)(fl_Button button, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Button_contains)(fl_Button button, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Button_inside)(fl_Button button, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Button_redraw)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_redraw_label)(fl_Button button);
-  FL_EXPORT_C(uchar,        Fl_Button_damage)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_clear_damage_with_bitmask)(fl_Button button, uchar c);
-  FL_EXPORT_C(void,         Fl_Button_clear_damage)(fl_Button button);
-  FL_EXPORT_C(void,         Fl_Button_damage_with_text)(fl_Button button, uchar c);
-  FL_EXPORT_C(void,         Fl_Button_damage_inside_widget)(fl_Button button, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Button_draw_label_with_xywh_alignment)(fl_Button button, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Button_measure_label)(fl_Button button, int* ww , int* hh);
+FL_EXPORT_C_HEADER(void,Fl_Button_draw_box,(fl_Button Button));
+FL_EXPORT_C_HEADER(void,Fl_Button_draw_box_with_tc,(fl_Button Button,Fl_Boxtype t, Fl_Color c));
+FL_EXPORT_C_HEADER(void,Fl_Button_draw_box_with_txywhc,(fl_Button Button,Fl_Boxtype t, int x,int y,int w,int h, Fl_Color c));
+FL_EXPORT_C_HEADER(void,Fl_Button_draw_backdrop,(fl_Button Button));
+FL_EXPORT_C_HEADER(void,Fl_Button_draw_focus,(fl_Button Button));
+FL_EXPORT_C_HEADER(void,Fl_Button_draw_focus_with_txywh,(fl_Button Button,Fl_Boxtype t, int x,int y,int w,int h));
+FL_EXPORT_C_HEADER(void,Fl_Button_draw_label,(fl_Button Button));
+  FL_EXPORT_C_HEADER(int,Fl_Button_x,(fl_Button button));
+  FL_EXPORT_C_HEADER(int,Fl_Button_y,(fl_Button button));
+  FL_EXPORT_C_HEADER(int,Fl_Button_w,(fl_Button button));
+  FL_EXPORT_C_HEADER(int,Fl_Button_h,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_set_align,(fl_Button button, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Button_align,(fl_Button button));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Button_box,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_set_box,(fl_Button button, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Button_color,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_set_color,(fl_Button button, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Button_set_color_with_bg_sel,(fl_Button button,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Button_selection_color,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_set_selection_color,(fl_Button button, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Button_label,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_copy_label,(fl_Button button, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Button_set_label,(fl_Button button, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Button_labeltype,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_set_labeltype,(fl_Button button, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Button_labelcolor,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_set_labelcolor,(fl_Button button, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Button_labelfont,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_set_labelfont,(fl_Button button, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Button_labelsize,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_set_labelsize,(fl_Button button, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Button_image,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_set_image,(fl_Button button, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Button_deimage,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_set_deimage,(fl_Button button, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Button_tooltip,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_copy_tooltip,(fl_Button button, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Button_set_tooltip,(fl_Button button, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Button_set_callback_with_user_data,(fl_Button button, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Button_set_callback,(fl_Button button, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Button_user_data,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_set_user_data,(fl_Button button, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Button_argument,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_set_argument,(fl_Button button, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Button_when,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_set_when,(fl_Button button, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Button_visible,(fl_Button button));
+  FL_EXPORT_C_HEADER(int,Fl_Button_visible_r,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_set_visible,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_clear_visible,(fl_Button button));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Button_active,(fl_Button button));
+  FL_EXPORT_C_HEADER(int,Fl_Button_active_r,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_activate,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_deactivate,(fl_Button button));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Button_output,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_set_output,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_clear_output,(fl_Button button));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Button_takesevents,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_set_changed,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_clear_changed,(fl_Button button));
+  FL_EXPORT_C_HEADER(int,Fl_Button_take_focus,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_set_visible_focus,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_clear_visible_focus,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_modify_visible_focus,(fl_Button button, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Button_visible_focus,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_do_callback,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_do_callback_with_widget_and_user_data,(fl_Button button, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Button_do_callback_with_widget_and_default_user_data,(fl_Button button, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Button_contains,(fl_Button button, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Button_inside,(fl_Button button, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Button_redraw,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_redraw_label,(fl_Button button));
+  FL_EXPORT_C_HEADER(uchar,Fl_Button_damage,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_clear_damage_with_bitmask,(fl_Button button, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Button_clear_damage,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_damage_with_text,(fl_Button button, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Button_damage_inside_widget,(fl_Button button, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Button_draw_label_with_xywh_alignment,(fl_Button button, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Button_measure_label,(fl_Button button, int* ww , int* hh));
 
-  FL_EXPORT_C(fl_Window,    Fl_Button_window)(fl_Button button);
-  FL_EXPORT_C(fl_Window,    Fl_Button_top_window)(fl_Button button);
-  FL_EXPORT_C(fl_Window ,   Fl_Button_top_window_offset)(fl_Button button, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Button_as_group_super)(fl_Button button);
-  FL_EXPORT_C(fl_Group,     Fl_Button_as_group)(fl_Button button);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Button_as_gl_window)(fl_Button button);
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Button_window,(fl_Button button));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Button_top_window,(fl_Button button));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Button_top_window_offset,(fl_Button button, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Button_as_group_super,(fl_Button button));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Button_as_group,(fl_Button button));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Button_as_gl_window,(fl_Button button));
 #ifdef __cplusplus
   class Fl_DerivedButton : public Fl_Button {
     fl_Button_Virtual_Funcs* overriddenFuncs;
@@ -142,27 +142,27 @@
     Fl_DerivedButton(int X, int Y, int W, int H, fl_Button_Virtual_Funcs* funcs);
     ~Fl_DerivedButton();
   };
-#endif  
+#endif
   /* Fl_Button specific functions */
-  FL_EXPORT_C(fl_Button_Virtual_Funcs*, Fl_Button_default_virtual_funcs)();
-  FL_EXPORT_C(void*, Fl_Button_other_data)(fl_Button button);
-  FL_EXPORT_C(void, Fl_Button_set_other_data)(fl_Button button, void* v);
-  FL_EXPORT_C(fl_Button,    Fl_Button_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Button   , Fl_Button_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(fl_Button,    Fl_OverriddenButton_New_WithLabel)(int x, int y, int w, int h, const char* label, fl_Button_Virtual_Funcs* funcs);
-  FL_EXPORT_C(fl_Button   , Fl_OverriddenButton_New)(int x, int y, int w, int h, fl_Button_Virtual_Funcs* funcs);
-  FL_EXPORT_C(void        , Fl_Button_Destroy)(fl_Button button);
-  FL_EXPORT_C(char        , Fl_Button_value)(fl_Button b);
-  FL_EXPORT_C(int         , Fl_Button_set_value)(fl_Button b, int v);
-  FL_EXPORT_C(int         , Fl_Button_set)(fl_Button b);
-  FL_EXPORT_C(int         , Fl_Button_clear)(fl_Button b);
-  FL_EXPORT_C(void        , Fl_Button_setonly)(fl_Button b);
-  FL_EXPORT_C(int         , Fl_Button_get_shortcut )(fl_Button b);
-  FL_EXPORT_C(void        , Fl_Button_set_shortcut )(fl_Button b, int s);
-  FL_EXPORT_C(Fl_Boxtype  , Fl_Button_down_box)(fl_Button b);
-  FL_EXPORT_C(void        , Fl_Button_set_down_box)(fl_Button b,Fl_Boxtype boxtype);
-  FL_EXPORT_C(Fl_Color    , Fl_Button_down_color )(fl_Button b);
-  FL_EXPORT_C(void        , Fl_Button_set_down_color)(fl_Button b, Fl_Color c);
+  FL_EXPORT_C_HEADER(fl_Button_Virtual_Funcs*,Fl_Button_default_virtual_funcs,());
+  FL_EXPORT_C_HEADER(void*,Fl_Button_other_data,(fl_Button button));
+  FL_EXPORT_C_HEADER(void,Fl_Button_set_other_data,(fl_Button button, void* v));
+  FL_EXPORT_C_HEADER(fl_Button,Fl_Button_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Button   ,Fl_Button_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(fl_Button,Fl_OverriddenButton_New_WithLabel,(int x, int y, int w, int h, const char* label, fl_Button_Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(fl_Button   ,Fl_OverriddenButton_New,(int x, int y, int w, int h, fl_Button_Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(void        ,Fl_Button_Destroy,(fl_Button button));
+  FL_EXPORT_C_HEADER(char        ,Fl_Button_value,(fl_Button b));
+  FL_EXPORT_C_HEADER(int         ,Fl_Button_set_value,(fl_Button b, int v));
+  FL_EXPORT_C_HEADER(int         ,Fl_Button_set,(fl_Button b));
+  FL_EXPORT_C_HEADER(int         ,Fl_Button_clear,(fl_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Button_setonly,(fl_Button b));
+  FL_EXPORT_C_HEADER(int         ,Fl_Button_get_shortcut ,(fl_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Button_set_shortcut ,(fl_Button b, int s));
+  FL_EXPORT_C_HEADER(Fl_Boxtype  ,Fl_Button_down_box,(fl_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Button_set_down_box,(fl_Button b,Fl_Boxtype boxtype));
+  FL_EXPORT_C_HEADER(Fl_Color    ,Fl_Button_down_color ,(fl_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Button_set_down_color,(fl_Button b, Fl_Color c));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_C.h b/c-src/Fl_C.h
--- a/c-src/Fl_C.h
+++ b/c-src/Fl_C.h
@@ -4,6 +4,7 @@
 #include "Fl_ExportMacros.h"
 #include "Fl_Types.h"
 #include "Fl_EnumerationsC.h"
+#include "../config.h"
 #ifdef __cplusplus
 #include "FL/Fl.H"
 #include "Fl_EnumerationsC.h"
@@ -51,6 +52,10 @@
 # define FL_SOCKET int
 #endif
 #endif
+#if !defined(__APPLE__) && HAVE_GL
+  FL_EXPORT_C_HEADER(int,Fl_gl_visual,(int mode));
+  FL_EXPORT_C_HEADER(int,Fl_gl_visual_with_alist,(int mode, int *alist));
+#endif
 
   typedef void (fl_Label_Draw_F)(const fl_Label label, int x, int y, int w, int h, Fl_Align align);
   typedef void (fl_Label_Measure_F)(const fl_Label label, int *width, int *height);
@@ -70,209 +75,205 @@
   typedef void (*fl_Atclose_Handler)(fl_Window window, void *data);
   typedef int  (*fl_Event_Dispatch)(int event, fl_Window w);
 
-  FL_EXPORT_C(int, Fl_run)();
-  FL_EXPORT_C(int, Fl_check)();
-  FL_EXPORT_C(int, Fl_ready)();
-  FL_EXPORT_C(int, Fl_option)(Fl_Option opt);
-  FL_EXPORT_C(void, Fl_set_option)(Fl_Option opt, int val);
+  FL_EXPORT_C_HEADER(int,Fl_run,());
+  FL_EXPORT_C_HEADER(int,Fl_check,());
+  FL_EXPORT_C_HEADER(int,Fl_ready,());
+  FL_EXPORT_C_HEADER(int,Fl_option,(Fl_Option opt));
+  FL_EXPORT_C_HEADER(void,Fl_set_option,(Fl_Option opt, int val));
 
-  FL_EXPORT_C(int, Fl_add_awake_handler_)(fl_Awake_Handler handler, void* user_data);
-  FL_EXPORT_C(int, Fl_get_awake_handler_)(fl_Awake_Handler* handler, void** user_data);
-  FL_EXPORT_C(double, Fl_version)();
-  FL_EXPORT_C(const char*, Fl_help)();
-  FL_EXPORT_C(int, Fl_arg)(int argc, char **argv, int i);
-  FL_EXPORT_C(int, Fl_args_with_i)(int argc, char **argv, int i);
-  FL_EXPORT_C(void, Fl_args)(int argc, char **argv);
-  FL_EXPORT_C(int, Fl_args_with_handler)(int argc,char **argv,int i,fl_Args_Handler cb);
-  FL_EXPORT_C(void, Fl_display)(const char* text);
-  FL_EXPORT_C(int, Fl_visual)(int mode);
-#if !defined(__APPLE__) && HAVE_GL
-  FL_EXPORT_C(int, Fl_gl_visual)(int mode);
-  FL_EXPORT_C(int, Fl_gl_visual_with_alist)(int mode, int *alist);
-#endif
-  FL_EXPORT_C(void, Fl_own_colormap)();
-  FL_EXPORT_C(void, Fl_get_system_colors)();
-  FL_EXPORT_C(void, Fl_foreground)(uchar r, uchar g, uchar b);
-  FL_EXPORT_C(void, Fl_background)(uchar r, uchar g, uchar b);
-  FL_EXPORT_C(void, Fl_background2)(uchar r, uchar g, uchar b);
+  FL_EXPORT_C_HEADER(int,Fl_add_awake_handler_,(fl_Awake_Handler handler, void* user_data));
+  FL_EXPORT_C_HEADER(int,Fl_get_awake_handler_,(fl_Awake_Handler* handler, void** user_data));
+  FL_EXPORT_C_HEADER(double,Fl_version,());
+  FL_EXPORT_C_HEADER(const char*,Fl_help,());
+  FL_EXPORT_C_HEADER(int,Fl_arg,(int argc, char **argv, int i));
+  FL_EXPORT_C_HEADER(int,Fl_args_with_i,(int argc, char **argv, int i));
+  FL_EXPORT_C_HEADER(void,Fl_args,(int argc, char **argv));
+  FL_EXPORT_C_HEADER(int,Fl_args_with_handler,(int argc,char **argv,int i,fl_Args_Handler cb));
+  FL_EXPORT_C_HEADER(void,Fl_display,(const char* text));
+  FL_EXPORT_C_HEADER(int,Fl_visual,(int mode));
+  FL_EXPORT_C_HEADER(void,Fl_own_colormap,());
+  FL_EXPORT_C_HEADER(void,Fl_get_system_colors,());
+  FL_EXPORT_C_HEADER(void,Fl_foreground,(uchar r, uchar g, uchar b));
+  FL_EXPORT_C_HEADER(void,Fl_background,(uchar r, uchar g, uchar b));
+  FL_EXPORT_C_HEADER(void,Fl_background2,(uchar r, uchar g, uchar b));
 
-  FL_EXPORT_C(const char*,Fl_scheme)();
-  FL_EXPORT_C(int        ,Fl_set_scheme)(const char* text);
-  FL_EXPORT_C(int        ,Fl_is_scheme)(const char* text);
-  FL_EXPORT_C(int        ,Fl_reload_scheme)();
-  FL_EXPORT_C(int        ,Fl_scrollbar_size)();
-  FL_EXPORT_C(void       ,Fl_set_scrollbar_size)(int W);
-  FL_EXPORT_C(int        ,Fl_wait)();
-  FL_EXPORT_C(double     ,Fl_set_wait)(double time);
-  FL_EXPORT_C(fl_Widget  ,Fl_readqueue)();
-  FL_EXPORT_C(void       ,Fl_add_timeout)(double t,fl_Timeout_Handler handler);
-  FL_EXPORT_C(void       ,Fl_add_timeout_with_userdata)(double t,fl_Timeout_Handler handler, void* userdata);
-  FL_EXPORT_C(void       ,Fl_repeat_timeout)(double t,fl_Timeout_Handler handler);
-  FL_EXPORT_C(void       ,Fl_repeat_timeout_with_userdata)(double t,fl_Timeout_Handler handler,void* userdata);
-  FL_EXPORT_C(int        ,Fl_has_timeout)(fl_Timeout_Handler handler);
-  FL_EXPORT_C(int        ,Fl_has_timeout_with_userdata)(fl_Timeout_Handler handler, void* userdata);
-  FL_EXPORT_C(void       ,Fl_remove_timeout)(fl_Timeout_Handler handler);
-  FL_EXPORT_C(void       ,Fl_remove_timeout_with_userdata)(fl_Timeout_Handler handler,void* userdata);
-  FL_EXPORT_C(void       ,Fl_add_check)(fl_Timeout_Handler handler);
-  FL_EXPORT_C(void       ,Fl_add_check_with_userdata)(fl_Timeout_Handler handler,void* userdata);
-  FL_EXPORT_C(int        ,Fl_has_check)(fl_Timeout_Handler handler);
-  FL_EXPORT_C(int        ,Fl_has_check_with_userdata)(fl_Timeout_Handler handler, void* userdata);
-  FL_EXPORT_C(void       ,Fl_remove_check)(fl_Timeout_Handler handler);
-  FL_EXPORT_C(void       ,Fl_remove_check_with_userdata)(fl_Timeout_Handler handler,void* userdata);
-  FL_EXPORT_C(void       ,Fl_add_fd_with_when)(int fd,int when,fl_FD_Handler cb);
-  FL_EXPORT_C(void       ,Fl_add_fd_with_when_userdata)(int fd,int when,fl_FD_Handler cb,void* userdata);
-  FL_EXPORT_C(void       ,Fl_add_fd)(int fd,fl_FD_Handler cb);
-  FL_EXPORT_C(void       ,Fl_add_fd_with_userdata)(int fd,fl_FD_Handler cb,void* userdata);
-  FL_EXPORT_C(void       ,Fl_remove_fd_with_when)(int fd_handle,int when);
-  FL_EXPORT_C(void       ,Fl_remove_fd)(int fd_handle);
-  FL_EXPORT_C(void       ,Fl_add_idle)(fl_Idle_Handler cb);
-  FL_EXPORT_C(void       ,Fl_add_idle_with_userdata)(fl_Idle_Handler cb,void* userdata);
-  FL_EXPORT_C(int        ,Fl_has_idle)(fl_Idle_Handler cb);
-  FL_EXPORT_C(int        ,Fl_has_idle_with_userdata)(fl_Idle_Handler cb, void* userdata);
-  FL_EXPORT_C(void       ,Fl_remove_idle)(fl_Idle_Handler cb);
-  FL_EXPORT_C(void       ,Fl_remove_idle_with_userdata)(fl_Idle_Handler cb,void* data);
-  FL_EXPORT_C(int        ,Fl_damage)();
-  FL_EXPORT_C(void       ,Fl_redraw)();
-  FL_EXPORT_C(void       ,Fl_flush)();
-  FL_EXPORT_C(fl_Window  ,Fl_first_window)();
-  FL_EXPORT_C(void       ,Fl_set_first_window)(fl_Window window);
-  FL_EXPORT_C(fl_Window  ,Fl_next_window)(fl_Window window);
-  FL_EXPORT_C(fl_Window  ,Fl_modal)();
-  FL_EXPORT_C(fl_Window  ,Fl_grab)();
-  FL_EXPORT_C(void       ,Fl_set_grab)(fl_Window window);
-  FL_EXPORT_C(int        ,Fl_event)();
-  FL_EXPORT_C(int        ,Fl_event_x)();
-  FL_EXPORT_C(int        ,Fl_event_y)();
-  FL_EXPORT_C(int        ,Fl_event_x_root)();
-  FL_EXPORT_C(int        ,Fl_event_y_root)();
-  FL_EXPORT_C(int        ,Fl_event_dx)();
-  FL_EXPORT_C(int        ,Fl_event_dy)();
-  FL_EXPORT_C(void       ,Fl_get_mouse)(int* x, int* y);
-  FL_EXPORT_C(int        ,Fl_event_clicks)();
-  FL_EXPORT_C(void       ,Fl_set_event_clicks)(int i);
-  FL_EXPORT_C(int        ,Fl_event_is_click)();
-  FL_EXPORT_C(void       ,Fl_set_event_is_click)(int i);
-  FL_EXPORT_C(int        ,Fl_event_button)();
-  FL_EXPORT_C(int        ,Fl_event_state)();
-  FL_EXPORT_C(int        ,Fl_contains_event_state)(int i);
-  FL_EXPORT_C(int        ,Fl_event_key)();
-  FL_EXPORT_C(int        ,Fl_event_original_key)();
-  FL_EXPORT_C(int        ,Fl_event_key_pressed)(int key);
-  FL_EXPORT_C(int        ,Fl_get_key)(int key);
-  FL_EXPORT_C(const char*,Fl_event_text)();
-  FL_EXPORT_C(int        ,Fl_event_length)();
-  FL_EXPORT_C(int        ,Fl_compose)(int* del);
-  FL_EXPORT_C(void       ,Fl_compose_reset)();
-  FL_EXPORT_C(int        ,Fl_event_inside_region)(int X,int Y,int W,int H);
-  FL_EXPORT_C(int        ,Fl_event_inside_widget)(fl_Widget widget);
-  FL_EXPORT_C(int        ,Fl_test_shortcut)(Fl_Shortcut shortcut);
-  FL_EXPORT_C(void       ,Fl_enable_im)();
-  FL_EXPORT_C(void       ,Fl_disable_im)();
-  FL_EXPORT_C(int        ,Fl_handle)(int event,fl_Window window);
-  FL_EXPORT_C(int        ,Fl_handle_)(int event,fl_Window window);
-  FL_EXPORT_C(fl_Widget  ,Fl_belowmouse)();
-  FL_EXPORT_C(void       ,Fl_set_belowmouse)(fl_Widget widget);
-  FL_EXPORT_C(fl_Widget  ,Fl_pushed)();
-  FL_EXPORT_C(void       ,Fl_set_pushed)(fl_Widget widget);
-  FL_EXPORT_C(fl_Widget  ,Fl_focus)();
-  FL_EXPORT_C(void       ,Fl_set_focus)(fl_Widget widget);
-  FL_EXPORT_C(void       ,Fl_add_handler)(fl_Event_Handler h);
-  FL_EXPORT_C(void       ,Fl_remove_handler)(fl_Event_Handler h);
-  FL_EXPORT_C(void              ,Fl_set_event_dispatch)(fl_Event_Dispatch* d);
-  FL_EXPORT_C(fl_Event_Dispatch ,Fl_event_dispatch)();
-  FL_EXPORT_C(void      ,Fl_copy)(const char* stuff,int len);
-  FL_EXPORT_C(void      ,Fl_copy_with_destination)(const char* stuff,int len,int destination);
-  FL_EXPORT_C(void      ,Fl_paste_with_source_type)(fl_Widget receiver,int source, const char* type);
-  FL_EXPORT_C(void      ,Fl_paste_with_source)(fl_Widget receiver,int source);
-  FL_EXPORT_C(int       ,Fl_dnd)();
-  FL_EXPORT_C(fl_Widget ,Fl_selection_owner)();
-  FL_EXPORT_C(void      ,Fl_set_selection_owner)(fl_Widget widget);
-  FL_EXPORT_C(void      ,Fl_selection)(fl_Widget owner,const char* text,int len);
-  FL_EXPORT_C(void      ,Fl_paste)(fl_Widget receiver);
-  FL_EXPORT_C(int       ,Fl_x)();
-  FL_EXPORT_C(int       ,Fl_y)();
-  FL_EXPORT_C(int       ,Fl_w)();
-  FL_EXPORT_C(int       ,Fl_h)();
-  FL_EXPORT_C(int               ,Fl_screen_count)();
-  FL_EXPORT_C(void              ,Fl_screen_xywh)(int* X,int* Y,int* W,int* H);
-  FL_EXPORT_C(void              ,Fl_screen_xywh_with_mxmy)(int* X,int* Y,int* W,int* H,int mx,int my);
-  FL_EXPORT_C(void              ,Fl_screen_xywh_with_n)(int* X,int* Y,int* W,int* H,int n);
-  FL_EXPORT_C(void              ,Fl_screen_xywh_with_mxmymwmh)(int* X,int* Y,int* W,int* H,int mx,int my,int mw,int mh);
-  FL_EXPORT_C(void              ,Fl_screen_dpi)(float* h,float* v);
-  FL_EXPORT_C(void              ,Fl_screen_dpi_with_n)(float* h,float* v,int n);
-  FL_EXPORT_C(void              ,Fl_screen_work_area_with_mx_my)(int* X,int* Y,int* W,int* H,int mx,int my);
-  FL_EXPORT_C(void              ,Fl_screen_work_area_with_n)(int* X,int* Y,int* W,int* H,int n);
-  FL_EXPORT_C(void              ,Fl_screen_work_area)(int* X,int* Y,int* W,int* H);
-  FL_EXPORT_C(void              ,Fl_set_color_rgb)(Fl_Color color,uchar r,uchar g,uchar b);
-  FL_EXPORT_C(void              ,Fl_set_color)(Fl_Color i,unsigned c);
-  FL_EXPORT_C(unsigned          ,Fl_get_color)(Fl_Color i);
-  FL_EXPORT_C(void              ,Fl_get_color_rgb)(Fl_Color i,uchar *red,uchar *green,uchar *blue);
+  FL_EXPORT_C_HEADER(const char*,Fl_scheme,());
+  FL_EXPORT_C_HEADER(int        ,Fl_set_scheme,(const char* text));
+  FL_EXPORT_C_HEADER(int        ,Fl_is_scheme,(const char* text));
+  FL_EXPORT_C_HEADER(int        ,Fl_reload_scheme,());
+  FL_EXPORT_C_HEADER(int        ,Fl_scrollbar_size,());
+  FL_EXPORT_C_HEADER(void       ,Fl_set_scrollbar_size,(int W));
+  FL_EXPORT_C_HEADER(int        ,Fl_wait,());
+  FL_EXPORT_C_HEADER(double     ,Fl_set_wait,(double time));
+  FL_EXPORT_C_HEADER(fl_Widget  ,Fl_readqueue,());
+  FL_EXPORT_C_HEADER(void       ,Fl_add_timeout,(double t,fl_Timeout_Handler handler));
+  FL_EXPORT_C_HEADER(void       ,Fl_add_timeout_with_userdata,(double t,fl_Timeout_Handler handler, void* userdata));
+  FL_EXPORT_C_HEADER(void       ,Fl_repeat_timeout,(double t,fl_Timeout_Handler handler));
+  FL_EXPORT_C_HEADER(void       ,Fl_repeat_timeout_with_userdata,(double t,fl_Timeout_Handler handler,void* userdata));
+  FL_EXPORT_C_HEADER(int        ,Fl_has_timeout,(fl_Timeout_Handler handler));
+  FL_EXPORT_C_HEADER(int        ,Fl_has_timeout_with_userdata,(fl_Timeout_Handler handler, void* userdata));
+  FL_EXPORT_C_HEADER(void       ,Fl_remove_timeout,(fl_Timeout_Handler handler));
+  FL_EXPORT_C_HEADER(void       ,Fl_remove_timeout_with_userdata,(fl_Timeout_Handler handler,void* userdata));
+  FL_EXPORT_C_HEADER(void       ,Fl_add_check,(fl_Timeout_Handler handler));
+  FL_EXPORT_C_HEADER(void       ,Fl_add_check_with_userdata,(fl_Timeout_Handler handler,void* userdata));
+  FL_EXPORT_C_HEADER(int        ,Fl_has_check,(fl_Timeout_Handler handler));
+  FL_EXPORT_C_HEADER(int        ,Fl_has_check_with_userdata,(fl_Timeout_Handler handler, void* userdata));
+  FL_EXPORT_C_HEADER(void       ,Fl_remove_check,(fl_Timeout_Handler handler));
+  FL_EXPORT_C_HEADER(void       ,Fl_remove_check_with_userdata,(fl_Timeout_Handler handler,void* userdata));
+  FL_EXPORT_C_HEADER(void       ,Fl_add_fd_with_when,(int fd,int when,fl_FD_Handler cb));
+  FL_EXPORT_C_HEADER(void       ,Fl_add_fd_with_when_userdata,(int fd,int when,fl_FD_Handler cb,void* userdata));
+  FL_EXPORT_C_HEADER(void       ,Fl_add_fd,(int fd,fl_FD_Handler cb));
+  FL_EXPORT_C_HEADER(void       ,Fl_add_fd_with_userdata,(int fd,fl_FD_Handler cb,void* userdata));
+  FL_EXPORT_C_HEADER(void       ,Fl_remove_fd_with_when,(int fd_handle,int when));
+  FL_EXPORT_C_HEADER(void       ,Fl_remove_fd,(int fd_handle));
+  FL_EXPORT_C_HEADER(void       ,Fl_add_idle,(fl_Idle_Handler cb));
+  FL_EXPORT_C_HEADER(void       ,Fl_add_idle_with_userdata,(fl_Idle_Handler cb,void* userdata));
+  FL_EXPORT_C_HEADER(int        ,Fl_has_idle,(fl_Idle_Handler cb));
+  FL_EXPORT_C_HEADER(int        ,Fl_has_idle_with_userdata,(fl_Idle_Handler cb, void* userdata));
+  FL_EXPORT_C_HEADER(void       ,Fl_remove_idle,(fl_Idle_Handler cb));
+  FL_EXPORT_C_HEADER(void       ,Fl_remove_idle_with_userdata,(fl_Idle_Handler cb,void* data));
+  FL_EXPORT_C_HEADER(int        ,Fl_damage,());
+  FL_EXPORT_C_HEADER(void       ,Fl_redraw,());
+  FL_EXPORT_C_HEADER(void       ,Fl_flush,());
+  FL_EXPORT_C_HEADER(fl_Window  ,Fl_first_window,());
+  FL_EXPORT_C_HEADER(void       ,Fl_set_first_window,(fl_Window window));
+  FL_EXPORT_C_HEADER(fl_Window  ,Fl_next_window,(fl_Window window));
+  FL_EXPORT_C_HEADER(fl_Window  ,Fl_modal,());
+  FL_EXPORT_C_HEADER(fl_Window  ,Fl_grab,());
+  FL_EXPORT_C_HEADER(void       ,Fl_set_grab,(fl_Window window));
+  FL_EXPORT_C_HEADER(int        ,Fl_event,());
+  FL_EXPORT_C_HEADER(int        ,Fl_event_x,());
+  FL_EXPORT_C_HEADER(int        ,Fl_event_y,());
+  FL_EXPORT_C_HEADER(int        ,Fl_event_x_root,());
+  FL_EXPORT_C_HEADER(int        ,Fl_event_y_root,());
+  FL_EXPORT_C_HEADER(int        ,Fl_event_dx,());
+  FL_EXPORT_C_HEADER(int        ,Fl_event_dy,());
+  FL_EXPORT_C_HEADER(void       ,Fl_get_mouse,(int* x, int* y));
+  FL_EXPORT_C_HEADER(int        ,Fl_event_clicks,());
+  FL_EXPORT_C_HEADER(void       ,Fl_set_event_clicks,(int i));
+  FL_EXPORT_C_HEADER(int        ,Fl_event_is_click,());
+  FL_EXPORT_C_HEADER(void       ,Fl_set_event_is_click,(int i));
+  FL_EXPORT_C_HEADER(int        ,Fl_event_button,());
+  FL_EXPORT_C_HEADER(int        ,Fl_event_state,());
+  FL_EXPORT_C_HEADER(int        ,Fl_contains_event_state,(int i));
+  FL_EXPORT_C_HEADER(int        ,Fl_event_key,());
+  FL_EXPORT_C_HEADER(int        ,Fl_event_original_key,());
+  FL_EXPORT_C_HEADER(int        ,Fl_event_key_pressed,(int key));
+  FL_EXPORT_C_HEADER(int        ,Fl_get_key,(int key));
+  FL_EXPORT_C_HEADER(const char*,Fl_event_text,());
+  FL_EXPORT_C_HEADER(int        ,Fl_event_length,());
+  FL_EXPORT_C_HEADER(int        ,Fl_compose,(int* del));
+  FL_EXPORT_C_HEADER(void       ,Fl_compose_reset,());
+  FL_EXPORT_C_HEADER(int        ,Fl_event_inside_region,(int X,int Y,int W,int H));
+  FL_EXPORT_C_HEADER(int        ,Fl_event_inside_widget,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(int        ,Fl_test_shortcut,(Fl_Shortcut shortcut));
+  FL_EXPORT_C_HEADER(void       ,Fl_enable_im,());
+  FL_EXPORT_C_HEADER(void       ,Fl_disable_im,());
+  FL_EXPORT_C_HEADER(int        ,Fl_handle,(int event,fl_Window window));
+  FL_EXPORT_C_HEADER(int        ,Fl_handle_,(int event,fl_Window window));
+  FL_EXPORT_C_HEADER(fl_Widget  ,Fl_belowmouse,());
+  FL_EXPORT_C_HEADER(void       ,Fl_set_belowmouse,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(fl_Widget  ,Fl_pushed,());
+  FL_EXPORT_C_HEADER(void       ,Fl_set_pushed,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(fl_Widget  ,Fl_focus,());
+  FL_EXPORT_C_HEADER(void       ,Fl_set_focus,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void       ,Fl_add_handler,(fl_Event_Handler h));
+  FL_EXPORT_C_HEADER(void       ,Fl_remove_handler,(fl_Event_Handler h));
+  FL_EXPORT_C_HEADER(void              ,Fl_set_event_dispatch,(fl_Event_Dispatch* d));
+  FL_EXPORT_C_HEADER(fl_Event_Dispatch ,Fl_event_dispatch,());
+  FL_EXPORT_C_HEADER(void      ,Fl_copy,(const char* stuff,int len));
+  FL_EXPORT_C_HEADER(void      ,Fl_copy_with_destination,(const char* stuff,int len,int destination));
+  FL_EXPORT_C_HEADER(void      ,Fl_paste_with_source_type,(fl_Widget receiver,int source, const char* type));
+  FL_EXPORT_C_HEADER(void      ,Fl_paste_with_source,(fl_Widget receiver,int source));
+  FL_EXPORT_C_HEADER(int       ,Fl_dnd,());
+  FL_EXPORT_C_HEADER(fl_Widget ,Fl_selection_owner,());
+  FL_EXPORT_C_HEADER(void      ,Fl_set_selection_owner,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void      ,Fl_selection,(fl_Widget owner,const char* text,int len));
+  FL_EXPORT_C_HEADER(void      ,Fl_paste,(fl_Widget receiver));
+  FL_EXPORT_C_HEADER(int       ,Fl_x,());
+  FL_EXPORT_C_HEADER(int       ,Fl_y,());
+  FL_EXPORT_C_HEADER(int       ,Fl_w,());
+  FL_EXPORT_C_HEADER(int       ,Fl_h,());
+  FL_EXPORT_C_HEADER(int               ,Fl_screen_count,());
+  FL_EXPORT_C_HEADER(void              ,Fl_screen_xywh,(int* X,int* Y,int* W,int* H));
+  FL_EXPORT_C_HEADER(void              ,Fl_screen_xywh_with_mxmy,(int* X,int* Y,int* W,int* H,int mx,int my));
+  FL_EXPORT_C_HEADER(void              ,Fl_screen_xywh_with_n,(int* X,int* Y,int* W,int* H,int n));
+  FL_EXPORT_C_HEADER(void              ,Fl_screen_xywh_with_mxmymwmh,(int* X,int* Y,int* W,int* H,int mx,int my,int mw,int mh));
+  FL_EXPORT_C_HEADER(void              ,Fl_screen_dpi,(float* h,float* v));
+  FL_EXPORT_C_HEADER(void              ,Fl_screen_dpi_with_n,(float* h,float* v,int n));
+  FL_EXPORT_C_HEADER(void              ,Fl_screen_work_area_with_mx_my,(int* X,int* Y,int* W,int* H,int mx,int my));
+  FL_EXPORT_C_HEADER(void              ,Fl_screen_work_area_with_n,(int* X,int* Y,int* W,int* H,int n));
+  FL_EXPORT_C_HEADER(void              ,Fl_screen_work_area,(int* X,int* Y,int* W,int* H));
+  FL_EXPORT_C_HEADER(void              ,Fl_set_color_rgb,(Fl_Color color,uchar r,uchar g,uchar b));
+  FL_EXPORT_C_HEADER(void              ,Fl_set_color,(Fl_Color i,unsigned c));
+  FL_EXPORT_C_HEADER(unsigned          ,Fl_get_color,(Fl_Color i));
+  FL_EXPORT_C_HEADER(void              ,Fl_get_color_rgb,(Fl_Color i,uchar *red,uchar *green,uchar *blue));
 #if !defined(__APPLE__)
-  FL_EXPORT_C(void              ,Fl_free_color)(Fl_Color i);
-  FL_EXPORT_C(void              ,Fl_free_color_with_overlay)(Fl_Color i,int overlay);
+  FL_EXPORT_C_HEADER(void              ,Fl_free_color,(Fl_Color i));
+  FL_EXPORT_C_HEADER(void              ,Fl_free_color_with_overlay,(Fl_Color i,int overlay));
 #endif
-  FL_EXPORT_C(const char*       ,Fl_get_font)(Fl_Font font);
-  FL_EXPORT_C(const char*       ,Fl_get_font_name)(Fl_Font font);
-  FL_EXPORT_C(const char*       ,Fl_get_font_name_with_attributes)(Fl_Font font,int* attributes);
-  FL_EXPORT_C(int               ,Fl_get_font_sizes)(Fl_Font font,int* sizep);
-  FL_EXPORT_C(void              ,Fl_set_font_by_string)(Fl_Font font,const char* fontString);
-  FL_EXPORT_C(void              ,Fl_set_font_by_font)(Fl_Font to,Fl_Font from);
-  FL_EXPORT_C(Fl_Font           ,Fl_set_fonts)();
-  FL_EXPORT_C(Fl_Font           ,Fl_set_fonts_with_string)(const char* string);
-  FL_EXPORT_C(void              ,Fl_set_labeltype)(Fl_Labeltype labeltype,fl_Label_Draw_F* label_draw_f,fl_Label_Measure_F* label_measure_f);
+  FL_EXPORT_C_HEADER(const char*       ,Fl_get_font,(Fl_Font font));
+  FL_EXPORT_C_HEADER(const char*       ,Fl_get_font_name,(Fl_Font font));
+  FL_EXPORT_C_HEADER(const char*       ,Fl_get_font_name_with_attributes,(Fl_Font font,int* attributes));
+  FL_EXPORT_C_HEADER(int               ,Fl_get_font_sizes,(Fl_Font font,int* sizep));
+  FL_EXPORT_C_HEADER(void              ,Fl_set_font_by_string,(Fl_Font font,const char* fontString));
+  FL_EXPORT_C_HEADER(void              ,Fl_set_font_by_font,(Fl_Font to,Fl_Font from));
+  FL_EXPORT_C_HEADER(Fl_Font           ,Fl_set_fonts,());
+  FL_EXPORT_C_HEADER(Fl_Font           ,Fl_set_fonts_with_string,(const char* string));
+  FL_EXPORT_C_HEADER(void              ,Fl_set_labeltype,(Fl_Labeltype labeltype,fl_Label_Draw_F* label_draw_f,fl_Label_Measure_F* label_measure_f));
   /* FL_EXPORT_C(void              ,Fl_set_labeltype_by_labeltype)(Fl_Labeltype to,Fl_Labeltype from); */
-  FL_EXPORT_C(fl_Box_Draw_F*    ,Fl_get_boxtype)(Fl_Boxtype boxtype);
-  FL_EXPORT_C(void              ,Fl_set_boxtype)(Fl_Boxtype boxtype,fl_Box_Draw_F* box_draw_f,uchar offsetX,uchar offsetY,uchar offsetW,uchar offsetH);
-  FL_EXPORT_C(void              ,Fl_set_boxtype_by_boxtype)(Fl_Boxtype to,Fl_Boxtype from);
-  FL_EXPORT_C(int               ,Fl_box_dx)(Fl_Boxtype boxtype);
-  FL_EXPORT_C(int               ,Fl_box_dy)(Fl_Boxtype boxtype);
-  FL_EXPORT_C(int               ,Fl_box_dw)(Fl_Boxtype boxtype);
-  FL_EXPORT_C(int               ,Fl_box_dh)(Fl_Boxtype boxtype);
-  FL_EXPORT_C(int               ,Fl_draw_box_active)();
-  FL_EXPORT_C(void              ,Fl_default_atclose)(fl_Window window,void* data);
-  FL_EXPORT_C(void              ,Fl_set_atclose)(fl_Atclose_Handler* f);
-  FL_EXPORT_C(int               ,Fl_event_shift)();
-  FL_EXPORT_C(int               ,Fl_event_ctrl)();
-  FL_EXPORT_C(int               ,Fl_event_command)();
-  FL_EXPORT_C(int               ,Fl_event_alt)();
-  FL_EXPORT_C(int               ,Fl_event_buttons)();
-  FL_EXPORT_C(int               ,Fl_event_button1)();
-  FL_EXPORT_C(int               ,Fl_event_button2)();
-  FL_EXPORT_C(int               ,Fl_event_button3)();
-  FL_EXPORT_C(void              ,Fl_set_idle)(fl_Old_Idle_Handler cb);
-  FL_EXPORT_C(void              ,Fl_release)();
-  FL_EXPORT_C(void              ,Fl_set_visible_focus)(int v);
-  FL_EXPORT_C(int               ,Fl_visible_focus)();
-  FL_EXPORT_C(void              ,Fl_set_dnd_text_ops)(int v);
-  FL_EXPORT_C(int               ,Fl_dnd_text_ops)();
-  FL_EXPORT_C(int               ,Fl_lock)();
-  FL_EXPORT_C(void              ,Fl_unlock)();
-  FL_EXPORT_C(void              ,Fl_awake)();
-  FL_EXPORT_C(void              ,Fl_awake_with_message)(void* message);
-  FL_EXPORT_C(int               ,Fl_awake_with_cb)(fl_Awake_Handler cb);
-  FL_EXPORT_C(int               ,Fl_awake_with_cb_message)(fl_Awake_Handler cb, void* message);
-  FL_EXPORT_C(void*             ,Fl_thread_message)();
-  FL_EXPORT_C(void              ,Fl_delete_widget)(fl_Widget w);
-  FL_EXPORT_C(void              ,Fl_do_widget_deletion)();
-  FL_EXPORT_C(void              ,Fl_watch_widget_pointer)(fl_Widget w);
-  FL_EXPORT_C(void              ,Fl_release_widget_pointer)(fl_Widget w);
-  FL_EXPORT_C(void              ,Fl_clear_widget_pointer)(fl_Widget w);
-  FL_EXPORT_C(void              ,Fl_clear_widget_pointer)(fl_Widget w);
-  FL_EXPORT_C(void*             ,Fl_event_clipboard)();
-  FL_EXPORT_C(const char*       ,Fl_event_clipboard_type)();
-  FL_EXPORT_C(int               ,Fl_reload_scheme());
+  FL_EXPORT_C_HEADER(fl_Box_Draw_F*    ,Fl_get_boxtype,(Fl_Boxtype boxtype));
+  FL_EXPORT_C_HEADER(void              ,Fl_set_boxtype,(Fl_Boxtype boxtype,fl_Box_Draw_F* box_draw_f,uchar offsetX,uchar offsetY,uchar offsetW,uchar offsetH));
+  FL_EXPORT_C_HEADER(void              ,Fl_set_boxtype_by_boxtype,(Fl_Boxtype to,Fl_Boxtype from));
+  FL_EXPORT_C_HEADER(int               ,Fl_box_dx,(Fl_Boxtype boxtype));
+  FL_EXPORT_C_HEADER(int               ,Fl_box_dy,(Fl_Boxtype boxtype));
+  FL_EXPORT_C_HEADER(int               ,Fl_box_dw,(Fl_Boxtype boxtype));
+  FL_EXPORT_C_HEADER(int               ,Fl_box_dh,(Fl_Boxtype boxtype));
+  FL_EXPORT_C_HEADER(int               ,Fl_draw_box_active,());
+  FL_EXPORT_C_HEADER(void              ,Fl_default_atclose,(fl_Window window,void* data));
+  FL_EXPORT_C_HEADER(void              ,Fl_set_atclose,(fl_Atclose_Handler* f));
+  FL_EXPORT_C_HEADER(int               ,Fl_event_shift,());
+  FL_EXPORT_C_HEADER(int               ,Fl_event_ctrl,());
+  FL_EXPORT_C_HEADER(int               ,Fl_event_command,());
+  FL_EXPORT_C_HEADER(int               ,Fl_event_alt,());
+  FL_EXPORT_C_HEADER(int               ,Fl_event_buttons,());
+  FL_EXPORT_C_HEADER(int               ,Fl_event_button1,());
+  FL_EXPORT_C_HEADER(int               ,Fl_event_button2,());
+  FL_EXPORT_C_HEADER(int               ,Fl_event_button3,());
+  FL_EXPORT_C_HEADER(void              ,Fl_set_idle,(fl_Old_Idle_Handler cb));
+  FL_EXPORT_C_HEADER(void              ,Fl_release,());
+  FL_EXPORT_C_HEADER(void              ,Fl_set_visible_focus,(int v));
+  FL_EXPORT_C_HEADER(int               ,Fl_visible_focus,());
+  FL_EXPORT_C_HEADER(void              ,Fl_set_dnd_text_ops,(int v));
+  FL_EXPORT_C_HEADER(int               ,Fl_dnd_text_ops,());
+  FL_EXPORT_C_HEADER(int               ,Fl_lock,());
+  FL_EXPORT_C_HEADER(void              ,Fl_unlock,());
+  FL_EXPORT_C_HEADER(void              ,Fl_awake,());
+  FL_EXPORT_C_HEADER(void              ,Fl_awake_with_message,(void* message));
+  FL_EXPORT_C_HEADER(int               ,Fl_awake_with_cb,(fl_Awake_Handler cb));
+  FL_EXPORT_C_HEADER(int               ,Fl_awake_with_cb_message,(fl_Awake_Handler cb, void* message));
+  FL_EXPORT_C_HEADER(void*             ,Fl_thread_message,());
+  FL_EXPORT_C_HEADER(void              ,Fl_delete_widget,(fl_Widget w));
+  FL_EXPORT_C_HEADER(void              ,Fl_do_widget_deletion,());
+  FL_EXPORT_C_HEADER(void              ,Fl_watch_widget_pointer,(fl_Widget w));
+  FL_EXPORT_C_HEADER(void              ,Fl_release_widget_pointer,(fl_Widget w));
+  FL_EXPORT_C_HEADER(void              ,Fl_clear_widget_pointer,(fl_Widget w));
+  FL_EXPORT_C_HEADER(void              ,Fl_clear_widget_pointer,(fl_Widget w));
+  FL_EXPORT_C_HEADER(void*             ,Fl_event_clipboard,());
+  FL_EXPORT_C_HEADER(const char*       ,Fl_event_clipboard_type,());
+  FL_EXPORT_C_HEADER(int               ,Fl_reload_scheme,());
 #if FL_API_VERSION >= 10304
-  FL_EXPORT_C(void              ,Fl_set_box_color)(Fl_Color c);
-  FL_EXPORT_C(Fl_Color          ,Fl_box_color)(Fl_Color c);
-  FL_EXPORT_C(int               ,Fl_abi_version)();
-  FL_EXPORT_C(int               ,Fl_api_version)();
-  FL_EXPORT_C(int               ,Fl_abi_check(int val));
-  FL_EXPORT_C(const char*       ,Fl_local_ctrl)();
-  FL_EXPORT_C(const char*       ,Fl_local_meta)();
-  FL_EXPORT_C(const char*       ,Fl_local_alt)();
-  FL_EXPORT_C(const char*       ,Fl_local_shift)();
-  FL_EXPORT_C(void              ,Fl_set_use_high_res_GL)(int val);
-  FL_EXPORT_C(int               ,Fl_use_high_res_GL)();
+  FL_EXPORT_C_HEADER(void              ,Fl_set_box_color,(Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Color          ,Fl_box_color,(Fl_Color c));
+  FL_EXPORT_C_HEADER(int               ,Fl_abi_version,());
+  FL_EXPORT_C_HEADER(int               ,Fl_api_version,());
+  FL_EXPORT_C_HEADER(int               ,Fl_abi_check, (int val));
+  FL_EXPORT_C_HEADER(const char*       ,Fl_local_ctrl,());
+  FL_EXPORT_C_HEADER(const char*       ,Fl_local_meta,());
+  FL_EXPORT_C_HEADER(const char*       ,Fl_local_alt,());
+  FL_EXPORT_C_HEADER(const char*       ,Fl_local_shift,());
+  FL_EXPORT_C_HEADER(void              ,Fl_set_use_high_res_GL,(int val));
+  FL_EXPORT_C_HEADER(int               ,Fl_use_high_res_GL,());
 #endif
 #ifdef __cplusplus
 }
diff --git a/c-src/Fl_Cairo_WindowC.h b/c-src/Fl_Cairo_WindowC.h
--- a/c-src/Fl_Cairo_WindowC.h
+++ b/c-src/Fl_Cairo_WindowC.h
@@ -11,178 +11,178 @@
 EXPORT {
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,Fl_Cairo_Window_handle)(fl_Cairo_Window self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Cairo_Window_parent)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_set_parent)(fl_Cairo_Window win, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Cairo_Window_type)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_set_type)(fl_Cairo_Window win, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Cairo_Window_handle,(fl_Cairo_Window self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Cairo_Window_parent,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_parent,(fl_Cairo_Window win, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Cairo_Window_type,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_type,(fl_Cairo_Window win, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Cairo_Window_x)(fl_Cairo_Window win);
-  FL_EXPORT_C(int,          Fl_Cairo_Window_y)(fl_Cairo_Window win);
-  FL_EXPORT_C(int,          Fl_Cairo_Window_w)(fl_Cairo_Window win);
-  FL_EXPORT_C(int,          Fl_Cairo_Window_h)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_set_align)(fl_Cairo_Window cairo_window, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Cairo_Window_align)(fl_Cairo_Window win);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Cairo_Window_box)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_set_box)(fl_Cairo_Window win, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Cairo_Window_color)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_set_color)(fl_Cairo_Window win, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_set_color_with_bg_sel)(fl_Cairo_Window win,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Cairo_Window_selection_color)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_set_selection_color)(fl_Cairo_Window win, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Cairo_Window_label)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_copy_label)(fl_Cairo_Window win, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_set_label)(fl_Cairo_Window win, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Cairo_Window_labeltype)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_set_labeltype)(fl_Cairo_Window win, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Cairo_Window_labelcolor)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_set_labelcolor)(fl_Cairo_Window win, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Cairo_Window_labelfont)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_set_labelfont)(fl_Cairo_Window win, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Cairo_Window_labelsize)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_set_labelsize)(fl_Cairo_Window win, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Cairo_Window_image)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_set_image)(fl_Cairo_Window win, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Cairo_Window_deimage)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_set_deimage)(fl_Cairo_Window win, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Cairo_Window_tooltip)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_copy_tooltip)(fl_Cairo_Window win, const char* text);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_set_tooltip)(fl_Cairo_Window win, const char* text);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_set_callback_with_user_data)(fl_Cairo_Window win, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_set_callback)(fl_Cairo_Window win, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Cairo_Window_user_data)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_set_user_data)(fl_Cairo_Window win, void* v);
-  FL_EXPORT_C(long,         Fl_Cairo_Window_argument)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_set_argument)(fl_Cairo_Window win, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Cairo_Window_when)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_set_when)(fl_Cairo_Window win, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Cairo_Window_visible)(fl_Cairo_Window win);
-  FL_EXPORT_C(int,          Fl_Cairo_Window_visible_r)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_set_visible)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_clear_visible)(fl_Cairo_Window win);
-  FL_EXPORT_C(unsigned int, Fl_Cairo_Window_active)(fl_Cairo_Window win);
-  FL_EXPORT_C(int,          Fl_Cairo_Window_active_r)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_activate)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_deactivate)(fl_Cairo_Window win);
-  FL_EXPORT_C(unsigned int, Fl_Cairo_Window_output)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_set_output)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_clear_output)(fl_Cairo_Window win);
-  FL_EXPORT_C(unsigned int, Fl_Cairo_Window_takesevents)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_set_changed)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_clear_changed)(fl_Cairo_Window win);
-  FL_EXPORT_C(int,          Fl_Cairo_Window_take_focus)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_set_visible_focus)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_clear_visible_focus)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_modify_visible_focus)(fl_Cairo_Window win, int v);
-  FL_EXPORT_C(unsigned int, Fl_Cairo_Window_visible_focus)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_do_callback)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_do_callback_with_widget_and_user_data)(fl_Cairo_Window win, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_do_callback_with_widget_and_default_user_data)(fl_Cairo_Window win, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Cairo_Window_contains)(fl_Cairo_Window win, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Cairo_Window_inside)(fl_Cairo_Window win, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_redraw)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_redraw_label)(fl_Cairo_Window win);
-  FL_EXPORT_C(uchar,        Fl_Cairo_Window_damage)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_clear_damage_with_bitmask)(fl_Cairo_Window win, uchar c);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_clear_damage)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_damage_with_text)(fl_Cairo_Window win, uchar c);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_damage_inside_widget)(fl_Cairo_Window win, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_draw_label_with_xywh_alignment)(fl_Cairo_Window win, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_measure_label)(fl_Cairo_Window win, int* ww , int* hh);
-  FL_EXPORT_C(fl_Group,     Fl_Cairo_Window_as_group)(fl_Cairo_Window win);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Cairo_Window_as_gl_window)(fl_Cairo_Window win);
-  FL_EXPORT_C(fl_Window,    Fl_Cairo_Window_window)(fl_Cairo_Window cairo_window);
-  FL_EXPORT_C(fl_Window,    Fl_Cairo_Window_top_window)(fl_Cairo_Window cairo_window);
-  FL_EXPORT_C(fl_Window ,   Fl_Cairo_Window_top_window_offset)(fl_Cairo_Window cairo_window, int* xoff, int* yoff);
+  FL_EXPORT_C_HEADER(int,Fl_Cairo_Window_x,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Cairo_Window_y,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Cairo_Window_w,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Cairo_Window_h,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_align,(fl_Cairo_Window cairo_window, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Cairo_Window_align,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Cairo_Window_box,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_box,(fl_Cairo_Window win, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Cairo_Window_color,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_color,(fl_Cairo_Window win, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_color_with_bg_sel,(fl_Cairo_Window win,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Cairo_Window_selection_color,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_selection_color,(fl_Cairo_Window win, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Cairo_Window_label,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_copy_label,(fl_Cairo_Window win, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_label,(fl_Cairo_Window win, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Cairo_Window_labeltype,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_labeltype,(fl_Cairo_Window win, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Cairo_Window_labelcolor,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_labelcolor,(fl_Cairo_Window win, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Cairo_Window_labelfont,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_labelfont,(fl_Cairo_Window win, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Cairo_Window_labelsize,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_labelsize,(fl_Cairo_Window win, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Cairo_Window_image,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_image,(fl_Cairo_Window win, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Cairo_Window_deimage,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_deimage,(fl_Cairo_Window win, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Cairo_Window_tooltip,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_copy_tooltip,(fl_Cairo_Window win, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_tooltip,(fl_Cairo_Window win, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_callback_with_user_data,(fl_Cairo_Window win, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_callback,(fl_Cairo_Window win, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Cairo_Window_user_data,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_user_data,(fl_Cairo_Window win, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Cairo_Window_argument,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_argument,(fl_Cairo_Window win, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Cairo_Window_when,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_when,(fl_Cairo_Window win, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Cairo_Window_visible,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Cairo_Window_visible_r,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_visible,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_clear_visible,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Cairo_Window_active,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Cairo_Window_active_r,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_activate,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_deactivate,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Cairo_Window_output,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_output,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_clear_output,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Cairo_Window_takesevents,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_changed,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_clear_changed,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Cairo_Window_take_focus,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_visible_focus,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_clear_visible_focus,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_modify_visible_focus,(fl_Cairo_Window win, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Cairo_Window_visible_focus,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_do_callback,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_do_callback_with_widget_and_user_data,(fl_Cairo_Window win, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_do_callback_with_widget_and_default_user_data,(fl_Cairo_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Cairo_Window_contains,(fl_Cairo_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Cairo_Window_inside,(fl_Cairo_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_redraw,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_redraw_label,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(uchar,Fl_Cairo_Window_damage,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_clear_damage_with_bitmask,(fl_Cairo_Window win, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_clear_damage,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_damage_with_text,(fl_Cairo_Window win, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_damage_inside_widget,(fl_Cairo_Window win, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_draw_label_with_xywh_alignment,(fl_Cairo_Window win, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_measure_label,(fl_Cairo_Window win, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Cairo_Window_as_group,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Cairo_Window_as_gl_window,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Cairo_Window_window,(fl_Cairo_Window cairo_window));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Cairo_Window_top_window,(fl_Cairo_Window cairo_window));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Cairo_Window_top_window_offset,(fl_Cairo_Window cairo_window, int* xoff, int* yoff));
   /* Inherited from Fl_Group */
-  FL_EXPORT_C(void, Fl_Cairo_Window_draw_child)(fl_Cairo_Window Cairo_Window,fl_Widget widget);
-  FL_EXPORT_C(void, Fl_Cairo_Window_draw_children)(fl_Cairo_Window Cairo_Window);
-  FL_EXPORT_C(void, Fl_Cairo_Window_draw_outside_label)(fl_Cairo_Window Cairo_Window,fl_Widget widget);
-  FL_EXPORT_C(void, Fl_Cairo_Window_update_child)(fl_Cairo_Window Cairo_Window,fl_Widget widget);
-  FL_EXPORT_C(int*, Fl_Cairo_Window_sizes)(fl_Cairo_Window Cairo_Window);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_begin)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_end)(fl_Cairo_Window win);
-  FL_EXPORT_C(int,          Fl_Cairo_Window_find)(fl_Cairo_Window win, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_add)(fl_Cairo_Window win, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_insert)(fl_Cairo_Window win, fl_Widget w, int i);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_remove_index)(fl_Cairo_Window win, int index);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_remove_widget)(fl_Cairo_Window win, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_clear)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_set_resizable_by_reference)(fl_Cairo_Window win,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_set_resizable)(fl_Cairo_Window win,fl_Widget o);
-  FL_EXPORT_C(fl_Widget,         Fl_Cairo_Window_resizable)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_add_resizable)(fl_Cairo_Window win,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_init_sizes)(fl_Cairo_Window win);
-  FL_EXPORT_C(int,          Fl_Cairo_Window_children)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_set_clip_children)(fl_Cairo_Window win,int c);
-  FL_EXPORT_C(unsigned int, Fl_Cairo_Window_clip_children)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_focus)(fl_Cairo_Window win,fl_Widget W);
-  FL_EXPORT_C(fl_Widget,    Fl_Cairo_Window__ddfdesign_kludge)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_insert_with_before)(fl_Cairo_Window self, fl_Widget w, fl_Widget before);
-  FL_EXPORT_C(fl_Widget*,   Fl_Cairo_Window_array)(fl_Cairo_Window self);
-  FL_EXPORT_C(fl_Widget,    Fl_Cairo_Window_child)(fl_Cairo_Window self, int n);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_forms_end)(fl_Cairo_Window self);
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_draw_child,(fl_Cairo_Window Cairo_Window,fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_draw_children,(fl_Cairo_Window Cairo_Window));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_draw_outside_label,(fl_Cairo_Window Cairo_Window,fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_update_child,(fl_Cairo_Window Cairo_Window,fl_Widget widget));
+  FL_EXPORT_C_HEADER(int*,Fl_Cairo_Window_sizes,(fl_Cairo_Window Cairo_Window));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_begin,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_end,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Cairo_Window_find,(fl_Cairo_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_add,(fl_Cairo_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_insert,(fl_Cairo_Window win, fl_Widget w, int i));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_remove_index,(fl_Cairo_Window win, int index));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_remove_widget,(fl_Cairo_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_clear,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_resizable_by_reference,(fl_Cairo_Window win,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_resizable,(fl_Cairo_Window win,fl_Widget o));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Cairo_Window_resizable,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_add_resizable,(fl_Cairo_Window win,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_init_sizes,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Cairo_Window_children,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_clip_children,(fl_Cairo_Window win,int c));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Cairo_Window_clip_children,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_focus,(fl_Cairo_Window win,fl_Widget W));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Cairo_Window__ddfdesign_kludge,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_insert_with_before,(fl_Cairo_Window self, fl_Widget w, fl_Widget before));
+  FL_EXPORT_C_HEADER(fl_Widget*,Fl_Cairo_Window_array,(fl_Cairo_Window self));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Cairo_Window_child,(fl_Cairo_Window self, int n));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_forms_end,(fl_Cairo_Window self));
   /* FL_EXPORT_C(void,         Fl_Cairo_Window_forms_end)(fl_Cairo_Window win); */
   /* Fl_Window inherited */
-  FL_EXPORT_C(unsigned int, Fl_Cairo_Window_changed)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_fullscreen)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_fullscreen_off)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_fullscreen_off_with_resize)(fl_Cairo_Window win,int X,int Y,int W,int H);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_iconize)(fl_Cairo_Window win);
-  FL_EXPORT_C(fl_Cairo_Window,    Fl_Cairo_Window_New_WithLabel)(int w, int h, const char* title);
-  FL_EXPORT_C(fl_Cairo_Window,    Fl_Cairo_Window_New)(int w, int h);
-  FL_EXPORT_C(fl_Cairo_Window, Fl_OverriddenCairo_Window_New_WithLabel)(int w, int h, const char* title, fl_Cairo_Window_Virtual_Funcs* funcs); 
-  FL_EXPORT_C(fl_Cairo_Window, Fl_OverriddenCairo_Window_New)(int w, int h,fl_Cairo_Window_Virtual_Funcs* funcs); 
-  FL_EXPORT_C(int ,Fl_Cairo_Window_handle)(fl_Cairo_Window win, int event);
-  FL_EXPORT_C(void ,Fl_Cairo_Window_set_border)(fl_Cairo_Window win, int b);
-  FL_EXPORT_C(void ,Fl_Cairo_Window_clear_border)(fl_Cairo_Window win);
-  FL_EXPORT_C(unsigned int ,Fl_Cairo_Window_border)(fl_Cairo_Window win);
-  FL_EXPORT_C(void ,Fl_Cairo_Window_set_override)(fl_Cairo_Window win);
-  FL_EXPORT_C(unsigned int,Fl_Cairo_Window_override)(fl_Cairo_Window win);
-  FL_EXPORT_C(void ,Fl_Cairo_Window_set_modal)(fl_Cairo_Window win);
-  FL_EXPORT_C(unsigned int,Fl_Cairo_Window_modal)(fl_Cairo_Window win);
-  FL_EXPORT_C(void ,Fl_Cairo_Window_set_non_modal)(fl_Cairo_Window win);
-  FL_EXPORT_C(unsigned int ,Fl_Cairo_Window_non_modal)(fl_Cairo_Window win);
-  FL_EXPORT_C(void ,Fl_Cairo_Window_set_menu_window)(fl_Cairo_Window win);
-  FL_EXPORT_C(unsigned int,Fl_Cairo_Window_menu_window)(fl_Cairo_Window win);
-  FL_EXPORT_C(void ,Fl_Cairo_Window_set_tooltip_window)(fl_Cairo_Window win);
-  FL_EXPORT_C(unsigned int,Fl_Cairo_Window_tooltip_window)(fl_Cairo_Window win);
-  FL_EXPORT_C(void ,Fl_Cairo_Window_hotspot_with_x_y)(fl_Cairo_Window win, int x, int y);
-  FL_EXPORT_C(void ,Fl_Cairo_Window_hotspot_with_x_y_with_offscreen)(fl_Cairo_Window win, int x, int y, int offscreen);
-  FL_EXPORT_C(void ,Fl_Cairo_Window_hotspot_with_widget)(fl_Cairo_Window win, fl_Widget w);//, int offscreen = 0);
-  FL_EXPORT_C(void ,Fl_Cairo_Window_hotspot_with_widget_with_offscreen)(fl_Cairo_Window win, fl_Widget w, int offscreen);
-  FL_EXPORT_C(void ,Fl_Cairo_Window_free_position)(fl_Cairo_Window win);
-  FL_EXPORT_C(void ,Fl_Cairo_Window_size_range)(fl_Cairo_Window win, int minw, int minh);
-  FL_EXPORT_C(void ,Fl_Cairo_Window_size_range_with_args)(fl_Window win, int minw, int minh, fl_Window_size_range_args* args);//int maxw=0, int maxh=0, int dw=0, int dh=0, int aspect=0);
-  FL_EXPORT_C(const char*, Fl_Cairo_Window_label)(fl_Cairo_Window win);
-  FL_EXPORT_C(const char*, Fl_Cairo_Window_iconlabel)(fl_Cairo_Window win);
-  FL_EXPORT_C(void, Fl_Cairo_Window_set_label)(fl_Cairo_Window win,const char*);
-  FL_EXPORT_C(void, Fl_Cairo_Window_set_iconlabel)(fl_Cairo_Window win,const char*);
-  FL_EXPORT_C(void, Fl_Cairo_Window_set_label_with_iconlabel)(fl_Cairo_Window win,const char* label, const char* iconlabel);
-  FL_EXPORT_C(void, Fl_Cairo_Window_copy_label)(fl_Cairo_Window win,const char* a);
-  FL_EXPORT_C(void, Fl_Cairo_Window_set_default_xclass)(const char* label);
-  FL_EXPORT_C(const char*, Fl_Cairo_Window_default_xclass)();
-  FL_EXPORT_C(const char*, Fl_Cairo_Window_xclass)(fl_Cairo_Window win);
-  FL_EXPORT_C(void, Fl_Cairo_Window_set_xclass)(fl_Cairo_Window win,const char* c);
-  FL_EXPORT_C(const void*, Fl_Cairo_Window_icon)(fl_Cairo_Window win);
-  FL_EXPORT_C(void, Fl_Cairo_Window_set_icon)(fl_Cairo_Window win,const void * ic);
-  FL_EXPORT_C(int, Fl_Cairo_Window_shown)(fl_Cairo_Window win);
-  FL_EXPORT_C(void, Fl_Cairo_Window_iconize)(fl_Cairo_Window win);
-  FL_EXPORT_C(int, Fl_Cairo_Window_x_root)(fl_Cairo_Window win);
-  FL_EXPORT_C(int, Fl_Cairo_Window_y_root)(fl_Cairo_Window win);
-  FL_EXPORT_C(fl_Cairo_Window, Fl_Cairo_Window_current)();
-  FL_EXPORT_C(void, Fl_Cairo_Window_make_current)(fl_Cairo_Window win);
-  FL_EXPORT_C(void, Fl_Cairo_Window_set_cursor_with_bg)(fl_Cairo_Window win, Fl_Cursor cursor, Fl_Color bg);
-  FL_EXPORT_C(void, Fl_Cairo_Window_set_cursor_with_fg)(fl_Cairo_Window win,Fl_Cursor cursor, Fl_Color fg);
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Cairo_Window_changed,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_fullscreen,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_fullscreen_off,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_fullscreen_off_with_resize,(fl_Cairo_Window win,int X,int Y,int W,int H));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_iconize,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(fl_Cairo_Window,Fl_Cairo_Window_New_WithLabel,(int w, int h, const char* title));
+  FL_EXPORT_C_HEADER(fl_Cairo_Window,Fl_Cairo_Window_New,(int w, int h));
+  FL_EXPORT_C(fl_Cairo_Window, Fl_OverriddenCairo_Window_New_WithLabel)(int w, int h, const char* title, fl_Cairo_Window_Virtual_Funcs* funcs);
+  FL_EXPORT_C(fl_Cairo_Window, Fl_OverriddenCairo_Window_New)(int w, int h,fl_Cairo_Window_Virtual_Funcs* funcs);
+  FL_EXPORT_C_HEADER(int ,Fl_Cairo_Window_handle,(fl_Cairo_Window win, int event));
+  FL_EXPORT_C_HEADER(void ,Fl_Cairo_Window_set_border,(fl_Cairo_Window win, int b));
+  FL_EXPORT_C_HEADER(void ,Fl_Cairo_Window_clear_border,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(unsigned int ,Fl_Cairo_Window_border,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Cairo_Window_set_override,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Cairo_Window_override,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Cairo_Window_set_modal,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Cairo_Window_modal,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Cairo_Window_set_non_modal,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(unsigned int ,Fl_Cairo_Window_non_modal,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Cairo_Window_set_menu_window,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Cairo_Window_menu_window,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Cairo_Window_set_tooltip_window,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Cairo_Window_tooltip_window,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Cairo_Window_hotspot_with_x_y,(fl_Cairo_Window win, int x, int y));
+  FL_EXPORT_C_HEADER(void ,Fl_Cairo_Window_hotspot_with_x_y_with_offscreen,(fl_Cairo_Window win, int x, int y, int offscreen));
+  FL_EXPORT_C_HEADER(void ,Fl_Cairo_Window_hotspot_with_widget,(fl_Cairo_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void ,Fl_Cairo_Window_hotspot_with_widget_with_offscreen,(fl_Cairo_Window win, fl_Widget w, int offscreen));
+  FL_EXPORT_C_HEADER(void ,Fl_Cairo_Window_free_position,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Cairo_Window_size_range,(fl_Cairo_Window win, int minw, int minh));
+  FL_EXPORT_C_HEADER(void ,Fl_Cairo_Window_size_range_with_args,(fl_Window win, int minw, int minh, fl_Window_size_range_args* args));
+  FL_EXPORT_C_HEADER(const char*,Fl_Cairo_Window_label,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(const char*,Fl_Cairo_Window_iconlabel,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_label,(fl_Cairo_Window win,const char*));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_iconlabel,(fl_Cairo_Window win,const char*));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_label_with_iconlabel,(fl_Cairo_Window win,const char* label, const char* iconlabel));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_copy_label,(fl_Cairo_Window win,const char* a));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_default_xclass,(const char* label));
+  FL_EXPORT_C_HEADER(const char*,Fl_Cairo_Window_default_xclass,());
+  FL_EXPORT_C_HEADER(const char*,Fl_Cairo_Window_xclass,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_xclass,(fl_Cairo_Window win,const char* c));
+  FL_EXPORT_C_HEADER(const void*,Fl_Cairo_Window_icon,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_icon,(fl_Cairo_Window win,const void * ic));
+  FL_EXPORT_C_HEADER(int,Fl_Cairo_Window_shown,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_iconize,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Cairo_Window_x_root,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Cairo_Window_y_root,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(fl_Cairo_Window,Fl_Cairo_Window_current,());
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_make_current,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_cursor_with_bg,(fl_Cairo_Window win, Fl_Cursor cursor, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_cursor_with_fg,(fl_Cairo_Window win,Fl_Cursor cursor, Fl_Color fg));
   FL_EXPORT_C(void, Fl_Cairo_Window_set_cursor_with_fg_bg)(fl_Cairo_Window win,Fl_Cursor cursor, Fl_Color fg , Fl_Color bg );/* =FL_BLACK *//*=FL_WHITE*/
-  FL_EXPORT_C(void, Fl_Cairo_Window_set_cursor)(fl_Cairo_Window win,Fl_Cursor cursor);
-  FL_EXPORT_C(void, Fl_Cairo_Window_set_default_cursor_with_bg)(fl_Cairo_Window win,Fl_Cursor cursor, Fl_Color bg);
-  FL_EXPORT_C(void, Fl_Cairo_Window_set_default_cursor_with_fg)(fl_Cairo_Window win, Fl_Cursor cursor, Fl_Color fg);
-  FL_EXPORT_C(void, Fl_Cairo_Window_set_default_cursor_with_fg_bg)(fl_Cairo_Window win,Fl_Cursor cursor, Fl_Color fg , Fl_Color bg );
-  FL_EXPORT_C(void, Fl_Cairo_Window_set_default_cursor)(fl_Cairo_Window win,Fl_Cursor cursor);
-  FL_EXPORT_C(void, Fl_Cairo_Window_default_callback)(fl_Cairo_Window win, void* v);
-  FL_EXPORT_C(int, Fl_Cairo_Window_decorated_w)(fl_Cairo_Window win);
-  FL_EXPORT_C(int, Fl_Cairo_Window_decorated_h)(fl_Cairo_Window win);
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_cursor,(fl_Cairo_Window win,Fl_Cursor cursor));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_default_cursor_with_bg,(fl_Cairo_Window win,Fl_Cursor cursor, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_default_cursor_with_fg,(fl_Cairo_Window win, Fl_Cursor cursor, Fl_Color fg));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_default_cursor_with_fg_bg,(fl_Cairo_Window win,Fl_Cursor cursor, Fl_Color fg , Fl_Color bg ));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_default_cursor,(fl_Cairo_Window win,Fl_Cursor cursor));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_default_callback,(fl_Cairo_Window win, void* v));
+  FL_EXPORT_C_HEADER(int,Fl_Cairo_Window_decorated_w,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Cairo_Window_decorated_h,(fl_Cairo_Window win));
   /* Fl_Cairo_Window specific */
   // flush resize destructor, constructor
 #ifdef __cplusplus
@@ -222,14 +222,14 @@
     ~Fl_DerivedCairo_Window();
   };
 #endif
-  FL_EXPORT_C(fl_Cairo_Window_Virtual_Funcs*, Fl_Cairo_Window_default_virtual_funcs)();
-  FL_EXPORT_C(void,         Fl_Cairo_Window_show)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_show_with_args)(fl_Cairo_Window win, int argc, char** argv);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_destroy)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_flush)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_resize)(fl_Cairo_Window win, int X, int Y, int W, int H);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_hide)(fl_Cairo_Window win);
-  FL_EXPORT_C(void,         Fl_Cairo_Window_set_draw_cb)(fl_Cairo_Window win, fl_Callback cb);
+  FL_EXPORT_C_HEADER(fl_Cairo_Window_Virtual_Funcs*,Fl_Cairo_Window_default_virtual_funcs,());
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_show,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_show_with_args,(fl_Cairo_Window win, int argc, char** argv));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_destroy,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_flush,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_resize,(fl_Cairo_Window win, int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_hide,(fl_Cairo_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Cairo_Window_set_draw_cb,(fl_Cairo_Window win, fl_Callback cb));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Check_ButtonC.h b/c-src/Fl_Check_ButtonC.h
--- a/c-src/Fl_Check_ButtonC.h
+++ b/c-src/Fl_Check_ButtonC.h
@@ -29,113 +29,113 @@
   };
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,Fl_Check_Button_handle)(fl_Check_Button self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Check_Button_parent)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_set_parent)(fl_Check_Button win, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Check_Button_type)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_set_type)(fl_Check_Button win, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Check_Button_handle,(fl_Check_Button self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Check_Button_parent,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_set_parent,(fl_Check_Button win, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Check_Button_type,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_set_type,(fl_Check_Button win, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Check_Button_x)(fl_Check_Button win);
-  FL_EXPORT_C(int,          Fl_Check_Button_y)(fl_Check_Button win);
-  FL_EXPORT_C(int,          Fl_Check_Button_w)(fl_Check_Button win);
-  FL_EXPORT_C(int,          Fl_Check_Button_h)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_set_align)(fl_Check_Button check_button, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Check_Button_align)(fl_Check_Button win);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Check_Button_box)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_set_box)(fl_Check_Button win, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Check_Button_color)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_set_color)(fl_Check_Button win, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Check_Button_set_color_with_bg_sel)(fl_Check_Button win,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Check_Button_selection_color)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_set_selection_color)(fl_Check_Button win, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Check_Button_label)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_copy_label)(fl_Check_Button win, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Check_Button_set_label)(fl_Check_Button win, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Check_Button_labeltype)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_set_labeltype)(fl_Check_Button win, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Check_Button_labelcolor)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_set_labelcolor)(fl_Check_Button win, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Check_Button_labelfont)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_set_labelfont)(fl_Check_Button win, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Check_Button_labelsize)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_set_labelsize)(fl_Check_Button win, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Check_Button_image)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_set_image)(fl_Check_Button win, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Check_Button_deimage)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_set_deimage)(fl_Check_Button win, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Check_Button_tooltip)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_copy_tooltip)(fl_Check_Button win, const char* text);
-  FL_EXPORT_C(void,         Fl_Check_Button_set_tooltip)(fl_Check_Button win, const char* text);
-  FL_EXPORT_C(void,         Fl_Check_Button_set_callback_with_user_data)(fl_Check_Button win, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Check_Button_set_callback)(fl_Check_Button win, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Check_Button_user_data)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_set_user_data)(fl_Check_Button win, void* v);
-  FL_EXPORT_C(long,         Fl_Check_Button_argument)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_set_argument)(fl_Check_Button win, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Check_Button_when)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_set_when)(fl_Check_Button win, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Check_Button_visible)(fl_Check_Button win);
-  FL_EXPORT_C(int,          Fl_Check_Button_visible_r)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_set_visible)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_clear_visible)(fl_Check_Button win);
-  FL_EXPORT_C(unsigned int, Fl_Check_Button_active)(fl_Check_Button win);
-  FL_EXPORT_C(int,          Fl_Check_Button_active_r)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_activate)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_deactivate)(fl_Check_Button win);
-  FL_EXPORT_C(unsigned int, Fl_Check_Button_output)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_set_output)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_clear_output)(fl_Check_Button win);
-  FL_EXPORT_C(unsigned int, Fl_Check_Button_takesevents)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_set_changed)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_clear_changed)(fl_Check_Button win);
-  FL_EXPORT_C(int,          Fl_Check_Button_take_focus)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_set_visible_focus)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_clear_visible_focus)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_modify_visible_focus)(fl_Check_Button win, int v);
-  FL_EXPORT_C(unsigned int, Fl_Check_Button_visible_focus)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_do_callback)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_do_callback_with_widget_and_user_data)(fl_Check_Button win, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Check_Button_do_callback_with_widget_and_default_user_data)(fl_Check_Button win, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Check_Button_contains)(fl_Check_Button win, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Check_Button_inside)(fl_Check_Button win, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Check_Button_redraw)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_redraw_label)(fl_Check_Button win);
-  FL_EXPORT_C(uchar,        Fl_Check_Button_damage)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_clear_damage_with_bitmask)(fl_Check_Button win, uchar c);
-  FL_EXPORT_C(void,         Fl_Check_Button_clear_damage)(fl_Check_Button win);
-  FL_EXPORT_C(void,         Fl_Check_Button_damage_with_text)(fl_Check_Button win, uchar c);
-  FL_EXPORT_C(void,         Fl_Check_Button_damage_inside_widget)(fl_Check_Button win, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Check_Button_draw_label_with_xywh_alignment)(fl_Check_Button win, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Check_Button_measure_label)(fl_Check_Button win, int* ww , int* hh);
+  FL_EXPORT_C_HEADER(int,Fl_Check_Button_x,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(int,Fl_Check_Button_y,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(int,Fl_Check_Button_w,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(int,Fl_Check_Button_h,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_set_align,(fl_Check_Button check_button, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Check_Button_align,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Check_Button_box,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_set_box,(fl_Check_Button win, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Check_Button_color,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_set_color,(fl_Check_Button win, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_set_color_with_bg_sel,(fl_Check_Button win,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Check_Button_selection_color,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_set_selection_color,(fl_Check_Button win, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Check_Button_label,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_copy_label,(fl_Check_Button win, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_set_label,(fl_Check_Button win, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Check_Button_labeltype,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_set_labeltype,(fl_Check_Button win, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Check_Button_labelcolor,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_set_labelcolor,(fl_Check_Button win, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Check_Button_labelfont,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_set_labelfont,(fl_Check_Button win, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Check_Button_labelsize,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_set_labelsize,(fl_Check_Button win, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Check_Button_image,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_set_image,(fl_Check_Button win, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Check_Button_deimage,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_set_deimage,(fl_Check_Button win, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Check_Button_tooltip,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_copy_tooltip,(fl_Check_Button win, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_set_tooltip,(fl_Check_Button win, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_set_callback_with_user_data,(fl_Check_Button win, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_set_callback,(fl_Check_Button win, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Check_Button_user_data,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_set_user_data,(fl_Check_Button win, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Check_Button_argument,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_set_argument,(fl_Check_Button win, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Check_Button_when,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_set_when,(fl_Check_Button win, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Check_Button_visible,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(int,Fl_Check_Button_visible_r,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_set_visible,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_clear_visible,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Check_Button_active,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(int,Fl_Check_Button_active_r,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_activate,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_deactivate,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Check_Button_output,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_set_output,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_clear_output,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Check_Button_takesevents,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_set_changed,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_clear_changed,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(int,Fl_Check_Button_take_focus,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_set_visible_focus,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_clear_visible_focus,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_modify_visible_focus,(fl_Check_Button win, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Check_Button_visible_focus,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_do_callback,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_do_callback_with_widget_and_user_data,(fl_Check_Button win, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_do_callback_with_widget_and_default_user_data,(fl_Check_Button win, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Check_Button_contains,(fl_Check_Button win, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Check_Button_inside,(fl_Check_Button win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_redraw,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_redraw_label,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(uchar,Fl_Check_Button_damage,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_clear_damage_with_bitmask,(fl_Check_Button win, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_clear_damage,(fl_Check_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_damage_with_text,(fl_Check_Button win, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_damage_inside_widget,(fl_Check_Button win, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_draw_label_with_xywh_alignment,(fl_Check_Button win, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_measure_label,(fl_Check_Button win, int* ww , int* hh));
 
   /* Fl_Check_Button specific functions */
-  FL_EXPORT_C(fl_Check_Button, Fl_Check_Button_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Check_Button, Fl_Check_Button_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(void,            Fl_Check_Button_Destroy)(fl_Check_Button button);
+  FL_EXPORT_C_HEADER(fl_Check_Button,Fl_Check_Button_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Check_Button,Fl_Check_Button_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_Destroy,(fl_Check_Button button));
 
-  FL_EXPORT_C(char        , Fl_Check_Button_value)(fl_Check_Button b);
-  FL_EXPORT_C(int         , Fl_Check_Button_set_value)(fl_Check_Button b, int v);
-  FL_EXPORT_C(int         , Fl_Check_Button_set)(fl_Check_Button b);
-  FL_EXPORT_C(int         , Fl_Check_Button_clear)(fl_Check_Button b);
-  FL_EXPORT_C(void        , Fl_Check_Button_setonly)(fl_Check_Button b);
-  FL_EXPORT_C(int         , Fl_Check_Button_get_shortcut )(fl_Check_Button b);
-  FL_EXPORT_C(void        , Fl_Check_Button_set_shortcut )(fl_Check_Button b, int s);
-  FL_EXPORT_C(Fl_Boxtype  , Fl_Check_Button_down_box)(fl_Check_Button b);
-  FL_EXPORT_C(void        , Fl_Check_Button_set_down_box)(fl_Check_Button b,Fl_Boxtype boxtype);
-  FL_EXPORT_C(Fl_Color    , Fl_Check_Button_down_color )(fl_Check_Button b);
-  FL_EXPORT_C(void        , Fl_Check_Button_set_down_color)(fl_Check_Button b, Fl_Color c);
-  FL_EXPORT_C(fl_Check_Button,    Fl_OverriddenCheck_Button_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Check_Button,    Fl_OverriddenCheck_Button_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Check_Button_draw)(fl_Check_Button o);
-  FL_EXPORT_C(void, Fl_Check_Button_draw_super)(fl_Check_Button o);
-  FL_EXPORT_C(int, Fl_Check_Button_handle)(fl_Check_Button o, int event);
-  FL_EXPORT_C(int, Fl_Check_Button_handle_super)(fl_Check_Button o, int event);
-  FL_EXPORT_C(void, Fl_Check_Button_resize)(fl_Check_Button o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Check_Button_resize_super)(fl_Check_Button o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Check_Button_show)(fl_Check_Button o);
-  FL_EXPORT_C(void, Fl_Check_Button_show_super)(fl_Check_Button o);
-  FL_EXPORT_C(void, Fl_Check_Button_hide)(fl_Check_Button o);
-  FL_EXPORT_C(void, Fl_Check_Button_hide_super)(fl_Check_Button o);
+  FL_EXPORT_C_HEADER(char        ,Fl_Check_Button_value,(fl_Check_Button b));
+  FL_EXPORT_C_HEADER(int         ,Fl_Check_Button_set_value,(fl_Check_Button b, int v));
+  FL_EXPORT_C_HEADER(int         ,Fl_Check_Button_set,(fl_Check_Button b));
+  FL_EXPORT_C_HEADER(int         ,Fl_Check_Button_clear,(fl_Check_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Check_Button_setonly,(fl_Check_Button b));
+  FL_EXPORT_C_HEADER(int         ,Fl_Check_Button_get_shortcut ,(fl_Check_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Check_Button_set_shortcut ,(fl_Check_Button b, int s));
+  FL_EXPORT_C_HEADER(Fl_Boxtype  ,Fl_Check_Button_down_box,(fl_Check_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Check_Button_set_down_box,(fl_Check_Button b,Fl_Boxtype boxtype));
+  FL_EXPORT_C_HEADER(Fl_Color    ,Fl_Check_Button_down_color ,(fl_Check_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Check_Button_set_down_color,(fl_Check_Button b, Fl_Color c));
+  FL_EXPORT_C_HEADER(fl_Check_Button,Fl_OverriddenCheck_Button_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Check_Button,Fl_OverriddenCheck_Button_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_draw,(fl_Check_Button o));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_draw_super,(fl_Check_Button o));
+  FL_EXPORT_C_HEADER(int,Fl_Check_Button_handle,(fl_Check_Button o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Check_Button_handle_super,(fl_Check_Button o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_resize,(fl_Check_Button o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_resize_super,(fl_Check_Button o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_show,(fl_Check_Button o));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_show_super,(fl_Check_Button o));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_hide,(fl_Check_Button o));
+  FL_EXPORT_C_HEADER(void,Fl_Check_Button_hide_super,(fl_Check_Button o));
 
 #ifdef __cplusplus
 }
diff --git a/c-src/Fl_ChoiceC.h b/c-src/Fl_ChoiceC.h
--- a/c-src/Fl_ChoiceC.h
+++ b/c-src/Fl_ChoiceC.h
@@ -30,168 +30,168 @@
   };
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(fl_Group,     Fl_Choice_parent)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_set_parent)(fl_Choice choice, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Choice_type)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_set_type)(fl_Choice choice, uchar t);
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Choice_parent,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_set_parent,(fl_Choice choice, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Choice_type,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_set_type,(fl_Choice choice, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Choice_x)(fl_Choice choice);
-  FL_EXPORT_C(int,          Fl_Choice_y)(fl_Choice choice);
-  FL_EXPORT_C(int,          Fl_Choice_w)(fl_Choice choice);
-  FL_EXPORT_C(int,          Fl_Choice_h)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_set_align)(fl_Choice choice, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Choice_align)(fl_Choice choice);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Choice_box)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_set_box)(fl_Choice choice, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Choice_color)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_set_color)(fl_Choice choice, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Choice_set_color_with_bg_sel)(fl_Choice choice,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Choice_selection_color)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_set_selection_color)(fl_Choice choice, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Choice_label)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_copy_label)(fl_Choice choice, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Choice_set_label)(fl_Choice choice, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Choice_labeltype)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_set_labeltype)(fl_Choice choice, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Choice_labelcolor)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_set_labelcolor)(fl_Choice choice, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Choice_item_labelfont)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_set_item_labelfont)(fl_Choice choice, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Choice_item_labelsize)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_set_item_labelsize)(fl_Choice choice, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Choice_image)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_set_image)(fl_Choice choice, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Choice_deimage)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_set_deimage)(fl_Choice choice, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Choice_tooltip)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_copy_tooltip)(fl_Choice choice, const char* text);
-  FL_EXPORT_C(void,         Fl_Choice_set_tooltip)(fl_Choice choice, const char* text);
-  FL_EXPORT_C(void,         Fl_Choice_set_callback_with_user_data)(fl_Choice choice, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Choice_set_callback)(fl_Choice choice, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Choice_other_data)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_set_other_data)(fl_Choice choice, void* v);
-  FL_EXPORT_C(void*,        Fl_Choice_user_data)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_set_user_data)(fl_Choice choice, void* v);
-  FL_EXPORT_C(long,         Fl_Choice_argument)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_set_argument)(fl_Choice choice, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Choice_when)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_set_when)(fl_Choice choice, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Choice_visible)(fl_Choice choice);
-  FL_EXPORT_C(int,          Fl_Choice_visible_r)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_set_visible)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_clear_visible)(fl_Choice choice);
-  FL_EXPORT_C(unsigned int, Fl_Choice_active)(fl_Choice choice);
-  FL_EXPORT_C(int,          Fl_Choice_active_r)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_activate)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_deactivate)(fl_Choice choice);
-  FL_EXPORT_C(unsigned int, Fl_Choice_output)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_set_output)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_clear_output)(fl_Choice choice);
-  FL_EXPORT_C(unsigned int, Fl_Choice_takesevents)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_set_changed)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_clear_changed)(fl_Choice choice);
-  FL_EXPORT_C(int,          Fl_Choice_take_focus)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_set_visible_focus)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_clear_visible_focus)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_modify_visible_focus)(fl_Choice choice, int v);
-  FL_EXPORT_C(unsigned int, Fl_Choice_visible_focus)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_do_callback)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_do_callback_with_widget_and_user_data)(fl_Choice choice, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Choice_do_callback_with_widget_and_default_user_data)(fl_Choice choice, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Choice_contains)(fl_Choice choice, fl_Group w);
-  FL_EXPORT_C(int,          Fl_Choice_inside)(fl_Choice choice, fl_Group w);
-  FL_EXPORT_C(void,         Fl_Choice_redraw)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_redraw_label)(fl_Choice choice);
-  FL_EXPORT_C(uchar,        Fl_Choice_damage)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_clear_damage_with_bitmask)(fl_Choice choice, uchar c);
-  FL_EXPORT_C(void,         Fl_Choice_clear_damage)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_damage_with_text)(fl_Choice choice, uchar c);
-  FL_EXPORT_C(void,         Fl_Choice_damage_inside_group)(fl_Choice choice, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Choice_draw_label_with_xywh_alignment)(fl_Choice choice, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Choice_measure_label)(fl_Choice choice, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Choice_window)(fl_Choice choice);
-  FL_EXPORT_C(fl_Window,    Fl_Choice_top_window)(fl_Choice choice);
-  FL_EXPORT_C(fl_Window ,   Fl_Choice_top_window_offset)(fl_Choice choice, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Choice_as_group_super)(fl_Choice choice);
-  FL_EXPORT_C(fl_Group,     Fl_Choice_as_group)(fl_Choice choice);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Choice_as_gl_window_super)(fl_Choice choice);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Choice_as_gl_window)(fl_Choice choice);
-  FL_EXPORT_C(void,         Fl_Choice_resize_super)(fl_Choice choice,int X, int Y, int W, int H);
-  FL_EXPORT_C(void,         Fl_Choice_resize)(fl_Choice choice,int X, int Y, int W, int H);
+  FL_EXPORT_C_HEADER(int,Fl_Choice_x,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_y,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_w,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_h,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_set_align,(fl_Choice choice, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Choice_align,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Choice_box,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_set_box,(fl_Choice choice, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Choice_color,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_set_color,(fl_Choice choice, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_set_color_with_bg_sel,(fl_Choice choice,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Choice_selection_color,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_set_selection_color,(fl_Choice choice, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Choice_label,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_copy_label,(fl_Choice choice, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_set_label,(fl_Choice choice, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Choice_labeltype,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_set_labeltype,(fl_Choice choice, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Choice_labelcolor,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_set_labelcolor,(fl_Choice choice, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Choice_item_labelfont,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_set_item_labelfont,(fl_Choice choice, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Choice_item_labelsize,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_set_item_labelsize,(fl_Choice choice, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Choice_image,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_set_image,(fl_Choice choice, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Choice_deimage,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_set_deimage,(fl_Choice choice, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Choice_tooltip,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_copy_tooltip,(fl_Choice choice, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_set_tooltip,(fl_Choice choice, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_set_callback_with_user_data,(fl_Choice choice, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_set_callback,(fl_Choice choice, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Choice_other_data,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_set_other_data,(fl_Choice choice, void* v));
+  FL_EXPORT_C_HEADER(void*,Fl_Choice_user_data,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_set_user_data,(fl_Choice choice, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Choice_argument,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_set_argument,(fl_Choice choice, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Choice_when,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_set_when,(fl_Choice choice, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Choice_visible,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_visible_r,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_set_visible,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_clear_visible,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Choice_active,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_active_r,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_activate,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_deactivate,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Choice_output,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_set_output,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_clear_output,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Choice_takesevents,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_set_changed,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_clear_changed,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_take_focus,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_set_visible_focus,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_clear_visible_focus,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_modify_visible_focus,(fl_Choice choice, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Choice_visible_focus,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_do_callback,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_do_callback_with_widget_and_user_data,(fl_Choice choice, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_do_callback_with_widget_and_default_user_data,(fl_Choice choice, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_contains,(fl_Choice choice, fl_Group w));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_inside,(fl_Choice choice, fl_Group w));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_redraw,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_redraw_label,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(uchar,Fl_Choice_damage,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_clear_damage_with_bitmask,(fl_Choice choice, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_clear_damage,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_damage_with_text,(fl_Choice choice, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_damage_inside_group,(fl_Choice choice, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_draw_label_with_xywh_alignment,(fl_Choice choice, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_measure_label,(fl_Choice choice, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Choice_window,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Choice_top_window,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Choice_top_window_offset,(fl_Choice choice, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Choice_as_group_super,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Choice_as_group,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Choice_as_gl_window_super,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Choice_as_gl_window,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_resize_super,(fl_Choice choice,int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_resize,(fl_Choice choice,int X, int Y, int W, int H));
 
   /* Fl_Choice specific */
-  FL_EXPORT_C(fl_Choice,    Fl_Choice_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Choice   , Fl_Choice_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Choice_Destroy)(fl_Choice choice);
+  FL_EXPORT_C_HEADER(fl_Choice,Fl_Choice_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Choice   ,Fl_Choice_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_Destroy,(fl_Choice choice));
 
-  FL_EXPORT_C(int, Fl_Choice_item_pathname_with_finditem)(fl_Choice choice, char* name, int namelen,  fl_Menu_Item finditem);
-  FL_EXPORT_C(int, Fl_Choice_item_pathname)(fl_Choice choice, char* name, int namelen);
-  FL_EXPORT_C( fl_Menu_Item, Fl_Choice_picked)(fl_Choice choice,  const fl_Menu_Item item);
-  FL_EXPORT_C( fl_Menu_Item, Fl_Choice_find_item_with_name)(fl_Choice choice,  char* name);
+  FL_EXPORT_C_HEADER(int,Fl_Choice_item_pathname_with_finditem,(fl_Choice choice, char* name, int namelen,  fl_Menu_Item finditem));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_item_pathname,(fl_Choice choice, char* name, int namelen));
+  FL_EXPORT_C_HEADER( fl_Menu_Item,Fl_Choice_picked,(fl_Choice choice,  const fl_Menu_Item item));
+  FL_EXPORT_C_HEADER( fl_Menu_Item,Fl_Choice_find_item_with_name,(fl_Choice choice,  char* name));
   //  FL_EXPORT_C( fl_Menu_Item, Fl_Choice_find_item_with_cb)(fl_Choice choice, fl_Callback cb); Don't know how to do this
-  FL_EXPORT_C(int, Fl_Choice_find_index_with_name)(fl_Choice choice,  char* name);
-  FL_EXPORT_C(int, Fl_Choice_find_index_with_item)(fl_Choice choice,  fl_Menu_Item item);
+  FL_EXPORT_C_HEADER(int,Fl_Choice_find_index_with_name,(fl_Choice choice,  char* name));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_find_index_with_item,(fl_Choice choice,  fl_Menu_Item item));
   //  FL_EXPORT_C(int, Fl_Choice_find_index_with_cb)(fl_Choice choice, fl_Callback cb); Don't know how to do this
-  FL_EXPORT_C( fl_Menu_Item, Fl_Choice_test_shortcut)(fl_Choice choice);
-  FL_EXPORT_C(void, Fl_Choice_global)(fl_Choice choice);
-  FL_EXPORT_C( fl_Menu_Item, Fl_Choice_menu)(fl_Choice choice);
-  FL_EXPORT_C(void, Fl_Choice_menu_with_m)(fl_Choice choice,  fl_Menu_Item* item, int size);
-  FL_EXPORT_C(void, Fl_Choice_copy)(fl_Choice choice,  fl_Menu_Item m);
-  FL_EXPORT_C(void, Fl_Choice_copy_with_user_data)(fl_Choice choice,  fl_Menu_Item m, void* user_data);
-  FL_EXPORT_C(int, Fl_Choice_insert)(fl_Choice choice, int index,  char* name, int shortcut, fl_Callback cb);
-  FL_EXPORT_C(int, Fl_Choice_insert_with_user_data)(fl_Choice choice, int index,  char*, int shortcut, fl_Callback* cb, void* user_data);
-  FL_EXPORT_C(int, Fl_Choice_insert_with_flags)(fl_Choice choice, int index,  char* name, int shortcut, fl_Callback* cb, int flags);
-  FL_EXPORT_C(int, Fl_Choice_insert_with_user_data_flags)(fl_Choice choice, int index,  char* name, int shortcut, fl_Callback* cb, void* user_data, int flags);
-  FL_EXPORT_C(int, Fl_Choice_insert_with_shortcutname)(fl_Choice choice, int index,  char* name, char* shortcut);
-  FL_EXPORT_C(int, Fl_Choice_insert_with_shortcutname_user_data)(fl_Choice choice, int index,  char* name,   char* shortcut, fl_Callback* cb, void* user_data);
-  FL_EXPORT_C(int, Fl_Choice_insert_with_shortcutname_flags)(fl_Choice choice, int index,  char* name,   char* shortcut, fl_Callback* cb, int flags);
-  FL_EXPORT_C(int, Fl_Choice_insert_with_shortcutname_user_data_flags)(fl_Choice choice, int index,  char* name,   char* shortcut, fl_Callback* cb, void* user_data, int flags);
-  FL_EXPORT_C(int, Fl_Choice_add)(fl_Choice choice, char* name, int shortcut, fl_Callback);
-  FL_EXPORT_C(int, Fl_Choice_add_with_user_data)(fl_Choice choice, char* name, int shortcut, fl_Callback* cb, void* user_data);
-  FL_EXPORT_C(int, Fl_Choice_add_with_flags)(fl_Choice choice, char* name, int shortcut, fl_Callback* cb, int flags);
-  FL_EXPORT_C(int, Fl_Choice_add_with_user_data_flags)(fl_Choice choice, char* name, int shortcut, fl_Callback* cb, void* user_data, int flags);
-  FL_EXPORT_C(int, Fl_Choice_add_with_shortcutname)(fl_Choice choice, char* name,   char* shortcut, fl_Callback* cb);
-  FL_EXPORT_C(int, Fl_Choice_add_with_shortcutname_user_data)(fl_Choice choice, char* name,   char* shortcut, fl_Callback* cb, void* user_data);
-  FL_EXPORT_C(int, Fl_Choice_add_with_shortcutname_flags)(fl_Choice choice, char* name,   char* shortcut, fl_Callback* cb, int flags);
-  FL_EXPORT_C(int, Fl_Choice_add_with_shortcutname_user_data_flags)(fl_Choice choice, char* name,  char* shortcut, fl_Callback* cb, void* user_data, int flags);
-  FL_EXPORT_C(int, Fl_Choice_add_with_name)(fl_Choice choice,  char* name);
-  FL_EXPORT_C(int , Fl_Choice_size)(fl_Choice choice);
-  FL_EXPORT_C(void, Fl_Choice_set_size)(fl_Choice choice, int W, int H);
-  FL_EXPORT_C(void, Fl_Choice_clear)(fl_Choice choice);
-  FL_EXPORT_C(int, Fl_Choice_clear_submenu)(fl_Choice choice, int index);
-  FL_EXPORT_C(void, Fl_Choice_replace)(fl_Choice choice, int, char* name);
-  FL_EXPORT_C(void, Fl_Choice_remove)(fl_Choice choice, int);
-  FL_EXPORT_C(void, Fl_Choice_shortcut)(fl_Choice choice, int i, int s);
-  FL_EXPORT_C(void, Fl_Choice_set_mode)(fl_Choice choice, int i,int fl);
-  FL_EXPORT_C(int , Fl_Choice_mode)(fl_Choice choice, int i);
-  FL_EXPORT_C(fl_Menu_Item, Fl_Choice_mvalue)(fl_Choice choice);
-  FL_EXPORT_C(int, Fl_Choice_value)(fl_Choice choice);
-  FL_EXPORT_C(int, Fl_Choice_set_value_with_item)(fl_Choice choice,  fl_Menu_Item item);
-  FL_EXPORT_C(int, Fl_Choice_set_value_with_index)(fl_Choice choice, int index);
-  FL_EXPORT_C(char*, Fl_Choice_text)(fl_Choice choice);
-  FL_EXPORT_C(char*, Fl_Choice_text_with_index)(fl_Choice choice, int i);
-  FL_EXPORT_C(Fl_Font, Fl_Choice_textfont)(fl_Choice choice);
-  FL_EXPORT_C(void, Fl_Choice_set_textfont)(fl_Choice choice, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize, Fl_Choice_textsize)(fl_Choice choice);
-  FL_EXPORT_C(void, Fl_Choice_set_textsize)(fl_Choice choice, Fl_Fontsize c);
-  FL_EXPORT_C(Fl_Color, Fl_Choice_textcolor)(fl_Choice choice);
-  FL_EXPORT_C(void, Fl_Choice_set_textcolor)(fl_Choice choice, Fl_Color c);
-  FL_EXPORT_C(Fl_Boxtype, Fl_Choice_down_box)(fl_Choice choice);
-  FL_EXPORT_C(void, Fl_Choice_set_down_box)(fl_Choice choice, Fl_Boxtype b);
-  FL_EXPORT_C(Fl_Color, Fl_Choice_down_color)(fl_Choice choice);
-  FL_EXPORT_C(void, Fl_Choice_set_down_color)(fl_Choice choice, unsigned c);
-  FL_EXPORT_C(fl_Choice,    Fl_OverriddenChoice_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Choice,    Fl_OverriddenChoice_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Choice_draw)(fl_Choice o);
-  FL_EXPORT_C(void, Fl_Choice_draw_super)(fl_Choice o);
-  FL_EXPORT_C(int, Fl_Choice_handle)(fl_Choice o, int event);
-  FL_EXPORT_C(int, Fl_Choice_handle_super)(fl_Choice o, int event);
-  FL_EXPORT_C(void, Fl_Choice_resize)(fl_Choice o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Choice_resize_super)(fl_Choice o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Choice_show)(fl_Choice o);
-  FL_EXPORT_C(void, Fl_Choice_show_super)(fl_Choice o);
-  FL_EXPORT_C(void, Fl_Choice_hide)(fl_Choice o);
-  FL_EXPORT_C(void, Fl_Choice_hide_super)(fl_Choice o);
+  FL_EXPORT_C_HEADER( fl_Menu_Item,Fl_Choice_test_shortcut,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_global,(fl_Choice choice));
+  FL_EXPORT_C_HEADER( fl_Menu_Item,Fl_Choice_menu,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_menu_with_m,(fl_Choice choice,  fl_Menu_Item* item, int size));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_copy,(fl_Choice choice,  fl_Menu_Item m));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_copy_with_user_data,(fl_Choice choice,  fl_Menu_Item m, void* user_data));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_insert,(fl_Choice choice, int index,  char* name, int shortcut, fl_Callback cb));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_insert_with_user_data,(fl_Choice choice, int index,  char*, int shortcut, fl_Callback* cb, void* user_data));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_insert_with_flags,(fl_Choice choice, int index,  char* name, int shortcut, fl_Callback* cb, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_insert_with_user_data_flags,(fl_Choice choice, int index,  char* name, int shortcut, fl_Callback* cb, void* user_data, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_insert_with_shortcutname,(fl_Choice choice, int index,  char* name, char* shortcut));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_insert_with_shortcutname_user_data,(fl_Choice choice, int index,  char* name,   char* shortcut, fl_Callback* cb, void* user_data));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_insert_with_shortcutname_flags,(fl_Choice choice, int index,  char* name,   char* shortcut, fl_Callback* cb, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_insert_with_shortcutname_user_data_flags,(fl_Choice choice, int index,  char* name,   char* shortcut, fl_Callback* cb, void* user_data, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_add,(fl_Choice choice, char* name, int shortcut, fl_Callback));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_add_with_user_data,(fl_Choice choice, char* name, int shortcut, fl_Callback* cb, void* user_data));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_add_with_flags,(fl_Choice choice, char* name, int shortcut, fl_Callback* cb, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_add_with_user_data_flags,(fl_Choice choice, char* name, int shortcut, fl_Callback* cb, void* user_data, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_add_with_shortcutname,(fl_Choice choice, char* name,   char* shortcut, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_add_with_shortcutname_user_data,(fl_Choice choice, char* name,   char* shortcut, fl_Callback* cb, void* user_data));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_add_with_shortcutname_flags,(fl_Choice choice, char* name,   char* shortcut, fl_Callback* cb, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_add_with_shortcutname_user_data_flags,(fl_Choice choice, char* name,  char* shortcut, fl_Callback* cb, void* user_data, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_add_with_name,(fl_Choice choice,  char* name));
+  FL_EXPORT_C_HEADER(int ,Fl_Choice_size,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_set_size,(fl_Choice choice, int W, int H));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_clear,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_clear_submenu,(fl_Choice choice, int index));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_replace,(fl_Choice choice, int, char* name));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_remove,(fl_Choice choice, int));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_shortcut,(fl_Choice choice, int i, int s));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_set_mode,(fl_Choice choice, int i,int fl));
+  FL_EXPORT_C_HEADER(int ,Fl_Choice_mode,(fl_Choice choice, int i));
+  FL_EXPORT_C_HEADER(fl_Menu_Item,Fl_Choice_mvalue,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_value,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_set_value_with_item,(fl_Choice choice,  fl_Menu_Item item));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_set_value_with_index,(fl_Choice choice, int index));
+  FL_EXPORT_C_HEADER(char*,Fl_Choice_text,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(char*,Fl_Choice_text_with_index,(fl_Choice choice, int i));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Choice_textfont,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_set_textfont,(fl_Choice choice, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Choice_textsize,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_set_textsize,(fl_Choice choice, Fl_Fontsize c));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Choice_textcolor,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_set_textcolor,(fl_Choice choice, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Choice_down_box,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_set_down_box,(fl_Choice choice, Fl_Boxtype b));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Choice_down_color,(fl_Choice choice));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_set_down_color,(fl_Choice choice, unsigned c));
+  FL_EXPORT_C_HEADER(fl_Choice,Fl_OverriddenChoice_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Choice,Fl_OverriddenChoice_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_draw,(fl_Choice o));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_draw_super,(fl_Choice o));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_handle,(fl_Choice o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Choice_handle_super,(fl_Choice o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_resize,(fl_Choice o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_resize_super,(fl_Choice o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_show,(fl_Choice o));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_show_super,(fl_Choice o));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_hide,(fl_Choice o));
+  FL_EXPORT_C_HEADER(void,Fl_Choice_hide_super,(fl_Choice o));
 
 #ifdef __cplusplus
 }
diff --git a/c-src/Fl_ClockC.h b/c-src/Fl_ClockC.h
--- a/c-src/Fl_ClockC.h
+++ b/c-src/Fl_ClockC.h
@@ -34,110 +34,110 @@
 #define FL_ANALOG_CLOCK FL_SQUARE_CLOCK
 #define FL_DIGITAL_CLOCK FL_SQUARE_CLOCK
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(fl_Group,     Fl_Clock_parent)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_set_parent)(fl_Clock clock, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Clock_type)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_set_type)(fl_Clock clock, uchar t);
-  FL_EXPORT_C(int,          Fl_Clock_x)(fl_Clock clock);
-  FL_EXPORT_C(int,          Fl_Clock_y)(fl_Clock clock);
-  FL_EXPORT_C(int,          Fl_Clock_w)(fl_Clock clock);
-  FL_EXPORT_C(int,          Fl_Clock_h)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_set_align)(fl_Clock clock, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Clock_align)(fl_Clock clock);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Clock_box)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_set_box)(fl_Clock clock, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Clock_color)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_set_color)(fl_Clock clock, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Clock_set_color_with_bg_sel)(fl_Clock clock,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Clock_selection_color)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_set_selection_color)(fl_Clock clock, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Clock_label)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_copy_label)(fl_Clock clock, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Clock_set_label)(fl_Clock clock, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Clock_labeltype)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_set_labeltype)(fl_Clock clock, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Clock_labelcolor)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_set_labelcolor)(fl_Clock clock, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Clock_labelfont)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_set_labelfont)(fl_Clock clock, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Clock_labelsize)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_set_labelsize)(fl_Clock clock, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Clock_image)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_set_image)(fl_Clock clock, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Clock_deimage)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_set_deimage)(fl_Clock clock, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Clock_tooltip)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_copy_tooltip)(fl_Clock clock, const char* text);
-  FL_EXPORT_C(void,         Fl_Clock_set_tooltip)(fl_Clock clock, const char* text);
-  FL_EXPORT_C(void,         Fl_Clock_set_callback_with_user_data)(fl_Clock clock, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Clock_set_callback)(fl_Clock clock, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Clock_user_data)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_set_user_data)(fl_Clock clock, void* v);
-  FL_EXPORT_C(long,         Fl_Clock_argument)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_set_argument)(fl_Clock clock, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Clock_when)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_set_when)(fl_Clock clock, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Clock_visible)(fl_Clock clock);
-  FL_EXPORT_C(int,          Fl_Clock_visible_r)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_set_visible)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_clear_visible)(fl_Clock clock);
-  FL_EXPORT_C(unsigned int, Fl_Clock_active)(fl_Clock clock);
-  FL_EXPORT_C(int,          Fl_Clock_active_r)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_activate)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_deactivate)(fl_Clock clock);
-  FL_EXPORT_C(unsigned int, Fl_Clock_output)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_set_output)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_clear_output)(fl_Clock clock);
-  FL_EXPORT_C(unsigned int, Fl_Clock_takesevents)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_set_changed)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_clear_changed)(fl_Clock clock);
-  FL_EXPORT_C(int,          Fl_Clock_take_focus)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_set_visible_focus)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_clear_visible_focus)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_modify_visible_focus)(fl_Clock clock, int v);
-  FL_EXPORT_C(unsigned int, Fl_Clock_visible_focus)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_do_callback)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_do_callback_with_widget_and_user_data)(fl_Clock clock, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Clock_do_callback_with_widget_and_default_user_data)(fl_Clock clock, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Clock_contains)(fl_Clock clock, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Clock_inside)(fl_Clock clock, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Clock_redraw)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_redraw_label)(fl_Clock clock);
-  FL_EXPORT_C(uchar,        Fl_Clock_damage)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_clear_damage_with_bitmask)(fl_Clock clock, uchar c);
-  FL_EXPORT_C(void,         Fl_Clock_clear_damage)(fl_Clock clock);
-  FL_EXPORT_C(void,         Fl_Clock_damage_with_text)(fl_Clock clock, uchar c);
-  FL_EXPORT_C(void,         Fl_Clock_damage_inside_widget)(fl_Clock clock, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Clock_draw_label_with_xywh_alignment)(fl_Clock clock, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Clock_measure_label)(fl_Clock clock, int* ww , int* hh);
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Clock_parent,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_set_parent,(fl_Clock clock, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Clock_type,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_set_type,(fl_Clock clock, uchar t));
+  FL_EXPORT_C_HEADER(int,Fl_Clock_x,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(int,Fl_Clock_y,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(int,Fl_Clock_w,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(int,Fl_Clock_h,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_set_align,(fl_Clock clock, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Clock_align,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Clock_box,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_set_box,(fl_Clock clock, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Clock_color,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_set_color,(fl_Clock clock, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_set_color_with_bg_sel,(fl_Clock clock,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Clock_selection_color,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_set_selection_color,(fl_Clock clock, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Clock_label,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_copy_label,(fl_Clock clock, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_set_label,(fl_Clock clock, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Clock_labeltype,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_set_labeltype,(fl_Clock clock, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Clock_labelcolor,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_set_labelcolor,(fl_Clock clock, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Clock_labelfont,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_set_labelfont,(fl_Clock clock, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Clock_labelsize,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_set_labelsize,(fl_Clock clock, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Clock_image,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_set_image,(fl_Clock clock, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Clock_deimage,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_set_deimage,(fl_Clock clock, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Clock_tooltip,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_copy_tooltip,(fl_Clock clock, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_set_tooltip,(fl_Clock clock, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_set_callback_with_user_data,(fl_Clock clock, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_set_callback,(fl_Clock clock, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Clock_user_data,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_set_user_data,(fl_Clock clock, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Clock_argument,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_set_argument,(fl_Clock clock, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Clock_when,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_set_when,(fl_Clock clock, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Clock_visible,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(int,Fl_Clock_visible_r,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_set_visible,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_clear_visible,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Clock_active,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(int,Fl_Clock_active_r,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_activate,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_deactivate,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Clock_output,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_set_output,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_clear_output,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Clock_takesevents,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_set_changed,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_clear_changed,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(int,Fl_Clock_take_focus,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_set_visible_focus,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_clear_visible_focus,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_modify_visible_focus,(fl_Clock clock, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Clock_visible_focus,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_do_callback,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_do_callback_with_widget_and_user_data,(fl_Clock clock, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_do_callback_with_widget_and_default_user_data,(fl_Clock clock, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Clock_contains,(fl_Clock clock, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Clock_inside,(fl_Clock clock, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_redraw,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_redraw_label,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(uchar,Fl_Clock_damage,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_clear_damage_with_bitmask,(fl_Clock clock, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_clear_damage,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_damage_with_text,(fl_Clock clock, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_damage_inside_widget,(fl_Clock clock, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_draw_label_with_xywh_alignment,(fl_Clock clock, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_measure_label,(fl_Clock clock, int* ww , int* hh));
 
-  FL_EXPORT_C(fl_Window,    Fl_Clock_window)(fl_Clock clock);
-  FL_EXPORT_C(fl_Window,    Fl_Clock_top_window)(fl_Clock clock);
-  FL_EXPORT_C(fl_Window ,   Fl_Clock_top_window_offset)(fl_Clock clock, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Clock_as_group)(fl_Clock clock);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Clock_as_gl_window)(fl_Clock clock);
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Clock_window,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Clock_top_window,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Clock_top_window_offset,(fl_Clock clock, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Clock_as_group,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Clock_as_gl_window,(fl_Clock clock));
   /* Fl_Clock specific functions */
-  FL_EXPORT_C(fl_Clock,    Fl_Clock_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Clock,    Fl_Clock_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(fl_Clock,    Fl_Clock_New_WithClockType)(uchar t, int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(void, Fl_Clock_set_value)(fl_Clock clock, ulong v);
-  FL_EXPORT_C(void, Fl_Clock_set_value_with_hms)(fl_Clock clock, int H, int m, int s);
-  FL_EXPORT_C(ulong, Fl_Clock_value)(fl_Clock clock);
-  FL_EXPORT_C(int, Fl_Clock_hour)(fl_Clock clock);
-  FL_EXPORT_C(int, Fl_Clock_minute)(fl_Clock clock);
-  FL_EXPORT_C(int, Fl_Clock_second)(fl_Clock clock);
-  FL_EXPORT_C(fl_Clock,    Fl_OverriddenClock_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Clock,    Fl_OverriddenClock_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Clock_draw)(fl_Clock o);
-  FL_EXPORT_C(void, Fl_Clock_draw_super)(fl_Clock o);
-  FL_EXPORT_C(int, Fl_Clock_handle)(fl_Clock o, int event);
-  FL_EXPORT_C(int, Fl_Clock_handle_super)(fl_Clock o, int event);
-  FL_EXPORT_C(void, Fl_Clock_resize)(fl_Clock o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Clock_resize_super)(fl_Clock o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Clock_show)(fl_Clock o);
-  FL_EXPORT_C(void, Fl_Clock_show_super)(fl_Clock o);
-  FL_EXPORT_C(void, Fl_Clock_hide)(fl_Clock o);
-  FL_EXPORT_C(void, Fl_Clock_hide_super)(fl_Clock o);
+  FL_EXPORT_C_HEADER(fl_Clock,Fl_Clock_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Clock,Fl_Clock_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(fl_Clock,Fl_Clock_New_WithClockType,(uchar t, int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_set_value,(fl_Clock clock, ulong v));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_set_value_with_hms,(fl_Clock clock, int H, int m, int s));
+  FL_EXPORT_C_HEADER(ulong,Fl_Clock_value,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(int,Fl_Clock_hour,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(int,Fl_Clock_minute,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(int,Fl_Clock_second,(fl_Clock clock));
+  FL_EXPORT_C_HEADER(fl_Clock,Fl_OverriddenClock_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Clock,Fl_OverriddenClock_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_draw,(fl_Clock o));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_draw_super,(fl_Clock o));
+  FL_EXPORT_C_HEADER(int,Fl_Clock_handle,(fl_Clock o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Clock_handle_super,(fl_Clock o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_resize,(fl_Clock o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_resize_super,(fl_Clock o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_show,(fl_Clock o));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_show_super,(fl_Clock o));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_hide,(fl_Clock o));
+  FL_EXPORT_C_HEADER(void,Fl_Clock_hide_super,(fl_Clock o));
 
 #ifdef __cplusplus
 }
diff --git a/c-src/Fl_Color_ChooserC.h b/c-src/Fl_Color_ChooserC.h
--- a/c-src/Fl_Color_ChooserC.h
+++ b/c-src/Fl_Color_ChooserC.h
@@ -29,153 +29,153 @@
   };
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,          Fl_Color_Chooser_handle)(fl_Color_Chooser color_chooser, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Color_Chooser_parent)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_set_parent)(fl_Color_Chooser color_chooser, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Color_Chooser_type)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_set_type)(fl_Color_Chooser color_chooser, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Color_Chooser_handle,(fl_Color_Chooser color_chooser, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Color_Chooser_parent,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_set_parent,(fl_Color_Chooser color_chooser, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Color_Chooser_type,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_set_type,(fl_Color_Chooser color_chooser, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Color_Chooser_x)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(int,          Fl_Color_Chooser_y)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(int,          Fl_Color_Chooser_w)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(int,          Fl_Color_Chooser_h)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_set_align)(fl_Color_Chooser color_chooser, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Color_Chooser_align)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Color_Chooser_box)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_set_box)(fl_Color_Chooser color_chooser, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Color_Chooser_color)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_set_color)(fl_Color_Chooser color_chooser, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_set_color_with_bg_sel)(fl_Color_Chooser color_chooser,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Color_Chooser_selection_color)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_set_selection_color)(fl_Color_Chooser color_chooser, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Color_Chooser_label)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_copy_label)(fl_Color_Chooser color_chooser, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_set_label)(fl_Color_Chooser color_chooser, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Color_Chooser_labeltype)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_set_labeltype)(fl_Color_Chooser color_chooser, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Color_Chooser_labelcolor)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_set_labelcolor)(fl_Color_Chooser color_chooser, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Color_Chooser_item_labelfont)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_set_item_labelfont)(fl_Color_Chooser color_chooser, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Color_Chooser_item_labelsize)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_set_item_labelsize)(fl_Color_Chooser color_chooser, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Color_Chooser_image)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_set_image)(fl_Color_Chooser color_chooser, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Color_Chooser_deimage)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_set_deimage)(fl_Color_Chooser color_chooser, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Color_Chooser_tooltip)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_copy_tooltip)(fl_Color_Chooser color_chooser, const char* text);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_set_tooltip)(fl_Color_Chooser color_chooser, const char* text);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_set_callback_with_user_data)(fl_Color_Chooser color_chooser, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_set_callback)(fl_Color_Chooser color_chooser, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Color_Chooser_other_data)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_set_other_data)(fl_Color_Chooser color_chooser, void* v);
-  FL_EXPORT_C(void*,        Fl_Color_Chooser_user_data)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_set_user_data)(fl_Color_Chooser color_chooser, void* v);
-  FL_EXPORT_C(long,         Fl_Color_Chooser_argument)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_set_argument)(fl_Color_Chooser color_chooser, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Color_Chooser_when)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_set_when)(fl_Color_Chooser color_chooser, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Color_Chooser_visible)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(int,          Fl_Color_Chooser_visible_r)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_show_super)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_show)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_hide_super)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_hide)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_set_visible)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_clear_visible)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(unsigned int, Fl_Color_Chooser_active)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(int,          Fl_Color_Chooser_active_r)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_activate)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_deactivate)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(unsigned int, Fl_Color_Chooser_output)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_set_output)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_clear_output)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(unsigned int, Fl_Color_Chooser_takesevents)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_set_changed)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_clear_changed)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(int,          Fl_Color_Chooser_take_focus)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_set_visible_focus)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_clear_visible_focus)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_modify_visible_focus)(fl_Color_Chooser color_chooser, int v);
-  FL_EXPORT_C(unsigned int, Fl_Color_Chooser_visible_focus)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(int,          Fl_Color_Chooser_contains)(fl_Color_Chooser color_chooser, fl_Group w);
-  FL_EXPORT_C(int,          Fl_Color_Chooser_inside)(fl_Color_Chooser color_chooser, fl_Group w);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_redraw)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_redraw_label)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(uchar,        Fl_Color_Chooser_damage)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_clear_damage_with_bitmask)(fl_Color_Chooser color_chooser, uchar c);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_clear_damage)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_damage_with_text)(fl_Color_Chooser color_chooser, uchar c);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_damage_inside_group)(fl_Color_Chooser color_chooser, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_draw_label_with_xywh_alignment)(fl_Color_Chooser color_chooser, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_measure_label)(fl_Color_Chooser color_chooser, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Color_Chooser_window)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(fl_Window,    Fl_Color_Chooser_top_window)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(fl_Window ,   Fl_Color_Chooser_top_window_offset)(fl_Color_Chooser color_chooser, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Color_Chooser_as_group_super)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(fl_Group,     Fl_Color_Chooser_as_group)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Color_Chooser_as_gl_window_super)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Color_Chooser_as_gl_window)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_resize_super)(fl_Color_Chooser color_chooser,int X, int Y, int W, int H);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_resize)(fl_Color_Chooser color_chooser,int X, int Y, int W, int H);
+  FL_EXPORT_C_HEADER(int,Fl_Color_Chooser_x,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(int,Fl_Color_Chooser_y,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(int,Fl_Color_Chooser_w,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(int,Fl_Color_Chooser_h,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_set_align,(fl_Color_Chooser color_chooser, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Color_Chooser_align,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Color_Chooser_box,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_set_box,(fl_Color_Chooser color_chooser, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Color_Chooser_color,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_set_color,(fl_Color_Chooser color_chooser, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_set_color_with_bg_sel,(fl_Color_Chooser color_chooser,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Color_Chooser_selection_color,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_set_selection_color,(fl_Color_Chooser color_chooser, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Color_Chooser_label,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_copy_label,(fl_Color_Chooser color_chooser, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_set_label,(fl_Color_Chooser color_chooser, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Color_Chooser_labeltype,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_set_labeltype,(fl_Color_Chooser color_chooser, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Color_Chooser_labelcolor,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_set_labelcolor,(fl_Color_Chooser color_chooser, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Color_Chooser_item_labelfont,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_set_item_labelfont,(fl_Color_Chooser color_chooser, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Color_Chooser_item_labelsize,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_set_item_labelsize,(fl_Color_Chooser color_chooser, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Color_Chooser_image,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_set_image,(fl_Color_Chooser color_chooser, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Color_Chooser_deimage,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_set_deimage,(fl_Color_Chooser color_chooser, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Color_Chooser_tooltip,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_copy_tooltip,(fl_Color_Chooser color_chooser, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_set_tooltip,(fl_Color_Chooser color_chooser, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_set_callback_with_user_data,(fl_Color_Chooser color_chooser, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_set_callback,(fl_Color_Chooser color_chooser, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Color_Chooser_other_data,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_set_other_data,(fl_Color_Chooser color_chooser, void* v));
+  FL_EXPORT_C_HEADER(void*,Fl_Color_Chooser_user_data,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_set_user_data,(fl_Color_Chooser color_chooser, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Color_Chooser_argument,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_set_argument,(fl_Color_Chooser color_chooser, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Color_Chooser_when,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_set_when,(fl_Color_Chooser color_chooser, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Color_Chooser_visible,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(int,Fl_Color_Chooser_visible_r,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_show_super,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_show,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_hide_super,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_hide,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_set_visible,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_clear_visible,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Color_Chooser_active,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(int,Fl_Color_Chooser_active_r,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_activate,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_deactivate,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Color_Chooser_output,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_set_output,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_clear_output,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Color_Chooser_takesevents,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_set_changed,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_clear_changed,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(int,Fl_Color_Chooser_take_focus,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_set_visible_focus,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_clear_visible_focus,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_modify_visible_focus,(fl_Color_Chooser color_chooser, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Color_Chooser_visible_focus,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(int,Fl_Color_Chooser_contains,(fl_Color_Chooser color_chooser, fl_Group w));
+  FL_EXPORT_C_HEADER(int,Fl_Color_Chooser_inside,(fl_Color_Chooser color_chooser, fl_Group w));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_redraw,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_redraw_label,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(uchar,Fl_Color_Chooser_damage,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_clear_damage_with_bitmask,(fl_Color_Chooser color_chooser, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_clear_damage,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_damage_with_text,(fl_Color_Chooser color_chooser, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_damage_inside_group,(fl_Color_Chooser color_chooser, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_draw_label_with_xywh_alignment,(fl_Color_Chooser color_chooser, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_measure_label,(fl_Color_Chooser color_chooser, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Color_Chooser_window,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Color_Chooser_top_window,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Color_Chooser_top_window_offset,(fl_Color_Chooser color_chooser, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Color_Chooser_as_group_super,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Color_Chooser_as_group,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Color_Chooser_as_gl_window_super,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Color_Chooser_as_gl_window,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_resize_super,(fl_Color_Chooser color_chooser,int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_resize,(fl_Color_Chooser color_chooser,int X, int Y, int W, int H));
 
   /* Fl_Color_Chooser specific */
-  FL_EXPORT_C(void,         Fl_Color_Chooser_begin)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_end)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(int,          Fl_Color_Chooser_find)(fl_Color_Chooser color_chooser, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_add)(fl_Color_Chooser color_chooser, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_insert)(fl_Color_Chooser color_chooser, fl_Widget w, int i);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_remove_index)(fl_Color_Chooser color_chooser, int index);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_remove_widget)(fl_Color_Chooser color_chooser, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_clear)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_set_resizable_by_reference)(fl_Color_Chooser color_chooser,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_set_resizable)(fl_Color_Chooser color_chooser,fl_Widget o);
-  FL_EXPORT_C(fl_Widget,    Fl_Color_Chooser_resizable)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_add_resizable)(fl_Color_Chooser color_chooser,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_init_sizes)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(int,          Fl_Color_Chooser_children)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_set_clip_children)(fl_Color_Chooser color_chooser,int c);
-  FL_EXPORT_C(unsigned int, Fl_Color_Chooser_clip_children)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_focus)(fl_Color_Chooser color_chooser,fl_Widget W);
-  FL_EXPORT_C(fl_Widget,    Fl_Color_Chooser__ddfdesign_kludge)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,         Fl_Color_Chooser_insert_with_before)(fl_Color_Chooser color_chooser, fl_Widget w, fl_Widget before);
-  FL_EXPORT_C(fl_Widget*,   Fl_Color_Chooser_array)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(fl_Widget,    Fl_Color_Chooser_child)(fl_Color_Chooser color_chooser, int n);
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_begin,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_end,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(int,Fl_Color_Chooser_find,(fl_Color_Chooser color_chooser, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_add,(fl_Color_Chooser color_chooser, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_insert,(fl_Color_Chooser color_chooser, fl_Widget w, int i));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_remove_index,(fl_Color_Chooser color_chooser, int index));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_remove_widget,(fl_Color_Chooser color_chooser, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_clear,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_set_resizable_by_reference,(fl_Color_Chooser color_chooser,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_set_resizable,(fl_Color_Chooser color_chooser,fl_Widget o));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Color_Chooser_resizable,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_add_resizable,(fl_Color_Chooser color_chooser,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_init_sizes,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(int,Fl_Color_Chooser_children,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_set_clip_children,(fl_Color_Chooser color_chooser,int c));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Color_Chooser_clip_children,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_focus,(fl_Color_Chooser color_chooser,fl_Widget W));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Color_Chooser__ddfdesign_kludge,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_insert_with_before,(fl_Color_Chooser color_chooser, fl_Widget w, fl_Widget before));
+  FL_EXPORT_C_HEADER(fl_Widget*,Fl_Color_Chooser_array,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Color_Chooser_child,(fl_Color_Chooser color_chooser, int n));
 
-  FL_EXPORT_C(int,Fl_Color_Chooser_mode)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(void,Fl_Color_Chooser_set_mode)(fl_Color_Chooser color_chooser,int newMode);
-  FL_EXPORT_C(double,Fl_Color_Chooser_hue)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(double,Fl_Color_Chooser_saturation)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(double,Fl_Color_Chooser_value)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(double,Fl_Color_Chooser_r)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(double,Fl_Color_Chooser_g)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(double,Fl_Color_Chooser_b)(fl_Color_Chooser color_chooser);
-  FL_EXPORT_C(int,Fl_Color_Chooser_hsv)(fl_Color_Chooser color_chooser,double H, double S, double V);
-  FL_EXPORT_C(int,Fl_Color_Chooser_rgb)(fl_Color_Chooser color_chooser,double R, double G, double B);
-  FL_EXPORT_C(void,Fl_Color_Chooser_hsv2rgb)(double H, double S, double V, double* R, double* G, double* B);
-  FL_EXPORT_C(void,Fl_Color_Chooser_rgb2hsv)(double R, double G, double B, double* H, double* S, double* V);
-  FL_EXPORT_C(fl_Color_Chooser,Fl_Color_Chooser_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(fl_Color_Chooser,Fl_Color_Chooser_New_WithLabel)(int x, int y, int w, int h, const char* t);
-  FL_EXPORT_C(int, flc_color_chooser)(const char* name, double* r, double* g, double* b);
-  FL_EXPORT_C(fl_Color_Chooser,    Fl_Color_Chooser_New)(int X, int Y, int W, int H);
-  FL_EXPORT_C(fl_Color_Chooser,    Fl_Color_Chooser_New_WithLabel)(int X, int Y, int W, int H, const char* label);
-  FL_EXPORT_C(fl_Color_Chooser,    Fl_OverriddenColor_Chooser_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Color_Chooser,    Fl_OverriddenColor_Chooser_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
+  FL_EXPORT_C_HEADER(int,Fl_Color_Chooser_mode,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_set_mode,(fl_Color_Chooser color_chooser,int newMode));
+  FL_EXPORT_C_HEADER(double,Fl_Color_Chooser_hue,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(double,Fl_Color_Chooser_saturation,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(double,Fl_Color_Chooser_value,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(double,Fl_Color_Chooser_r,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(double,Fl_Color_Chooser_g,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(double,Fl_Color_Chooser_b,(fl_Color_Chooser color_chooser));
+  FL_EXPORT_C_HEADER(int,Fl_Color_Chooser_hsv,(fl_Color_Chooser color_chooser,double H, double S, double V));
+  FL_EXPORT_C_HEADER(int,Fl_Color_Chooser_rgb,(fl_Color_Chooser color_chooser,double R, double G, double B));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_hsv2rgb,(double H, double S, double V, double* R, double* G, double* B));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_rgb2hsv,(double R, double G, double B, double* H, double* S, double* V));
+  FL_EXPORT_C_HEADER(fl_Color_Chooser,Fl_Color_Chooser_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(fl_Color_Chooser,Fl_Color_Chooser_New_WithLabel,(int x, int y, int w, int h, const char* t));
+  FL_EXPORT_C_HEADER(int,flc_color_chooser,(const char* name, double* r, double* g, double* b));
+  FL_EXPORT_C_HEADER(fl_Color_Chooser,Fl_Color_Chooser_New,(int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(fl_Color_Chooser,Fl_Color_Chooser_New_WithLabel,(int X, int Y, int W, int H, const char* label));
+  FL_EXPORT_C_HEADER(fl_Color_Chooser,Fl_OverriddenColor_Chooser_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Color_Chooser,Fl_OverriddenColor_Chooser_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
 
-  FL_EXPORT_C(int, flc_color_chooser_with_m)(const char* name, double* r, double* g, double* b, int m);
-  FL_EXPORT_C(int, flc_color_chooser_with_uchar)(const char* name, uchar* r, uchar* g, uchar* b);
-  FL_EXPORT_C(int, flc_color_chooser_with_uchar_m)(const char* name, uchar* r, uchar* g, uchar* b, int m);
-  FL_EXPORT_C(void, Fl_Color_Chooser_draw)(fl_Color_Chooser o);
-  FL_EXPORT_C(void, Fl_Color_Chooser_draw_super)(fl_Color_Chooser o);
-  FL_EXPORT_C(int, Fl_Color_Chooser_handle)(fl_Color_Chooser o, int event);
-  FL_EXPORT_C(int, Fl_Color_Chooser_handle_super)(fl_Color_Chooser o, int event);
-  FL_EXPORT_C(void, Fl_Color_Chooser_resize)(fl_Color_Chooser o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Color_Chooser_resize_super)(fl_Color_Chooser o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Color_Chooser_show)(fl_Color_Chooser o);
-  FL_EXPORT_C(void, Fl_Color_Chooser_show_super)(fl_Color_Chooser o);
-  FL_EXPORT_C(void, Fl_Color_Chooser_hide)(fl_Color_Chooser o);
-  FL_EXPORT_C(void, Fl_Color_Chooser_hide_super)(fl_Color_Chooser o);
+  FL_EXPORT_C_HEADER(int,flc_color_chooser_with_m,(const char* name, double* r, double* g, double* b, int m));
+  FL_EXPORT_C_HEADER(int,flc_color_chooser_with_uchar,(const char* name, uchar* r, uchar* g, uchar* b));
+  FL_EXPORT_C_HEADER(int,flc_color_chooser_with_uchar_m,(const char* name, uchar* r, uchar* g, uchar* b, int m));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_draw,(fl_Color_Chooser o));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_draw_super,(fl_Color_Chooser o));
+  FL_EXPORT_C_HEADER(int,Fl_Color_Chooser_handle,(fl_Color_Chooser o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Color_Chooser_handle_super,(fl_Color_Chooser o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_resize,(fl_Color_Chooser o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_resize_super,(fl_Color_Chooser o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_show,(fl_Color_Chooser o));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_show_super,(fl_Color_Chooser o));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_hide,(fl_Color_Chooser o));
+  FL_EXPORT_C_HEADER(void,Fl_Color_Chooser_hide_super,(fl_Color_Chooser o));
 
 
 #ifdef __cplusplus
diff --git a/c-src/Fl_Copy_SurfaceC.h b/c-src/Fl_Copy_SurfaceC.h
--- a/c-src/Fl_Copy_SurfaceC.h
+++ b/c-src/Fl_Copy_SurfaceC.h
@@ -10,11 +10,11 @@
 #include "FL/Fl_Copy_Surface.H"
 EXPORT {
 #endif
-  FL_EXPORT_C(const char* ,Fl_Copy_Surface_class_name)(fl_Copy_Surface copy_surface);
-  FL_EXPORT_C(void        ,Fl_Copy_Surface_set_current)(fl_Copy_Surface copy_surface);
-  FL_EXPORT_C(void        ,Fl_Copy_Surface_draw)(fl_Copy_Surface copy_surface, fl_Widget widget, int delta_x, int delta_y);
-  FL_EXPORT_C(fl_Copy_Surface, Fl_Copy_Surface_New)(int w, int h);
-  FL_EXPORT_C(void, Fl_Copy_Surface_Destroy)(fl_Copy_Surface copy_surface);
+  FL_EXPORT_C_HEADER(const char* ,Fl_Copy_Surface_class_name,(fl_Copy_Surface copy_surface));
+  FL_EXPORT_C_HEADER(void        ,Fl_Copy_Surface_set_current,(fl_Copy_Surface copy_surface));
+  FL_EXPORT_C_HEADER(void        ,Fl_Copy_Surface_draw,(fl_Copy_Surface copy_surface, fl_Widget widget, int delta_x, int delta_y));
+  FL_EXPORT_C_HEADER(fl_Copy_Surface,Fl_Copy_Surface_New,(int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Copy_Surface_Destroy,(fl_Copy_Surface copy_surface));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_CounterC.h b/c-src/Fl_CounterC.h
--- a/c-src/Fl_CounterC.h
+++ b/c-src/Fl_CounterC.h
@@ -35,135 +35,135 @@
     FL_SIMPLE_COUNTERC = 1
   } Counter_Type;
 #endif
-  FL_EXPORT_C(fl_Group,     Fl_Counter_parent)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_set_parent)(fl_Counter counter, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Counter_type)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_set_type)(fl_Counter counter, uchar t);
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Counter_parent,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_set_parent,(fl_Counter counter, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Counter_type,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_set_type,(fl_Counter counter, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Counter_x)(fl_Counter counter);
-  FL_EXPORT_C(int,          Fl_Counter_y)(fl_Counter counter);
-  FL_EXPORT_C(int,          Fl_Counter_w)(fl_Counter counter);
-  FL_EXPORT_C(int,          Fl_Counter_h)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_set_align)(fl_Counter counter, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Counter_align)(fl_Counter counter);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Counter_box)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_set_box)(fl_Counter counter, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Counter_color)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_set_color)(fl_Counter counter, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Counter_set_color_with_bg_sel)(fl_Counter counter,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Counter_selection_color)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_set_selection_color)(fl_Counter counter, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Counter_label)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_copy_label)(fl_Counter counter, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Counter_set_label)(fl_Counter counter, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Counter_labeltype)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_set_labeltype)(fl_Counter counter, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Counter_labelcolor)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_set_labelcolor)(fl_Counter counter, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Counter_labelfont)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_set_labelfont)(fl_Counter counter, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Counter_labelsize)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_set_labelsize)(fl_Counter counter, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Counter_image)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_set_image)(fl_Counter counter, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Counter_deimage)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_set_deimage)(fl_Counter counter, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Counter_tooltip)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_copy_tooltip)(fl_Counter counter, const char* text);
-  FL_EXPORT_C(void,         Fl_Counter_set_tooltip)(fl_Counter counter, const char* text);
-  FL_EXPORT_C(void,         Fl_Counter_set_callback_with_user_data)(fl_Counter counter, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Counter_set_callback)(fl_Counter counter, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Counter_other_data)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_set_other_data)(fl_Counter counter, void* v);
-  FL_EXPORT_C(void*,        Fl_Counter_user_data)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_set_user_data)(fl_Counter counter, void* v);
-  FL_EXPORT_C(long,         Fl_Counter_argument)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_set_argument)(fl_Counter counter, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Counter_when)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_set_when)(fl_Counter counter, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Counter_visible)(fl_Counter counter);
-  FL_EXPORT_C(int,          Fl_Counter_visible_r)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_show)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_hide)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_set_visible)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_clear_visible)(fl_Counter counter);
-  FL_EXPORT_C(unsigned int, Fl_Counter_active)(fl_Counter counter);
-  FL_EXPORT_C(int,          Fl_Counter_active_r)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_activate)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_deactivate)(fl_Counter counter);
-  FL_EXPORT_C(unsigned int, Fl_Counter_output)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_set_output)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_clear_output)(fl_Counter counter);
-  FL_EXPORT_C(unsigned int, Fl_Counter_takesevents)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_set_changed)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_clear_changed)(fl_Counter counter);
-  FL_EXPORT_C(int,          Fl_Counter_take_focus)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_set_visible_focus)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_clear_visible_focus)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_modify_visible_focus)(fl_Counter counter, int v);
-  FL_EXPORT_C(unsigned int, Fl_Counter_visible_focus)(fl_Counter counter);
-  FL_EXPORT_C(int,          Fl_Counter_contains)(fl_Counter counter, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Counter_inside)(fl_Counter counter, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Counter_redraw)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_redraw_label)(fl_Counter counter);
-  FL_EXPORT_C(uchar,        Fl_Counter_damage)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_clear_damage_with_bitmask)(fl_Counter counter, uchar c);
-  FL_EXPORT_C(void,         Fl_Counter_clear_damage)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_damage_with_text)(fl_Counter counter, uchar c);
-  FL_EXPORT_C(void,         Fl_Counter_damage_inside_widget)(fl_Counter counter, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Counter_draw_label_with_xywh_alignment)(fl_Counter counter, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Counter_measure_label)(fl_Counter counter, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Counter_window)(fl_Counter counter);
-  FL_EXPORT_C(fl_Window,    Fl_Counter_top_window)(fl_Counter counter);
-  FL_EXPORT_C(fl_Window ,   Fl_Counter_top_window_offset)(fl_Counter counter, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Counter_as_gl_window)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_resize)(fl_Counter counter ,int X, int Y, int W, int H);
+  FL_EXPORT_C_HEADER(int,Fl_Counter_x,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(int,Fl_Counter_y,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(int,Fl_Counter_w,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(int,Fl_Counter_h,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_set_align,(fl_Counter counter, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Counter_align,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Counter_box,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_set_box,(fl_Counter counter, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Counter_color,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_set_color,(fl_Counter counter, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_set_color_with_bg_sel,(fl_Counter counter,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Counter_selection_color,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_set_selection_color,(fl_Counter counter, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Counter_label,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_copy_label,(fl_Counter counter, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_set_label,(fl_Counter counter, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Counter_labeltype,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_set_labeltype,(fl_Counter counter, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Counter_labelcolor,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_set_labelcolor,(fl_Counter counter, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Counter_labelfont,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_set_labelfont,(fl_Counter counter, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Counter_labelsize,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_set_labelsize,(fl_Counter counter, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Counter_image,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_set_image,(fl_Counter counter, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Counter_deimage,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_set_deimage,(fl_Counter counter, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Counter_tooltip,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_copy_tooltip,(fl_Counter counter, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_set_tooltip,(fl_Counter counter, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_set_callback_with_user_data,(fl_Counter counter, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_set_callback,(fl_Counter counter, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Counter_other_data,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_set_other_data,(fl_Counter counter, void* v));
+  FL_EXPORT_C_HEADER(void*,Fl_Counter_user_data,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_set_user_data,(fl_Counter counter, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Counter_argument,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_set_argument,(fl_Counter counter, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Counter_when,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_set_when,(fl_Counter counter, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Counter_visible,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(int,Fl_Counter_visible_r,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_show,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_hide,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_set_visible,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_clear_visible,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Counter_active,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(int,Fl_Counter_active_r,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_activate,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_deactivate,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Counter_output,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_set_output,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_clear_output,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Counter_takesevents,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_set_changed,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_clear_changed,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(int,Fl_Counter_take_focus,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_set_visible_focus,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_clear_visible_focus,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_modify_visible_focus,(fl_Counter counter, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Counter_visible_focus,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(int,Fl_Counter_contains,(fl_Counter counter, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Counter_inside,(fl_Counter counter, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_redraw,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_redraw_label,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(uchar,Fl_Counter_damage,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_clear_damage_with_bitmask,(fl_Counter counter, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_clear_damage,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_damage_with_text,(fl_Counter counter, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_damage_inside_widget,(fl_Counter counter, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_draw_label_with_xywh_alignment,(fl_Counter counter, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_measure_label,(fl_Counter counter, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Counter_window,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Counter_top_window,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Counter_top_window_offset,(fl_Counter counter, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Counter_as_gl_window,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_resize,(fl_Counter counter ,int X, int Y, int W, int H));
 
   /* Inherited from Fl_Valuator */
-  FL_EXPORT_C(void, Fl_Counter_bounds)(fl_Counter counter, double a, double b);
-  FL_EXPORT_C(double, Fl_Counter_minimum)(fl_Counter counter);
-  FL_EXPORT_C(void, Fl_Counter_set_minimum)(fl_Counter counter, double a);
-  FL_EXPORT_C(double, Fl_Counter_maximum)(fl_Counter counter);
-  FL_EXPORT_C(void, Fl_Counter_set_maximum)(fl_Counter counter, double a);
-  FL_EXPORT_C(void, Fl_Counter_range)(fl_Counter counter, double a, double b);
-  FL_EXPORT_C(void, Fl_Counter_set_step)(fl_Counter counter, int a);
-  FL_EXPORT_C(void, Fl_Counter_set_step_with_a_b)(fl_Counter counter, double a, int b);
-  FL_EXPORT_C(void, Fl_Counter_step_with_s)(fl_Counter counter, double s);
-  FL_EXPORT_C(double, Fl_Counter_step)(fl_Counter counter);
-  FL_EXPORT_C(void, Fl_Counter_precision)(fl_Counter counter, int precision);
-  FL_EXPORT_C(double, Fl_Counter_value)(fl_Counter counter);
-  FL_EXPORT_C(int, Fl_Counter_set_value)(fl_Counter counter, double v);
-  FL_EXPORT_C(int, Fl_Counter_format)(fl_Counter counter, char* format);
-  FL_EXPORT_C(double, Fl_Counter_round)(fl_Counter counter, double v);
-  FL_EXPORT_C(double, Fl_Counter_clamp)(fl_Counter counter, double v);
-  FL_EXPORT_C(double, Fl_Counter_increment)(fl_Counter counter, double v, int n);
+  FL_EXPORT_C_HEADER(void,Fl_Counter_bounds,(fl_Counter counter, double a, double b));
+  FL_EXPORT_C_HEADER(double,Fl_Counter_minimum,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_set_minimum,(fl_Counter counter, double a));
+  FL_EXPORT_C_HEADER(double,Fl_Counter_maximum,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_set_maximum,(fl_Counter counter, double a));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_range,(fl_Counter counter, double a, double b));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_set_step,(fl_Counter counter, int a));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_set_step_with_a_b,(fl_Counter counter, double a, int b));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_step_with_s,(fl_Counter counter, double s));
+  FL_EXPORT_C_HEADER(double,Fl_Counter_step,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_precision,(fl_Counter counter, int precision));
+  FL_EXPORT_C_HEADER(double,Fl_Counter_value,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(int,Fl_Counter_set_value,(fl_Counter counter, double v));
+  FL_EXPORT_C_HEADER(int,Fl_Counter_format,(fl_Counter counter, char* format));
+  FL_EXPORT_C_HEADER(double,Fl_Counter_round,(fl_Counter counter, double v));
+  FL_EXPORT_C_HEADER(double,Fl_Counter_clamp,(fl_Counter counter, double v));
+  FL_EXPORT_C_HEADER(double,Fl_Counter_increment,(fl_Counter counter, double v, int n));
 
   /* Fl_Counter specific */
-  FL_EXPORT_C(fl_Counter,    Fl_Counter_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Counter   , Fl_Counter_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(fl_Simple_Counter,Fl_Simple_Counter_New)(int x,int y,int w,int h);
-  FL_EXPORT_C(fl_Simple_Counter,Fl_Simple_Counter_New_WithLabel)(int x,int y,int w,int h,const char* label);
-  FL_EXPORT_C(void,      Fl_Counter_Destroy)(fl_Counter counter);
-  FL_EXPORT_C(int,       Fl_Counter_handle)(fl_Counter counter, int event);
-  FL_EXPORT_C(void,      Fl_Counter_lstep)(fl_Counter counter, double lstep);
-  FL_EXPORT_C(void,         Fl_Counter_set_textfont)(fl_Counter counter, Fl_Font text);
-  FL_EXPORT_C(Fl_Font,     Fl_Counter_textfont)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_set_textsize)(fl_Counter counter, Fl_Fontsize text);
-  FL_EXPORT_C(Fl_Fontsize,     Fl_Counter_textsize)(fl_Counter counter);
-  FL_EXPORT_C(void,         Fl_Counter_set_textcolor)(fl_Counter counter, Fl_Color text);
-  FL_EXPORT_C(Fl_Color,     Fl_Counter_textcolor)(fl_Counter counter);
-  FL_EXPORT_C(fl_Counter,    Fl_OverriddenCounter_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Counter,    Fl_OverriddenCounter_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Counter_draw)(fl_Counter o);
-  FL_EXPORT_C(void, Fl_Counter_draw_super)(fl_Counter o);
-  FL_EXPORT_C(int, Fl_Counter_handle)(fl_Counter o, int event);
-  FL_EXPORT_C(int, Fl_Counter_handle_super)(fl_Counter o, int event);
-  FL_EXPORT_C(void, Fl_Counter_resize)(fl_Counter o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Counter_resize_super)(fl_Counter o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Counter_show)(fl_Counter o);
-  FL_EXPORT_C(void, Fl_Counter_show_super)(fl_Counter o);
-  FL_EXPORT_C(void, Fl_Counter_hide)(fl_Counter o);
-  FL_EXPORT_C(void, Fl_Counter_hide_super)(fl_Counter o);
+  FL_EXPORT_C_HEADER(fl_Counter,Fl_Counter_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Counter   ,Fl_Counter_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(fl_Simple_Counter,Fl_Simple_Counter_New,(int x,int y,int w,int h));
+  FL_EXPORT_C_HEADER(fl_Simple_Counter,Fl_Simple_Counter_New_WithLabel,(int x,int y,int w,int h,const char* label));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_Destroy,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(int,Fl_Counter_handle,(fl_Counter counter, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_lstep,(fl_Counter counter, double lstep));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_set_textfont,(fl_Counter counter, Fl_Font text));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Counter_textfont,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_set_textsize,(fl_Counter counter, Fl_Fontsize text));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Counter_textsize,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_set_textcolor,(fl_Counter counter, Fl_Color text));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Counter_textcolor,(fl_Counter counter));
+  FL_EXPORT_C_HEADER(fl_Counter,Fl_OverriddenCounter_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Counter,Fl_OverriddenCounter_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_draw,(fl_Counter o));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_draw_super,(fl_Counter o));
+  FL_EXPORT_C_HEADER(int,Fl_Counter_handle,(fl_Counter o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Counter_handle_super,(fl_Counter o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_resize,(fl_Counter o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_resize_super,(fl_Counter o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_show,(fl_Counter o));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_show_super,(fl_Counter o));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_hide,(fl_Counter o));
+  FL_EXPORT_C_HEADER(void,Fl_Counter_hide_super,(fl_Counter o));
 
 #ifdef __cplusplus
 }
diff --git a/c-src/Fl_DeviceC.h b/c-src/Fl_DeviceC.h
--- a/c-src/Fl_DeviceC.h
+++ b/c-src/Fl_DeviceC.h
@@ -10,36 +10,36 @@
 EXPORT {
 #endif
   //Fl_Graphics_Driver
-  FL_EXPORT_C(const char*, Fl_Graphics_Driver_class_id)();
-  FL_EXPORT_C(const char*, Fl_Graphics_Driver_class_name)(fl_Graphics_Driver graphics_driver);
-  FL_EXPORT_C(const char*, Fl_Graphics_Driver_class_id)();
-  FL_EXPORT_C(const char*, Fl_Graphics_Driver_class_name)(fl_Graphics_Driver graphics_driver);
-  FL_EXPORT_C(void, Fl_Graphics_Driver_set_font)(fl_Graphics_Driver graphics_driver,Fl_Font face, Fl_Fontsize fsize);
-  FL_EXPORT_C(Fl_Font, Fl_Graphics_Driver_font)(fl_Graphics_Driver graphics_driver);
-  FL_EXPORT_C(Fl_Fontsize, Fl_Graphics_Driver_size)(fl_Graphics_Driver graphics_driver);
-  FL_EXPORT_C(double, Fl_Graphics_Driver_width)(fl_Graphics_Driver graphics_driver,const char* str, int n);
-  FL_EXPORT_C(double, Fl_Graphics_Driver_width_with_c)(fl_Graphics_Driver graphics_driver,unsigned int c);
-  FL_EXPORT_C(void, Fl_Graphics_Driver_text_extents)(fl_Graphics_Driver graphics_driver,const char*, int n, int* dx, int* dy, int* w, int* h);;
-  FL_EXPORT_C(int, Fl_Graphics_Driver_height)(fl_Graphics_Driver graphics_driver);
-  FL_EXPORT_C(int, Fl_Graphics_Driver_descent)(fl_Graphics_Driver graphics_driver);
-  FL_EXPORT_C(Fl_Color, Fl_Graphics_Driver_color)(fl_Graphics_Driver graphics_driver);
-  FL_EXPORT_C(fl_Font_Descriptor, Fl_Graphics_Driver_font_descriptor)(fl_Graphics_Driver graphics_driver);
-  FL_EXPORT_C(void, Fl_Graphics_Driver_set_font_descriptor)(fl_Graphics_Driver graphics_driver,fl_Font_Descriptor d);
+  FL_EXPORT_C_HEADER(const char*,Fl_Graphics_Driver_class_id,());
+  FL_EXPORT_C_HEADER(const char*,Fl_Graphics_Driver_class_name,(fl_Graphics_Driver graphics_driver));
+  FL_EXPORT_C_HEADER(const char*,Fl_Graphics_Driver_class_id,());
+  FL_EXPORT_C_HEADER(const char*,Fl_Graphics_Driver_class_name,(fl_Graphics_Driver graphics_driver));
+  FL_EXPORT_C_HEADER(void,Fl_Graphics_Driver_set_font,(fl_Graphics_Driver graphics_driver,Fl_Font face, Fl_Fontsize fsize));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Graphics_Driver_font,(fl_Graphics_Driver graphics_driver));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Graphics_Driver_size,(fl_Graphics_Driver graphics_driver));
+  FL_EXPORT_C_HEADER(double,Fl_Graphics_Driver_width,(fl_Graphics_Driver graphics_driver,const char* str, int n));
+  FL_EXPORT_C_HEADER(double,Fl_Graphics_Driver_width_with_c,(fl_Graphics_Driver graphics_driver,unsigned int c));
+  FL_EXPORT_C_HEADER(void,Fl_Graphics_Driver_text_extents,(fl_Graphics_Driver graphics_driver,const char*, int n, int* dx, int* dy, int* w, int* h));
+  FL_EXPORT_C_HEADER(int,Fl_Graphics_Driver_height,(fl_Graphics_Driver graphics_driver));
+  FL_EXPORT_C_HEADER(int,Fl_Graphics_Driver_descent,(fl_Graphics_Driver graphics_driver));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Graphics_Driver_color,(fl_Graphics_Driver graphics_driver));
+  FL_EXPORT_C_HEADER(fl_Font_Descriptor,Fl_Graphics_Driver_font_descriptor,(fl_Graphics_Driver graphics_driver));
+  FL_EXPORT_C_HEADER(void,Fl_Graphics_Driver_set_font_descriptor,(fl_Graphics_Driver graphics_driver,fl_Font_Descriptor d));
 #if FL_API_VERSION == 10304
-  FL_EXPORT_C(int, fl_Graphics_Driver_draw_scaled)(fl_Graphics_Driver graphics_driver, fl_Image i,int X, int Y, int W, int H);
+  FL_EXPORT_C_HEADER(int,fl_Graphics_Driver_draw_scaled,(fl_Graphics_Driver graphics_driver, fl_Image i,int X, int Y, int W, int H));
 #endif
-  FL_EXPORT_C(void, Fl_Graphics_Driver_Destroy)(fl_Graphics_Driver graphics_driver);
+  FL_EXPORT_C_HEADER(void,Fl_Graphics_Driver_Destroy,(fl_Graphics_Driver graphics_driver));
 
   // Fl_Surface_Device
-  FL_EXPORT_C(const char*, Fl_Surface_Device_class_id)();
-  FL_EXPORT_C(const char*, Fl_Surface_Device_class_name)(fl_Surface_Device surface_device);
-  FL_EXPORT_C(const char*, Fl_Surface_Device_class_id)();
-  FL_EXPORT_C(const char*, Fl_Surface_Device_class_name)(fl_Surface_Device surface_device);
-  FL_EXPORT_C(void, Fl_Surface_Device_set_current)(fl_Surface_Device surface_device);
-  FL_EXPORT_C(void, Fl_Surface_Device_set_driver)(fl_Surface_Device surface_device,fl_Graphics_Driver graphics_driver);
-  FL_EXPORT_C(fl_Graphics_Driver, Fl_Surface_Device_driver)(fl_Surface_Device surface_device);
-  FL_EXPORT_C(fl_Surface_Device, Fl_Surface_Device_surface)();
-  FL_EXPORT_C(void, Fl_Surface_Device_Destroy)(fl_Surface_Device surface_device);
+  FL_EXPORT_C_HEADER(const char*,Fl_Surface_Device_class_id,());
+  FL_EXPORT_C_HEADER(const char*,Fl_Surface_Device_class_name,(fl_Surface_Device surface_device));
+  FL_EXPORT_C_HEADER(const char*,Fl_Surface_Device_class_id,());
+  FL_EXPORT_C_HEADER(const char*,Fl_Surface_Device_class_name,(fl_Surface_Device surface_device));
+  FL_EXPORT_C_HEADER(void,Fl_Surface_Device_set_current,(fl_Surface_Device surface_device));
+  FL_EXPORT_C_HEADER(void,Fl_Surface_Device_set_driver,(fl_Surface_Device surface_device,fl_Graphics_Driver graphics_driver));
+  FL_EXPORT_C_HEADER(fl_Graphics_Driver,Fl_Surface_Device_driver,(fl_Surface_Device surface_device));
+  FL_EXPORT_C_HEADER(fl_Surface_Device,Fl_Surface_Device_surface,());
+  FL_EXPORT_C_HEADER(void,Fl_Surface_Device_Destroy,(fl_Surface_Device surface_device));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_DialC.h b/c-src/Fl_DialC.h
--- a/c-src/Fl_DialC.h
+++ b/c-src/Fl_DialC.h
@@ -38,133 +38,133 @@
   } Dial_Type;
 #endif
 
-  FL_EXPORT_C(fl_Group,     Fl_Dial_parent)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_set_parent)(fl_Dial dial, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Dial_type)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_set_type)(fl_Dial dial, uchar t);
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Dial_parent,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_set_parent,(fl_Dial dial, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Dial_type,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_set_type,(fl_Dial dial, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Dial_x)(fl_Dial dial);
-  FL_EXPORT_C(int,          Fl_Dial_y)(fl_Dial dial);
-  FL_EXPORT_C(int,          Fl_Dial_w)(fl_Dial dial);
-  FL_EXPORT_C(int,          Fl_Dial_h)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_set_align)(fl_Dial dial, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Dial_align)(fl_Dial dial);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Dial_box)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_set_box)(fl_Dial dial, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Dial_color)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_set_color)(fl_Dial dial, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Dial_set_color_with_bg_sel)(fl_Dial dial,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Dial_selection_color)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_set_selection_color)(fl_Dial dial, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Dial_label)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_copy_label)(fl_Dial dial, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Dial_set_label)(fl_Dial dial, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Dial_labeltype)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_set_labeltype)(fl_Dial dial, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Dial_labelcolor)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_set_labelcolor)(fl_Dial dial, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Dial_labelfont)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_set_labelfont)(fl_Dial dial, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Dial_labelsize)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_set_labelsize)(fl_Dial dial, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Dial_image)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_set_image)(fl_Dial dial, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Dial_deimage)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_set_deimage)(fl_Dial dial, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Dial_tooltip)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_copy_tooltip)(fl_Dial dial, const char* text);
-  FL_EXPORT_C(void,         Fl_Dial_set_tooltip)(fl_Dial dial, const char* text);
-  FL_EXPORT_C(void,         Fl_Dial_set_callback_with_user_data)(fl_Dial dial, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Dial_set_callback)(fl_Dial dial, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Dial_other_data)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_set_other_data)(fl_Dial dial, void* v);
-  FL_EXPORT_C(void*,        Fl_Dial_user_data)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_set_user_data)(fl_Dial dial, void* v);
-  FL_EXPORT_C(long,         Fl_Dial_argument)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_set_argument)(fl_Dial dial, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Dial_when)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_set_when)(fl_Dial dial, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Dial_visible)(fl_Dial dial);
-  FL_EXPORT_C(int,          Fl_Dial_visible_r)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_show)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_hide)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_set_visible)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_clear_visible)(fl_Dial dial);
-  FL_EXPORT_C(unsigned int, Fl_Dial_active)(fl_Dial dial);
-  FL_EXPORT_C(int,          Fl_Dial_active_r)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_activate)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_deactivate)(fl_Dial dial);
-  FL_EXPORT_C(unsigned int, Fl_Dial_output)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_set_output)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_clear_output)(fl_Dial dial);
-  FL_EXPORT_C(unsigned int, Fl_Dial_takesevents)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_set_changed)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_clear_changed)(fl_Dial dial);
-  FL_EXPORT_C(int,          Fl_Dial_take_focus)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_set_visible_focus)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_clear_visible_focus)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_modify_visible_focus)(fl_Dial dial, int v);
-  FL_EXPORT_C(unsigned int, Fl_Dial_visible_focus)(fl_Dial dial);
-  FL_EXPORT_C(int,          Fl_Dial_contains)(fl_Dial dial, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Dial_inside)(fl_Dial dial, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Dial_redraw)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_redraw_label)(fl_Dial dial);
-  FL_EXPORT_C(uchar,        Fl_Dial_damage)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_clear_damage_with_bitmask)(fl_Dial dial, uchar c);
-  FL_EXPORT_C(void,         Fl_Dial_clear_damage)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_damage_with_text)(fl_Dial dial, uchar c);
-  FL_EXPORT_C(void,         Fl_Dial_damage_inside_widget)(fl_Dial dial, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Dial_draw_label_with_xywh_alignment)(fl_Dial dial, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Dial_measure_label)(fl_Dial dial, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Dial_window)(fl_Dial dial);
-  FL_EXPORT_C(fl_Window,    Fl_Dial_top_window)(fl_Dial dial);
-  FL_EXPORT_C(fl_Window ,   Fl_Dial_top_window_offset)(fl_Dial dial, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Dial_as_gl_window)(fl_Dial dial);
-  FL_EXPORT_C(void,         Fl_Dial_resize)(fl_Table table,int X, int Y, int W, int H);
+  FL_EXPORT_C_HEADER(int,Fl_Dial_x,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(int,Fl_Dial_y,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(int,Fl_Dial_w,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(int,Fl_Dial_h,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_set_align,(fl_Dial dial, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Dial_align,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Dial_box,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_set_box,(fl_Dial dial, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Dial_color,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_set_color,(fl_Dial dial, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_set_color_with_bg_sel,(fl_Dial dial,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Dial_selection_color,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_set_selection_color,(fl_Dial dial, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Dial_label,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_copy_label,(fl_Dial dial, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_set_label,(fl_Dial dial, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Dial_labeltype,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_set_labeltype,(fl_Dial dial, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Dial_labelcolor,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_set_labelcolor,(fl_Dial dial, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Dial_labelfont,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_set_labelfont,(fl_Dial dial, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Dial_labelsize,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_set_labelsize,(fl_Dial dial, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Dial_image,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_set_image,(fl_Dial dial, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Dial_deimage,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_set_deimage,(fl_Dial dial, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Dial_tooltip,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_copy_tooltip,(fl_Dial dial, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_set_tooltip,(fl_Dial dial, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_set_callback_with_user_data,(fl_Dial dial, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_set_callback,(fl_Dial dial, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Dial_other_data,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_set_other_data,(fl_Dial dial, void* v));
+  FL_EXPORT_C_HEADER(void*,Fl_Dial_user_data,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_set_user_data,(fl_Dial dial, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Dial_argument,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_set_argument,(fl_Dial dial, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Dial_when,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_set_when,(fl_Dial dial, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Dial_visible,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(int,Fl_Dial_visible_r,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_show,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_hide,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_set_visible,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_clear_visible,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Dial_active,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(int,Fl_Dial_active_r,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_activate,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_deactivate,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Dial_output,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_set_output,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_clear_output,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Dial_takesevents,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_set_changed,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_clear_changed,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(int,Fl_Dial_take_focus,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_set_visible_focus,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_clear_visible_focus,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_modify_visible_focus,(fl_Dial dial, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Dial_visible_focus,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(int,Fl_Dial_contains,(fl_Dial dial, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Dial_inside,(fl_Dial dial, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_redraw,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_redraw_label,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(uchar,Fl_Dial_damage,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_clear_damage_with_bitmask,(fl_Dial dial, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_clear_damage,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_damage_with_text,(fl_Dial dial, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_damage_inside_widget,(fl_Dial dial, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_draw_label_with_xywh_alignment,(fl_Dial dial, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_measure_label,(fl_Dial dial, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Dial_window,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Dial_top_window,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Dial_top_window_offset,(fl_Dial dial, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Dial_as_gl_window,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_resize,(fl_Table table,int X, int Y, int W, int H));
 
   /* Inherited from Fl_Valuator */
-  FL_EXPORT_C(void, Fl_Dial_bounds)(fl_Dial dial, double a, double b);
-  FL_EXPORT_C(double, Fl_Dial_minimum)(fl_Dial dial);
-  FL_EXPORT_C(void, Fl_Dial_set_minimum)(fl_Dial dial, double a);
-  FL_EXPORT_C(double, Fl_Dial_maximum)(fl_Dial dial);
-  FL_EXPORT_C(void, Fl_Dial_set_maximum)(fl_Dial dial, double a);
-  FL_EXPORT_C(void, Fl_Dial_range)(fl_Dial dial, double a, double b);
-  FL_EXPORT_C(void, Fl_Dial_set_step)(fl_Dial dial, int a);
-  FL_EXPORT_C(void, Fl_Dial_set_step_with_a_b)(fl_Dial dial, double a, int b);
-  FL_EXPORT_C(void, Fl_Dial_step_with_s)(fl_Dial dial, double s);
-  FL_EXPORT_C(double, Fl_Dial_step)(fl_Dial dial);
-  FL_EXPORT_C(void, Fl_Dial_precision)(fl_Dial dial, int precision);
-  FL_EXPORT_C(double, Fl_Dial_value)(fl_Dial dial);
-  FL_EXPORT_C(int, Fl_Dial_set_value)(fl_Dial dial, double v);
-  FL_EXPORT_C(int, Fl_Dial_format)(fl_Dial dial, char* format);
-  FL_EXPORT_C(double, Fl_Dial_round)(fl_Dial dial, double v);
-  FL_EXPORT_C(double, Fl_Dial_clamp)(fl_Dial dial, double v);
-  FL_EXPORT_C(double, Fl_Dial_increment)(fl_Dial dial, double v, int n);
+  FL_EXPORT_C_HEADER(void,Fl_Dial_bounds,(fl_Dial dial, double a, double b));
+  FL_EXPORT_C_HEADER(double,Fl_Dial_minimum,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_set_minimum,(fl_Dial dial, double a));
+  FL_EXPORT_C_HEADER(double,Fl_Dial_maximum,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_set_maximum,(fl_Dial dial, double a));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_range,(fl_Dial dial, double a, double b));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_set_step,(fl_Dial dial, int a));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_set_step_with_a_b,(fl_Dial dial, double a, int b));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_step_with_s,(fl_Dial dial, double s));
+  FL_EXPORT_C_HEADER(double,Fl_Dial_step,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_precision,(fl_Dial dial, int precision));
+  FL_EXPORT_C_HEADER(double,Fl_Dial_value,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(int,Fl_Dial_set_value,(fl_Dial dial, double v));
+  FL_EXPORT_C_HEADER(int,Fl_Dial_format,(fl_Dial dial, char* format));
+  FL_EXPORT_C_HEADER(double,Fl_Dial_round,(fl_Dial dial, double v));
+  FL_EXPORT_C_HEADER(double,Fl_Dial_clamp,(fl_Dial dial, double v));
+  FL_EXPORT_C_HEADER(double,Fl_Dial_increment,(fl_Dial dial, double v, int n));
 
   /* Fl_Dial specific */
-  FL_EXPORT_C(fl_Dial      ,Fl_Dial_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Dial      ,Fl_Dial_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(fl_Fill_Dial ,Fl_Fill_Dial_New)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Line_Dial ,Fl_Line_Dial_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Line_Dial ,Fl_Line_Dial_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(void,      Fl_Dial_Destroy)(fl_Dial dial);
-  FL_EXPORT_C(void,      Fl_Dial_set_angle1)(fl_Dial dial, short a);
-  FL_EXPORT_C(void,      Fl_Dial_set_angle2)(fl_Dial dial, short a);
-  FL_EXPORT_C(short,     Fl_Dial_angle1)(fl_Dial dial);
-  FL_EXPORT_C(short,     Fl_Dial_angle2)(fl_Dial dial);
-  FL_EXPORT_C(int,       Fl_Dial_handle)(fl_Dial dial, int event);
-  FL_EXPORT_C(fl_Dial,    Fl_OverriddenDial_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Dial,    Fl_OverriddenDial_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Dial_draw)(fl_Dial o);
-  FL_EXPORT_C(void, Fl_Dial_draw_super)(fl_Dial o);
-  FL_EXPORT_C(int, Fl_Dial_handle)(fl_Dial o, int event);
-  FL_EXPORT_C(int, Fl_Dial_handle_super)(fl_Dial o, int event);
-  FL_EXPORT_C(void, Fl_Dial_resize)(fl_Dial o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Dial_resize_super)(fl_Dial o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Dial_show)(fl_Dial o);
-  FL_EXPORT_C(void, Fl_Dial_show_super)(fl_Dial o);
-  FL_EXPORT_C(void, Fl_Dial_hide)(fl_Dial o);
-  FL_EXPORT_C(void, Fl_Dial_hide_super)(fl_Dial o);
+  FL_EXPORT_C_HEADER(fl_Dial      ,Fl_Dial_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Dial      ,Fl_Dial_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(fl_Fill_Dial ,Fl_Fill_Dial_New,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Line_Dial ,Fl_Line_Dial_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Line_Dial ,Fl_Line_Dial_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_Destroy,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_set_angle1,(fl_Dial dial, short a));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_set_angle2,(fl_Dial dial, short a));
+  FL_EXPORT_C_HEADER(short,Fl_Dial_angle1,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(short,Fl_Dial_angle2,(fl_Dial dial));
+  FL_EXPORT_C_HEADER(int,Fl_Dial_handle,(fl_Dial dial, int event));
+  FL_EXPORT_C_HEADER(fl_Dial,Fl_OverriddenDial_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Dial,Fl_OverriddenDial_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_draw,(fl_Dial o));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_draw_super,(fl_Dial o));
+  FL_EXPORT_C_HEADER(int,Fl_Dial_handle,(fl_Dial o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Dial_handle_super,(fl_Dial o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_resize,(fl_Dial o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_resize_super,(fl_Dial o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_show,(fl_Dial o));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_show_super,(fl_Dial o));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_hide,(fl_Dial o));
+  FL_EXPORT_C_HEADER(void,Fl_Dial_hide_super,(fl_Dial o));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Double_WindowC.h b/c-src/Fl_Double_WindowC.h
--- a/c-src/Fl_Double_WindowC.h
+++ b/c-src/Fl_Double_WindowC.h
@@ -11,182 +11,182 @@
 EXPORT {
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,Fl_Double_Window_handle)(fl_Double_Window self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Double_Window_parent)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_set_parent)(fl_Double_Window win, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Double_Window_type)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_set_type)(fl_Double_Window win, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Double_Window_handle,(fl_Double_Window self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Double_Window_parent,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_parent,(fl_Double_Window win, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Double_Window_type,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_type,(fl_Double_Window win, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Double_Window_x)(fl_Double_Window win);
-  FL_EXPORT_C(int,          Fl_Double_Window_y)(fl_Double_Window win);
-  FL_EXPORT_C(int,          Fl_Double_Window_w)(fl_Double_Window win);
-  FL_EXPORT_C(int,          Fl_Double_Window_h)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_set_align)(fl_Double_Window double_window, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Double_Window_align)(fl_Double_Window win);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Double_Window_box)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_set_box)(fl_Double_Window win, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Double_Window_color)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_set_color)(fl_Double_Window win, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Double_Window_set_color_with_bg_sel)(fl_Double_Window win,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Double_Window_selection_color)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_set_selection_color)(fl_Double_Window win, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Double_Window_label)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_copy_label)(fl_Double_Window win, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Double_Window_set_label)(fl_Double_Window win, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Double_Window_labeltype)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_set_labeltype)(fl_Double_Window win, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Double_Window_labelcolor)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_set_labelcolor)(fl_Double_Window win, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Double_Window_labelfont)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_set_labelfont)(fl_Double_Window win, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Double_Window_labelsize)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_set_labelsize)(fl_Double_Window win, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Double_Window_image)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_set_image)(fl_Double_Window win, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Double_Window_deimage)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_set_deimage)(fl_Double_Window win, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Double_Window_tooltip)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_copy_tooltip)(fl_Double_Window win, const char* text);
-  FL_EXPORT_C(void,         Fl_Double_Window_set_tooltip)(fl_Double_Window win, const char* text);
-  FL_EXPORT_C(void,         Fl_Double_Window_set_callback_with_user_data)(fl_Double_Window win, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Double_Window_set_callback)(fl_Double_Window win, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Double_Window_user_data)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_set_user_data)(fl_Double_Window win, void* v);
-  FL_EXPORT_C(long,         Fl_Double_Window_argument)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_set_argument)(fl_Double_Window win, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Double_Window_when)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_set_when)(fl_Double_Window win, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Double_Window_visible)(fl_Double_Window win);
-  FL_EXPORT_C(int,          Fl_Double_Window_visible_r)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_set_visible)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_clear_visible)(fl_Double_Window win);
-  FL_EXPORT_C(unsigned int, Fl_Double_Window_active)(fl_Double_Window win);
-  FL_EXPORT_C(int,          Fl_Double_Window_active_r)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_activate)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_deactivate)(fl_Double_Window win);
-  FL_EXPORT_C(unsigned int, Fl_Double_Window_output)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_set_output)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_clear_output)(fl_Double_Window win);
-  FL_EXPORT_C(unsigned int, Fl_Double_Window_takesevents)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_set_changed)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_clear_changed)(fl_Double_Window win);
-  FL_EXPORT_C(int,          Fl_Double_Window_take_focus)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_set_visible_focus)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_clear_visible_focus)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_modify_visible_focus)(fl_Double_Window win, int v);
-  FL_EXPORT_C(unsigned int, Fl_Double_Window_visible_focus)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_do_callback)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_do_callback_with_widget_and_user_data)(fl_Double_Window win, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Double_Window_do_callback_with_widget_and_default_user_data)(fl_Double_Window win, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Double_Window_contains)(fl_Double_Window win, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Double_Window_inside)(fl_Double_Window win, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Double_Window_redraw)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_redraw_label)(fl_Double_Window win);
-  FL_EXPORT_C(uchar,        Fl_Double_Window_damage)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_clear_damage_with_bitmask)(fl_Double_Window win, uchar c);
-  FL_EXPORT_C(void,         Fl_Double_Window_clear_damage)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_damage_with_text)(fl_Double_Window win, uchar c);
-  FL_EXPORT_C(void,         Fl_Double_Window_damage_inside_widget)(fl_Double_Window win, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Double_Window_draw_label_with_xywh_alignment)(fl_Double_Window win, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Double_Window_measure_label)(fl_Double_Window win, int* ww , int* hh);
-  FL_EXPORT_C(fl_Group,     Fl_Double_Window_as_group)(fl_Double_Window win);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Double_Window_as_gl_window)(fl_Double_Window win);
-  FL_EXPORT_C(fl_Window,    Fl_Double_Window_window)(fl_Double_Window double_window);
-  FL_EXPORT_C(fl_Window,    Fl_Double_Window_top_window)(fl_Double_Window double_window);
-  FL_EXPORT_C(fl_Window ,   Fl_Double_Window_top_window_offset)(fl_Double_Window double_window, int* xoff, int* yoff);
+  FL_EXPORT_C_HEADER(int,Fl_Double_Window_x,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Double_Window_y,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Double_Window_w,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Double_Window_h,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_align,(fl_Double_Window double_window, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Double_Window_align,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Double_Window_box,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_box,(fl_Double_Window win, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Double_Window_color,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_color,(fl_Double_Window win, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_color_with_bg_sel,(fl_Double_Window win,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Double_Window_selection_color,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_selection_color,(fl_Double_Window win, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Double_Window_label,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_copy_label,(fl_Double_Window win, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_label,(fl_Double_Window win, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Double_Window_labeltype,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_labeltype,(fl_Double_Window win, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Double_Window_labelcolor,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_labelcolor,(fl_Double_Window win, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Double_Window_labelfont,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_labelfont,(fl_Double_Window win, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Double_Window_labelsize,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_labelsize,(fl_Double_Window win, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Double_Window_image,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_image,(fl_Double_Window win, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Double_Window_deimage,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_deimage,(fl_Double_Window win, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Double_Window_tooltip,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_copy_tooltip,(fl_Double_Window win, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_tooltip,(fl_Double_Window win, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_callback_with_user_data,(fl_Double_Window win, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_callback,(fl_Double_Window win, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Double_Window_user_data,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_user_data,(fl_Double_Window win, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Double_Window_argument,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_argument,(fl_Double_Window win, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Double_Window_when,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_when,(fl_Double_Window win, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Double_Window_visible,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Double_Window_visible_r,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_visible,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_clear_visible,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Double_Window_active,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Double_Window_active_r,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_activate,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_deactivate,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Double_Window_output,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_output,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_clear_output,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Double_Window_takesevents,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_changed,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_clear_changed,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Double_Window_take_focus,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_visible_focus,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_clear_visible_focus,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_modify_visible_focus,(fl_Double_Window win, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Double_Window_visible_focus,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_do_callback,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_do_callback_with_widget_and_user_data,(fl_Double_Window win, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_do_callback_with_widget_and_default_user_data,(fl_Double_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Double_Window_contains,(fl_Double_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Double_Window_inside,(fl_Double_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_redraw,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_redraw_label,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(uchar,Fl_Double_Window_damage,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_clear_damage_with_bitmask,(fl_Double_Window win, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_clear_damage,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_damage_with_text,(fl_Double_Window win, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_damage_inside_widget,(fl_Double_Window win, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_draw_label_with_xywh_alignment,(fl_Double_Window win, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_measure_label,(fl_Double_Window win, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Double_Window_as_group,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Double_Window_as_gl_window,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Double_Window_window,(fl_Double_Window double_window));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Double_Window_top_window,(fl_Double_Window double_window));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Double_Window_top_window_offset,(fl_Double_Window double_window, int* xoff, int* yoff));
   /* Inherited from Fl_Group */
-  FL_EXPORT_C(void, Fl_Double_Window_draw_child)(fl_Double_Window Double_Window,fl_Widget widget);
-  FL_EXPORT_C(void, Fl_Double_Window_draw_children)(fl_Double_Window Double_Window);
-  FL_EXPORT_C(void, Fl_Double_Window_draw_outside_label)(fl_Double_Window Double_Window,fl_Widget widget);
-  FL_EXPORT_C(void, Fl_Double_Window_update_child)(fl_Double_Window Double_Window,fl_Widget widget);
-  FL_EXPORT_C(int*, Fl_Double_Window_sizes)(fl_Double_Window Double_Window);
-  FL_EXPORT_C(void,         Fl_Double_Window_begin)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_end)(fl_Double_Window win);
-  FL_EXPORT_C(int,          Fl_Double_Window_find)(fl_Double_Window win, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Double_Window_add)(fl_Double_Window win, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Double_Window_insert)(fl_Double_Window win, fl_Widget w, int i);
-  FL_EXPORT_C(void,         Fl_Double_Window_remove_index)(fl_Double_Window win, int index);
-  FL_EXPORT_C(void,         Fl_Double_Window_remove_widget)(fl_Double_Window win, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Double_Window_clear)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_set_resizable_by_reference)(fl_Double_Window win,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Double_Window_set_resizable)(fl_Double_Window win,fl_Widget o);
-  FL_EXPORT_C(fl_Widget,         Fl_Double_Window_resizable)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_add_resizable)(fl_Double_Window win,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Double_Window_init_sizes)(fl_Double_Window win);
-  FL_EXPORT_C(int,          Fl_Double_Window_children)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_set_clip_children)(fl_Double_Window win,int c);
-  FL_EXPORT_C(unsigned int, Fl_Double_Window_clip_children)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_focus)(fl_Double_Window win,fl_Widget W);
-  FL_EXPORT_C(fl_Widget,    Fl_Double_Window__ddfdesign_kludge)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_insert_with_before)(fl_Double_Window self, fl_Widget w, fl_Widget before);
-  FL_EXPORT_C(fl_Widget*,   Fl_Double_Window_array)(fl_Double_Window self);
-  FL_EXPORT_C(fl_Widget,    Fl_Double_Window_child)(fl_Double_Window self, int n);
-  FL_EXPORT_C(void,         Fl_Double_Window_forms_end)(fl_Double_Window self);
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_draw_child,(fl_Double_Window Double_Window,fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_draw_children,(fl_Double_Window Double_Window));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_draw_outside_label,(fl_Double_Window Double_Window,fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_update_child,(fl_Double_Window Double_Window,fl_Widget widget));
+  FL_EXPORT_C_HEADER(int*,Fl_Double_Window_sizes,(fl_Double_Window Double_Window));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_begin,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_end,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Double_Window_find,(fl_Double_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_add,(fl_Double_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_insert,(fl_Double_Window win, fl_Widget w, int i));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_remove_index,(fl_Double_Window win, int index));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_remove_widget,(fl_Double_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_clear,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_resizable_by_reference,(fl_Double_Window win,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_resizable,(fl_Double_Window win,fl_Widget o));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Double_Window_resizable,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_add_resizable,(fl_Double_Window win,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_init_sizes,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Double_Window_children,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_clip_children,(fl_Double_Window win,int c));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Double_Window_clip_children,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_focus,(fl_Double_Window win,fl_Widget W));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Double_Window__ddfdesign_kludge,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_insert_with_before,(fl_Double_Window self, fl_Widget w, fl_Widget before));
+  FL_EXPORT_C_HEADER(fl_Widget*,Fl_Double_Window_array,(fl_Double_Window self));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Double_Window_child,(fl_Double_Window self, int n));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_forms_end,(fl_Double_Window self));
   /* FL_EXPORT_C(void,         Fl_Double_Window_forms_end)(fl_Double_Window win); */
   /* Fl_Window inherited */
-  FL_EXPORT_C(unsigned int, Fl_Double_Window_changed)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_fullscreen)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_fullscreen_off)(fl_Double_Window win);
-  FL_EXPORT_C(void,         Fl_Double_Window_fullscreen_off_with_resize)(fl_Double_Window win,int X,int Y,int W,int H);
-  FL_EXPORT_C(fl_Double_Window,    Fl_Double_Window_New_WithLabel)(int w, int h, const char* title);
-  FL_EXPORT_C(fl_Double_Window,    Fl_Double_Window_New)(int w, int h);
-  FL_EXPORT_C(fl_Double_Window,    Fl_Double_Window_NewXY_WithLabel)(int x, int y, int w, int h, const char* title);
-  FL_EXPORT_C(fl_Double_Window,    Fl_Double_Window_NewXY)(int x, int y, int w, int h);
-  FL_EXPORT_C(void,         Fl_Double_Window_iconize)(fl_Double_Window win);
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Double_Window_changed,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_fullscreen,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_fullscreen_off,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_fullscreen_off_with_resize,(fl_Double_Window win,int X,int Y,int W,int H));
+  FL_EXPORT_C_HEADER(fl_Double_Window,Fl_Double_Window_New_WithLabel,(int w, int h, const char* title));
+  FL_EXPORT_C_HEADER(fl_Double_Window,Fl_Double_Window_New,(int w, int h));
+  FL_EXPORT_C_HEADER(fl_Double_Window,Fl_Double_Window_NewXY_WithLabel,(int x, int y, int w, int h, const char* title));
+  FL_EXPORT_C_HEADER(fl_Double_Window,Fl_Double_Window_NewXY,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_iconize,(fl_Double_Window win));
 
-  FL_EXPORT_C(fl_Double_Window, Fl_OverriddenDouble_Window_New_WithLabel)(int w, int h, const char* title, fl_Double_Window_Virtual_Funcs* funcs);
-  FL_EXPORT_C(fl_Double_Window, Fl_OverriddenDouble_Window_New)(int w, int h,fl_Double_Window_Virtual_Funcs* funcs);
-  FL_EXPORT_C(fl_Double_Window, Fl_OverriddenDouble_Window_NewXY_WithLabel)(int x, int y, int w, int h, const char* title,fl_Double_Window_Virtual_Funcs* funcs);
-  FL_EXPORT_C(fl_Double_Window, Fl_OverriddenDouble_Window_NewXY)(int x, int y, int w, int h,fl_Double_Window_Virtual_Funcs* funcs);
-  FL_EXPORT_C(void ,Fl_Double_Window_set_border)(fl_Double_Window win, int b);
-  FL_EXPORT_C(void ,Fl_Double_Window_clear_border)(fl_Double_Window win);
-  FL_EXPORT_C(unsigned int ,Fl_Double_Window_border)(fl_Double_Window win);
-  FL_EXPORT_C(void ,Fl_Double_Window_set_override)(fl_Double_Window win);
-  FL_EXPORT_C(unsigned int,Fl_Double_Window_override)(fl_Double_Window win);
-  FL_EXPORT_C(void ,Fl_Double_Window_set_modal)(fl_Double_Window win);
-  FL_EXPORT_C(unsigned int,Fl_Double_Window_modal)(fl_Double_Window win);
-  FL_EXPORT_C(void ,Fl_Double_Window_set_non_modal)(fl_Double_Window win);
-  FL_EXPORT_C(unsigned int ,Fl_Double_Window_non_modal)(fl_Double_Window win);
-  FL_EXPORT_C(void ,Fl_Double_Window_set_menu_window)(fl_Double_Window win);
-  FL_EXPORT_C(unsigned int,Fl_Double_Window_menu_window)(fl_Double_Window win);
-  FL_EXPORT_C(void ,Fl_Double_Window_set_tooltip_window)(fl_Double_Window win);
-  FL_EXPORT_C(unsigned int,Fl_Double_Window_tooltip_window)(fl_Double_Window win);
-  FL_EXPORT_C(void ,Fl_Double_Window_hotspot_with_x_y)(fl_Double_Window win, int x, int y);
-  FL_EXPORT_C(void ,Fl_Double_Window_hotspot_with_x_y_with_offscreen)(fl_Double_Window win, int x, int y, int offscreen);
-  FL_EXPORT_C(void ,Fl_Double_Window_hotspot_with_widget)(fl_Double_Window win, fl_Widget w);//, int offscreen = 0);
-  FL_EXPORT_C(void ,Fl_Double_Window_hotspot_with_widget_with_offscreen)(fl_Double_Window win, fl_Widget w, int offscreen);
-  FL_EXPORT_C(void ,Fl_Double_Window_free_position)(fl_Double_Window win);
-  FL_EXPORT_C(void ,Fl_Double_Window_size_range)(fl_Double_Window win, int minw, int minh);
-  FL_EXPORT_C(void ,Fl_Double_Window_size_range_with_args)(fl_Window win, int minw, int minh, fl_Window_size_range_args* args);//int maxw=0, int maxh=0, int dw=0, int dh=0, int aspect=0);
-  FL_EXPORT_C(const char*, Fl_Double_Window_label)(fl_Double_Window win);
-  FL_EXPORT_C(const char*, Fl_Double_Window_iconlabel)(fl_Double_Window win);
-  FL_EXPORT_C(void, Fl_Double_Window_set_label)(fl_Double_Window win,const char*);
-  FL_EXPORT_C(void, Fl_Double_Window_set_iconlabel)(fl_Double_Window win,const char*);
-  FL_EXPORT_C(void, Fl_Double_Window_set_label_with_iconlabel)(fl_Double_Window win,const char* label, const char* iconlabel);
-  FL_EXPORT_C(void, Fl_Double_Window_copy_label)(fl_Double_Window win,const char* a);
-  FL_EXPORT_C(void, Fl_Double_Window_set_default_xclass)(const char* label);
-  FL_EXPORT_C(const char*, Fl_Double_Window_default_xclass)();
-  FL_EXPORT_C(const char*, Fl_Double_Window_xclass)(fl_Double_Window win);
-  FL_EXPORT_C(void, Fl_Double_Window_set_xclass)(fl_Double_Window win,const char* c);
-  FL_EXPORT_C(const void*, Fl_Double_Window_icon)(fl_Double_Window win);
-  FL_EXPORT_C(void, Fl_Double_Window_set_icon)(fl_Double_Window win,const void * ic);
-  FL_EXPORT_C(int, Fl_Double_Window_shown)(fl_Double_Window win);
-  FL_EXPORT_C(void, Fl_Double_Window_iconize)(fl_Double_Window win);
-  FL_EXPORT_C(int, Fl_Double_Window_x_root)(fl_Double_Window win);
-  FL_EXPORT_C(int, Fl_Double_Window_y_root)(fl_Double_Window win);
-  FL_EXPORT_C(fl_Double_Window, Fl_Double_Window_current)();
-  FL_EXPORT_C(void, Fl_Double_Window_make_current)(fl_Double_Window win);
-  FL_EXPORT_C(void, Fl_Double_Window_set_cursor_with_bg)(fl_Double_Window win, Fl_Cursor cursor, Fl_Color bg);
-  FL_EXPORT_C(void, Fl_Double_Window_set_cursor_with_fg)(fl_Double_Window win,Fl_Cursor cursor, Fl_Color fg);
+  FL_EXPORT_C_HEADER(fl_Double_Window,Fl_OverriddenDouble_Window_New_WithLabel,(int w, int h, const char* title, fl_Double_Window_Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(fl_Double_Window,Fl_OverriddenDouble_Window_New,(int w, int h,fl_Double_Window_Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(fl_Double_Window,Fl_OverriddenDouble_Window_NewXY_WithLabel,(int x, int y, int w, int h, const char* title,fl_Double_Window_Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(fl_Double_Window,Fl_OverriddenDouble_Window_NewXY,(int x, int y, int w, int h,fl_Double_Window_Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(void ,Fl_Double_Window_set_border,(fl_Double_Window win, int b));
+  FL_EXPORT_C_HEADER(void ,Fl_Double_Window_clear_border,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(unsigned int ,Fl_Double_Window_border,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Double_Window_set_override,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Double_Window_override,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Double_Window_set_modal,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Double_Window_modal,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Double_Window_set_non_modal,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(unsigned int ,Fl_Double_Window_non_modal,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Double_Window_set_menu_window,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Double_Window_menu_window,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Double_Window_set_tooltip_window,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Double_Window_tooltip_window,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Double_Window_hotspot_with_x_y,(fl_Double_Window win, int x, int y));
+  FL_EXPORT_C_HEADER(void ,Fl_Double_Window_hotspot_with_x_y_with_offscreen,(fl_Double_Window win, int x, int y, int offscreen));
+  FL_EXPORT_C_HEADER(void ,Fl_Double_Window_hotspot_with_widget,(fl_Double_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void ,Fl_Double_Window_hotspot_with_widget_with_offscreen,(fl_Double_Window win, fl_Widget w, int offscreen));
+  FL_EXPORT_C_HEADER(void ,Fl_Double_Window_free_position,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Double_Window_size_range,(fl_Double_Window win, int minw, int minh));
+  FL_EXPORT_C_HEADER(void ,Fl_Double_Window_size_range_with_args,(fl_Window win, int minw, int minh, fl_Window_size_range_args* args));
+  FL_EXPORT_C_HEADER(const char*,Fl_Double_Window_label,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(const char*,Fl_Double_Window_iconlabel,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_label,(fl_Double_Window win,const char*));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_iconlabel,(fl_Double_Window win,const char*));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_label_with_iconlabel,(fl_Double_Window win,const char* label, const char* iconlabel));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_copy_label,(fl_Double_Window win,const char* a));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_default_xclass,(const char* label));
+  FL_EXPORT_C_HEADER(const char*,Fl_Double_Window_default_xclass,());
+  FL_EXPORT_C_HEADER(const char*,Fl_Double_Window_xclass,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_xclass,(fl_Double_Window win,const char* c));
+  FL_EXPORT_C_HEADER(const void*,Fl_Double_Window_icon,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_icon,(fl_Double_Window win,const void * ic));
+  FL_EXPORT_C_HEADER(int,Fl_Double_Window_shown,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_iconize,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Double_Window_x_root,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Double_Window_y_root,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(fl_Double_Window,Fl_Double_Window_current,());
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_make_current,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_cursor_with_bg,(fl_Double_Window win, Fl_Cursor cursor, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_cursor_with_fg,(fl_Double_Window win,Fl_Cursor cursor, Fl_Color fg));
   FL_EXPORT_C(void, Fl_Double_Window_set_cursor_with_fg_bg)(fl_Double_Window win,Fl_Cursor cursor, Fl_Color fg , Fl_Color bg );/* =FL_BLACK *//*=FL_WHITE*/
-  FL_EXPORT_C(void, Fl_Double_Window_set_cursor)(fl_Double_Window win,Fl_Cursor cursor);
-  FL_EXPORT_C(void, Fl_Double_Window_set_default_cursor_with_bg)(fl_Double_Window win,Fl_Cursor cursor, Fl_Color bg);
-  FL_EXPORT_C(void, Fl_Double_Window_set_default_cursor_with_fg)(fl_Double_Window win, Fl_Cursor cursor, Fl_Color fg);
-  FL_EXPORT_C(void, Fl_Double_Window_set_default_cursor_with_fg_bg)(fl_Double_Window win,Fl_Cursor cursor, Fl_Color fg , Fl_Color bg );
-  FL_EXPORT_C(void, Fl_Double_Window_set_default_cursor)(fl_Double_Window win,Fl_Cursor cursor);
-  FL_EXPORT_C(void, Fl_Double_Window_default_callback)(fl_Double_Window win, void* v);
-  FL_EXPORT_C(int, Fl_Double_Window_decorated_w)(fl_Double_Window win);
-  FL_EXPORT_C(int, Fl_Double_Window_decorated_h)(fl_Double_Window win);
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_cursor,(fl_Double_Window win,Fl_Cursor cursor));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_default_cursor_with_bg,(fl_Double_Window win,Fl_Cursor cursor, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_default_cursor_with_fg,(fl_Double_Window win, Fl_Cursor cursor, Fl_Color fg));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_default_cursor_with_fg_bg,(fl_Double_Window win,Fl_Cursor cursor, Fl_Color fg , Fl_Color bg ));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_set_default_cursor,(fl_Double_Window win,Fl_Cursor cursor));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_default_callback,(fl_Double_Window win, void* v));
+  FL_EXPORT_C_HEADER(int,Fl_Double_Window_decorated_w,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Double_Window_decorated_h,(fl_Double_Window win));
   /* Fl_Double_Window specific */
   // flush resize destructor, constructor
 #ifdef __cplusplus
@@ -236,27 +236,27 @@
     ~Fl_DerivedDouble_Window();
   };
 #endif
-  FL_EXPORT_C(fl_Double_Window_Virtual_Funcs*, Fl_Double_Window_default_virtual_funcs)();
-  FL_EXPORT_C(int ,		Fl_Double_Window_handle)(fl_Double_Window win, int event);
-  FL_EXPORT_C(int ,		Fl_Double_Window_handle_super)(fl_Double_Window win, int event);
-  FL_EXPORT_C(void,		Fl_Double_Window_draw_super)(fl_Double_Window win);
-  FL_EXPORT_C(fl_Group,		Fl_Double_Window_as_group)(fl_Double_Window window);
-  FL_EXPORT_C(fl_Window,	Fl_Double_Window_as_window)(fl_Double_Window window);
-  FL_EXPORT_C(fl_Gl_Window,	Fl_Double_Window_as_gl_window)(fl_Double_Window window);
-  FL_EXPORT_C(fl_Group,		Fl_Double_Window_as_group_super)(fl_Double_Window window);
-  FL_EXPORT_C(fl_Window,	Fl_Double_Window_as_window_super)(fl_Double_Window window);
-  FL_EXPORT_C(fl_Gl_Window,	Fl_Double_Window_as_gl_window_super)(fl_Double_Window window);
-  FL_EXPORT_C(void,		Fl_Double_Window_show_super)(fl_Double_Window win);
-  FL_EXPORT_C(void,		Fl_Double_Window_show)(fl_Double_Window win);
-  FL_EXPORT_C(void,		Fl_Double_Window_show_with_args)(fl_Double_Window win, int argc, char** argv);
-  FL_EXPORT_C(void,		Fl_Double_Window_Destroy)(fl_Double_Window win);
-  FL_EXPORT_C(void,		Fl_Double_Window_flush_super)(fl_Double_Window win);
-  FL_EXPORT_C(void,		Fl_Double_Window_flush)(fl_Double_Window win);
-  FL_EXPORT_C(void,		Fl_Double_Window_resize_super)(fl_Double_Window win, int X, int Y, int W, int H);
-  FL_EXPORT_C(void,		Fl_Double_Window_resize)(fl_Double_Window win, int X, int Y, int W, int H);
-  FL_EXPORT_C(void,		Fl_Double_Window_hide_super)(fl_Double_Window win);
-  FL_EXPORT_C(void,             Fl_Double_Window_hide)(fl_Double_Window win);
-  FL_EXPORT_C(void,             fl_Double_Window_wait_for_expose)(fl_Double_Window win);
+  FL_EXPORT_C_HEADER(fl_Double_Window_Virtual_Funcs*,Fl_Double_Window_default_virtual_funcs,());
+  FL_EXPORT_C_HEADER(int ,		Fl_Double_Window_handle,(fl_Double_Window win, int event));
+  FL_EXPORT_C_HEADER(int ,		Fl_Double_Window_handle_super,(fl_Double_Window win, int event));
+  FL_EXPORT_C_HEADER(void,		Fl_Double_Window_draw_super,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(fl_Group,		Fl_Double_Window_as_group,(fl_Double_Window window));
+  FL_EXPORT_C_HEADER(fl_Window,	Fl_Double_Window_as_window,(fl_Double_Window window));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,	Fl_Double_Window_as_gl_window,(fl_Double_Window window));
+  FL_EXPORT_C_HEADER(fl_Group,		Fl_Double_Window_as_group_super,(fl_Double_Window window));
+  FL_EXPORT_C_HEADER(fl_Window,	Fl_Double_Window_as_window_super,(fl_Double_Window window));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,	Fl_Double_Window_as_gl_window_super,(fl_Double_Window window));
+  FL_EXPORT_C_HEADER(void,		Fl_Double_Window_show_super,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,		Fl_Double_Window_show,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,		Fl_Double_Window_show_with_args,(fl_Double_Window win, int argc, char** argv));
+  FL_EXPORT_C_HEADER(void,		Fl_Double_Window_Destroy,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,		Fl_Double_Window_flush_super,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,		Fl_Double_Window_flush,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,		Fl_Double_Window_resize_super,(fl_Double_Window win, int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(void,		Fl_Double_Window_resize,(fl_Double_Window win, int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(void,		Fl_Double_Window_hide_super,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Double_Window_hide,(fl_Double_Window win));
+  FL_EXPORT_C_HEADER(void,fl_Double_Window_wait_for_expose,(fl_Double_Window win));
 
 #ifdef __cplusplus
 }
diff --git a/c-src/Fl_DrawC.h b/c-src/Fl_DrawC.h
--- a/c-src/Fl_DrawC.h
+++ b/c-src/Fl_DrawC.h
@@ -10,25 +10,25 @@
 EXPORT {
 #endif
   typedef void (*Fl_Draw_Image_Cb)(void* data,int x,int y,int w,uchar* buf);
-  FL_EXPORT_C(void      , flc_set_color)(Fl_Color c);
-  FL_EXPORT_C(void      , flc_set_color_with_c)(int c);
+  FL_EXPORT_C_HEADER(void      ,flc_set_color,(Fl_Color c));
+  FL_EXPORT_C_HEADER(void      ,flc_set_color_with_c,(int c));
   FL_EXPORT_C(void      , flc_set_color_with_rgb)(uchar r, uchar g, uchar b); // select actual color
-  FL_EXPORT_C(Fl_Color  , flc_color)();
-  FL_EXPORT_C(void      , flc_push_clip)(int x, int y, int w, int h);
+  FL_EXPORT_C_HEADER(Fl_Color  ,flc_color,());
+  FL_EXPORT_C_HEADER(void      ,flc_push_clip,(int x, int y, int w, int h));
 #define fl_clipc fl_push_clipc
-  FL_EXPORT_C(void      , flc_push_no_clip)();
-  FL_EXPORT_C(void      , flc_pop_clip)();
-  FL_EXPORT_C(int       , flc_not_clipped)(int x, int y, int w, int h);
-  FL_EXPORT_C(int       , flc_clip_box)(int x , int y, int w, int h, int* X, int* Y, int* W, int* H);
-  FL_EXPORT_C(void      , flc_restore_clip)();
-  FL_EXPORT_C(void      , flc_set_clip_region)(fl_Region r);
-  FL_EXPORT_C(fl_Region , flc_clip_region)();
-  FL_EXPORT_C(void      , flc_point)(int x, int y);
-  FL_EXPORT_C(void      , flc_line_style_with_width_dashes)(int style, int width, char* dashes);
-  FL_EXPORT_C(void      , flc_line_style_with_dashes)(int style, char* dashes);
-  FL_EXPORT_C(void      , flc_line_style_with_width)(int style, int width);
-  FL_EXPORT_C(void      , flc_line_style)(int style);
-#ifndef INTERNAL_LINKAGE  
+  FL_EXPORT_C_HEADER(void      ,flc_push_no_clip,());
+  FL_EXPORT_C_HEADER(void      ,flc_pop_clip,());
+  FL_EXPORT_C_HEADER(int       ,flc_not_clipped,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(int       ,flc_clip_box,(int x , int y, int w, int h, int* X, int* Y, int* W, int* H));
+  FL_EXPORT_C_HEADER(void      ,flc_restore_clip,());
+  FL_EXPORT_C_HEADER(void      ,flc_set_clip_region,(fl_Region r));
+  FL_EXPORT_C_HEADER(fl_Region ,flc_clip_region,());
+  FL_EXPORT_C_HEADER(void      ,flc_point,(int x, int y));
+  FL_EXPORT_C_HEADER(void      ,flc_line_style_with_width_dashes,(int style, int width, char* dashes));
+  FL_EXPORT_C_HEADER(void      ,flc_line_style_with_dashes,(int style, char* dashes));
+  FL_EXPORT_C_HEADER(void      ,flc_line_style_with_width,(int style, int width));
+  FL_EXPORT_C_HEADER(void      ,flc_line_style,(int style));
+#ifndef INTERNAL_LINKAGE
   enum {
     FL_SOLID    = 0,
     FL_DASH     = 1,
@@ -45,129 +45,129 @@
     FL_JOIN_BEVEL       = 0x3000
   };
 #endif
-  FL_EXPORT_C(void         , flc_rect)(int x, int y, int w, int h);
-  FL_EXPORT_C(void         , flc_rect_with_color)(int x, int y, int w, int h, Fl_Color c);
-  FL_EXPORT_C(void         , flc_rectf)(int x, int y, int w, int h);
-  FL_EXPORT_C(void         , flc_rectf_with_color)(int x, int y, int w, int h, Fl_Color c);
-  FL_EXPORT_C(void         , flc_rectf_with_rgb)(int x, int y, int w, int h, uchar r, uchar g, uchar b);
-  FL_EXPORT_C(void         , flc_line)(int x, int y, int x1, int y1);
-  FL_EXPORT_C(void         , flc_line_with_x2_y2)(int x, int y, int x1, int y1, int x2, int y2);
-  FL_EXPORT_C(void         , flc_loop)(int x, int y, int x1, int y1, int x2, int y2);
-  FL_EXPORT_C(void         , flc_loop_with_x3_y3)(int x, int y, int x1, int y1, int x2, int y2, int x3, int y3);
-  FL_EXPORT_C(void         , flc_polygon)(int x, int y, int x1, int y1, int x2, int y2);
-  FL_EXPORT_C(void         , flc_polygon_with_x3_y3)(int x, int y, int x1, int y1, int x2, int y2, int x3, int y3);
-  FL_EXPORT_C(void         , flc_xyline)(int x, int y, int x1);
-  FL_EXPORT_C(void         , flc_xyline_with_x2)(int x, int y, int x1, int y2);
-  FL_EXPORT_C(void         , flc_xyline_with_y2_x3)(int x, int y, int x1, int y2, int x3);
-  FL_EXPORT_C(void         , flc_yxline_with_y1)(int x, int y, int y1);
-  FL_EXPORT_C(void         , flc_yxline_with_y2_x2)(int x, int y, int y1, int x2);
-  FL_EXPORT_C(void         , flc_yxline_with_y2_x3)(int x, int y, int y1, int x2, int y3);
-  FL_EXPORT_C(void         , flc_arc_by_width_height)(int x, int y, int w, int h, double a1, double a2);
-  FL_EXPORT_C(void         , flc_pie)(int x, int y, int w, int h, double a1, double a2);
-  FL_EXPORT_C(void         , flc_push_matrix)();
-  FL_EXPORT_C(void         , flc_pop_matrix)();
-  FL_EXPORT_C(void         , flc_scale_with_y)(double x, double y);
-  FL_EXPORT_C(void         , flc_scale)(double x);
-  FL_EXPORT_C(void         , flc_translate)(double x, double y);
-  FL_EXPORT_C(void         , flc_rotate)(double d);
-  FL_EXPORT_C(void         , flc_mult_matrix)(double a, double b, double c, double d, double x,double y);
-  FL_EXPORT_C(void         , flc_begin_points)();
-  FL_EXPORT_C(void         , flc_begin_line)();
-  FL_EXPORT_C(void         , flc_begin_loop)();
-  FL_EXPORT_C(void         , flc_begin_polygon)();
-  FL_EXPORT_C(void         , flc_vertex)(double x, double y);
-  FL_EXPORT_C(void         , flc_curve)(double X0, double Y0, double X1, double Y1, double X2, double Y2, double X3, double Y3);
-  FL_EXPORT_C(void         , flc_arc_by_radius)(double x, double y, double r, double start, double end);
-  FL_EXPORT_C(void         , flc_circle)(double x, double y, double r);
-  FL_EXPORT_C(void         , flc_end_points)();
-  FL_EXPORT_C(void         , flc_end_line)();
-  FL_EXPORT_C(void         , flc_end_loop)();
-  FL_EXPORT_C(void         , flc_end_polygon)();
-  FL_EXPORT_C(void         , flc_begin_complex_polygon)();
-  FL_EXPORT_C(void         , flc_gap)();
-  FL_EXPORT_C(void         , flc_end_complex_polygon)();
-  FL_EXPORT_C(double       , flc_transform_x)(double x, double y);
-  FL_EXPORT_C(double       , flc_transform_y)(double x, double y);
-  FL_EXPORT_C(double       , flc_transform_dx)(double x, double y);
-  FL_EXPORT_C(double       , flc_transform_dy)(double x, double y);
-  FL_EXPORT_C(void         , flc_transformed_vertex)(double xf, double yf);
-  FL_EXPORT_C(void         , flc_set_font)(Fl_Font face, Fl_Fontsize fsize);
-  FL_EXPORT_C(Fl_Font      , flc_font)();
-  FL_EXPORT_C(Fl_Fontsize  , flc_size)();
-  FL_EXPORT_C(int          , flc_height)();
-  FL_EXPORT_C(int          , flc_set_height)(int font, int size);
-  FL_EXPORT_C(int          , flc_descent)();
-  FL_EXPORT_C(double       , flc_width)(const char* txt);
-  FL_EXPORT_C(double       , flc_width_with_n)(const char* txt, int n);
-  FL_EXPORT_C(double       , flc_width_with_c)(unsigned int c);
+  FL_EXPORT_C_HEADER(void         ,flc_rect,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void         ,flc_rect_with_color,(int x, int y, int w, int h, Fl_Color c));
+  FL_EXPORT_C_HEADER(void         ,flc_rectf,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void         ,flc_rectf_with_color,(int x, int y, int w, int h, Fl_Color c));
+  FL_EXPORT_C_HEADER(void         ,flc_rectf_with_rgb,(int x, int y, int w, int h, uchar r, uchar g, uchar b));
+  FL_EXPORT_C_HEADER(void         ,flc_line,(int x, int y, int x1, int y1));
+  FL_EXPORT_C_HEADER(void         ,flc_line_with_x2_y2,(int x, int y, int x1, int y1, int x2, int y2));
+  FL_EXPORT_C_HEADER(void         ,flc_loop,(int x, int y, int x1, int y1, int x2, int y2));
+  FL_EXPORT_C_HEADER(void         ,flc_loop_with_x3_y3,(int x, int y, int x1, int y1, int x2, int y2, int x3, int y3));
+  FL_EXPORT_C_HEADER(void         ,flc_polygon,(int x, int y, int x1, int y1, int x2, int y2));
+  FL_EXPORT_C_HEADER(void         ,flc_polygon_with_x3_y3,(int x, int y, int x1, int y1, int x2, int y2, int x3, int y3));
+  FL_EXPORT_C_HEADER(void         ,flc_xyline,(int x, int y, int x1));
+  FL_EXPORT_C_HEADER(void         ,flc_xyline_with_x2,(int x, int y, int x1, int y2));
+  FL_EXPORT_C_HEADER(void         ,flc_xyline_with_y2_x3,(int x, int y, int x1, int y2, int x3));
+  FL_EXPORT_C_HEADER(void         ,flc_yxline_with_y1,(int x, int y, int y1));
+  FL_EXPORT_C_HEADER(void         ,flc_yxline_with_y2_x2,(int x, int y, int y1, int x2));
+  FL_EXPORT_C_HEADER(void         ,flc_yxline_with_y2_x3,(int x, int y, int y1, int x2, int y3));
+  FL_EXPORT_C_HEADER(void         ,flc_arc_by_width_height,(int x, int y, int w, int h, double a1, double a2));
+  FL_EXPORT_C_HEADER(void         ,flc_pie,(int x, int y, int w, int h, double a1, double a2));
+  FL_EXPORT_C_HEADER(void         ,flc_push_matrix,());
+  FL_EXPORT_C_HEADER(void         ,flc_pop_matrix,());
+  FL_EXPORT_C_HEADER(void         ,flc_scale_with_y,(double x, double y));
+  FL_EXPORT_C_HEADER(void         ,flc_scale,(double x));
+  FL_EXPORT_C_HEADER(void         ,flc_translate,(double x, double y));
+  FL_EXPORT_C_HEADER(void         ,flc_rotate,(double d));
+  FL_EXPORT_C_HEADER(void         ,flc_mult_matrix,(double a, double b, double c, double d, double x,double y));
+  FL_EXPORT_C_HEADER(void         ,flc_begin_points,());
+  FL_EXPORT_C_HEADER(void         ,flc_begin_line,());
+  FL_EXPORT_C_HEADER(void         ,flc_begin_loop,());
+  FL_EXPORT_C_HEADER(void         ,flc_begin_polygon,());
+  FL_EXPORT_C_HEADER(void         ,flc_vertex,(double x, double y));
+  FL_EXPORT_C_HEADER(void         ,flc_curve,(double X0, double Y0, double X1, double Y1, double X2, double Y2, double X3, double Y3));
+  FL_EXPORT_C_HEADER(void         ,flc_arc_by_radius,(double x, double y, double r, double start, double end));
+  FL_EXPORT_C_HEADER(void         ,flc_circle,(double x, double y, double r));
+  FL_EXPORT_C_HEADER(void         ,flc_end_points,());
+  FL_EXPORT_C_HEADER(void         ,flc_end_line,());
+  FL_EXPORT_C_HEADER(void         ,flc_end_loop,());
+  FL_EXPORT_C_HEADER(void         ,flc_end_polygon,());
+  FL_EXPORT_C_HEADER(void         ,flc_begin_complex_polygon,());
+  FL_EXPORT_C_HEADER(void         ,flc_gap,());
+  FL_EXPORT_C_HEADER(void         ,flc_end_complex_polygon,());
+  FL_EXPORT_C_HEADER(double       ,flc_transform_x,(double x, double y));
+  FL_EXPORT_C_HEADER(double       ,flc_transform_y,(double x, double y));
+  FL_EXPORT_C_HEADER(double       ,flc_transform_dx,(double x, double y));
+  FL_EXPORT_C_HEADER(double       ,flc_transform_dy,(double x, double y));
+  FL_EXPORT_C_HEADER(void         ,flc_transformed_vertex,(double xf, double yf));
+  FL_EXPORT_C_HEADER(void         ,flc_set_font,(Fl_Font face, Fl_Fontsize fsize));
+  FL_EXPORT_C_HEADER(Fl_Font      ,flc_font,());
+  FL_EXPORT_C_HEADER(Fl_Fontsize  ,flc_size,());
+  FL_EXPORT_C_HEADER(int          ,flc_height,());
+  FL_EXPORT_C_HEADER(int          ,flc_set_height,(int font, int size));
+  FL_EXPORT_C_HEADER(int          ,flc_descent,());
+  FL_EXPORT_C_HEADER(double       ,flc_width,(const char* txt));
+  FL_EXPORT_C_HEADER(double       ,flc_width_with_n,(const char* txt, int n));
+  FL_EXPORT_C_HEADER(double       ,flc_width_with_c,(unsigned int c));
   FL_EXPORT_C(void         , flc_text_extents)(const char* s, int* dx, int* dy, int* w, int* h); // NO fltk symbol expansion will be performed
-  FL_EXPORT_C(void         , flc_text_extents_with_n)(const char* t, int n, int* dx, int* dy, int* w, int* h);
-  FL_EXPORT_C(const char*  , flc_latin1_to_local)(const char* t);
-  FL_EXPORT_C(const char*  , flc_latin1_to_local_with_n)(const char* t, int n);
-  FL_EXPORT_C(const char*  , flc_local_to_latin1)(const char* t);
-  FL_EXPORT_C(const char*  , flc_local_to_latin1_with_n)(const char* t, int n);
-  FL_EXPORT_C(const char*  , flc_mac_roman_to_local)(const char* t);
-  FL_EXPORT_C(const char*  , flc_mac_roman_to_local_with_n)(const char* t, int n);
-  FL_EXPORT_C(const char*  , flc_local_to_mac_roman)(const char* t);
-  FL_EXPORT_C(const char*  , flc_local_to_mac_roman_with_n)(const char* t, int n);
-  FL_EXPORT_C(void         , flc_draw)(const char* str, int x, int y);
-  FL_EXPORT_C(void         , flc_draw_with_angle)(int angle, const char* str, int x, int y);
-  FL_EXPORT_C(void         , flc_draw_with_n)(const char* str, int n, int x, int y);
-  FL_EXPORT_C(void         , flc_draw_with_n_angle)(int angle, const char* str, int n, int x, int y);
-  FL_EXPORT_C(void         , flc_rtl_draw)(const char* str, int n, int x, int y);
-  FL_EXPORT_C(void         , flc_measure)(const char* str, int* x, int* y);
-  FL_EXPORT_C(void         , flc_measure_with_draw_symbols)(const char* str, int* x, int* y,int draw_symbols);
-  FL_EXPORT_C(void         , flc_draw_with_img_draw_symbols)(const char* str, int x, int y, int w, int h, Fl_Align align, fl_Image img,int draw_symbols);
-  FL_EXPORT_C(void         , flc_draw_with_img)(const char* str, int x, int y, int w, int h, Fl_Align align, fl_Image img);
-  FL_EXPORT_C(void         , flc_draw_with_draw_symbols)(const char* str, int x, int y, int w, int h, Fl_Align align,int draw_symbols);
-  FL_EXPORT_C(void         , flc_draw_with_align)(const char* str, int x, int y, int w, int h, Fl_Align align);
-  FL_EXPORT_C(void         , flc_draw_with_callthis_img_draw_symbols)(const char* str, int x, int y, int w, int h, Fl_Align align,void (*callthis)(const char* ,int,int,int), fl_Image img,int draw_symbols);
-  FL_EXPORT_C(void         , flc_draw_with_callthis_img)(const char* str, int x, int y, int w, int h, Fl_Align align,void (*callthis)(const char* ,int,int,int), fl_Image img);
-  FL_EXPORT_C(void         , flc_draw_with_callthis_draw_symbols)(const char* str, int x, int y, int w, int h, Fl_Align align,void (*callthis)(const char* ,int,int,int),int draw_symbols);
-  FL_EXPORT_C(void         , flc_draw_with_callthis)(const char* str, int x, int y, int w, int h, Fl_Align align, void (*callthis)(const char* ,int,int,int));
-  FL_EXPORT_C(void         , flc_frame)(const char* s, int x, int y, int w, int h);
-  FL_EXPORT_C(void         , flc_frame2)(const char* s, int x, int y, int w, int h);
-  FL_EXPORT_C(void         , flc_draw_box)(Fl_Boxtype boxtype, int x, int y, int w, int h, Fl_Color color);
-  FL_EXPORT_C(void         , flc_draw_image_buf_with_d_l)(const uchar* buf, int X,int Y,int W,int H, int D, int L);
-  FL_EXPORT_C(void         , flc_draw_image_buf_with_d)(const uchar* buf, int X,int Y,int W,int H, int D);
-  FL_EXPORT_C(void         , flc_draw_image_buf_with_l)(const uchar* buf, int X,int Y,int W,int H,int L);
-  FL_EXPORT_C(void         , flc_draw_image_buf)(const uchar* buf, int X,int Y,int W,int H);
-  FL_EXPORT_C(void         , flc_draw_image_mono_buf_with_d_l)(const uchar* buf, int X,int Y,int W,int H, int D, int L);
-  FL_EXPORT_C(void         , flc_draw_box)(Fl_Boxtype boxtype, int x, int y, int w, int h, Fl_Color color);
-  FL_EXPORT_C(void         , flc_draw_image_mono_buf_with_d)(const uchar* buf, int X,int Y,int W,int H, int D);
-  FL_EXPORT_C(void         , flc_draw_image_mono_buf_with_l)(const uchar* buf, int X,int Y,int W,int H, int L);
-  FL_EXPORT_C(void         , flc_draw_image_mono_buf)(const uchar* buf, int X,int Y,int W,int H);
-  FL_EXPORT_C(void         , flc_draw_image_cb)(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H);
-  FL_EXPORT_C(void         , flc_draw_image_cb_with_d)(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D);
-  FL_EXPORT_C(void         , flc_draw_image_mono_cb_with_d)(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D);
-  FL_EXPORT_C(void         , flc_draw_image_mono_cb)(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H);
-  FL_EXPORT_C(char         , flc_can_do_alpha_blending)();
-  FL_EXPORT_C(uchar*       , flc_read_image_with_alpha)(uchar* p,int X,int Y,int W,int H,int alpha);
-  FL_EXPORT_C(uchar*       , flc_read_image)(uchar* p,int X,int Y,int W,int H);
-  FL_EXPORT_C(int          , flc_draw_pixmap_with_color)(char* const* data, int x,int y,Fl_Color color);
-  FL_EXPORT_C(int          , flc_draw_pixmap)(char* const* data, int x,int y);
-  FL_EXPORT_C(int          , flc_draw_pixmap_with_cdata_color)(char* const* cdata, int x,int y,Fl_Color color);
-  FL_EXPORT_C(int          , flc_draw_pixmap_with_cdata)(char* const* cdata, int x,int y);
-  FL_EXPORT_C(int          , flc_measure_pixmap)(char* const* data, int* w, int* h);
-  FL_EXPORT_C(int          , flc_measure_pixmap_with_cdata)(const char* const* cdata, int* w, int* h);
-  FL_EXPORT_C(void         , flc_scroll)(int X, int Y, int W, int H, int dx, int dy, void (*draw_area)(void*, int,int,int,int), void* data);
-  FL_EXPORT_C(const char*  , flc_shortcut_label)(unsigned int shortcut);
-  FL_EXPORT_C(const char*  , flc_shortcut_label_with_eom)(unsigned int shortcut, const char* *eom);
-  FL_EXPORT_C(unsigned int , flc_old_shortcut)(const char* s);
-  FL_EXPORT_C(void         , flc_overlay_rect)(int x,int y,int w,int h);
-  FL_EXPORT_C(void         , flc_overlay_clear)();
-  FL_EXPORT_C(void         , flc_cursor_with_fg_bg)(Fl_Cursor cursore, Fl_Color fg, Fl_Color bg);
-  FL_EXPORT_C(void         , flc_cursor_with_fg)(Fl_Cursor cursor, Fl_Color fg);
-  FL_EXPORT_C(void         , flc_cursor_with_bg)(Fl_Cursor cursor, Fl_Color bg);
-  FL_EXPORT_C(void         , flc_cursor)(Fl_Cursor cursor);
-  FL_EXPORT_C(const char*  , flc_expand_text_with_draw_symbols)(const char* from, char* buf, int maxbuf, double maxw, int* n, double* width, int wrap, int draw_symbols);
-  FL_EXPORT_C(const char*  , flc_expand_text)(const char* from, char* buf, int maxbuf, double maxw, int* n, double *width, int wrap);
-  FL_EXPORT_C(void         , flc_set_status)(int X, int Y, int W, int H);
-  FL_EXPORT_C(void         , flc_set_spot_with_win)(int font, int size, int X, int Y, int W, int H, fl_Window win);
-  FL_EXPORT_C(void         , flc_set_spot)(int font, int size, int X, int Y, int W, int H);
-  FL_EXPORT_C(void         , flc_reset_spot)();
-  FL_EXPORT_C(int          , flc_draw_symbol)(const char* label,int x,int y,int w,int h, Fl_Color color);
-  FL_EXPORT_C(int          , flc_add_symbol)(const char* name, void (*drawit)(Fl_Color), int scalable);
+  FL_EXPORT_C_HEADER(void         ,flc_text_extents_with_n,(const char* t, int n, int* dx, int* dy, int* w, int* h));
+  FL_EXPORT_C_HEADER(const char*  ,flc_latin1_to_local,(const char* t));
+  FL_EXPORT_C_HEADER(const char*  ,flc_latin1_to_local_with_n,(const char* t, int n));
+  FL_EXPORT_C_HEADER(const char*  ,flc_local_to_latin1,(const char* t));
+  FL_EXPORT_C_HEADER(const char*  ,flc_local_to_latin1_with_n,(const char* t, int n));
+  FL_EXPORT_C_HEADER(const char*  ,flc_mac_roman_to_local,(const char* t));
+  FL_EXPORT_C_HEADER(const char*  ,flc_mac_roman_to_local_with_n,(const char* t, int n));
+  FL_EXPORT_C_HEADER(const char*  ,flc_local_to_mac_roman,(const char* t));
+  FL_EXPORT_C_HEADER(const char*  ,flc_local_to_mac_roman_with_n,(const char* t, int n));
+  FL_EXPORT_C_HEADER(void         ,flc_draw,(const char* str, int x, int y));
+  FL_EXPORT_C_HEADER(void         ,flc_draw_with_angle,(int angle, const char* str, int x, int y));
+  FL_EXPORT_C_HEADER(void         ,flc_draw_with_n,(const char* str, int n, int x, int y));
+  FL_EXPORT_C_HEADER(void         ,flc_draw_with_n_angle,(int angle, const char* str, int n, int x, int y));
+  FL_EXPORT_C_HEADER(void         ,flc_rtl_draw,(const char* str, int n, int x, int y));
+  FL_EXPORT_C_HEADER(void         ,flc_measure,(const char* str, int* x, int* y));
+  FL_EXPORT_C_HEADER(void         ,flc_measure_with_draw_symbols,(const char* str, int* x, int* y,int draw_symbols));
+  FL_EXPORT_C_HEADER(void         ,flc_draw_with_img_draw_symbols,(const char* str, int x, int y, int w, int h, Fl_Align align, fl_Image img,int draw_symbols));
+  FL_EXPORT_C_HEADER(void         ,flc_draw_with_img,(const char* str, int x, int y, int w, int h, Fl_Align align, fl_Image img));
+  FL_EXPORT_C_HEADER(void         ,flc_draw_with_draw_symbols,(const char* str, int x, int y, int w, int h, Fl_Align align,int draw_symbols));
+  FL_EXPORT_C_HEADER(void         ,flc_draw_with_align,(const char* str, int x, int y, int w, int h, Fl_Align align));
+  FL_EXPORT_C_HEADER(void         ,flc_draw_with_callthis_img_draw_symbols,(const char* str, int x, int y, int w, int h, Fl_Align align,void (*callthis)(const char* ,int,int,int), fl_Image img,int draw_symbols));
+  FL_EXPORT_C_HEADER(void         ,flc_draw_with_callthis_img,(const char* str, int x, int y, int w, int h, Fl_Align align,void (*callthis)(const char* ,int,int,int), fl_Image img));
+  FL_EXPORT_C_HEADER(void         ,flc_draw_with_callthis_draw_symbols,(const char* str, int x, int y, int w, int h, Fl_Align align,void (*callthis)(const char* ,int,int,int),int draw_symbols));
+  FL_EXPORT_C_HEADER(void         ,flc_draw_with_callthis,(const char* str, int x, int y, int w, int h, Fl_Align align, void (*callthis)(const char* ,int,int,int)));
+  FL_EXPORT_C_HEADER(void         ,flc_frame,(const char* s, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void         ,flc_frame2,(const char* s, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void         ,flc_draw_box,(Fl_Boxtype boxtype, int x, int y, int w, int h, Fl_Color color));
+  FL_EXPORT_C_HEADER(void         ,flc_draw_image_buf_with_d_l,(const uchar* buf, int X,int Y,int W,int H, int D, int L));
+  FL_EXPORT_C_HEADER(void         ,flc_draw_image_buf_with_d,(const uchar* buf, int X,int Y,int W,int H, int D));
+  FL_EXPORT_C_HEADER(void         ,flc_draw_image_buf_with_l,(const uchar* buf, int X,int Y,int W,int H,int L));
+  FL_EXPORT_C_HEADER(void         ,flc_draw_image_buf,(const uchar* buf, int X,int Y,int W,int H));
+  FL_EXPORT_C_HEADER(void         ,flc_draw_image_mono_buf_with_d_l,(const uchar* buf, int X,int Y,int W,int H, int D, int L));
+  FL_EXPORT_C_HEADER(void         ,flc_draw_box,(Fl_Boxtype boxtype, int x, int y, int w, int h, Fl_Color color));
+  FL_EXPORT_C_HEADER(void         ,flc_draw_image_mono_buf_with_d,(const uchar* buf, int X,int Y,int W,int H, int D));
+  FL_EXPORT_C_HEADER(void         ,flc_draw_image_mono_buf_with_l,(const uchar* buf, int X,int Y,int W,int H, int L));
+  FL_EXPORT_C_HEADER(void         ,flc_draw_image_mono_buf,(const uchar* buf, int X,int Y,int W,int H));
+  FL_EXPORT_C_HEADER(void         ,flc_draw_image_cb,(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H));
+  FL_EXPORT_C_HEADER(void         ,flc_draw_image_cb_with_d,(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D));
+  FL_EXPORT_C_HEADER(void         ,flc_draw_image_mono_cb_with_d,(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D));
+  FL_EXPORT_C_HEADER(void         ,flc_draw_image_mono_cb,(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H));
+  FL_EXPORT_C_HEADER(char         ,flc_can_do_alpha_blending,());
+  FL_EXPORT_C_HEADER(uchar*       ,flc_read_image_with_alpha,(uchar* p,int X,int Y,int W,int H,int alpha));
+  FL_EXPORT_C_HEADER(uchar*       ,flc_read_image,(uchar* p,int X,int Y,int W,int H));
+  FL_EXPORT_C_HEADER(int          ,flc_draw_pixmap_with_color,(char* const* data, int x,int y,Fl_Color color));
+  FL_EXPORT_C_HEADER(int          ,flc_draw_pixmap,(char* const* data, int x,int y));
+  FL_EXPORT_C_HEADER(int          ,flc_draw_pixmap_with_cdata_color,(char* const* cdata, int x,int y,Fl_Color color));
+  FL_EXPORT_C_HEADER(int          ,flc_draw_pixmap_with_cdata,(char* const* cdata, int x,int y));
+  FL_EXPORT_C_HEADER(int          ,flc_measure_pixmap,(char* const* data, int* w, int* h));
+  FL_EXPORT_C_HEADER(int          ,flc_measure_pixmap_with_cdata,(const char* const* cdata, int* w, int* h));
+  FL_EXPORT_C_HEADER(void         ,flc_scroll,(int X, int Y, int W, int H, int dx, int dy, void (*draw_area)(void*, int,int,int,int), void* data));
+  FL_EXPORT_C_HEADER(const char*  ,flc_shortcut_label,(unsigned int shortcut));
+  FL_EXPORT_C_HEADER(const char*  ,flc_shortcut_label_with_eom,(unsigned int shortcut, const char* *eom));
+  FL_EXPORT_C_HEADER(unsigned int ,flc_old_shortcut,(const char* s));
+  FL_EXPORT_C_HEADER(void         ,flc_overlay_rect,(int x,int y,int w,int h));
+  FL_EXPORT_C_HEADER(void         ,flc_overlay_clear,());
+  FL_EXPORT_C_HEADER(void         ,flc_cursor_with_fg_bg,(Fl_Cursor cursore, Fl_Color fg, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void         ,flc_cursor_with_fg,(Fl_Cursor cursor, Fl_Color fg));
+  FL_EXPORT_C_HEADER(void         ,flc_cursor_with_bg,(Fl_Cursor cursor, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void         ,flc_cursor,(Fl_Cursor cursor));
+  FL_EXPORT_C_HEADER(const char*  ,flc_expand_text_with_draw_symbols,(const char* from, char* buf, int maxbuf, double maxw, int* n, double* width, int wrap, int draw_symbols));
+  FL_EXPORT_C_HEADER(const char*  ,flc_expand_text,(const char* from, char* buf, int maxbuf, double maxw, int* n, double *width, int wrap));
+  FL_EXPORT_C_HEADER(void         ,flc_set_status,(int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(void         ,flc_set_spot_with_win,(int font, int size, int X, int Y, int W, int H, fl_Window win));
+  FL_EXPORT_C_HEADER(void         ,flc_set_spot,(int font, int size, int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(void         ,flc_reset_spot,());
+  FL_EXPORT_C_HEADER(int          ,flc_draw_symbol,(const char* label,int x,int y,int w,int h, Fl_Color color));
+  FL_EXPORT_C_HEADER(int          ,flc_add_symbol,(const char* name, void (*drawit)(Fl_Color), int scalable));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_EnumerationsC.h b/c-src/Fl_EnumerationsC.h
--- a/c-src/Fl_EnumerationsC.h
+++ b/c-src/Fl_EnumerationsC.h
@@ -447,35 +447,35 @@
 #    define inactive    fl_inactive
 #  endif /* FLTK_1_0_COMPAT */
 #endif
-  FL_EXPORT_C(Fl_Boxtype, fl_define_FL_ROUND_UP_BOXC)();
-  FL_EXPORT_C(Fl_Boxtype, fl_define_FL_SHADOW_BOXC)();
-  FL_EXPORT_C(Fl_Boxtype, fl_define_FL_ROUNDED_BOXC)();
-  FL_EXPORT_C(Fl_Boxtype, fl_define_FL_RFLAT_BOXC)();
-  FL_EXPORT_C(Fl_Boxtype, fl_define_FL_RSHADOW_BOXC)();
-  FL_EXPORT_C(Fl_Boxtype, fl_define_FL_DIAMOND_BOXC)();
-  FL_EXPORT_C(Fl_Boxtype, fl_define_FL_OVAL_BOXC)();
-  FL_EXPORT_C(Fl_Boxtype, fl_define_FL_PLASTIC_UP_BOXC)();
-  FL_EXPORT_C(Fl_Boxtype, fl_define_FL_GTK_UP_BOXC)();
-  FL_EXPORT_C(Fl_Boxtype, fl_define_FL_GLEAM_UP_BOXC)();
-  FL_EXPORT_C(Fl_Boxtype, fl_boxC)(Fl_Boxtype b) ;
-  FL_EXPORT_C(Fl_Boxtype, fl_downC)(Fl_Boxtype b) ;
-  FL_EXPORT_C(Fl_Boxtype, fl_frameC)(Fl_Boxtype b) ;
-  FL_EXPORT_C(Fl_Labeltype, fl_define_FL_SHADOW_LABELC)() ;
-  FL_EXPORT_C(Fl_Labeltype, fl_define_FL_ENGRAVED_LABELC)() ;
-  FL_EXPORT_C(Fl_Labeltype, fl_define_FL_EMBOSSED_LABELC)() ;
-  FL_EXPORT_C(Fl_Align, FL_ALIGN_TOP_LEFTC)();
-  FL_EXPORT_C(Fl_Align, FL_ALIGN_TOP_RIGHTC)();
-  FL_EXPORT_C(Fl_Align, FL_ALIGN_BOTTOM_LEFTC)();
-  FL_EXPORT_C(Fl_Align, FL_ALIGN_BOTTOM_RIGHTC)();
-  FL_EXPORT_C(Fl_Color, fl_inactiveC)(Fl_Color c) ;
-  FL_EXPORT_C(Fl_Color, fl_contrastC)(Fl_Color fg, Fl_Color bg) ;
-  FL_EXPORT_C(Fl_Color, fl_color_averageC)(Fl_Color c1, Fl_Color c2, float weight);
-  FL_EXPORT_C(Fl_Color, fl_lighterC)(Fl_Color c);
-  FL_EXPORT_C(Fl_Color, fl_darkerC)(Fl_Color c);
-  FL_EXPORT_C(Fl_Color, fl_rgb_color_with_rgbC)(uchar r, uchar g, uchar b);
-  FL_EXPORT_C(Fl_Color, fl_rgb_color_with_grayscaleC)(uchar g);
-  FL_EXPORT_C(Fl_Color, fl_gray_rampC)(int i);
-  FL_EXPORT_C(Fl_Color, fl_color_cubeC)(int r, int g, int b);
+  FL_EXPORT_C_HEADER(Fl_Boxtype,fl_define_FL_ROUND_UP_BOXC,());
+  FL_EXPORT_C_HEADER(Fl_Boxtype,fl_define_FL_SHADOW_BOXC,());
+  FL_EXPORT_C_HEADER(Fl_Boxtype,fl_define_FL_ROUNDED_BOXC,());
+  FL_EXPORT_C_HEADER(Fl_Boxtype,fl_define_FL_RFLAT_BOXC,());
+  FL_EXPORT_C_HEADER(Fl_Boxtype,fl_define_FL_RSHADOW_BOXC,());
+  FL_EXPORT_C_HEADER(Fl_Boxtype,fl_define_FL_DIAMOND_BOXC,());
+  FL_EXPORT_C_HEADER(Fl_Boxtype,fl_define_FL_OVAL_BOXC,());
+  FL_EXPORT_C_HEADER(Fl_Boxtype,fl_define_FL_PLASTIC_UP_BOXC,());
+  FL_EXPORT_C_HEADER(Fl_Boxtype,fl_define_FL_GTK_UP_BOXC,());
+  FL_EXPORT_C_HEADER(Fl_Boxtype,fl_define_FL_GLEAM_UP_BOXC,());
+  FL_EXPORT_C_HEADER(Fl_Boxtype,fl_boxC,(Fl_Boxtype b) );
+  FL_EXPORT_C_HEADER(Fl_Boxtype,fl_downC,(Fl_Boxtype b) );
+  FL_EXPORT_C_HEADER(Fl_Boxtype,fl_frameC,(Fl_Boxtype b) );
+  FL_EXPORT_C_HEADER(Fl_Labeltype,fl_define_FL_SHADOW_LABELC,() );
+  FL_EXPORT_C_HEADER(Fl_Labeltype,fl_define_FL_ENGRAVED_LABELC,() );
+  FL_EXPORT_C_HEADER(Fl_Labeltype,fl_define_FL_EMBOSSED_LABELC,() );
+  FL_EXPORT_C_HEADER(Fl_Align,FL_ALIGN_TOP_LEFTC,());
+  FL_EXPORT_C_HEADER(Fl_Align,FL_ALIGN_TOP_RIGHTC,());
+  FL_EXPORT_C_HEADER(Fl_Align,FL_ALIGN_BOTTOM_LEFTC,());
+  FL_EXPORT_C_HEADER(Fl_Align,FL_ALIGN_BOTTOM_RIGHTC,());
+  FL_EXPORT_C_HEADER(Fl_Color,fl_inactiveC,(Fl_Color c) );
+  FL_EXPORT_C_HEADER(Fl_Color,fl_contrastC,(Fl_Color fg, Fl_Color bg) );
+  FL_EXPORT_C_HEADER(Fl_Color,fl_color_averageC,(Fl_Color c1, Fl_Color c2, float weight));
+  FL_EXPORT_C_HEADER(Fl_Color,fl_lighterC,(Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Color,fl_darkerC,(Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Color,fl_rgb_color_with_rgbC,(uchar r, uchar g, uchar b));
+  FL_EXPORT_C_HEADER(Fl_Color,fl_rgb_color_with_grayscaleC,(uchar g));
+  FL_EXPORT_C_HEADER(Fl_Color,fl_gray_rampC,(int i));
+  FL_EXPORT_C_HEADER(Fl_Color,fl_color_cubeC,(int r, int g, int b));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_ExportMacros.h b/c-src/Fl_ExportMacros.h
--- a/c-src/Fl_ExportMacros.h
+++ b/c-src/Fl_ExportMacros.h
@@ -5,14 +5,18 @@
 #undef EXPORT
 #endif
 #define EXPORT extern "C"
+#define WARN_UNUSED __attribute__((warn_unused_result))
 
 #ifdef __WATCOMC__
   #include <windows.h>
+  #define FL_EXPORT_C_HEADER(TYPE,FUNC_NAME,ARGS) extern TYPE __export __cdecl FUNC_NAME ARGS WARN_UNUSED
   #define FL_EXPORT_C(TYPE,FUNC_NAME) extern TYPE __export __cdecl FUNC_NAME
 #else
   #ifdef _WIN32
+    #define FL_EXPORT_C_HEADER(TYPE,FUNC_NAME,ARGS) extern __declspec(dllexport) TYPE __cdecl FUNC_NAME ARGS WARN_UNUSED
     #define FL_EXPORT_C(TYPE,FUNC_NAME) extern __declspec(dllexport) TYPE __cdecl FUNC_NAME
   #else
+    #define FL_EXPORT_C_HEADER(TYPE,FUNC_NAME,ARGS) extern TYPE FUNC_NAME ARGS WARN_UNUSED
     #define FL_EXPORT_C(TYPE,FUNC_NAME) extern TYPE FUNC_NAME
   #endif
   #ifndef _cdecl
diff --git a/c-src/Fl_File_BrowserC.h b/c-src/Fl_File_BrowserC.h
--- a/c-src/Fl_File_BrowserC.h
+++ b/c-src/Fl_File_BrowserC.h
@@ -37,200 +37,200 @@
 #endif
 
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(fl_Window,    Fl_File_Browser_as_window_super)(fl_File_Browser file_browser);
-  FL_EXPORT_C(fl_Window,    Fl_File_Browser_as_window )(fl_File_Browser file_browser);
-  FL_EXPORT_C(fl_Gl_Window, Fl_File_Browser_as_gl_window_super)(fl_File_Browser file_browser);
-  FL_EXPORT_C(fl_Gl_Window, Fl_File_Browser_as_gl_window)(fl_File_Browser file_browser);
-  FL_EXPORT_C(fl_Group,     Fl_File_Browser_parent)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_set_parent)(fl_File_Browser file_browser, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_File_Browser_type)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_set_type)(fl_File_Browser file_browser, uchar t);
+  FL_EXPORT_C_HEADER(fl_Window,Fl_File_Browser_as_window_super,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_File_Browser_as_window ,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_File_Browser_as_gl_window_super,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_File_Browser_as_gl_window,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_File_Browser_parent,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_parent,(fl_File_Browser file_browser, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_File_Browser_type,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_type,(fl_File_Browser file_browser, uchar t));
 
-  FL_EXPORT_C(int,          Fl_File_Browser_x)(fl_File_Browser file_browser);
-  FL_EXPORT_C(int,          Fl_File_Browser_y)(fl_File_Browser file_browser);
-  FL_EXPORT_C(int,          Fl_File_Browser_w)(fl_File_Browser file_browser);
-  FL_EXPORT_C(int,          Fl_File_Browser_h)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_set_align)(fl_File_Browser file_browser, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_File_Browser_align)(fl_File_Browser file_browser);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_File_Browser_box)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_set_box)(fl_File_Browser file_browser, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_File_Browser_color)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_set_color)(fl_File_Browser file_browser, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_File_Browser_set_color_with_bg_sel)(fl_File_Browser file_browser,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_File_Browser_selection_color)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_set_selection_color)(fl_File_Browser file_browser, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_File_Browser_label)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_copy_label)(fl_File_Browser file_browser, const char* new_label);
-  FL_EXPORT_C(void,         Fl_File_Browser_set_label)(fl_File_Browser file_browser, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_File_Browser_labeltype)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_set_labeltype)(fl_File_Browser file_browser, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_File_Browser_labelcolor)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_set_labelcolor)(fl_File_Browser file_browser, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_File_Browser_labelfont)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_set_labelfont)(fl_File_Browser file_browser, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_File_Browser_labelsize)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_set_labelsize)(fl_File_Browser file_browser, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_File_Browser_image)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_set_image)(fl_File_Browser file_browser, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_File_Browser_deimage)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_set_deimage)(fl_File_Browser file_browser, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_File_Browser_tooltip)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_copy_tooltip)(fl_File_Browser file_browser, const char* text);
-  FL_EXPORT_C(void,         Fl_File_Browser_set_tooltip)(fl_File_Browser file_browser, const char* text);
-  FL_EXPORT_C(void,         Fl_File_Browser_set_callback_with_user_data)(fl_File_Browser file_browser, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_File_Browser_set_callback)(fl_File_Browser file_browser, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_File_Browser_user_data)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_set_user_data)(fl_File_Browser file_browser, void* v);
-  FL_EXPORT_C(long,         Fl_File_Browser_argument)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_set_argument)(fl_File_Browser file_browser, long v);
-  FL_EXPORT_C(Fl_When,      Fl_File_Browser_when)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_set_when)(fl_File_Browser file_browser, uchar i);
-  FL_EXPORT_C(int,          Fl_File_Browser_visible_r)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_set_visible)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_clear_visible)(fl_File_Browser file_browser);
-  FL_EXPORT_C(unsigned int, Fl_File_Browser_active)(fl_File_Browser file_browser);
-  FL_EXPORT_C(int,          Fl_File_Browser_active_r)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_activate)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_deactivate)(fl_File_Browser file_browser);
-  FL_EXPORT_C(unsigned int, Fl_File_Browser_output)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_set_output)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_clear_output)(fl_File_Browser file_browser);
-  FL_EXPORT_C(unsigned int, Fl_File_Browser_takesevents)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_set_changed)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_clear_changed)(fl_File_Browser file_browser);
-  FL_EXPORT_C(int,          Fl_File_Browser_take_focus)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_set_visible_focus)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_clear_visible_focus)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_modify_visible_focus)(fl_File_Browser file_browser, int v);
-  FL_EXPORT_C(unsigned int, Fl_File_Browser_visible_focus)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_do_callback)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_do_callback_with_widget_and_user_data)(fl_File_Browser file_browser, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_File_Browser_do_callback_with_widget_and_default_user_data)(fl_File_Browser file_browser, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_File_Browser_contains)(fl_File_Browser file_browser, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_File_Browser_inside)(fl_File_Browser file_browser, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_File_Browser_redraw)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_redraw_label)(fl_File_Browser file_browser);
-  FL_EXPORT_C(uchar,        Fl_File_Browser_damage)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_clear_damage_with_bitmask)(fl_File_Browser file_browser, uchar c);
-  FL_EXPORT_C(void,         Fl_File_Browser_clear_damage)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,         Fl_File_Browser_damage_with_text)(fl_File_Browser file_browser, uchar c);
-  FL_EXPORT_C(void,         Fl_File_Browser_damage_inside_widget)(fl_File_Browser file_browser, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_File_Browser_draw_label_with_xywh_alignment)(fl_File_Browser file_browser, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_File_Browser_measure_label)(fl_File_Browser file_browser, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_File_Browser_window)(fl_File_Browser file_browser);
-  FL_EXPORT_C(fl_Window,    Fl_File_Browser_top_window)(fl_File_Browser file_browser);
-  FL_EXPORT_C(fl_Window ,   Fl_File_Browser_top_window_offset)(fl_File_Browser file_browser, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_File_Browser_as_group)(fl_File_Browser file_browser);
-  FL_EXPORT_C(fl_Gl_Window, Fl_File_Browser_as_gl_window)(fl_File_Browser file_browser);
+  FL_EXPORT_C_HEADER(int,Fl_File_Browser_x,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(int,Fl_File_Browser_y,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(int,Fl_File_Browser_w,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(int,Fl_File_Browser_h,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_align,(fl_File_Browser file_browser, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_File_Browser_align,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_File_Browser_box,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_box,(fl_File_Browser file_browser, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_File_Browser_color,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_color,(fl_File_Browser file_browser, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_color_with_bg_sel,(fl_File_Browser file_browser,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_File_Browser_selection_color,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_selection_color,(fl_File_Browser file_browser, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_File_Browser_label,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_copy_label,(fl_File_Browser file_browser, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_label,(fl_File_Browser file_browser, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_File_Browser_labeltype,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_labeltype,(fl_File_Browser file_browser, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_File_Browser_labelcolor,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_labelcolor,(fl_File_Browser file_browser, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_File_Browser_labelfont,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_labelfont,(fl_File_Browser file_browser, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_File_Browser_labelsize,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_labelsize,(fl_File_Browser file_browser, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_File_Browser_image,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_image,(fl_File_Browser file_browser, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_File_Browser_deimage,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_deimage,(fl_File_Browser file_browser, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_File_Browser_tooltip,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_copy_tooltip,(fl_File_Browser file_browser, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_tooltip,(fl_File_Browser file_browser, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_callback_with_user_data,(fl_File_Browser file_browser, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_callback,(fl_File_Browser file_browser, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_File_Browser_user_data,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_user_data,(fl_File_Browser file_browser, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_File_Browser_argument,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_argument,(fl_File_Browser file_browser, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_File_Browser_when,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_when,(fl_File_Browser file_browser, uchar i));
+  FL_EXPORT_C_HEADER(int,Fl_File_Browser_visible_r,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_visible,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_clear_visible,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_File_Browser_active,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(int,Fl_File_Browser_active_r,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_activate,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_deactivate,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_File_Browser_output,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_output,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_clear_output,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_File_Browser_takesevents,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_changed,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_clear_changed,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(int,Fl_File_Browser_take_focus,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_visible_focus,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_clear_visible_focus,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_modify_visible_focus,(fl_File_Browser file_browser, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_File_Browser_visible_focus,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_do_callback,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_do_callback_with_widget_and_user_data,(fl_File_Browser file_browser, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_do_callback_with_widget_and_default_user_data,(fl_File_Browser file_browser, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_File_Browser_contains,(fl_File_Browser file_browser, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_File_Browser_inside,(fl_File_Browser file_browser, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_redraw,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_redraw_label,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(uchar,Fl_File_Browser_damage,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_clear_damage_with_bitmask,(fl_File_Browser file_browser, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_clear_damage,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_damage_with_text,(fl_File_Browser file_browser, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_damage_inside_widget,(fl_File_Browser file_browser, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_draw_label_with_xywh_alignment,(fl_File_Browser file_browser, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_measure_label,(fl_File_Browser file_browser, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_File_Browser_window,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_File_Browser_top_window,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_File_Browser_top_window_offset,(fl_File_Browser file_browser, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_File_Browser_as_group,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_File_Browser_as_gl_window,(fl_File_Browser file_browser));
   /* Inherited from Fl_Group */
-  FL_EXPORT_C(void,         Fl_File_Browser_begin)(fl_File_Browser self);
-  FL_EXPORT_C(void,         Fl_File_Browser_end)(fl_File_Browser self);
-  FL_EXPORT_C(int,          Fl_File_Browser_find)(fl_File_Browser self, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_File_Browser_remove_index)(fl_File_Browser self, int index);
-  FL_EXPORT_C(void,         Fl_File_Browser_remove_widget)(fl_File_Browser self, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_File_Browser_clear)(fl_File_Browser self);
-  FL_EXPORT_C(void,         Fl_File_Browser_set_resizable_by_reference)(fl_File_Browser self,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_File_Browser_set_resizable)(fl_File_Browser self,fl_Widget o);
-  FL_EXPORT_C(fl_Widget,    Fl_File_Browser_resizable)(fl_File_Browser self);
-  FL_EXPORT_C(void,         Fl_File_Browser_add_resizable)(fl_File_Browser self,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_File_Browser_init_sizes)(fl_File_Browser self);
-  FL_EXPORT_C(int,          Fl_File_Browser_children)(fl_File_Browser self);
-  FL_EXPORT_C(void,         Fl_File_Browser_set_clip_children)(fl_File_Browser self,int c);
-  FL_EXPORT_C(unsigned int, Fl_File_Browser_clip_children)(fl_File_Browser self);
-  FL_EXPORT_C(void,         Fl_File_Browser_focus)(fl_File_Browser self,fl_Widget W);
-  FL_EXPORT_C(fl_Widget,    Fl_File_Browser__ddfdesign_kludge)(fl_File_Browser self);
-  FL_EXPORT_C(void,         Fl_File_Browser_insert_with_before)(fl_File_Browser self, fl_Widget w, fl_Widget before);
-  FL_EXPORT_C(fl_Widget*,   Fl_File_Browser_array)(fl_File_Browser self);
-  FL_EXPORT_C(fl_Widget,    Fl_File_Browser_child)(fl_File_Browser self, int n);
-  FL_EXPORT_C(void,         Fl_File_Browser_forms_end)(fl_File_Browser self);
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_begin,(fl_File_Browser self));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_end,(fl_File_Browser self));
+  FL_EXPORT_C_HEADER(int,Fl_File_Browser_find,(fl_File_Browser self, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_remove_index,(fl_File_Browser self, int index));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_remove_widget,(fl_File_Browser self, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_clear,(fl_File_Browser self));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_resizable_by_reference,(fl_File_Browser self,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_resizable,(fl_File_Browser self,fl_Widget o));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_File_Browser_resizable,(fl_File_Browser self));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_add_resizable,(fl_File_Browser self,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_init_sizes,(fl_File_Browser self));
+  FL_EXPORT_C_HEADER(int,Fl_File_Browser_children,(fl_File_Browser self));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_clip_children,(fl_File_Browser self,int c));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_File_Browser_clip_children,(fl_File_Browser self));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_focus,(fl_File_Browser self,fl_Widget W));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_File_Browser__ddfdesign_kludge,(fl_File_Browser self));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_insert_with_before,(fl_File_Browser self, fl_Widget w, fl_Widget before));
+  FL_EXPORT_C_HEADER(fl_Widget*,Fl_File_Browser_array,(fl_File_Browser self));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_File_Browser_child,(fl_File_Browser self, int n));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_forms_end,(fl_File_Browser self));
 
   /* Fl_File_Browser specific functions */
-  FL_EXPORT_C(fl_File_Browser, Fl_File_Browser_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_File_Browser, Fl_File_Browser_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(void,Fl_File_Browser_Destroy)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void,Fl_File_Browser_remove)(fl_File_Browser file_browser, int line);
-  FL_EXPORT_C(void, Fl_File_Browser_add)(fl_File_Browser file_browser, const char* newtext);
-  FL_EXPORT_C(void, Fl_File_Browser_add_with_d)(fl_File_Browser file_browser, const char* newtext, void* d);
-  FL_EXPORT_C(void, Fl_File_Browser_insert)(fl_File_Browser file_browser, int line, const char* newtext);
-  FL_EXPORT_C(void, Fl_File_Browser_insert_with_d)(fl_File_Browser file_browser, int line, const char* newtext, void* d);
-  FL_EXPORT_C(void, Fl_File_Browser_move)(fl_File_Browser file_browser, int to, int from);
-  FL_EXPORT_C(void, Fl_File_Browser_swap)(fl_File_Browser file_browser, int a, int b);
-  FL_EXPORT_C(void, Fl_File_Browser_clear)(fl_File_Browser file_browser);
-  FL_EXPORT_C(int, Fl_File_Browser_size)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void, Fl_File_Browser_set_size)(fl_File_Browser file_browser, int W, int H);
-  FL_EXPORT_C(int, Fl_File_Browser_topline)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void, Fl_File_Browser_lineposition)(fl_File_Browser file_browser, int line, Fl_Line_Position pos);
-  FL_EXPORT_C(void, Fl_File_Browser_set_topline)(fl_File_Browser file_browser, int line);
-  FL_EXPORT_C(void, Fl_File_Browser_bottomline)(fl_File_Browser file_browser, int line);
-  FL_EXPORT_C(void, Fl_File_Browser_middleline)(fl_File_Browser file_browser, int line);
-  FL_EXPORT_C(int, Fl_File_Browser_select)(fl_File_Browser file_browser, int line);
-  FL_EXPORT_C(int, Fl_File_Browser_select_with_val)(fl_File_Browser file_browser, int line, int val);
-  FL_EXPORT_C(int, Fl_File_Browser_selected)(fl_File_Browser file_browser, int line);
-  FL_EXPORT_C(void, Fl_File_Browser_show_with_line)(fl_File_Browser file_browser, int line);
-  FL_EXPORT_C(void, Fl_File_Browser_show)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void, Fl_File_Browser_hide_with_line)(fl_File_Browser file_browser, int line);
-  FL_EXPORT_C(void, Fl_File_Browser_hide)(fl_File_Browser file_browser);
-  FL_EXPORT_C(int, Fl_File_Browser_visible)(fl_File_Browser file_browser, int line);
-  FL_EXPORT_C(int, Fl_File_Browser_value)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void, Fl_File_Browser_set_value)(fl_File_Browser file_browser, int line);
-  FL_EXPORT_C(const char*, Fl_File_Browser_text)(fl_File_Browser file_browser, int line);
-  FL_EXPORT_C(void, Fl_File_Browser_set_text)(fl_File_Browser file_browser, int line, const char* newtext);
-  FL_EXPORT_C(void*, Fl_File_Browser_data)(fl_File_Browser file_browser, int line);
-  FL_EXPORT_C(void, Fl_File_Browser_set_data)(fl_File_Browser file_browser, int line, void* d);
-  FL_EXPORT_C(char, Fl_File_Browser_format_char)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void, Fl_File_Browser_set_format_char)(fl_File_Browser file_browser, char c);
-  FL_EXPORT_C(char, Fl_File_Browser_column_char)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void, Fl_File_Browser_set_column_char)(fl_File_Browser file_browser, char c);
-  FL_EXPORT_C(const int*, Fl_File_Browser_column_widths)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void, Fl_File_Browser_set_column_widths)(fl_File_Browser file_browser, const int* arr);
-  FL_EXPORT_C(int, Fl_File_Browser_displayed)(fl_File_Browser file_browser, int line);
-  FL_EXPORT_C(void, Fl_File_Browser_make_visible)(fl_File_Browser file_browser, int line);
-  FL_EXPORT_C(void, Fl_File_Browser_set_icon)(fl_File_Browser file_browser, int line, fl_Image icon);
-  FL_EXPORT_C(fl_Image, Fl_File_Browser_icon)(fl_File_Browser file_browser, int line);
-  FL_EXPORT_C(void, Fl_File_Browser_remove_icon)(fl_File_Browser file_browser, int line);
-  FL_EXPORT_C(int, Fl_File_Browser_select_only)(fl_File_Browser file_browser,void *item);
-  FL_EXPORT_C(int, Fl_File_Browser_select_only_with_docallbacks)(fl_File_Browser file_browser,void *item,int docallbacks);
-  FL_EXPORT_C(int, Fl_File_Browser_deselect)(fl_File_Browser file_browser);
-  FL_EXPORT_C(int, Fl_File_Browser_deselect_with_docallbacks)(fl_File_Browser file_browser,int docallbacks);
-  FL_EXPORT_C(int, Fl_File_Browser_position)(fl_File_Browser file_browser);
+  FL_EXPORT_C_HEADER(fl_File_Browser,Fl_File_Browser_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_File_Browser,Fl_File_Browser_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_Destroy,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_remove,(fl_File_Browser file_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_add,(fl_File_Browser file_browser, const char* newtext));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_add_with_d,(fl_File_Browser file_browser, const char* newtext, void* d));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_insert,(fl_File_Browser file_browser, int line, const char* newtext));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_insert_with_d,(fl_File_Browser file_browser, int line, const char* newtext, void* d));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_move,(fl_File_Browser file_browser, int to, int from));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_swap,(fl_File_Browser file_browser, int a, int b));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_clear,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(int,Fl_File_Browser_size,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_size,(fl_File_Browser file_browser, int W, int H));
+  FL_EXPORT_C_HEADER(int,Fl_File_Browser_topline,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_lineposition,(fl_File_Browser file_browser, int line, Fl_Line_Position pos));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_topline,(fl_File_Browser file_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_bottomline,(fl_File_Browser file_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_middleline,(fl_File_Browser file_browser, int line));
+  FL_EXPORT_C_HEADER(int,Fl_File_Browser_select,(fl_File_Browser file_browser, int line));
+  FL_EXPORT_C_HEADER(int,Fl_File_Browser_select_with_val,(fl_File_Browser file_browser, int line, int val));
+  FL_EXPORT_C_HEADER(int,Fl_File_Browser_selected,(fl_File_Browser file_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_show_with_line,(fl_File_Browser file_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_show,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_hide_with_line,(fl_File_Browser file_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_hide,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(int,Fl_File_Browser_visible,(fl_File_Browser file_browser, int line));
+  FL_EXPORT_C_HEADER(int,Fl_File_Browser_value,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_value,(fl_File_Browser file_browser, int line));
+  FL_EXPORT_C_HEADER(const char*,Fl_File_Browser_text,(fl_File_Browser file_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_text,(fl_File_Browser file_browser, int line, const char* newtext));
+  FL_EXPORT_C_HEADER(void*,Fl_File_Browser_data,(fl_File_Browser file_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_data,(fl_File_Browser file_browser, int line, void* d));
+  FL_EXPORT_C_HEADER(char,Fl_File_Browser_format_char,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_format_char,(fl_File_Browser file_browser, char c));
+  FL_EXPORT_C_HEADER(char,Fl_File_Browser_column_char,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_column_char,(fl_File_Browser file_browser, char c));
+  FL_EXPORT_C_HEADER(const int*,Fl_File_Browser_column_widths,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_column_widths,(fl_File_Browser file_browser, const int* arr));
+  FL_EXPORT_C_HEADER(int,Fl_File_Browser_displayed,(fl_File_Browser file_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_make_visible,(fl_File_Browser file_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_icon,(fl_File_Browser file_browser, int line, fl_Image icon));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_File_Browser_icon,(fl_File_Browser file_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_remove_icon,(fl_File_Browser file_browser, int line));
+  FL_EXPORT_C_HEADER(int,Fl_File_Browser_select_only,(fl_File_Browser file_browser,void *item));
+  FL_EXPORT_C_HEADER(int,Fl_File_Browser_select_only_with_docallbacks,(fl_File_Browser file_browser,void *item,int docallbacks));
+  FL_EXPORT_C_HEADER(int,Fl_File_Browser_deselect,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(int,Fl_File_Browser_deselect_with_docallbacks,(fl_File_Browser file_browser,int docallbacks));
+  FL_EXPORT_C_HEADER(int,Fl_File_Browser_position,(fl_File_Browser file_browser));
   FL_EXPORT_C(void, Fl_File_Browser_set_position)(fl_File_Browser file_browser,int pos); // scroll to here
-  FL_EXPORT_C(int, Fl_File_Browser_hposition)(fl_File_Browser file_browser);
+  FL_EXPORT_C_HEADER(int,Fl_File_Browser_hposition,(fl_File_Browser file_browser));
   FL_EXPORT_C(void, Fl_File_Browser_set_hposition)(fl_File_Browser file_browser,int); // pan to here
-  FL_EXPORT_C(uchar, Fl_File_Browser_has_scrollbar)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void, Fl_File_Browser_set_has_scrollbar)(fl_File_Browser file_browser,uchar mode);
-  FL_EXPORT_C(Fl_Font, Fl_File_Browser_textfont)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void, Fl_File_Browser_set_textfont)(fl_File_Browser file_browser,Fl_Font font);
-  FL_EXPORT_C(Fl_Fontsize, Fl_File_Browser_textsize)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void, Fl_File_Browser_set_textsize)(fl_File_Browser file_browser,Fl_Fontsize newSize);
-  FL_EXPORT_C(Fl_Color, Fl_File_Browser_textcolor)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void, Fl_File_Browser_set_textcolor)(fl_File_Browser file_browser,Fl_Color col);
-  FL_EXPORT_C(int, Fl_File_Browser_scrollbar_size)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void, Fl_File_Browser_set_scrollbar_size)(fl_File_Browser file_browser,int newSize);
-  FL_EXPORT_C(int, Fl_File_Browser_scrollbar_width)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void, Fl_File_Browser_set_scrollbar_width)(fl_File_Browser file_browser,int width);
-  FL_EXPORT_C(void, Fl_File_Browser_scrollbar_right)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void, Fl_File_Browser_set_scrollbar_left)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void, Fl_File_Browser_sort)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void, Fl_File_Browser_sort_with_flags)(fl_File_Browser file_browser,int flags);
-  FL_EXPORT_C(uchar,	Fl_File_Browser_iconsize)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void, Fl_File_Browser_set_iconsize)(fl_File_Browser file_browser,uchar s);
-  FL_EXPORT_C(void, Fl_File_Browser_set_filter)(fl_File_Browser file_browser,const char* pattern);
-  FL_EXPORT_C(const char*, Fl_File_Browser_filter)(fl_File_Browser file_browser);
-  FL_EXPORT_C(int, Fl_File_Browser_load)(fl_File_Browser file_browser,const char *directory, Fl_File_Sort_F* sort);
-  FL_EXPORT_C(int, Fl_File_Browser_filetype)(fl_File_Browser file_browser);
-  FL_EXPORT_C(void, Fl_File_Browser_set_filetype)(fl_File_Browser file_browser,int t);
-  FL_EXPORT_C(fl_File_Browser,    Fl_OverriddenFile_Browser_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_File_Browser,    Fl_OverriddenFile_Browser_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_File_Browser_draw)(fl_File_Browser o);
-  FL_EXPORT_C(void, Fl_File_Browser_draw_super)(fl_File_Browser o);
-  FL_EXPORT_C(int, Fl_File_Browser_handle)(fl_File_Browser o, int event);
-  FL_EXPORT_C(int, Fl_File_Browser_handle_super)(fl_File_Browser o, int event);
-  FL_EXPORT_C(void, Fl_File_Browser_resize)(fl_File_Browser o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_File_Browser_resize_super)(fl_File_Browser o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_File_Browser_show)(fl_File_Browser o);
-  FL_EXPORT_C(void, Fl_File_Browser_show_super)(fl_File_Browser o);
-  FL_EXPORT_C(void, Fl_File_Browser_hide)(fl_File_Browser o);
-  FL_EXPORT_C(void, Fl_File_Browser_hide_super)(fl_File_Browser o);
+  FL_EXPORT_C_HEADER(uchar,Fl_File_Browser_has_scrollbar,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_has_scrollbar,(fl_File_Browser file_browser,uchar mode));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_File_Browser_textfont,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_textfont,(fl_File_Browser file_browser,Fl_Font font));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_File_Browser_textsize,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_textsize,(fl_File_Browser file_browser,Fl_Fontsize newSize));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_File_Browser_textcolor,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_textcolor,(fl_File_Browser file_browser,Fl_Color col));
+  FL_EXPORT_C_HEADER(int,Fl_File_Browser_scrollbar_size,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_scrollbar_size,(fl_File_Browser file_browser,int newSize));
+  FL_EXPORT_C_HEADER(int,Fl_File_Browser_scrollbar_width,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_scrollbar_width,(fl_File_Browser file_browser,int width));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_scrollbar_right,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_scrollbar_left,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_sort,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_sort_with_flags,(fl_File_Browser file_browser,int flags));
+  FL_EXPORT_C_HEADER(uchar,	Fl_File_Browser_iconsize,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_iconsize,(fl_File_Browser file_browser,uchar s));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_filter,(fl_File_Browser file_browser,const char* pattern));
+  FL_EXPORT_C_HEADER(const char*,Fl_File_Browser_filter,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(int,Fl_File_Browser_load,(fl_File_Browser file_browser,const char *directory, Fl_File_Sort_F* sort));
+  FL_EXPORT_C_HEADER(int,Fl_File_Browser_filetype,(fl_File_Browser file_browser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_set_filetype,(fl_File_Browser file_browser,int t));
+  FL_EXPORT_C_HEADER(fl_File_Browser,Fl_OverriddenFile_Browser_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_File_Browser,Fl_OverriddenFile_Browser_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_draw,(fl_File_Browser o));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_draw_super,(fl_File_Browser o));
+  FL_EXPORT_C_HEADER(int,Fl_File_Browser_handle,(fl_File_Browser o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_File_Browser_handle_super,(fl_File_Browser o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_resize,(fl_File_Browser o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_resize_super,(fl_File_Browser o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_show,(fl_File_Browser o));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_show_super,(fl_File_Browser o));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_hide,(fl_File_Browser o));
+  FL_EXPORT_C_HEADER(void,Fl_File_Browser_hide_super,(fl_File_Browser o));
 
 #ifdef __cplusplus
 }
diff --git a/c-src/Fl_File_ChooserC.h b/c-src/Fl_File_ChooserC.h
--- a/c-src/Fl_File_ChooserC.h
+++ b/c-src/Fl_File_ChooserC.h
@@ -10,83 +10,83 @@
 #include "Fl_CallbackC.h"
 EXPORT {
 #else
-#include "FL/filename.H"  
+#include "FL/filename.H"
 #endif
-  FL_EXPORT_C(fl_File_Chooser, Fl_File_Chooser_New)(const char *d, const char *p, int t, const char *title);
-  FL_EXPORT_C(void, Fl_File_Chooser_Destroy)(fl_File_Chooser file_chooser);
-  FL_EXPORT_C(void, Fl_File_Chooser_callback)(fl_File_Chooser file_chooser, void (*cb)(fl_File_Chooser, void* ));
-  FL_EXPORT_C(void, Fl_File_Chooser_callback_with_user_data)(fl_File_Chooser file_chooser, void (*cb)(fl_File_Chooser, void* ), void* d);
-  FL_EXPORT_C(void, Fl_File_Chooser_set_color)(fl_File_Chooser file_chooser, Fl_Color c);
-  FL_EXPORT_C(Fl_Color, Fl_File_Chooser_color)(fl_File_Chooser file_chooser);
-  FL_EXPORT_C(int, Fl_File_Chooser_count)(fl_File_Chooser file_chooser);
-  FL_EXPORT_C(void, Fl_File_Chooser_set_directory)(fl_File_Chooser file_chooser, const char* d);
-  FL_EXPORT_C(char* , Fl_File_Chooser_directory)(fl_File_Chooser file_chooser);
-  FL_EXPORT_C(void, Fl_File_Chooser_set_filter)(fl_File_Chooser file_chooser, const char* p);
-  FL_EXPORT_C(const char* , Fl_File_Chooser_filter)(fl_File_Chooser file_chooser);
-  FL_EXPORT_C(int, Fl_File_Chooser_set_filter_value)(fl_File_Chooser file_chooser);
-  FL_EXPORT_C(void, Fl_File_Chooser_filter_value)(fl_File_Chooser file_chooser, int f);
-  FL_EXPORT_C(void, Fl_File_Chooser_hide)(fl_File_Chooser file_chooser);
-  FL_EXPORT_C(void, Fl_File_Chooser_set_iconsize)(fl_File_Chooser file_chooser, uchar s);
-  FL_EXPORT_C(uchar, Fl_File_Chooser_iconsize)(fl_File_Chooser file_chooser);
-  FL_EXPORT_C(void, Fl_File_Chooser_set_label)(fl_File_Chooser file_chooser, const char* l);
-  FL_EXPORT_C(const char* , Fl_File_Chooser_label)(fl_File_Chooser file_chooser);
-  FL_EXPORT_C(void, Fl_File_Chooser_set_ok_label)(fl_File_Chooser file_chooser, const char* l);
-  FL_EXPORT_C(const char* , Fl_File_Chooser_ok_label)(fl_File_Chooser file_chooser);
-  FL_EXPORT_C(void, Fl_File_Chooser_set_preview)(fl_File_Chooser file_chooser, int e);
-  FL_EXPORT_C(int, Fl_File_Chooser_preview)(fl_File_Chooser file_chooser);
-  FL_EXPORT_C(void, Fl_File_Chooser_rescan)(fl_File_Chooser file_chooser);
-  FL_EXPORT_C(void, Fl_File_Chooser_rescan_keep_filename)(fl_File_Chooser file_chooser);
-  FL_EXPORT_C(void, Fl_File_Chooser_show)(fl_File_Chooser file_chooser);
-  FL_EXPORT_C(int, Fl_File_Chooser_shown)(fl_File_Chooser file_chooser);
-  FL_EXPORT_C(void, Fl_File_Chooser_set_textcolor)(fl_File_Chooser file_chooser, Fl_Color c);
-  FL_EXPORT_C(Fl_Color, Fl_File_Chooser_textcolor)(fl_File_Chooser file_chooser);
-  FL_EXPORT_C(void, Fl_File_Chooser_set_textfont)(fl_File_Chooser file_chooser, Fl_Font f);
-  FL_EXPORT_C(Fl_Font, Fl_File_Chooser_textfont)(fl_File_Chooser file_chooser);
-  FL_EXPORT_C(void, Fl_File_Chooser_set_textsize)(fl_File_Chooser file_chooser, Fl_Fontsize s);
-  FL_EXPORT_C(Fl_Fontsize, Fl_File_Chooser_textsize)(fl_File_Chooser file_chooser);
-  FL_EXPORT_C(void, Fl_File_Chooser_set_type)(fl_File_Chooser file_chooser, int t);
-  FL_EXPORT_C(int, Fl_File_Chooser_type)(fl_File_Chooser file_chooser);
-  FL_EXPORT_C(void*, Fl_File_Chooser_user_data)(fl_File_Chooser file_chooser);
-  FL_EXPORT_C(void, Fl_File_Chooser_set_user_data)(fl_File_Chooser file_chooser, void* d);
-  FL_EXPORT_C(const char*, Fl_File_Chooser_value)(fl_File_Chooser file_chooser);
-  FL_EXPORT_C(const char*, Fl_File_Chooser_value_with_f)(fl_File_Chooser file_chooser, int f);
-  FL_EXPORT_C(void, Fl_File_Chooser_set_value)(fl_File_Chooser file_chooser, const char* filename);
-  FL_EXPORT_C(int, Fl_File_Chooser_visible)(fl_File_Chooser file_chooser);
-  FL_EXPORT_C(fl_Widget, Fl_File_Chooser_add_extra)(fl_File_Chooser file_chooser,fl_Widget gr);
-  FL_EXPORT_C(const char*, Fl_File_Chooser_add_favorites_label)();
-  FL_EXPORT_C(void, Fl_File_Chooser_set_add_favorites_label)(const char* value);
-  FL_EXPORT_C(const char*, Fl_File_Chooser_all_files_label)();
-  FL_EXPORT_C(void, Fl_File_Chooser_set_all_files_label)(const char* value);
-  FL_EXPORT_C(const char*, Fl_File_Chooser_custom_filter_label)();
-  FL_EXPORT_C(void, Fl_File_Chooser_set_custom_filter_label)(const char* value);
-  FL_EXPORT_C(const char*, Fl_File_Chooser_existing_file_label)();
-  FL_EXPORT_C(void, Fl_File_Chooser_set_existing_file_label)(const char* value);
-  FL_EXPORT_C(const char*, Fl_File_Chooser_favorites_label)();
-  FL_EXPORT_C(void, Fl_File_Chooser_set_favorites_label)(const char* value);
-  FL_EXPORT_C(const char*, Fl_File_Chooser_filename_label)();
-  FL_EXPORT_C(void, Fl_File_Chooser_set_filename_label)(const char* value);
-  FL_EXPORT_C(const char*, Fl_File_Chooser_filesystems_label)();
-  FL_EXPORT_C(void, Fl_File_Chooser_set_filesystems_label)(const char* value);
-  FL_EXPORT_C(const char*, Fl_File_Chooser_manage_favorites_label)();
-  FL_EXPORT_C(void, Fl_File_Chooser_set_manage_favorites_label)(const char* value);
-  FL_EXPORT_C(const char*, Fl_File_Chooser_new_directory_label)();
-  FL_EXPORT_C(void, Fl_File_Chooser_set_new_directory_label)(const char* value);
-  FL_EXPORT_C(const char*, Fl_File_Chooser_new_directory_tooltip)();
-  FL_EXPORT_C(void, Fl_File_Chooser_set_new_directory_tooltip)(const char* value);
-  FL_EXPORT_C(const char*, Fl_File_Chooser_preview_label)();
-  FL_EXPORT_C(void, Fl_File_Chooser_set_preview_label)(const char* value);
-  FL_EXPORT_C(const char*, Fl_File_Chooser_save_label)();
-  FL_EXPORT_C(void, Fl_File_Chooser_set_save_label)(const char* value);
-  FL_EXPORT_C(const char*, Fl_File_Chooser_show_label)();
-  FL_EXPORT_C(void, Fl_File_Chooser_set_show_label)(const char* value);
-  FL_EXPORT_C(Fl_File_Sort_F*, Fl_File_Chooser_sort)();
-  FL_EXPORT_C(void, Fl_File_Chooser_set_sort)(Fl_File_Sort_F* cb);
-  FL_EXPORT_C(char*, flc_dir_chooser)(const char* message,const char* fname);
-  FL_EXPORT_C(char*, flc_dir_chooser_with_relative)(const char* message,const char* fname,int relative);
-  FL_EXPORT_C(char*, flc_file_chooser)(const char* message,const char* pat,const char* fname);
-  FL_EXPORT_C(char*, flc_file_chooser_with_relative)(const char* message,const char* pat,const char* fname,int relative);
-  FL_EXPORT_C(void, flc_file_chooser_callback)(void (*cb)(const char*));
-  FL_EXPORT_C(void, flc_file_chooser_ok_label)(const char*l);
+  FL_EXPORT_C_HEADER(fl_File_Chooser,Fl_File_Chooser_New,(const char *d, const char *p, int t, const char *title));
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_Destroy,(fl_File_Chooser file_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_callback,(fl_File_Chooser file_chooser, void (*cb)(fl_File_Chooser, void* )));
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_callback_with_user_data,(fl_File_Chooser file_chooser, void (*cb)(fl_File_Chooser, void* ), void* d));
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_set_color,(fl_File_Chooser file_chooser, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_File_Chooser_color,(fl_File_Chooser file_chooser));
+  FL_EXPORT_C_HEADER(int,Fl_File_Chooser_count,(fl_File_Chooser file_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_set_directory,(fl_File_Chooser file_chooser, const char* d));
+  FL_EXPORT_C_HEADER(char* ,Fl_File_Chooser_directory,(fl_File_Chooser file_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_set_filter,(fl_File_Chooser file_chooser, const char* p));
+  FL_EXPORT_C_HEADER(const char* ,Fl_File_Chooser_filter,(fl_File_Chooser file_chooser));
+  FL_EXPORT_C_HEADER(int,Fl_File_Chooser_set_filter_value,(fl_File_Chooser file_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_filter_value,(fl_File_Chooser file_chooser, int f));
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_hide,(fl_File_Chooser file_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_set_iconsize,(fl_File_Chooser file_chooser, uchar s));
+  FL_EXPORT_C_HEADER(uchar,Fl_File_Chooser_iconsize,(fl_File_Chooser file_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_set_label,(fl_File_Chooser file_chooser, const char* l));
+  FL_EXPORT_C_HEADER(const char* ,Fl_File_Chooser_label,(fl_File_Chooser file_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_set_ok_label,(fl_File_Chooser file_chooser, const char* l));
+  FL_EXPORT_C_HEADER(const char* ,Fl_File_Chooser_ok_label,(fl_File_Chooser file_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_set_preview,(fl_File_Chooser file_chooser, int e));
+  FL_EXPORT_C_HEADER(int,Fl_File_Chooser_preview,(fl_File_Chooser file_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_rescan,(fl_File_Chooser file_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_rescan_keep_filename,(fl_File_Chooser file_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_show,(fl_File_Chooser file_chooser));
+  FL_EXPORT_C_HEADER(int,Fl_File_Chooser_shown,(fl_File_Chooser file_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_set_textcolor,(fl_File_Chooser file_chooser, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_File_Chooser_textcolor,(fl_File_Chooser file_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_set_textfont,(fl_File_Chooser file_chooser, Fl_Font f));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_File_Chooser_textfont,(fl_File_Chooser file_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_set_textsize,(fl_File_Chooser file_chooser, Fl_Fontsize s));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_File_Chooser_textsize,(fl_File_Chooser file_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_set_type,(fl_File_Chooser file_chooser, int t));
+  FL_EXPORT_C_HEADER(int,Fl_File_Chooser_type,(fl_File_Chooser file_chooser));
+  FL_EXPORT_C_HEADER(void*,Fl_File_Chooser_user_data,(fl_File_Chooser file_chooser));
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_set_user_data,(fl_File_Chooser file_chooser, void* d));
+  FL_EXPORT_C_HEADER(const char*,Fl_File_Chooser_value,(fl_File_Chooser file_chooser));
+  FL_EXPORT_C_HEADER(const char*,Fl_File_Chooser_value_with_f,(fl_File_Chooser file_chooser, int f));
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_set_value,(fl_File_Chooser file_chooser, const char* filename));
+  FL_EXPORT_C_HEADER(int,Fl_File_Chooser_visible,(fl_File_Chooser file_chooser));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_File_Chooser_add_extra,(fl_File_Chooser file_chooser,fl_Widget gr));
+  FL_EXPORT_C_HEADER(const char*,Fl_File_Chooser_add_favorites_label,());
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_set_add_favorites_label,(const char* value));
+  FL_EXPORT_C_HEADER(const char*,Fl_File_Chooser_all_files_label,());
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_set_all_files_label,(const char* value));
+  FL_EXPORT_C_HEADER(const char*,Fl_File_Chooser_custom_filter_label,());
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_set_custom_filter_label,(const char* value));
+  FL_EXPORT_C_HEADER(const char*,Fl_File_Chooser_existing_file_label,());
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_set_existing_file_label,(const char* value));
+  FL_EXPORT_C_HEADER(const char*,Fl_File_Chooser_favorites_label,());
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_set_favorites_label,(const char* value));
+  FL_EXPORT_C_HEADER(const char*,Fl_File_Chooser_filename_label,());
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_set_filename_label,(const char* value));
+  FL_EXPORT_C_HEADER(const char*,Fl_File_Chooser_filesystems_label,());
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_set_filesystems_label,(const char* value));
+  FL_EXPORT_C_HEADER(const char*,Fl_File_Chooser_manage_favorites_label,());
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_set_manage_favorites_label,(const char* value));
+  FL_EXPORT_C_HEADER(const char*,Fl_File_Chooser_new_directory_label,());
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_set_new_directory_label,(const char* value));
+  FL_EXPORT_C_HEADER(const char*,Fl_File_Chooser_new_directory_tooltip,());
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_set_new_directory_tooltip,(const char* value));
+  FL_EXPORT_C_HEADER(const char*,Fl_File_Chooser_preview_label,());
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_set_preview_label,(const char* value));
+  FL_EXPORT_C_HEADER(const char*,Fl_File_Chooser_save_label,());
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_set_save_label,(const char* value));
+  FL_EXPORT_C_HEADER(const char*,Fl_File_Chooser_show_label,());
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_set_show_label,(const char* value));
+  FL_EXPORT_C_HEADER(Fl_File_Sort_F*,Fl_File_Chooser_sort,());
+  FL_EXPORT_C_HEADER(void,Fl_File_Chooser_set_sort,(Fl_File_Sort_F* cb));
+  FL_EXPORT_C_HEADER(char*,flc_dir_chooser,(const char* message,const char* fname));
+  FL_EXPORT_C_HEADER(char*,flc_dir_chooser_with_relative,(const char* message,const char* fname,int relative));
+  FL_EXPORT_C_HEADER(char*,flc_file_chooser,(const char* message,const char* pat,const char* fname));
+  FL_EXPORT_C_HEADER(char*,flc_file_chooser_with_relative,(const char* message,const char* pat,const char* fname,int relative));
+  FL_EXPORT_C_HEADER(void,flc_file_chooser_callback,(void (*cb)(const char*)));
+  FL_EXPORT_C_HEADER(void,flc_file_chooser_ok_label,(const char*l));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_File_IconC.cpp b/c-src/Fl_File_IconC.cpp
--- a/c-src/Fl_File_IconC.cpp
+++ b/c-src/Fl_File_IconC.cpp
@@ -58,7 +58,7 @@
   FL_EXPORT_C(void,Fl_File_Icon_labeltype)(fl_Label o,int x,int y,int w,int h,Fl_Align a){
     Fl_File_Icon::labeltype((static_cast<Fl_Label*>(o)),x,y,w,h,a);
   }
-  FL_EXPORT_C(fl_File_Icon,Fl_File_Icon_find)(const char* filename,int filetype){
+  FL_EXPORT_C(fl_File_Icon,Fl_File_Icon_find)(const char* filename){
     return (fl_File_Icon)Fl_File_Icon::find(filename);
   }
   FL_EXPORT_C(fl_File_Icon,Fl_File_Icon_find_with_filetype)(const char* filename,int filetype){
diff --git a/c-src/Fl_File_IconC.h b/c-src/Fl_File_IconC.h
--- a/c-src/Fl_File_IconC.h
+++ b/c-src/Fl_File_IconC.h
@@ -9,28 +9,28 @@
 #include "Fl_CallbackC.h"
 EXPORT {
 #endif
-  FL_EXPORT_C(fl_File_Icon, Fl_File_Icon_New)(const char* p, int t, int nd, short* d);
-  FL_EXPORT_C(void        , Fl_File_Icon_Destroy)(fl_File_Icon file_icon);
-  FL_EXPORT_C(short*, Fl_File_Icon_add)(fl_File_Icon file_icon, short d);
-  FL_EXPORT_C(short*, Fl_File_Icon_add_color)(fl_File_Icon file_icon, Fl_Color c);
-  FL_EXPORT_C(short*, Fl_File_Icon_add_vertex)(fl_File_Icon file_icon, float x, float y);
-  FL_EXPORT_C(void, Fl_File_Icon_clear)(fl_File_Icon file_icon);
-  FL_EXPORT_C(void, Fl_File_Icon_draw)(fl_File_Icon file_icon, int x, int y, int w, int h, Fl_Color ic);
-  FL_EXPORT_C(void, Fl_File_Icon_draw_with_active)(fl_File_Icon file_icon, int x, int y, int w, int h, Fl_Color ic, int active);
-  FL_EXPORT_C(void, Fl_File_Icon_label)(fl_File_Icon file_icon, fl_Widget w);
-  FL_EXPORT_C(void, Fl_File_Icon_load)(fl_File_Icon file_icon, const char* f);
-  FL_EXPORT_C(int, Fl_File_Icon_load_fti)(fl_File_Icon file_icon, const char* fti);
-  FL_EXPORT_C(int, Fl_File_Icon_load_image)(fl_File_Icon file_icon, const char* i);
-  FL_EXPORT_C(fl_File_Icon, Fl_File_Icon_next)(fl_File_Icon file_icon);
-  FL_EXPORT_C(const char*, Fl_File_Icon_pattern)(fl_File_Icon file_icon);
-  FL_EXPORT_C(int, Fl_File_Icon_size)(fl_File_Icon file_icon);
-  FL_EXPORT_C(int, Fl_File_Icon_type)(fl_File_Icon file_icon);
-  FL_EXPORT_C(short*, Fl_File_Icon_value)(fl_File_Icon file_icon);
-  FL_EXPORT_C(void, Fl_File_Icon_labeltype)(fl_Label o, int x, int y, int w, int h, Fl_Align a);
-  FL_EXPORT_C(fl_File_Icon, Fl_File_Icon_find)(const char* filename, int filetype);
-  FL_EXPORT_C(fl_File_Icon, Fl_File_Icon_find_with_filetype)(const char* filename, int filetype);
-  FL_EXPORT_C(fl_File_Icon, Fl_File_Icon_first)();
-  FL_EXPORT_C(void, Fl_File_Icon_load_system_icons)();
+  FL_EXPORT_C_HEADER(fl_File_Icon,Fl_File_Icon_New,(const char* p, int t, int nd, short* d));
+  FL_EXPORT_C_HEADER(void        ,Fl_File_Icon_Destroy,(fl_File_Icon file_icon));
+  FL_EXPORT_C_HEADER(short*,Fl_File_Icon_add,(fl_File_Icon file_icon, short d));
+  FL_EXPORT_C_HEADER(short*,Fl_File_Icon_add_color,(fl_File_Icon file_icon, Fl_Color c));
+  FL_EXPORT_C_HEADER(short*,Fl_File_Icon_add_vertex,(fl_File_Icon file_icon, float x, float y));
+  FL_EXPORT_C_HEADER(void,Fl_File_Icon_clear,(fl_File_Icon file_icon));
+  FL_EXPORT_C_HEADER(void,Fl_File_Icon_draw,(fl_File_Icon file_icon, int x, int y, int w, int h, Fl_Color ic));
+  FL_EXPORT_C_HEADER(void,Fl_File_Icon_draw_with_active,(fl_File_Icon file_icon, int x, int y, int w, int h, Fl_Color ic, int active));
+  FL_EXPORT_C_HEADER(void,Fl_File_Icon_label,(fl_File_Icon file_icon, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_File_Icon_load,(fl_File_Icon file_icon, const char* f));
+  FL_EXPORT_C_HEADER(int,Fl_File_Icon_load_fti,(fl_File_Icon file_icon, const char* fti));
+  FL_EXPORT_C_HEADER(int,Fl_File_Icon_load_image,(fl_File_Icon file_icon, const char* i));
+  FL_EXPORT_C_HEADER(fl_File_Icon,Fl_File_Icon_next,(fl_File_Icon file_icon));
+  FL_EXPORT_C_HEADER(const char*,Fl_File_Icon_pattern,(fl_File_Icon file_icon));
+  FL_EXPORT_C_HEADER(int,Fl_File_Icon_size,(fl_File_Icon file_icon));
+  FL_EXPORT_C_HEADER(int,Fl_File_Icon_type,(fl_File_Icon file_icon));
+  FL_EXPORT_C_HEADER(short*,Fl_File_Icon_value,(fl_File_Icon file_icon));
+  FL_EXPORT_C_HEADER(void,Fl_File_Icon_labeltype,(fl_Label o, int x, int y, int w, int h, Fl_Align a));
+  FL_EXPORT_C_HEADER(fl_File_Icon,Fl_File_Icon_find,(const char* filename));
+  FL_EXPORT_C_HEADER(fl_File_Icon,Fl_File_Icon_find_with_filetype,(const char* filename, int filetype));
+  FL_EXPORT_C_HEADER(fl_File_Icon,Fl_File_Icon_first,());
+  FL_EXPORT_C_HEADER(void,Fl_File_Icon_load_system_icons,());
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_File_InputC.h b/c-src/Fl_File_InputC.h
--- a/c-src/Fl_File_InputC.h
+++ b/c-src/Fl_File_InputC.h
@@ -29,154 +29,154 @@
   };
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(fl_Group,     Fl_File_Input_parent)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_set_parent)(fl_File_Input file_input, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_File_Input_type)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_set_type)(fl_File_Input file_input, uchar t);
+  FL_EXPORT_C_HEADER(fl_Group,Fl_File_Input_parent,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_parent,(fl_File_Input file_input, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_File_Input_type,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_type,(fl_File_Input file_input, uchar t));
 
-  FL_EXPORT_C(int,          Fl_File_Input_x)(fl_File_Input file_input);
-  FL_EXPORT_C(int,          Fl_File_Input_y)(fl_File_Input file_input);
-  FL_EXPORT_C(int,          Fl_File_Input_w)(fl_File_Input file_input);
-  FL_EXPORT_C(int,          Fl_File_Input_h)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_set_align)(fl_File_Input file_input, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_File_Input_align)(fl_File_Input file_input);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_File_Input_box)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_set_box)(fl_File_Input file_input, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_File_Input_color)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_set_color)(fl_File_Input file_input, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_File_Input_set_color_with_bg_sel)(fl_File_Input file_input,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_File_Input_selection_color)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_set_selection_color)(fl_File_Input file_input, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_File_Input_label)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_copy_label)(fl_File_Input file_input, const char* new_label);
-  FL_EXPORT_C(void,         Fl_File_Input_set_label)(fl_File_Input file_input, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_File_Input_labeltype)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_set_labeltype)(fl_File_Input file_input, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_File_Input_labelcolor)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_set_labelcolor)(fl_File_Input file_input, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_File_Input_labelfont)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_set_labelfont)(fl_File_Input file_input, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_File_Input_labelsize)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_set_labelsize)(fl_File_Input file_input, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_File_Input_image)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_set_image)(fl_File_Input file_input, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_File_Input_deimage)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_set_deimage)(fl_File_Input file_input, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_File_Input_tooltip)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_copy_tooltip)(fl_File_Input file_input, const char* text);
-  FL_EXPORT_C(void,         Fl_File_Input_set_tooltip)(fl_File_Input file_input, const char* text);
-  FL_EXPORT_C(void,         Fl_File_Input_set_callback_with_user_data)(fl_File_Input file_input, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_File_Input_set_callback)(fl_File_Input file_input, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_File_Input_user_data)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_set_user_data)(fl_File_Input file_input, void* v);
-  FL_EXPORT_C(long,         Fl_File_Input_argument)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_set_argument)(fl_File_Input file_input, long v);
-  FL_EXPORT_C(Fl_When,      Fl_File_Input_when)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_set_when)(fl_File_Input file_input, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_File_Input_visible)(fl_File_Input file_input);
-  FL_EXPORT_C(int,          Fl_File_Input_visible_r)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_set_visible)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_clear_visible)(fl_File_Input file_input);
-  FL_EXPORT_C(unsigned int, Fl_File_Input_active)(fl_File_Input file_input);
-  FL_EXPORT_C(int,          Fl_File_Input_active_r)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_activate)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_deactivate)(fl_File_Input file_input);
-  FL_EXPORT_C(unsigned int, Fl_File_Input_output)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_set_output)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_clear_output)(fl_File_Input file_input);
-  FL_EXPORT_C(unsigned int, Fl_File_Input_takesevents)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_set_changed)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_clear_changed)(fl_File_Input file_input);
-  FL_EXPORT_C(int,          Fl_File_Input_take_focus)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_set_visible_focus)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_clear_visible_focus)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_modify_visible_focus)(fl_File_Input file_input, int v);
-  FL_EXPORT_C(unsigned int, Fl_File_Input_visible_focus)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_do_callback)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_do_callback_with_widget_and_user_data)(fl_File_Input file_input, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_File_Input_do_callback_with_widget_and_default_user_data)(fl_File_Input file_input, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_File_Input_contains)(fl_File_Input file_input, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_File_Input_inside)(fl_File_Input file_input, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_File_Input_redraw)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_redraw_label)(fl_File_Input file_input);
-  FL_EXPORT_C(uchar,        Fl_File_Input_damage)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_clear_damage_with_bitmask)(fl_File_Input file_input, uchar c);
-  FL_EXPORT_C(void,         Fl_File_Input_clear_damage)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_damage_with_text)(fl_File_Input file_input, uchar c);
-  FL_EXPORT_C(void,         Fl_File_Input_damage_inside_widget)(fl_File_Input file_input, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_File_Input_draw_label_with_xywh_alignment)(fl_File_Input file_input, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_File_Input_measure_label)(fl_File_Input file_input, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_File_Input_window)(fl_File_Input file_input);
-  FL_EXPORT_C(fl_Window,    Fl_File_Input_top_window)(fl_File_Input file_input);
-  FL_EXPORT_C(fl_Window ,   Fl_File_Input_top_window_offset)(fl_File_Input file_input, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_File_Input_as_group)(fl_File_Input file_input);
-  FL_EXPORT_C(fl_Gl_Window, Fl_File_Input_as_gl_window)(fl_File_Input file_input);
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_x,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_y,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_w,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_h,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_align,(fl_File_Input file_input, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_File_Input_align,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_File_Input_box,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_box,(fl_File_Input file_input, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_File_Input_color,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_color,(fl_File_Input file_input, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_color_with_bg_sel,(fl_File_Input file_input,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_File_Input_selection_color,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_selection_color,(fl_File_Input file_input, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_File_Input_label,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_copy_label,(fl_File_Input file_input, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_label,(fl_File_Input file_input, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_File_Input_labeltype,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_labeltype,(fl_File_Input file_input, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_File_Input_labelcolor,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_labelcolor,(fl_File_Input file_input, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_File_Input_labelfont,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_labelfont,(fl_File_Input file_input, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_File_Input_labelsize,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_labelsize,(fl_File_Input file_input, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_File_Input_image,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_image,(fl_File_Input file_input, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_File_Input_deimage,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_deimage,(fl_File_Input file_input, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_File_Input_tooltip,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_copy_tooltip,(fl_File_Input file_input, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_tooltip,(fl_File_Input file_input, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_callback_with_user_data,(fl_File_Input file_input, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_callback,(fl_File_Input file_input, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_File_Input_user_data,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_user_data,(fl_File_Input file_input, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_File_Input_argument,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_argument,(fl_File_Input file_input, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_File_Input_when,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_when,(fl_File_Input file_input, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_File_Input_visible,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_visible_r,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_visible,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_clear_visible,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_File_Input_active,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_active_r,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_activate,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_deactivate,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_File_Input_output,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_output,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_clear_output,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_File_Input_takesevents,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_changed,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_clear_changed,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_take_focus,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_visible_focus,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_clear_visible_focus,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_modify_visible_focus,(fl_File_Input file_input, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_File_Input_visible_focus,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_do_callback,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_do_callback_with_widget_and_user_data,(fl_File_Input file_input, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_do_callback_with_widget_and_default_user_data,(fl_File_Input file_input, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_contains,(fl_File_Input file_input, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_inside,(fl_File_Input file_input, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_redraw,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_redraw_label,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(uchar,Fl_File_Input_damage,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_clear_damage_with_bitmask,(fl_File_Input file_input, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_clear_damage,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_damage_with_text,(fl_File_Input file_input, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_damage_inside_widget,(fl_File_Input file_input, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_draw_label_with_xywh_alignment,(fl_File_Input file_input, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_measure_label,(fl_File_Input file_input, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_File_Input_window,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_File_Input_top_window,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_File_Input_top_window_offset,(fl_File_Input file_input, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_File_Input_as_group,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_File_Input_as_gl_window,(fl_File_Input file_input));
   /* Inherited from Fl_Input */
-  FL_EXPORT_C(int,           Fl_File_Input_handle)(fl_File_Input file_input, int event);
-  FL_EXPORT_C(int,         Fl_File_Input_static_value)(fl_File_Input file_input, const char* text);
-  FL_EXPORT_C(int,         Fl_File_Input_static_value_with_length)(fl_File_Input file_input, const char* text, int length);
-  FL_EXPORT_C(Fl_Char,     Fl_File_Input_index)(fl_File_Input file_input, int i);
-  FL_EXPORT_C(int,         Fl_File_Input_size)(fl_File_Input file_input);
-  FL_EXPORT_C(void,        Fl_File_Input_set_size)(fl_File_Input file_input, int W, int H);
-  FL_EXPORT_C(int,         Fl_File_Input_maximum_size)(fl_File_Input file_input);
-  FL_EXPORT_C(void,        Fl_File_Input_set_maximum_size)(fl_File_Input file_input, int m);
-  FL_EXPORT_C(int,         Fl_File_Input_position)(fl_File_Input file_input);
-  FL_EXPORT_C(int,         Fl_File_Input_mark)(fl_File_Input file_input);
-  FL_EXPORT_C(int,         Fl_File_Input_set_position_with_cursor_mark)(fl_File_Input file_input,int p, int m);
-  FL_EXPORT_C(int,         Fl_File_Input_set_position_n_n)(fl_File_Input file_input,int p);
-  FL_EXPORT_C(int,         Fl_File_Input_set_mark)(fl_File_Input file_input,int m);
-  FL_EXPORT_C(int,         Fl_File_Input_replace)(fl_File_Input file_input,int b, int e, const char *text);
-  FL_EXPORT_C(int,         Fl_File_Input_replace_with_ilen)(fl_File_Input file_input,int b, int e, const char *text, int ilen);
-  FL_EXPORT_C(int,         Fl_File_Input_cut)(fl_File_Input file_input);
-  FL_EXPORT_C(int,         Fl_File_Input_cut_bytes)(fl_File_Input file_input,int n);
-  FL_EXPORT_C(int,         Fl_File_Input_cut_range)(fl_File_Input file_input,int a, int b);
-  FL_EXPORT_C(int,         Fl_File_Input_insert)(fl_File_Input file_input,const char* t);
-  FL_EXPORT_C(int,         Fl_File_Input_insert_with_length)(fl_File_Input file_input,const char* t, int l);
-  FL_EXPORT_C(int,         Fl_File_Input_copy)(fl_File_Input file_input,int clipboard);
-  FL_EXPORT_C(int,         Fl_File_Input_undo)(fl_File_Input file_input);
-  FL_EXPORT_C(int,         Fl_File_Input_copy_cuts)(fl_File_Input file_input);
-  FL_EXPORT_C(int,         Fl_File_Input_shortcut)(fl_File_Input file_input);
-  FL_EXPORT_C(void,        Fl_File_Input_set_shortcut)(fl_File_Input file_input,int s);
-  FL_EXPORT_C(Fl_Font,     Fl_File_Input_textfont)(fl_File_Input file_input);
-  FL_EXPORT_C(void,        Fl_File_Input_set_textfont)(fl_File_Input file_input,Fl_Font s);
-  FL_EXPORT_C(Fl_Fontsize, Fl_File_Input_textsize)(fl_File_Input file_input);
-  FL_EXPORT_C(void,        Fl_File_Input_set_textsize)(fl_File_Input file_input,Fl_Fontsize s);
-  FL_EXPORT_C(Fl_Color,    Fl_File_Input_textcolor)(fl_File_Input file_input);
-  FL_EXPORT_C(void,        Fl_File_Input_set_textcolor)(fl_File_Input file_input,Fl_Color n);
-  FL_EXPORT_C(Fl_Color,    Fl_File_Input_cursor_color)(fl_File_Input file_input);
-  FL_EXPORT_C(void,        Fl_File_Input_set_cursor_color)(fl_File_Input file_input,Fl_Color n);
-  FL_EXPORT_C(int,         Fl_File_Input_input_type)(fl_File_Input file_input);
-  FL_EXPORT_C(void,        Fl_File_Input_set_input_type)(fl_File_Input file_input,int t);
-  FL_EXPORT_C(int,         Fl_File_Input_readonly)(fl_File_Input file_input);
-  FL_EXPORT_C(void,        Fl_File_Input_set_readonly)(fl_File_Input file_input,int b);
-  FL_EXPORT_C(int,         Fl_File_Input_wrap)(fl_File_Input file_input);
-  FL_EXPORT_C(void,        Fl_File_Input_set_wrap)(fl_File_Input file_input,int b);
-  FL_EXPORT_C(void,        Fl_File_Input_tab_nav)(fl_File_Input file_input,int val);
-  FL_EXPORT_C(int,         Fl_File_Input_set_tab_nav)(fl_File_Input file_input);
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_handle,(fl_File_Input file_input, int event));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_static_value,(fl_File_Input file_input, const char* text));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_static_value_with_length,(fl_File_Input file_input, const char* text, int length));
+  FL_EXPORT_C_HEADER(Fl_Char,Fl_File_Input_index,(fl_File_Input file_input, int i));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_size,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_size,(fl_File_Input file_input, int W, int H));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_maximum_size,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_maximum_size,(fl_File_Input file_input, int m));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_position,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_mark,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_set_position_with_cursor_mark,(fl_File_Input file_input,int p, int m));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_set_position_n_n,(fl_File_Input file_input,int p));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_set_mark,(fl_File_Input file_input,int m));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_replace,(fl_File_Input file_input,int b, int e, const char *text));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_replace_with_ilen,(fl_File_Input file_input,int b, int e, const char *text, int ilen));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_cut,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_cut_bytes,(fl_File_Input file_input,int n));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_cut_range,(fl_File_Input file_input,int a, int b));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_insert,(fl_File_Input file_input,const char* t));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_insert_with_length,(fl_File_Input file_input,const char* t, int l));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_copy,(fl_File_Input file_input,int clipboard));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_undo,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_copy_cuts,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_shortcut,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_shortcut,(fl_File_Input file_input,int s));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_File_Input_textfont,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_textfont,(fl_File_Input file_input,Fl_Font s));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_File_Input_textsize,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_textsize,(fl_File_Input file_input,Fl_Fontsize s));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_File_Input_textcolor,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_textcolor,(fl_File_Input file_input,Fl_Color n));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_File_Input_cursor_color,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_cursor_color,(fl_File_Input file_input,Fl_Color n));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_input_type,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_input_type,(fl_File_Input file_input,int t));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_readonly,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_readonly,(fl_File_Input file_input,int b));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_wrap,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_wrap,(fl_File_Input file_input,int b));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_tab_nav,(fl_File_Input file_input,int val));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_set_tab_nav,(fl_File_Input file_input));
 
   /* Fl_File_Input specific functions */
-  FL_EXPORT_C(fl_File_Input, Fl_File_Input_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_File_Input, Fl_File_Input_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(void,          Fl_File_Input_Destroy)(fl_File_Input file_input);
-  FL_EXPORT_C(int,         Fl_File_Input_set_value)(fl_File_Input file_input, const char*);
-  FL_EXPORT_C(int,         Fl_File_Input_set_value_with_length)(fl_File_Input file_input, const char* text, int length);
-  FL_EXPORT_C(const char*, Fl_File_Input_value)(fl_File_Input file_input);
-  FL_EXPORT_C(Fl_Color,    Fl_File_Input_errorcolor)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_set_errorcolor)(fl_File_Input file_input, Fl_Color color);
-  FL_EXPORT_C(Fl_Boxtype,  Fl_File_Input_down_box)(fl_File_Input file_input);
-  FL_EXPORT_C(void,         Fl_File_Input_set_down_box)(fl_File_Input file_input, Fl_Boxtype color);
-  FL_EXPORT_C(fl_File_Input,    Fl_OverriddenFile_Input_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_File_Input,    Fl_OverriddenFile_Input_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_File_Input_draw)(fl_File_Input o);
-  FL_EXPORT_C(void, Fl_File_Input_draw_super)(fl_File_Input o);
-  FL_EXPORT_C(int, Fl_File_Input_handle)(fl_File_Input o, int event);
-  FL_EXPORT_C(int, Fl_File_Input_handle_super)(fl_File_Input o, int event);
-  FL_EXPORT_C(void, Fl_File_Input_resize)(fl_File_Input o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_File_Input_resize_super)(fl_File_Input o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_File_Input_show)(fl_File_Input o);
-  FL_EXPORT_C(void, Fl_File_Input_show_super)(fl_File_Input o);
-  FL_EXPORT_C(void, Fl_File_Input_hide)(fl_File_Input o);
-  FL_EXPORT_C(void, Fl_File_Input_hide_super)(fl_File_Input o);
+  FL_EXPORT_C_HEADER(fl_File_Input,Fl_File_Input_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_File_Input,Fl_File_Input_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_Destroy,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_set_value,(fl_File_Input file_input, const char*));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_set_value_with_length,(fl_File_Input file_input, const char* text, int length));
+  FL_EXPORT_C_HEADER(const char*,Fl_File_Input_value,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_File_Input_errorcolor,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_errorcolor,(fl_File_Input file_input, Fl_Color color));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_File_Input_down_box,(fl_File_Input file_input));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_set_down_box,(fl_File_Input file_input, Fl_Boxtype color));
+  FL_EXPORT_C_HEADER(fl_File_Input,Fl_OverriddenFile_Input_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_File_Input,Fl_OverriddenFile_Input_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_draw,(fl_File_Input o));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_draw_super,(fl_File_Input o));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_handle,(fl_File_Input o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_File_Input_handle_super,(fl_File_Input o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_resize,(fl_File_Input o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_resize_super,(fl_File_Input o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_show,(fl_File_Input o));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_show_super,(fl_File_Input o));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_hide,(fl_File_Input o));
+  FL_EXPORT_C_HEADER(void,Fl_File_Input_hide_super,(fl_File_Input o));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Float_InputC.h b/c-src/Fl_Float_InputC.h
--- a/c-src/Fl_Float_InputC.h
+++ b/c-src/Fl_Float_InputC.h
@@ -10,139 +10,139 @@
 EXPORT {
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,Fl_Float_Input_handle)(fl_Float_Input self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Float_Input_parent)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_parent)(fl_Float_Input float_input, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Float_Input_type)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_type)(fl_Float_Input float_input, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_handle,(fl_Float_Input self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Float_Input_parent,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_parent,(fl_Float_Input float_input, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Float_Input_type,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_type,(fl_Float_Input float_input, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Float_Input_x)(fl_Float_Input float_input);
-  FL_EXPORT_C(int,          Fl_Float_Input_y)(fl_Float_Input float_input);
-  FL_EXPORT_C(int,          Fl_Float_Input_w)(fl_Float_Input float_input);
-  FL_EXPORT_C(int,          Fl_Float_Input_h)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_align)(fl_Float_Input float_input, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,         Fl_Float_Input_align)(fl_Float_Input float_input);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Float_Input_box)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_box)(fl_Float_Input float_input, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Float_Input_color)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_color)(fl_Float_Input float_input, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_color_with_bg_sel)(fl_Float_Input float_input,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Float_Input_selection_color)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_selection_color)(fl_Float_Input float_input, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Float_Input_label)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_copy_label)(fl_Float_Input float_input, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_label)(fl_Float_Input float_input, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Float_Input_labeltype)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_labeltype)(fl_Float_Input float_input, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Float_Input_labelcolor)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_labelcolor)(fl_Float_Input float_input, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Float_Input_labelfont)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_labelfont)(fl_Float_Input float_input, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Float_Input_labelsize)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_labelsize)(fl_Float_Input float_input, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Float_Input_image)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_image)(fl_Float_Input float_input, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Float_Input_deimage)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_deimage)(fl_Float_Input float_input, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Float_Input_tooltip)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_copy_tooltip)(fl_Float_Input float_input, const char* text);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_tooltip)(fl_Float_Input float_input, const char* text);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_callback_with_user_data)(fl_Float_Input float_input, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_callback)(fl_Float_Input float_input, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Float_Input_user_data)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_user_data)(fl_Float_Input float_input, void* v);
-  FL_EXPORT_C(long,         Fl_Float_Input_argument)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_argument)(fl_Float_Input float_input, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Float_Input_when)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_when)(fl_Float_Input float_input, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Float_Input_visible)(fl_Float_Input float_input);
-  FL_EXPORT_C(int,          Fl_Float_Input_visible_r)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_visible)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_clear_visible)(fl_Float_Input float_input);
-  FL_EXPORT_C(unsigned int, Fl_Float_Input_active)(fl_Float_Input float_input);
-  FL_EXPORT_C(int,          Fl_Float_Input_active_r)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_activate)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_deactivate)(fl_Float_Input float_input);
-  FL_EXPORT_C(unsigned int, Fl_Float_Input_output)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_output)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_clear_output)(fl_Float_Input float_input);
-  FL_EXPORT_C(unsigned int, Fl_Float_Input_takesevents)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_changed)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_clear_changed)(fl_Float_Input float_input);
-  FL_EXPORT_C(int,          Fl_Float_Input_take_focus)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_visible_focus)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_clear_visible_focus)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_modify_visible_focus)(fl_Float_Input float_input, int v);
-  FL_EXPORT_C(unsigned int, Fl_Float_Input_visible_focus)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_do_callback)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_do_callback_with_widget_and_user_data)(fl_Float_Input float_input, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Float_Input_do_callback_with_widget_and_default_user_data)(fl_Float_Input float_input, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Float_Input_contains)(fl_Float_Input float_input, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Float_Input_inside)(fl_Float_Input float_input, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Float_Input_redraw)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_redraw_label)(fl_Float_Input float_input);
-  FL_EXPORT_C(uchar,        Fl_Float_Input_damage)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_clear_damage_with_bitmask)(fl_Float_Input float_input, uchar c);
-  FL_EXPORT_C(void,         Fl_Float_Input_clear_damage)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_damage_with_text)(fl_Float_Input float_input, uchar c);
-  FL_EXPORT_C(void,         Fl_Float_Input_damage_inside_widget)(fl_Float_Input float_input, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Float_Input_draw_label_with_xywh_alignment)(fl_Float_Input float_input, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Float_Input_measure_label)(fl_Float_Input float_input, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Float_Input_window)(fl_Float_Input float_input);
-  FL_EXPORT_C(fl_Window,    Fl_Float_Input_top_window)(fl_Float_Input float_input);
-  FL_EXPORT_C(fl_Window ,   Fl_Float_Input_top_window_offset)(fl_Float_Input float_input, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Float_Input_as_group)(fl_Float_Input float_input);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Float_Input_as_gl_window)(fl_Float_Input float_input);
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_x,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_y,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_w,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_h,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_align,(fl_Float_Input float_input, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Float_Input_align,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Float_Input_box,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_box,(fl_Float_Input float_input, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Float_Input_color,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_color,(fl_Float_Input float_input, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_color_with_bg_sel,(fl_Float_Input float_input,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Float_Input_selection_color,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_selection_color,(fl_Float_Input float_input, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Float_Input_label,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_copy_label,(fl_Float_Input float_input, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_label,(fl_Float_Input float_input, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Float_Input_labeltype,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_labeltype,(fl_Float_Input float_input, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Float_Input_labelcolor,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_labelcolor,(fl_Float_Input float_input, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Float_Input_labelfont,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_labelfont,(fl_Float_Input float_input, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Float_Input_labelsize,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_labelsize,(fl_Float_Input float_input, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Float_Input_image,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_image,(fl_Float_Input float_input, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Float_Input_deimage,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_deimage,(fl_Float_Input float_input, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Float_Input_tooltip,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_copy_tooltip,(fl_Float_Input float_input, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_tooltip,(fl_Float_Input float_input, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_callback_with_user_data,(fl_Float_Input float_input, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_callback,(fl_Float_Input float_input, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Float_Input_user_data,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_user_data,(fl_Float_Input float_input, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Float_Input_argument,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_argument,(fl_Float_Input float_input, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Float_Input_when,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_when,(fl_Float_Input float_input, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Float_Input_visible,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_visible_r,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_visible,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_clear_visible,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Float_Input_active,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_active_r,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_activate,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_deactivate,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Float_Input_output,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_output,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_clear_output,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Float_Input_takesevents,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_changed,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_clear_changed,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_take_focus,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_visible_focus,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_clear_visible_focus,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_modify_visible_focus,(fl_Float_Input float_input, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Float_Input_visible_focus,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_do_callback,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_do_callback_with_widget_and_user_data,(fl_Float_Input float_input, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_do_callback_with_widget_and_default_user_data,(fl_Float_Input float_input, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_contains,(fl_Float_Input float_input, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_inside,(fl_Float_Input float_input, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_redraw,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_redraw_label,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(uchar,Fl_Float_Input_damage,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_clear_damage_with_bitmask,(fl_Float_Input float_input, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_clear_damage,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_damage_with_text,(fl_Float_Input float_input, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_damage_inside_widget,(fl_Float_Input float_input, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_draw_label_with_xywh_alignment,(fl_Float_Input float_input, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_measure_label,(fl_Float_Input float_input, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Float_Input_window,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Float_Input_top_window,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Float_Input_top_window_offset,(fl_Float_Input float_input, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Float_Input_as_group,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Float_Input_as_gl_window,(fl_Float_Input float_input));
   /* Fl_Float_Input specific functions */
-  FL_EXPORT_C(int,      Fl_Float_Input_handle)(fl_Float_Input float_input, int event);
-  FL_EXPORT_C(fl_Float_Input, Fl_Float_Input_New_WithLabel)(int x, int y, int w, int h, const char* label); 
-  FL_EXPORT_C(fl_Float_Input, Fl_Float_Input_New)(int x, int y, int w, int h); 
-  FL_EXPORT_C(void,     Fl_Float_Input_Destroy)(fl_Float_Input float_input);
-  
-  FL_EXPORT_C(void,         Fl_Float_Input_resize)(fl_Float_Input float_input, int X, int Y, int W, int H);
-  FL_EXPORT_C(int,          Fl_Float_Input_set_value)(fl_Float_Input float_input, const char*);
-  FL_EXPORT_C(int,          Fl_Float_Input_set_value_with_length)(fl_Float_Input float_input, const char* text, int length);
-  FL_EXPORT_C(int,          Fl_Float_Input_static_value)(fl_Float_Input float_input, const char* text);
-  FL_EXPORT_C(int,          Fl_Float_Input_static_value_with_length)(fl_Float_Input float_input, const char* text, int length);
-  FL_EXPORT_C(const char*,  Fl_Float_Input_value)(fl_Float_Input float_input);
-  FL_EXPORT_C(Fl_Char,      Fl_Float_Input_index)(fl_Float_Input float_input, int i);
-  FL_EXPORT_C(int,          Fl_Float_Input_size)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_size)(fl_Float_Input float_input, int W, int H);
-  FL_EXPORT_C(int,          Fl_Float_Input_maximum_size)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_maximum_size)(fl_Float_Input float_input, int m);
-  FL_EXPORT_C(int,          Fl_Float_Input_position)(fl_Float_Input float_input);
-  FL_EXPORT_C(int,          Fl_Float_Input_mark)(fl_Float_Input float_input);
-  FL_EXPORT_C(int,          Fl_Float_Input_set_position_with_cursor_mark)(fl_Float_Input float_input,int p, int m);
-  FL_EXPORT_C(int,          Fl_Float_Input_set_position_n_n)(fl_Float_Input float_input,int p);
-  FL_EXPORT_C(int,          Fl_Float_Input_set_mark)(fl_Float_Input float_input,int m);
-  FL_EXPORT_C(int,          Fl_Float_Input_replace)(fl_Float_Input float_input,int b, int e, const char *text);
-  FL_EXPORT_C(int,          Fl_Float_Input_replace_with_ilen)(fl_Float_Input float_input,int b, int e, const char *text, int ilen);
-  FL_EXPORT_C(int,          Fl_Float_Input_cut)(fl_Float_Input float_input);
-  FL_EXPORT_C(int,          Fl_Float_Input_cut_bytes)(fl_Float_Input float_input,int n);
-  FL_EXPORT_C(int,          Fl_Float_Input_cut_range)(fl_Float_Input float_input,int a, int b);
-  FL_EXPORT_C(int,          Fl_Float_Input_insert)(fl_Float_Input float_input,const char* t);
-  FL_EXPORT_C(int,          Fl_Float_Input_insert_with_length)(fl_Float_Input float_input,const char* t, int l);
-  FL_EXPORT_C(int,          Fl_Float_Input_copy)(fl_Float_Input float_input,int clipboard);
-  FL_EXPORT_C(int,          Fl_Float_Input_undo)(fl_Float_Input float_input);
-  FL_EXPORT_C(int,          Fl_Float_Input_copy_cuts)(fl_Float_Input float_input);
-  FL_EXPORT_C(int,          Fl_Float_Input_shortcut)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_shortcut)(fl_Float_Input float_input,int s);
-  FL_EXPORT_C(Fl_Font,      Fl_Float_Input_textfont)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_textfont)(fl_Float_Input float_input,Fl_Font s);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Float_Input_textsize)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_textsize)(fl_Float_Input float_input,Fl_Fontsize s);
-  FL_EXPORT_C(Fl_Color,     Fl_Float_Input_textcolor)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_textcolor)(fl_Float_Input float_input,Fl_Color n);
-  FL_EXPORT_C(Fl_Color,     Fl_Float_Input_cursor_color)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_cursor_color)(fl_Float_Input float_input,Fl_Color n);
-  FL_EXPORT_C(int,          Fl_Float_Input_input_type)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_input_type)(fl_Float_Input float_input,int t);
-  FL_EXPORT_C(int,          Fl_Float_Input_readonly)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_readonly)(fl_Float_Input float_input,int b);
-  FL_EXPORT_C(int,          Fl_Float_Input_wrap)(fl_Float_Input float_input);
-  FL_EXPORT_C(void,         Fl_Float_Input_set_wrap)(fl_Float_Input float_input,int b);
-  FL_EXPORT_C(void,         Fl_Float_Input_tab_nav)(fl_Float_Input float_input,int val);
-  FL_EXPORT_C(int,          Fl_Float_Input_set_tab_nav)(fl_Float_Input float_input);
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_handle,(fl_Float_Input float_input, int event));
+  FL_EXPORT_C(fl_Float_Input, Fl_Float_Input_New_WithLabel)(int x, int y, int w, int h, const char* label);
+  FL_EXPORT_C(fl_Float_Input, Fl_Float_Input_New)(int x, int y, int w, int h);
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_Destroy,(fl_Float_Input float_input));
+
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_resize,(fl_Float_Input float_input, int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_set_value,(fl_Float_Input float_input, const char*));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_set_value_with_length,(fl_Float_Input float_input, const char* text, int length));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_static_value,(fl_Float_Input float_input, const char* text));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_static_value_with_length,(fl_Float_Input float_input, const char* text, int length));
+  FL_EXPORT_C_HEADER(const char*,Fl_Float_Input_value,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(Fl_Char,Fl_Float_Input_index,(fl_Float_Input float_input, int i));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_size,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_size,(fl_Float_Input float_input, int W, int H));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_maximum_size,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_maximum_size,(fl_Float_Input float_input, int m));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_position,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_mark,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_set_position_with_cursor_mark,(fl_Float_Input float_input,int p, int m));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_set_position_n_n,(fl_Float_Input float_input,int p));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_set_mark,(fl_Float_Input float_input,int m));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_replace,(fl_Float_Input float_input,int b, int e, const char *text));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_replace_with_ilen,(fl_Float_Input float_input,int b, int e, const char *text, int ilen));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_cut,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_cut_bytes,(fl_Float_Input float_input,int n));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_cut_range,(fl_Float_Input float_input,int a, int b));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_insert,(fl_Float_Input float_input,const char* t));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_insert_with_length,(fl_Float_Input float_input,const char* t, int l));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_copy,(fl_Float_Input float_input,int clipboard));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_undo,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_copy_cuts,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_shortcut,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_shortcut,(fl_Float_Input float_input,int s));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Float_Input_textfont,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_textfont,(fl_Float_Input float_input,Fl_Font s));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Float_Input_textsize,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_textsize,(fl_Float_Input float_input,Fl_Fontsize s));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Float_Input_textcolor,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_textcolor,(fl_Float_Input float_input,Fl_Color n));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Float_Input_cursor_color,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_cursor_color,(fl_Float_Input float_input,Fl_Color n));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_input_type,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_input_type,(fl_Float_Input float_input,int t));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_readonly,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_readonly,(fl_Float_Input float_input,int b));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_wrap,(fl_Float_Input float_input));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_set_wrap,(fl_Float_Input float_input,int b));
+  FL_EXPORT_C_HEADER(void,Fl_Float_Input_tab_nav,(fl_Float_Input float_input,int val));
+  FL_EXPORT_C_HEADER(int,Fl_Float_Input_set_tab_nav,(fl_Float_Input float_input));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_GIF_ImageC.h b/c-src/Fl_GIF_ImageC.h
--- a/c-src/Fl_GIF_ImageC.h
+++ b/c-src/Fl_GIF_ImageC.h
@@ -6,7 +6,7 @@
 #include "Fl_CallbackC.h"
 EXPORT {
 #endif
-  FL_EXPORT_C(fl_GIF_Image, Fl_GIF_Image_New)(const char* filename);
+  FL_EXPORT_C_HEADER(fl_GIF_Image,Fl_GIF_Image_New,(const char* filename));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Gl_WindowC.h b/c-src/Fl_Gl_WindowC.h
--- a/c-src/Fl_Gl_WindowC.h
+++ b/c-src/Fl_Gl_WindowC.h
@@ -12,123 +12,123 @@
 EXPORT {
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(fl_Gl_Window_Virtual_Funcs*, Fl_Gl_Window_default_virtual_funcs)();
-  FL_EXPORT_C(int,Fl_Gl_Window_handle)(fl_Gl_Window self, int event);
-  FL_EXPORT_C(int,Fl_Gl_Window_handle_super)(fl_Gl_Window self, int event);
-  FL_EXPORT_C(void,Fl_Gl_Window_draw_super)(fl_Gl_Window self);
-  FL_EXPORT_C(fl_Group,     Fl_Gl_Window_parent)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_set_parent)(fl_Gl_Window win, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Gl_Window_type)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_set_type)(fl_Gl_Window win, uchar t);
-  FL_EXPORT_C(void, Fl_Gl_Window_draw_box)(fl_Gl_Window Gl_Window);
-  FL_EXPORT_C(void, Fl_Gl_Window_draw_box_with_tc)(fl_Gl_Window Gl_Window,Fl_Boxtype t, Fl_Color c);
-  FL_EXPORT_C(void, Fl_Gl_Window_draw_box_with_txywhc)(fl_Gl_Window Gl_Window,Fl_Boxtype t, int x,int y,int w,int h, Fl_Color c);
-  FL_EXPORT_C(void, Fl_Gl_Window_draw_backdrop)(fl_Gl_Window Gl_Window);
-  FL_EXPORT_C(void, Fl_Gl_Window_draw_focus)(fl_Gl_Window Gl_Window);
-  FL_EXPORT_C(void, Fl_Gl_Window_draw_focus_with_txywh)(fl_Gl_Window Gl_Window,Fl_Boxtype t, int x,int y,int w,int h);
-  FL_EXPORT_C(void, Fl_Gl_Window_draw_label)(fl_Gl_Window Gl_Window);
+  FL_EXPORT_C_HEADER(fl_Gl_Window_Virtual_Funcs*,Fl_Gl_Window_default_virtual_funcs,());
+  FL_EXPORT_C_HEADER(int,Fl_Gl_Window_handle,(fl_Gl_Window self, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Gl_Window_handle_super,(fl_Gl_Window self, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_draw_super,(fl_Gl_Window self));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Gl_Window_parent,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_parent,(fl_Gl_Window win, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Gl_Window_type,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_type,(fl_Gl_Window win, uchar t));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_draw_box,(fl_Gl_Window Gl_Window));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_draw_box_with_tc,(fl_Gl_Window Gl_Window,Fl_Boxtype t, Fl_Color c));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_draw_box_with_txywhc,(fl_Gl_Window Gl_Window,Fl_Boxtype t, int x,int y,int w,int h, Fl_Color c));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_draw_backdrop,(fl_Gl_Window Gl_Window));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_draw_focus,(fl_Gl_Window Gl_Window));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_draw_focus_with_txywh,(fl_Gl_Window Gl_Window,Fl_Boxtype t, int x,int y,int w,int h));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_draw_label,(fl_Gl_Window Gl_Window));
 
-  FL_EXPORT_C(int,          Fl_Gl_Window_x)(fl_Gl_Window win);
-  FL_EXPORT_C(int,          Fl_Gl_Window_y)(fl_Gl_Window win);
-  FL_EXPORT_C(int,          Fl_Gl_Window_w)(fl_Gl_Window win);
-  FL_EXPORT_C(int,          Fl_Gl_Window_h)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_set_align)(fl_Gl_Window gl_window, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Gl_Window_align)(fl_Gl_Window win);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Gl_Window_box)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_set_box)(fl_Gl_Window win, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Gl_Window_color)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_set_color)(fl_Gl_Window win, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Gl_Window_set_color_with_bg_sel)(fl_Gl_Window win,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Gl_Window_selection_color)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_set_selection_color)(fl_Gl_Window win, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Gl_Window_label)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_copy_label)(fl_Gl_Window win, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Gl_Window_set_label)(fl_Gl_Window win, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Gl_Window_labeltype)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_set_labeltype)(fl_Gl_Window win, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Gl_Window_labelcolor)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_set_labelcolor)(fl_Gl_Window win, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Gl_Window_labelfont)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_set_labelfont)(fl_Gl_Window win, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Gl_Window_labelsize)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_set_labelsize)(fl_Gl_Window win, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Gl_Window_image)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_set_image)(fl_Gl_Window win, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Gl_Window_deimage)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_set_deimage)(fl_Gl_Window win, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Gl_Window_tooltip)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_copy_tooltip)(fl_Gl_Window win, const char* text);
-  FL_EXPORT_C(void,         Fl_Gl_Window_set_tooltip)(fl_Gl_Window win, const char* text);
-  FL_EXPORT_C(void,         Fl_Gl_Window_set_callback_with_user_data)(fl_Gl_Window win, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Gl_Window_set_callback)(fl_Gl_Window win, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Gl_Window_user_data)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_set_user_data)(fl_Gl_Window win, void* v);
-  FL_EXPORT_C(long,         Fl_Gl_Window_argument)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_set_argument)(fl_Gl_Window win, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Gl_Window_when)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_set_when)(fl_Gl_Window win, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Gl_Window_visible)(fl_Gl_Window win);
-  FL_EXPORT_C(int,          Fl_Gl_Window_visible_r)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_set_visible)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_clear_visible)(fl_Gl_Window win);
-  FL_EXPORT_C(unsigned int, Fl_Gl_Window_active)(fl_Gl_Window win);
-  FL_EXPORT_C(int,          Fl_Gl_Window_active_r)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_activate)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_deactivate)(fl_Gl_Window win);
-  FL_EXPORT_C(unsigned int, Fl_Gl_Window_output)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_set_output)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_clear_output)(fl_Gl_Window win);
-  FL_EXPORT_C(unsigned int, Fl_Gl_Window_takesevents)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_set_changed)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_clear_changed)(fl_Gl_Window win);
-  FL_EXPORT_C(int,          Fl_Gl_Window_take_focus)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_set_visible_focus)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_clear_visible_focus)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_modify_visible_focus)(fl_Gl_Window win, int v);
-  FL_EXPORT_C(unsigned int, Fl_Gl_Window_visible_focus)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_do_callback)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_do_callback_with_widget_and_user_data)(fl_Gl_Window win, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Gl_Window_do_callback_with_widget_and_default_user_data)(fl_Gl_Window win, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Gl_Window_contains)(fl_Gl_Window win, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Gl_Window_inside)(fl_Gl_Window win, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Gl_Window_redraw)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_redraw_label)(fl_Gl_Window win);
-  FL_EXPORT_C(uchar,        Fl_Gl_Window_damage)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_clear_damage_with_bitmask)(fl_Gl_Window win, uchar c);
-  FL_EXPORT_C(void,         Fl_Gl_Window_clear_damage)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_damage_with_text)(fl_Gl_Window win, uchar c);
-  FL_EXPORT_C(void,         Fl_Gl_Window_damage_inside_widget)(fl_Gl_Window win, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Gl_Window_draw_label_with_xywh_alignment)(fl_Gl_Window win, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(fl_Window,    Fl_Gl_Window_window)(fl_Gl_Window gl_window);
-  FL_EXPORT_C(fl_Window,    Fl_Gl_Window_top_window)(fl_Gl_Window gl_window);
-  FL_EXPORT_C(fl_Window ,   Fl_Gl_Window_top_window_offset)(fl_Gl_Window gl_window, int* xoff, int* yoff);
-  FL_EXPORT_C(void,         Fl_Gl_Window_measure_label)(fl_Gl_Window win, int* ww , int* hh);
-  FL_EXPORT_C(fl_Group,     Fl_Gl_Window_as_group)(fl_Gl_Window win);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Gl_Window_as_gl_window)(fl_Gl_Window win);
+  FL_EXPORT_C_HEADER(int,Fl_Gl_Window_x,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Gl_Window_y,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Gl_Window_w,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Gl_Window_h,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_align,(fl_Gl_Window gl_window, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Gl_Window_align,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Gl_Window_box,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_box,(fl_Gl_Window win, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Gl_Window_color,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_color,(fl_Gl_Window win, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_color_with_bg_sel,(fl_Gl_Window win,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Gl_Window_selection_color,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_selection_color,(fl_Gl_Window win, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Gl_Window_label,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_copy_label,(fl_Gl_Window win, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_label,(fl_Gl_Window win, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Gl_Window_labeltype,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_labeltype,(fl_Gl_Window win, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Gl_Window_labelcolor,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_labelcolor,(fl_Gl_Window win, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Gl_Window_labelfont,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_labelfont,(fl_Gl_Window win, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Gl_Window_labelsize,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_labelsize,(fl_Gl_Window win, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Gl_Window_image,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_image,(fl_Gl_Window win, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Gl_Window_deimage,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_deimage,(fl_Gl_Window win, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Gl_Window_tooltip,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_copy_tooltip,(fl_Gl_Window win, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_tooltip,(fl_Gl_Window win, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_callback_with_user_data,(fl_Gl_Window win, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_callback,(fl_Gl_Window win, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Gl_Window_user_data,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_user_data,(fl_Gl_Window win, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Gl_Window_argument,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_argument,(fl_Gl_Window win, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Gl_Window_when,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_when,(fl_Gl_Window win, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Gl_Window_visible,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Gl_Window_visible_r,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_visible,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_clear_visible,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Gl_Window_active,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Gl_Window_active_r,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_activate,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_deactivate,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Gl_Window_output,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_output,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_clear_output,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Gl_Window_takesevents,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_changed,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_clear_changed,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Gl_Window_take_focus,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_visible_focus,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_clear_visible_focus,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_modify_visible_focus,(fl_Gl_Window win, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Gl_Window_visible_focus,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_do_callback,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_do_callback_with_widget_and_user_data,(fl_Gl_Window win, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_do_callback_with_widget_and_default_user_data,(fl_Gl_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Gl_Window_contains,(fl_Gl_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Gl_Window_inside,(fl_Gl_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_redraw,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_redraw_label,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(uchar,Fl_Gl_Window_damage,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_clear_damage_with_bitmask,(fl_Gl_Window win, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_clear_damage,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_damage_with_text,(fl_Gl_Window win, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_damage_inside_widget,(fl_Gl_Window win, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_draw_label_with_xywh_alignment,(fl_Gl_Window win, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Gl_Window_window,(fl_Gl_Window gl_window));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Gl_Window_top_window,(fl_Gl_Window gl_window));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Gl_Window_top_window_offset,(fl_Gl_Window gl_window, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_measure_label,(fl_Gl_Window win, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Gl_Window_as_group,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Gl_Window_as_gl_window,(fl_Gl_Window win));
 
   /* Inherited from Fl_Group */
-  FL_EXPORT_C(void,         Fl_Gl_Window_begin)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_end)(fl_Gl_Window win);
-  FL_EXPORT_C(int,          Fl_Gl_Window_find)(fl_Gl_Window win, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Gl_Window_add)(fl_Gl_Window win, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Gl_Window_insert)(fl_Gl_Window win, fl_Widget w, int i);
-  FL_EXPORT_C(void,         Fl_Gl_Window_remove_index)(fl_Gl_Window win, int index);
-  FL_EXPORT_C(void,         Fl_Gl_Window_remove_widget)(fl_Gl_Window win, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Gl_Window_clear)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_set_resizable_by_reference)(fl_Gl_Window win,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Gl_Window_set_resizable)(fl_Gl_Window win,fl_Widget o);
-  FL_EXPORT_C(fl_Widget,    Fl_Gl_Window_resizable)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_add_resizable)(fl_Gl_Window win,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Gl_Window_init_sizes)(fl_Gl_Window win);
-  FL_EXPORT_C(int,          Fl_Gl_Window_children)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_set_clip_children)(fl_Gl_Window win,int c);
-  FL_EXPORT_C(unsigned int, Fl_Gl_Window_clip_children)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_focus)(fl_Gl_Window win,fl_Widget W);
-  FL_EXPORT_C(fl_Widget,    Fl_Gl_Window__ddfdesign_kludge)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_insert_with_before)(fl_Gl_Window self, fl_Widget w, fl_Widget before);
-  FL_EXPORT_C(fl_Widget*,   Fl_Gl_Window_array)(fl_Gl_Window self);
-  FL_EXPORT_C(fl_Widget,    Fl_Gl_Window_child)(fl_Gl_Window self, int n);
-  FL_EXPORT_C(void,         Fl_Gl_Window_forms_end)(fl_Gl_Window self);
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_begin,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_end,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Gl_Window_find,(fl_Gl_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_add,(fl_Gl_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_insert,(fl_Gl_Window win, fl_Widget w, int i));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_remove_index,(fl_Gl_Window win, int index));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_remove_widget,(fl_Gl_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_clear,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_resizable_by_reference,(fl_Gl_Window win,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_resizable,(fl_Gl_Window win,fl_Widget o));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Gl_Window_resizable,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_add_resizable,(fl_Gl_Window win,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_init_sizes,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Gl_Window_children,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_clip_children,(fl_Gl_Window win,int c));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Gl_Window_clip_children,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_focus,(fl_Gl_Window win,fl_Widget W));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Gl_Window__ddfdesign_kludge,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_insert_with_before,(fl_Gl_Window self, fl_Widget w, fl_Widget before));
+  FL_EXPORT_C_HEADER(fl_Widget*,Fl_Gl_Window_array,(fl_Gl_Window self));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Gl_Window_child,(fl_Gl_Window self, int n));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_forms_end,(fl_Gl_Window self));
   /* FL_EXPORT_C(void,         Fl_Gl_Window_forms_end)(fl_Gl_Window win); */
 #ifdef __cplusplus
   class Fl_DerivedGl_Window : public Fl_Gl_Window {
@@ -172,112 +172,112 @@
   };
 #endif
   /* Fl_Window inherited*/
-  FL_EXPORT_C(unsigned int, Fl_Gl_Window_changed)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_fullscreen)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_fullscreen_off)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_fullscreen_off_with_resize)(fl_Gl_Window win,int X,int Y,int W,int H);
-  FL_EXPORT_C(void*, Fl_Gl_Window_other_data)(fl_Gl_Window gl_window);
-  FL_EXPORT_C(void, Fl_Gl_Window_set_other_data)(fl_Gl_Window gl_window, void* v);
-  FL_EXPORT_C(fl_Gl_Window,    Fl_Gl_Window_New_WithLabel)(int w, int h, const char* title);
-  FL_EXPORT_C(fl_Gl_Window, Fl_OverriddenGl_Window_New_WithLabel)(int w, int h, const char* title, fl_Gl_Window_Virtual_Funcs* funcs);
-  FL_EXPORT_C(fl_Gl_Window,    Fl_Gl_Window_New)(int w, int h);
-  FL_EXPORT_C(fl_Gl_Window, Fl_OverriddenGl_Window_New)(int w, int h,fl_Gl_Window_Virtual_Funcs* funcs);
-  FL_EXPORT_C(fl_Gl_Window,    Fl_Gl_Window_NewXY_WithLabel)(int x, int y, int w, int h, const char* title);
-  FL_EXPORT_C(fl_Gl_Window, Fl_OverriddenGl_Window_NewXY_WithLabel)(int x, int y, int w, int h, const char* title,fl_Gl_Window_Virtual_Funcs* funcs);
-  FL_EXPORT_C(fl_Gl_Window,    Fl_Gl_Window_NewXY)(int x, int y, int w, int h);
-  FL_EXPORT_C(fl_Gl_Window, Fl_OverriddenGl_Window_NewXY)(int x, int y, int w, int h,fl_Gl_Window_Virtual_Funcs* funcs);
-  FL_EXPORT_C(void,         Fl_Gl_Window_hide)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_show)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_show_with_args)(fl_Gl_Window win, int argc, char** argv);
-  FL_EXPORT_C(void,         Fl_Gl_Window_Destroy)(fl_Gl_Window win);
-  FL_EXPORT_C(void,         Fl_Gl_Window_resize)(fl_Gl_Window win, int X, int Y, int W, int H);
-  FL_EXPORT_C(void,         Fl_Gl_Window_iconize)(fl_Gl_Window win);
-  FL_EXPORT_C(int ,Fl_Gl_Window_handle)(fl_Gl_Window win, int event);
-  FL_EXPORT_C(void ,Fl_Gl_Window_set_border)(fl_Gl_Window win, int b);
-  FL_EXPORT_C(void ,Fl_Gl_Window_clear_border)(fl_Gl_Window win);
-  FL_EXPORT_C(unsigned int ,Fl_Gl_Window_border)(fl_Gl_Window win);
-  FL_EXPORT_C(void ,Fl_Gl_Window_set_override)(fl_Gl_Window win);
-  FL_EXPORT_C(unsigned int,Fl_Gl_Window_override)(fl_Gl_Window win);
-  FL_EXPORT_C(void ,Fl_Gl_Window_set_modal)(fl_Gl_Window win);
-  FL_EXPORT_C(unsigned int,Fl_Gl_Window_modal)(fl_Gl_Window win);
-  FL_EXPORT_C(void ,Fl_Gl_Window_set_non_modal)(fl_Gl_Window win);
-  FL_EXPORT_C(unsigned int ,Fl_Gl_Window_non_modal)(fl_Gl_Window win);
-  FL_EXPORT_C(void ,Fl_Gl_Window_set_menu_window)(fl_Gl_Window win);
-  FL_EXPORT_C(unsigned int,Fl_Gl_Window_menu_window)(fl_Gl_Window win);
-  FL_EXPORT_C(void ,Fl_Gl_Window_set_tooltip_window)(fl_Gl_Window win);
-  FL_EXPORT_C(unsigned int,Fl_Gl_Window_tooltip_window)(fl_Gl_Window win);
-  FL_EXPORT_C(void ,Fl_Gl_Window_hotspot_with_x_y)(fl_Gl_Window win, int x, int y);
-  FL_EXPORT_C(void ,Fl_Gl_Window_hotspot_with_x_y_with_offscreen)(fl_Gl_Window win, int x, int y, int offscreen);
-  FL_EXPORT_C(void ,Fl_Gl_Window_hotspot_with_widget)(fl_Gl_Window win, fl_Widget w);//, int offscreen = 0);
-  FL_EXPORT_C(void ,Fl_Gl_Window_hotspot_with_widget_with_offscreen)(fl_Gl_Window win, fl_Widget w, int offscreen);
-  FL_EXPORT_C(fl_Window_size_range_args*,Fl_Gl_Window_default_size_range_args)();
-  FL_EXPORT_C(void ,Fl_Gl_Window_free_position)(fl_Gl_Window win);
-  FL_EXPORT_C(void ,Fl_Gl_Window_size_range)(fl_Gl_Window win, int minw, int minh);
-  FL_EXPORT_C(void ,Fl_Gl_Window_size_range_with_args)(fl_Gl_Window win, int minw, int minh, fl_Window_size_range_args* args);//int maxw=0, int maxh=0, int dw=0, int dh=0, int aspect=0);
-  FL_EXPORT_C(const char*, Fl_Gl_Window_label)(fl_Gl_Window win);
-  FL_EXPORT_C(const char*, Fl_Gl_Window_iconlabel)(fl_Gl_Window win);
-  FL_EXPORT_C(void, Fl_Gl_Window_set_label)(fl_Gl_Window win,const char*);
-  FL_EXPORT_C(void, Fl_Gl_Window_set_iconlabel)(fl_Gl_Window win,const char*);
-  FL_EXPORT_C(void, Fl_Gl_Window_set_label_with_iconlabel)(fl_Gl_Window win,const char* label, const char* iconlabel);
-  FL_EXPORT_C(void, Fl_Gl_Window_copy_label)(fl_Gl_Window win,const char* a);
-  FL_EXPORT_C(void, Fl_Gl_Window_set_default_xclass)(const char* label);
-  FL_EXPORT_C(const char*, Fl_Gl_Window_default_xclass)();
-  FL_EXPORT_C(const char*, Fl_Gl_Window_xclass)(fl_Gl_Window win);
-  FL_EXPORT_C(void, Fl_Gl_Window_set_xclass)(fl_Gl_Window win,const char* c);
-  FL_EXPORT_C(const void*, Fl_Gl_Window_icon)(fl_Gl_Window win);
-  FL_EXPORT_C(void, Fl_Gl_Window_set_icon)(fl_Gl_Window win,const void * ic);
-  FL_EXPORT_C(int, Fl_Gl_Window_shown)(fl_Gl_Window win);
-  FL_EXPORT_C(void, Fl_Gl_Window_iconize)(fl_Gl_Window win);
-  FL_EXPORT_C(int, Fl_Gl_Window_x_root)(fl_Gl_Window win);
-  FL_EXPORT_C(int, Fl_Gl_Window_y_root)(fl_Gl_Window win);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Gl_Window_current)();
-  FL_EXPORT_C(void, Fl_Gl_Window_make_current)(fl_Gl_Window win);
-  FL_EXPORT_C(void, Fl_Gl_Window_set_cursor_with_bg)(fl_Gl_Window win, Fl_Cursor cursor, Fl_Color bg);
-  FL_EXPORT_C(void, Fl_Gl_Window_set_cursor_with_fg)(fl_Gl_Window win,Fl_Cursor cursor, Fl_Color fg);
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Gl_Window_changed,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_fullscreen,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_fullscreen_off,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_fullscreen_off_with_resize,(fl_Gl_Window win,int X,int Y,int W,int H));
+  FL_EXPORT_C_HEADER(void*,Fl_Gl_Window_other_data,(fl_Gl_Window gl_window));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_other_data,(fl_Gl_Window gl_window, void* v));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Gl_Window_New_WithLabel,(int w, int h, const char* title));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_OverriddenGl_Window_New_WithLabel,(int w, int h, const char* title, fl_Gl_Window_Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Gl_Window_New,(int w, int h));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_OverriddenGl_Window_New,(int w, int h,fl_Gl_Window_Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Gl_Window_NewXY_WithLabel,(int x, int y, int w, int h, const char* title));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_OverriddenGl_Window_NewXY_WithLabel,(int x, int y, int w, int h, const char* title,fl_Gl_Window_Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Gl_Window_NewXY,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_OverriddenGl_Window_NewXY,(int x, int y, int w, int h,fl_Gl_Window_Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_hide,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_show,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_show_with_args,(fl_Gl_Window win, int argc, char** argv));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_Destroy,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_resize,(fl_Gl_Window win, int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_iconize,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(int ,Fl_Gl_Window_handle,(fl_Gl_Window win, int event));
+  FL_EXPORT_C_HEADER(void ,Fl_Gl_Window_set_border,(fl_Gl_Window win, int b));
+  FL_EXPORT_C_HEADER(void ,Fl_Gl_Window_clear_border,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(unsigned int ,Fl_Gl_Window_border,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Gl_Window_set_override,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Gl_Window_override,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Gl_Window_set_modal,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Gl_Window_modal,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Gl_Window_set_non_modal,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(unsigned int ,Fl_Gl_Window_non_modal,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Gl_Window_set_menu_window,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Gl_Window_menu_window,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Gl_Window_set_tooltip_window,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Gl_Window_tooltip_window,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Gl_Window_hotspot_with_x_y,(fl_Gl_Window win, int x, int y));
+  FL_EXPORT_C_HEADER(void ,Fl_Gl_Window_hotspot_with_x_y_with_offscreen,(fl_Gl_Window win, int x, int y, int offscreen));
+  FL_EXPORT_C_HEADER(void ,Fl_Gl_Window_hotspot_with_widget,(fl_Gl_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void ,Fl_Gl_Window_hotspot_with_widget_with_offscreen,(fl_Gl_Window win, fl_Widget w, int offscreen));
+  FL_EXPORT_C_HEADER(fl_Window_size_range_args*,Fl_Gl_Window_default_size_range_args,());
+  FL_EXPORT_C_HEADER(void ,Fl_Gl_Window_free_position,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Gl_Window_size_range,(fl_Gl_Window win, int minw, int minh));
+  FL_EXPORT_C_HEADER(void ,Fl_Gl_Window_size_range_with_args,(fl_Gl_Window win, int minw, int minh, fl_Window_size_range_args* args));
+  FL_EXPORT_C_HEADER(const char*,Fl_Gl_Window_label,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(const char*,Fl_Gl_Window_iconlabel,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_label,(fl_Gl_Window win,const char*));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_iconlabel,(fl_Gl_Window win,const char*));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_label_with_iconlabel,(fl_Gl_Window win,const char* label, const char* iconlabel));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_copy_label,(fl_Gl_Window win,const char* a));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_default_xclass,(const char* label));
+  FL_EXPORT_C_HEADER(const char*,Fl_Gl_Window_default_xclass,());
+  FL_EXPORT_C_HEADER(const char*,Fl_Gl_Window_xclass,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_xclass,(fl_Gl_Window win,const char* c));
+  FL_EXPORT_C_HEADER(const void*,Fl_Gl_Window_icon,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_icon,(fl_Gl_Window win,const void * ic));
+  FL_EXPORT_C_HEADER(int,Fl_Gl_Window_shown,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_iconize,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Gl_Window_x_root,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Gl_Window_y_root,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Gl_Window_current,());
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_make_current,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_cursor_with_bg,(fl_Gl_Window win, Fl_Cursor cursor, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_cursor_with_fg,(fl_Gl_Window win,Fl_Cursor cursor, Fl_Color fg));
   FL_EXPORT_C(void, Fl_Gl_Window_set_cursor_with_fg_bg)(fl_Gl_Window win,Fl_Cursor cursor, Fl_Color fg , Fl_Color bg );/* =FL_BLACK *//*=FL_WHITE*/
-  FL_EXPORT_C(void, Fl_Gl_Window_set_cursor)(fl_Gl_Window win,Fl_Cursor cursor);
-  FL_EXPORT_C(void, Fl_Gl_Window_set_default_cursor_with_bg)(fl_Gl_Window win,Fl_Cursor cursor, Fl_Color bg);
-  FL_EXPORT_C(void, Fl_Gl_Window_set_default_cursor_with_fg)(fl_Gl_Window win, Fl_Cursor cursor, Fl_Color fg);
-  FL_EXPORT_C(void, Fl_Gl_Window_set_default_cursor_with_fg_bg)(fl_Gl_Window win,Fl_Cursor cursor, Fl_Color fg , Fl_Color bg );
-  FL_EXPORT_C(void, Fl_Gl_Window_set_default_cursor)(fl_Gl_Window win,Fl_Cursor cursor);
-  FL_EXPORT_C(void, Fl_Gl_Window_default_callback)(fl_Gl_Window win, void* v);
-  FL_EXPORT_C(int, Fl_Gl_Window_decorated_w)(fl_Gl_Window win);
-  FL_EXPORT_C(int, Fl_Gl_Window_decorated_h)(fl_Gl_Window win);
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_cursor,(fl_Gl_Window win,Fl_Cursor cursor));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_default_cursor_with_bg,(fl_Gl_Window win,Fl_Cursor cursor, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_default_cursor_with_fg,(fl_Gl_Window win, Fl_Cursor cursor, Fl_Color fg));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_default_cursor_with_fg_bg,(fl_Gl_Window win,Fl_Cursor cursor, Fl_Color fg , Fl_Color bg ));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_default_cursor,(fl_Gl_Window win,Fl_Cursor cursor));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_default_callback,(fl_Gl_Window win, void* v));
+  FL_EXPORT_C_HEADER(int,Fl_Gl_Window_decorated_w,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Gl_Window_decorated_h,(fl_Gl_Window win));
   // Fl_Gl_Window specific
-  FL_EXPORT_C(char, Fl_Gl_Window_valid)(fl_Gl_Window win);
-  FL_EXPORT_C(void, Fl_Gl_Window_set_valid)(fl_Gl_Window win, char v);
-  FL_EXPORT_C(void, Fl_Gl_Window_invalidate)(fl_Gl_Window win);
-  FL_EXPORT_C(char, Fl_Gl_Window_context_valid)(fl_Gl_Window win);
-  FL_EXPORT_C(void, Fl_Gl_Window_set_context_valid)(fl_Gl_Window win,char v);
-  FL_EXPORT_C(int, Fl_Gl_Window_can_do_with_m)(int m);
-  FL_EXPORT_C(int, Fl_Gl_Window_can_do)(fl_Gl_Window win);
-  FL_EXPORT_C(Fl_Mode, Fl_Gl_Window_mode)(fl_Gl_Window win);
-  FL_EXPORT_C(int, Fl_Gl_Window_set_mode)(fl_Gl_Window win,int a);
-  FL_EXPORT_C(void*, Fl_Gl_Window_context)(fl_Gl_Window win);
-  FL_EXPORT_C(void, Fl_Gl_Window_set_context)(fl_Gl_Window win,void* context);
-  FL_EXPORT_C(void, Fl_Gl_Window_set_context_with_destroy_flag)(fl_Gl_Window win,void* context, int destroy_flag);
-  FL_EXPORT_C(void, Fl_Gl_Window_swap_buffers)(fl_Gl_Window win);
-  FL_EXPORT_C(void, Fl_Gl_Window_ortho)(fl_Gl_Window win);
-  FL_EXPORT_C(int, Fl_Gl_Window_can_do_overlay)(fl_Gl_Window win);
-  FL_EXPORT_C(void, Fl_Gl_Window_redraw_overlay)(fl_Gl_Window win);
-  FL_EXPORT_C(void, Fl_Gl_Window_hide_overlay)(fl_Gl_Window win);
-  FL_EXPORT_C(void, Fl_Gl_Window_make_overlay_current)(fl_Gl_Window win);
+  FL_EXPORT_C_HEADER(char,Fl_Gl_Window_valid,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_valid,(fl_Gl_Window win, char v));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_invalidate,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(char,Fl_Gl_Window_context_valid,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_context_valid,(fl_Gl_Window win,char v));
+  FL_EXPORT_C_HEADER(int,Fl_Gl_Window_can_do_with_m,(int m));
+  FL_EXPORT_C_HEADER(int,Fl_Gl_Window_can_do,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(Fl_Mode,Fl_Gl_Window_mode,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Gl_Window_set_mode,(fl_Gl_Window win,int a));
+  FL_EXPORT_C_HEADER(void*,Fl_Gl_Window_context,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_context,(fl_Gl_Window win,void* context));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_set_context_with_destroy_flag,(fl_Gl_Window win,void* context, int destroy_flag));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_swap_buffers,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_ortho,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Gl_Window_can_do_overlay,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_redraw_overlay,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_hide_overlay,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_make_overlay_current,(fl_Gl_Window win));
 #if FL_API_VERSION >= 10304
-  FL_EXPORT_C(float, Fl_Gl_Window_pixels_per_unit)(fl_Gl_Window win);
-  FL_EXPORT_C(int, Fl_Gl_Window_pixel_h)(fl_Gl_Window win);
-  FL_EXPORT_C(int, Fl_Gl_Window_pixel_w)(fl_Gl_Window win);
+  FL_EXPORT_C_HEADER(float,Fl_Gl_Window_pixels_per_unit,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Gl_Window_pixel_h,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Gl_Window_pixel_w,(fl_Gl_Window win));
 #endif
-  FL_EXPORT_C(int,Fl_Gl_Window_handle_super)(fl_Gl_Window self, int event);
-  FL_EXPORT_C(void,Fl_Gl_Window_draw_super)(fl_Gl_Window self);
-  FL_EXPORT_C(fl_Group,Fl_Gl_Window_as_group_super)(fl_Gl_Window win);
-  FL_EXPORT_C(fl_Gl_Window,Fl_Gl_Window_as_window_super)(fl_Gl_Window win);
-  FL_EXPORT_C(fl_Gl_Window,Fl_Gl_Window_as_window)(fl_Gl_Window win);
-  FL_EXPORT_C(fl_Gl_Window,Fl_Gl_Window_as_gl_window_super)(fl_Gl_Window win);
-  FL_EXPORT_C(void,Fl_Gl_Window_hide_super)(fl_Gl_Window win);
-  FL_EXPORT_C(void,Fl_Gl_Window_flush_super)(fl_Gl_Window win);
-  FL_EXPORT_C(void,Fl_Gl_Window_flush)(fl_Gl_Window win);
-  FL_EXPORT_C(void,Fl_Gl_Window_show_super)(fl_Gl_Window win);
-  FL_EXPORT_C(void,Fl_Gl_Window_resize_super)(fl_Gl_Window win,int X,int Y,int W,int H);
+  FL_EXPORT_C_HEADER(int,Fl_Gl_Window_handle_super,(fl_Gl_Window self, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_draw_super,(fl_Gl_Window self));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Gl_Window_as_group_super,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Gl_Window_as_window_super,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Gl_Window_as_window,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Gl_Window_as_gl_window_super,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_hide_super,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_flush_super,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_flush,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_show_super,(fl_Gl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Gl_Window_resize_super,(fl_Gl_Window win,int X,int Y,int W,int H));
 
 #ifdef __cplusplus
 }
diff --git a/c-src/Fl_GroupC.h b/c-src/Fl_GroupC.h
--- a/c-src/Fl_GroupC.h
+++ b/c-src/Fl_GroupC.h
@@ -34,136 +34,136 @@
 
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,          Fl_Group_handle)(fl_Group self, int event);
-  FL_EXPORT_C(int,          Fl_Group_handle_super)(fl_Group self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Group_parent)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_set_parent)(fl_Group group, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Group_type)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_set_type)(fl_Group group, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Group_handle,(fl_Group self, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Group_handle_super,(fl_Group self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Group_parent,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_set_parent,(fl_Group group, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Group_type,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_set_type,(fl_Group group, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Group_x)(fl_Group group);
-  FL_EXPORT_C(int,          Fl_Group_y)(fl_Group group);
-  FL_EXPORT_C(int,          Fl_Group_w)(fl_Group group);
-  FL_EXPORT_C(int,          Fl_Group_h)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_set_align)(fl_Group group, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Group_align)(fl_Group group);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Group_box)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_set_box)(fl_Group group, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Group_color)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_set_color)(fl_Group group, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Group_set_color_with_bg_sel)(fl_Group group,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Group_selection_color)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_set_selection_color)(fl_Group group, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Group_label)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_copy_label)(fl_Group group, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Group_set_label)(fl_Group group, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Group_labeltype)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_set_labeltype)(fl_Group group, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Group_labelcolor)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_set_labelcolor)(fl_Group group, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Group_item_labelfont)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_set_item_labelfont)(fl_Group group, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Group_item_labelsize)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_set_item_labelsize)(fl_Group group, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Group_image)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_set_image)(fl_Group group, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Group_deimage)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_set_deimage)(fl_Group group, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Group_tooltip)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_copy_tooltip)(fl_Group group, const char* text);
-  FL_EXPORT_C(void,         Fl_Group_set_tooltip)(fl_Group group, const char* text);
-  FL_EXPORT_C(void,         Fl_Group_set_callback_with_user_data)(fl_Group group, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Group_set_callback)(fl_Group group, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Group_other_data)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_set_other_data)(fl_Group group, void* v);
-  FL_EXPORT_C(void*,        Fl_Group_user_data)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_set_user_data)(fl_Group group, void* v);
-  FL_EXPORT_C(long,         Fl_Group_argument)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_set_argument)(fl_Group group, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Group_when)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_set_when)(fl_Group group, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Group_visible)(fl_Group group);
-  FL_EXPORT_C(int,          Fl_Group_visible_r)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_show_super)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_show)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_hide_super)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_hide)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_set_visible)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_clear_visible)(fl_Group group);
-  FL_EXPORT_C(unsigned int, Fl_Group_active)(fl_Group group);
-  FL_EXPORT_C(int,          Fl_Group_active_r)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_activate)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_deactivate)(fl_Group group);
-  FL_EXPORT_C(unsigned int, Fl_Group_output)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_set_output)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_clear_output)(fl_Group group);
-  FL_EXPORT_C(unsigned int, Fl_Group_takesevents)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_set_changed)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_clear_changed)(fl_Group group);
-  FL_EXPORT_C(int,          Fl_Group_take_focus)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_set_visible_focus)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_clear_visible_focus)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_modify_visible_focus)(fl_Group group, int v);
-  FL_EXPORT_C(unsigned int, Fl_Group_visible_focus)(fl_Group group);
-  FL_EXPORT_C(int,          Fl_Group_contains)(fl_Group group, fl_Group w);
-  FL_EXPORT_C(int,          Fl_Group_inside)(fl_Group group, fl_Group w);
-  FL_EXPORT_C(void,         Fl_Group_redraw)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_redraw_label)(fl_Group group);
-  FL_EXPORT_C(uchar,        Fl_Group_damage)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_clear_damage_with_bitmask)(fl_Group group, uchar c);
-  FL_EXPORT_C(void,         Fl_Group_clear_damage)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_damage_with_text)(fl_Group group, uchar c);
-  FL_EXPORT_C(void,         Fl_Group_damage_inside_group)(fl_Group group, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Group_draw_label_with_xywh_alignment)(fl_Group group, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Group_measure_label)(fl_Group group, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Group_window)(fl_Group group);
-  FL_EXPORT_C(fl_Window,    Fl_Group_top_window)(fl_Group group);
-  FL_EXPORT_C(fl_Window ,   Fl_Group_top_window_offset)(fl_Group group, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Group_as_group_super)(fl_Group group);
-  FL_EXPORT_C(fl_Group,     Fl_Group_as_group)(fl_Group group);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Group_as_gl_window_super)(fl_Group group);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Group_as_gl_window)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_resize_super)(fl_Group group,int X, int Y, int W, int H);
-  FL_EXPORT_C(void,         Fl_Group_resize)(fl_Group group,int X, int Y, int W, int H);
-  FL_EXPORT_C(void ,Fl_Group_resize_super)(fl_Group self, int x, int y, int w, int h);
+  FL_EXPORT_C_HEADER(int,Fl_Group_x,(fl_Group group));
+  FL_EXPORT_C_HEADER(int,Fl_Group_y,(fl_Group group));
+  FL_EXPORT_C_HEADER(int,Fl_Group_w,(fl_Group group));
+  FL_EXPORT_C_HEADER(int,Fl_Group_h,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_set_align,(fl_Group group, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Group_align,(fl_Group group));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Group_box,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_set_box,(fl_Group group, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Group_color,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_set_color,(fl_Group group, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Group_set_color_with_bg_sel,(fl_Group group,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Group_selection_color,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_set_selection_color,(fl_Group group, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Group_label,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_copy_label,(fl_Group group, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Group_set_label,(fl_Group group, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Group_labeltype,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_set_labeltype,(fl_Group group, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Group_labelcolor,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_set_labelcolor,(fl_Group group, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Group_item_labelfont,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_set_item_labelfont,(fl_Group group, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Group_item_labelsize,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_set_item_labelsize,(fl_Group group, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Group_image,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_set_image,(fl_Group group, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Group_deimage,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_set_deimage,(fl_Group group, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Group_tooltip,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_copy_tooltip,(fl_Group group, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Group_set_tooltip,(fl_Group group, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Group_set_callback_with_user_data,(fl_Group group, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Group_set_callback,(fl_Group group, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Group_other_data,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_set_other_data,(fl_Group group, void* v));
+  FL_EXPORT_C_HEADER(void*,Fl_Group_user_data,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_set_user_data,(fl_Group group, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Group_argument,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_set_argument,(fl_Group group, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Group_when,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_set_when,(fl_Group group, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Group_visible,(fl_Group group));
+  FL_EXPORT_C_HEADER(int,Fl_Group_visible_r,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_show_super,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_show,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_hide_super,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_hide,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_set_visible,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_clear_visible,(fl_Group group));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Group_active,(fl_Group group));
+  FL_EXPORT_C_HEADER(int,Fl_Group_active_r,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_activate,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_deactivate,(fl_Group group));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Group_output,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_set_output,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_clear_output,(fl_Group group));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Group_takesevents,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_set_changed,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_clear_changed,(fl_Group group));
+  FL_EXPORT_C_HEADER(int,Fl_Group_take_focus,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_set_visible_focus,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_clear_visible_focus,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_modify_visible_focus,(fl_Group group, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Group_visible_focus,(fl_Group group));
+  FL_EXPORT_C_HEADER(int,Fl_Group_contains,(fl_Group group, fl_Group w));
+  FL_EXPORT_C_HEADER(int,Fl_Group_inside,(fl_Group group, fl_Group w));
+  FL_EXPORT_C_HEADER(void,Fl_Group_redraw,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_redraw_label,(fl_Group group));
+  FL_EXPORT_C_HEADER(uchar,Fl_Group_damage,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_clear_damage_with_bitmask,(fl_Group group, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Group_clear_damage,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_damage_with_text,(fl_Group group, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Group_damage_inside_group,(fl_Group group, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Group_draw_label_with_xywh_alignment,(fl_Group group, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Group_measure_label,(fl_Group group, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Group_window,(fl_Group group));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Group_top_window,(fl_Group group));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Group_top_window_offset,(fl_Group group, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Group_as_group_super,(fl_Group group));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Group_as_group,(fl_Group group));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Group_as_gl_window_super,(fl_Group group));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Group_as_gl_window,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_resize_super,(fl_Group group,int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(void,Fl_Group_resize,(fl_Group group,int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(void ,Fl_Group_resize_super,(fl_Group self, int x, int y, int w, int h));
 
   /* Fl_Group static members */
-  FL_EXPORT_C(fl_Group,Fl_Group_current)();
-  FL_EXPORT_C(void ,   Fl_Group_set_current)(fl_Group g);
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Group_current,());
+  FL_EXPORT_C_HEADER(void ,Fl_Group_set_current,(fl_Group g));
 
   /* Fl_Group specific */
-  FL_EXPORT_C(void,         Fl_Group_draw_child)(fl_Group group, fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Group_draw_children)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_draw_outside_label)(fl_Group group, fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Group_update_child)(fl_Group group, fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Group_begin)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_draw)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_draw_super)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_end)(fl_Group group);
-  FL_EXPORT_C(int,          Fl_Group_find)(fl_Group group, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Group_add)(fl_Group group, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Group_insert)(fl_Group group, fl_Widget w, int i);
-  FL_EXPORT_C(void,         Fl_Group_remove_index)(fl_Group group, int index);
-  FL_EXPORT_C(void,         Fl_Group_remove_widget)(fl_Group group, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Group_clear)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_set_resizable_by_reference)(fl_Group group,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Group_set_resizable)(fl_Group group,fl_Widget o);
-  FL_EXPORT_C(fl_Widget,    Fl_Group_resizable)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_add_resizable)(fl_Group group,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Group_init_sizes)(fl_Group group);
-  FL_EXPORT_C(int,          Fl_Group_children)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_set_clip_children)(fl_Group group,int c);
-  FL_EXPORT_C(unsigned int, Fl_Group_clip_children)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_focus)(fl_Group group,fl_Widget W);
-  FL_EXPORT_C(fl_Widget,    Fl_Group__ddfdesign_kludge)(fl_Group group);
-  FL_EXPORT_C(void,         Fl_Group_insert_with_before)(fl_Group self, fl_Widget w, fl_Widget before);
-  FL_EXPORT_C(fl_Widget*,   Fl_Group_array)(fl_Group self);
-  FL_EXPORT_C(fl_Widget,    Fl_Group_child)(fl_Group self, int n);
-  FL_EXPORT_C(fl_Group,     Fl_Group_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(fl_Group,     Fl_Group_New_WithLabel)(int x, int y, int w, int h, const char* t);
-  FL_EXPORT_C(fl_Group,    Fl_OverriddenGroup_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Group,    Fl_OverriddenGroup_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void,         Fl_Group_Destroy)(fl_Group group);
+  FL_EXPORT_C_HEADER(void,Fl_Group_draw_child,(fl_Group group, fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Group_draw_children,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_draw_outside_label,(fl_Group group, fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Group_update_child,(fl_Group group, fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Group_begin,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_draw,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_draw_super,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_end,(fl_Group group));
+  FL_EXPORT_C_HEADER(int,Fl_Group_find,(fl_Group group, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Group_add,(fl_Group group, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Group_insert,(fl_Group group, fl_Widget w, int i));
+  FL_EXPORT_C_HEADER(void,Fl_Group_remove_index,(fl_Group group, int index));
+  FL_EXPORT_C_HEADER(void,Fl_Group_remove_widget,(fl_Group group, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Group_clear,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_set_resizable_by_reference,(fl_Group group,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Group_set_resizable,(fl_Group group,fl_Widget o));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Group_resizable,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_add_resizable,(fl_Group group,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Group_init_sizes,(fl_Group group));
+  FL_EXPORT_C_HEADER(int,Fl_Group_children,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_set_clip_children,(fl_Group group,int c));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Group_clip_children,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_focus,(fl_Group group,fl_Widget W));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Group__ddfdesign_kludge,(fl_Group group));
+  FL_EXPORT_C_HEADER(void,Fl_Group_insert_with_before,(fl_Group self, fl_Widget w, fl_Widget before));
+  FL_EXPORT_C_HEADER(fl_Widget*,Fl_Group_array,(fl_Group self));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Group_child,(fl_Group self, int n));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Group_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Group_New_WithLabel,(int x, int y, int w, int h, const char* t));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_OverriddenGroup_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_OverriddenGroup_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Group_Destroy,(fl_Group group));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Hold_BrowserC.h b/c-src/Fl_Hold_BrowserC.h
--- a/c-src/Fl_Hold_BrowserC.h
+++ b/c-src/Fl_Hold_BrowserC.h
@@ -8,194 +8,194 @@
 #include "FL/Fl_Hold_Browser.H"
 #include "Fl_CallbackC.h"
 EXPORT {
-#endif  
+#endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int ,         Fl_Hold_Browser_handle_super)(fl_Hold_Browser hold_browser,int event);
-  FL_EXPORT_C(int ,         Fl_Hold_Browser_handle )(fl_Hold_Browser hold_browser,int event);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_resize_super)(fl_Hold_Browser hold_browser,int x, int y, int w, int h);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_resize )(fl_Hold_Browser hold_browser,int x, int y, int w, int h);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_show_super)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_show )(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_hide_super)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_hide )(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(fl_Window,    Fl_Hold_Browser_as_window_super)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(fl_Window,    Fl_Hold_Browser_as_window )(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Hold_Browser_as_gl_window_super)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Hold_Browser_as_gl_window)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(fl_Group,     Fl_Hold_Browser_parent)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_set_parent)(fl_Hold_Browser hold_browser, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Hold_Browser_type)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_set_type)(fl_Hold_Browser hold_browser, uchar t);
+  FL_EXPORT_C_HEADER(int ,Fl_Hold_Browser_handle_super,(fl_Hold_Browser hold_browser,int event));
+  FL_EXPORT_C_HEADER(int ,Fl_Hold_Browser_handle ,(fl_Hold_Browser hold_browser,int event));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_resize_super,(fl_Hold_Browser hold_browser,int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_resize ,(fl_Hold_Browser hold_browser,int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_show_super,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_show ,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_hide_super,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_hide ,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Hold_Browser_as_window_super,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Hold_Browser_as_window ,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Hold_Browser_as_gl_window_super,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Hold_Browser_as_gl_window,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Hold_Browser_parent,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_parent,(fl_Hold_Browser hold_browser, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Hold_Browser_type,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_type,(fl_Hold_Browser hold_browser, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Hold_Browser_x)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(int,          Fl_Hold_Browser_y)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(int,          Fl_Hold_Browser_w)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(int,          Fl_Hold_Browser_h)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_set_align)(fl_Hold_Browser hold_browser, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Hold_Browser_align)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Hold_Browser_box)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_set_box)(fl_Hold_Browser hold_browser, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Hold_Browser_color)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_set_color)(fl_Hold_Browser hold_browser, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_set_color_with_bg_sel)(fl_Hold_Browser hold_browser,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Hold_Browser_selection_color)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_set_selection_color)(fl_Hold_Browser hold_browser, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Hold_Browser_label)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_copy_label)(fl_Hold_Browser hold_browser, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_set_label)(fl_Hold_Browser hold_browser, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Hold_Browser_labeltype)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_set_labeltype)(fl_Hold_Browser hold_browser, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Hold_Browser_labelcolor)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_set_labelcolor)(fl_Hold_Browser hold_browser, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Hold_Browser_labelfont)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_set_labelfont)(fl_Hold_Browser hold_browser, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Hold_Browser_labelsize)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_set_labelsize)(fl_Hold_Browser hold_browser, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Hold_Browser_image)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_set_image)(fl_Hold_Browser hold_browser, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Hold_Browser_deimage)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_set_deimage)(fl_Hold_Browser hold_browser, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Hold_Browser_tooltip)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_copy_tooltip)(fl_Hold_Browser hold_browser, const char* text);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_set_tooltip)(fl_Hold_Browser hold_browser, const char* text);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_set_callback_with_user_data)(fl_Hold_Browser hold_browser, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_set_callback)(fl_Hold_Browser hold_browser, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Hold_Browser_user_data)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_set_user_data)(fl_Hold_Browser hold_browser, void* v);
-  FL_EXPORT_C(long,         Fl_Hold_Browser_argument)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_set_argument)(fl_Hold_Browser hold_browser, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Hold_Browser_when)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_set_when)(fl_Hold_Browser hold_browser, uchar i);
-  FL_EXPORT_C(int,          Fl_Hold_Browser_visible_r)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_set_visible)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_clear_visible)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(unsigned int, Fl_Hold_Browser_active)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(int,          Fl_Hold_Browser_active_r)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_activate)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_deactivate)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(unsigned int, Fl_Hold_Browser_output)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_set_output)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_clear_output)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(unsigned int, Fl_Hold_Browser_takesevents)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_set_changed)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_clear_changed)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(int,          Fl_Hold_Browser_take_focus)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_set_visible_focus)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_clear_visible_focus)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_modify_visible_focus)(fl_Hold_Browser hold_browser, int v);
-  FL_EXPORT_C(unsigned int, Fl_Hold_Browser_visible_focus)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_do_callback)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_do_callback_with_widget_and_user_data)(fl_Hold_Browser hold_browser, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_do_callback_with_widget_and_default_user_data)(fl_Hold_Browser hold_browser, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Hold_Browser_contains)(fl_Hold_Browser hold_browser, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Hold_Browser_inside)(fl_Hold_Browser hold_browser, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_redraw)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_redraw_label)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(uchar,        Fl_Hold_Browser_damage)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_clear_damage_with_bitmask)(fl_Hold_Browser hold_browser, uchar c);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_clear_damage)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_damage_with_text)(fl_Hold_Browser hold_browser, uchar c);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_damage_inside_widget)(fl_Hold_Browser hold_browser, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_draw_label_with_xywh_alignment)(fl_Hold_Browser hold_browser, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_measure_label)(fl_Hold_Browser hold_browser, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Hold_Browser_window)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(fl_Window,    Fl_Hold_Browser_top_window)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(fl_Window ,   Fl_Hold_Browser_top_window_offset)(fl_Hold_Browser hold_browser, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Hold_Browser_as_group)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Hold_Browser_as_gl_window)(fl_Hold_Browser hold_browser);
+  FL_EXPORT_C_HEADER(int,Fl_Hold_Browser_x,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(int,Fl_Hold_Browser_y,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(int,Fl_Hold_Browser_w,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(int,Fl_Hold_Browser_h,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_align,(fl_Hold_Browser hold_browser, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Hold_Browser_align,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Hold_Browser_box,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_box,(fl_Hold_Browser hold_browser, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Hold_Browser_color,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_color,(fl_Hold_Browser hold_browser, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_color_with_bg_sel,(fl_Hold_Browser hold_browser,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Hold_Browser_selection_color,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_selection_color,(fl_Hold_Browser hold_browser, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Hold_Browser_label,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_copy_label,(fl_Hold_Browser hold_browser, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_label,(fl_Hold_Browser hold_browser, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Hold_Browser_labeltype,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_labeltype,(fl_Hold_Browser hold_browser, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Hold_Browser_labelcolor,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_labelcolor,(fl_Hold_Browser hold_browser, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Hold_Browser_labelfont,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_labelfont,(fl_Hold_Browser hold_browser, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Hold_Browser_labelsize,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_labelsize,(fl_Hold_Browser hold_browser, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Hold_Browser_image,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_image,(fl_Hold_Browser hold_browser, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Hold_Browser_deimage,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_deimage,(fl_Hold_Browser hold_browser, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Hold_Browser_tooltip,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_copy_tooltip,(fl_Hold_Browser hold_browser, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_tooltip,(fl_Hold_Browser hold_browser, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_callback_with_user_data,(fl_Hold_Browser hold_browser, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_callback,(fl_Hold_Browser hold_browser, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Hold_Browser_user_data,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_user_data,(fl_Hold_Browser hold_browser, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Hold_Browser_argument,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_argument,(fl_Hold_Browser hold_browser, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Hold_Browser_when,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_when,(fl_Hold_Browser hold_browser, uchar i));
+  FL_EXPORT_C_HEADER(int,Fl_Hold_Browser_visible_r,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_visible,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_clear_visible,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Hold_Browser_active,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(int,Fl_Hold_Browser_active_r,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_activate,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_deactivate,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Hold_Browser_output,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_output,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_clear_output,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Hold_Browser_takesevents,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_changed,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_clear_changed,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(int,Fl_Hold_Browser_take_focus,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_visible_focus,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_clear_visible_focus,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_modify_visible_focus,(fl_Hold_Browser hold_browser, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Hold_Browser_visible_focus,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_do_callback,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_do_callback_with_widget_and_user_data,(fl_Hold_Browser hold_browser, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_do_callback_with_widget_and_default_user_data,(fl_Hold_Browser hold_browser, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Hold_Browser_contains,(fl_Hold_Browser hold_browser, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Hold_Browser_inside,(fl_Hold_Browser hold_browser, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_redraw,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_redraw_label,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(uchar,Fl_Hold_Browser_damage,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_clear_damage_with_bitmask,(fl_Hold_Browser hold_browser, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_clear_damage,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_damage_with_text,(fl_Hold_Browser hold_browser, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_damage_inside_widget,(fl_Hold_Browser hold_browser, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_draw_label_with_xywh_alignment,(fl_Hold_Browser hold_browser, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_measure_label,(fl_Hold_Browser hold_browser, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Hold_Browser_window,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Hold_Browser_top_window,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Hold_Browser_top_window_offset,(fl_Hold_Browser hold_browser, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Hold_Browser_as_group,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Hold_Browser_as_gl_window,(fl_Hold_Browser hold_browser));
   /* Inherited from Fl_Group */
-  FL_EXPORT_C(void,         Fl_Hold_Browser_begin)(fl_Hold_Browser self);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_end)(fl_Hold_Browser self);
-  FL_EXPORT_C(int,          Fl_Hold_Browser_find)(fl_Hold_Browser self, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_remove_index)(fl_Hold_Browser self, int index);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_remove_widget)(fl_Hold_Browser self, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_clear)(fl_Hold_Browser self);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_set_resizable_by_reference)(fl_Hold_Browser self,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_set_resizable)(fl_Hold_Browser self,fl_Widget o);
-  FL_EXPORT_C(fl_Widget,    Fl_Hold_Browser_resizable)(fl_Hold_Browser self);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_add_resizable)(fl_Hold_Browser self,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_init_sizes)(fl_Hold_Browser self);
-  FL_EXPORT_C(int,          Fl_Hold_Browser_children)(fl_Hold_Browser self);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_set_clip_children)(fl_Hold_Browser self,int c);
-  FL_EXPORT_C(unsigned int, Fl_Hold_Browser_clip_children)(fl_Hold_Browser self);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_focus)(fl_Hold_Browser self,fl_Widget W);
-  FL_EXPORT_C(fl_Widget,    Fl_Hold_Browser__ddfdesign_kludge)(fl_Hold_Browser self);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_insert_with_before)(fl_Hold_Browser self, fl_Widget w, fl_Widget before);
-  FL_EXPORT_C(fl_Widget*,   Fl_Hold_Browser_array)(fl_Hold_Browser self);
-  FL_EXPORT_C(fl_Widget,    Fl_Hold_Browser_child)(fl_Hold_Browser self, int n);
-  FL_EXPORT_C(void,         Fl_Hold_Browser_forms_end)(fl_Hold_Browser self);
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_begin,(fl_Hold_Browser self));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_end,(fl_Hold_Browser self));
+  FL_EXPORT_C_HEADER(int,Fl_Hold_Browser_find,(fl_Hold_Browser self, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_remove_index,(fl_Hold_Browser self, int index));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_remove_widget,(fl_Hold_Browser self, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_clear,(fl_Hold_Browser self));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_resizable_by_reference,(fl_Hold_Browser self,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_resizable,(fl_Hold_Browser self,fl_Widget o));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Hold_Browser_resizable,(fl_Hold_Browser self));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_add_resizable,(fl_Hold_Browser self,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_init_sizes,(fl_Hold_Browser self));
+  FL_EXPORT_C_HEADER(int,Fl_Hold_Browser_children,(fl_Hold_Browser self));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_clip_children,(fl_Hold_Browser self,int c));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Hold_Browser_clip_children,(fl_Hold_Browser self));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_focus,(fl_Hold_Browser self,fl_Widget W));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Hold_Browser__ddfdesign_kludge,(fl_Hold_Browser self));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_insert_with_before,(fl_Hold_Browser self, fl_Widget w, fl_Widget before));
+  FL_EXPORT_C_HEADER(fl_Widget*,Fl_Hold_Browser_array,(fl_Hold_Browser self));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Hold_Browser_child,(fl_Hold_Browser self, int n));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_forms_end,(fl_Hold_Browser self));
 
   /* Fl_Hold_Browser specific functions */
-  FL_EXPORT_C(void*, Fl_Hold_Browser_other_data)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void, Fl_Hold_Browser_set_other_data)(fl_Hold_Browser hold_browser, void* v);
-  FL_EXPORT_C(fl_Hold_Browser, Fl_Hold_Browser_New_WithLabel)(int x, int y, int w, int h, const char* label); 
-  FL_EXPORT_C(fl_Hold_Browser, Fl_Hold_Browser_New)(int x, int y, int w, int h); 
-  FL_EXPORT_C(void,Fl_Hold_Browser_Destroy)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void,Fl_Hold_Browser_remove)(fl_Hold_Browser hold_browser, int line);
-  FL_EXPORT_C(void, Fl_Hold_Browser_add)(fl_Hold_Browser hold_browser, const char* newtext);
-  FL_EXPORT_C(void, Fl_Hold_Browser_add_with_d)(fl_Hold_Browser hold_browser, const char* newtext, void* d);
-  FL_EXPORT_C(void, Fl_Hold_Browser_insert)(fl_Hold_Browser hold_browser, int line, const char* newtext);
-  FL_EXPORT_C(void, Fl_Hold_Browser_insert_with_d)(fl_Hold_Browser hold_browser, int line, const char* newtext, void* d);
-  FL_EXPORT_C(void, Fl_Hold_Browser_move)(fl_Hold_Browser hold_browser, int to, int from);
-  FL_EXPORT_C(int , Fl_Hold_Browser_load)(fl_Hold_Browser hold_browser, const char* filename);
-  FL_EXPORT_C(void, Fl_Hold_Browser_swap)(fl_Hold_Browser hold_browser, int a, int b);
-  FL_EXPORT_C(void, Fl_Hold_Browser_clear)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(int, Fl_Hold_Browser_size)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void, Fl_Hold_Browser_set_size)(fl_Hold_Browser hold_browser, int W, int H);
-  FL_EXPORT_C(int, Fl_Hold_Browser_topline)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void, Fl_Hold_Browser_lineposition)(fl_Hold_Browser hold_browser, int line, Fl_Line_Position pos);
-  FL_EXPORT_C(void, Fl_Hold_Browser_set_topline)(fl_Hold_Browser hold_browser, int line);
-  FL_EXPORT_C(void, Fl_Hold_Browser_bottomline)(fl_Hold_Browser hold_browser, int line);
-  FL_EXPORT_C(void, Fl_Hold_Browser_middleline)(fl_Hold_Browser hold_browser, int line);
-  FL_EXPORT_C(int, Fl_Hold_Browser_select)(fl_Hold_Browser hold_browser, int line);
-  FL_EXPORT_C(int, Fl_Hold_Browser_select_with_val)(fl_Hold_Browser hold_browser, int line, int val);
-  FL_EXPORT_C(int, Fl_Hold_Browser_selected)(fl_Hold_Browser hold_browser, int line);
-  FL_EXPORT_C(void, Fl_Hold_Browser_show_with_line)(fl_Hold_Browser hold_browser, int line);
-  FL_EXPORT_C(void, Fl_Hold_Browser_show)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void, Fl_Hold_Browser_hide_with_line)(fl_Hold_Browser hold_browser, int line);
-  FL_EXPORT_C(void, Fl_Hold_Browser_hide)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(int, Fl_Hold_Browser_visible)(fl_Hold_Browser hold_browser, int line);
-  FL_EXPORT_C(int, Fl_Hold_Browser_value)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void, Fl_Hold_Browser_set_value)(fl_Hold_Browser hold_browser, int line);
-  FL_EXPORT_C(const char*, Fl_Hold_Browser_text)(fl_Hold_Browser hold_browser, int line);
-  FL_EXPORT_C(void, Fl_Hold_Browser_set_text)(fl_Hold_Browser hold_browser, int line, const char* newtext);
-  FL_EXPORT_C(void*, Fl_Hold_Browser_data)(fl_Hold_Browser hold_browser, int line);
-  FL_EXPORT_C(void, Fl_Hold_Browser_set_data)(fl_Hold_Browser hold_browser, int line, void* d);
-  FL_EXPORT_C(char, Fl_Hold_Browser_format_char)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void, Fl_Hold_Browser_set_format_char)(fl_Hold_Browser hold_browser, char c);
-  FL_EXPORT_C(char, Fl_Hold_Browser_column_char)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void, Fl_Hold_Browser_set_column_char)(fl_Hold_Browser hold_browser, char c);
-  FL_EXPORT_C(const int*, Fl_Hold_Browser_column_widths)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void, Fl_Hold_Browser_set_column_widths)(fl_Hold_Browser hold_browser, const int* arr);
-  FL_EXPORT_C(int, Fl_Hold_Browser_displayed)(fl_Hold_Browser hold_browser, int line);
-  FL_EXPORT_C(void, Fl_Hold_Browser_make_visible)(fl_Hold_Browser hold_browser, int line);
-  FL_EXPORT_C(void, Fl_Hold_Browser_set_icon)(fl_Hold_Browser hold_browser, int line, fl_Image icon);
-  FL_EXPORT_C(fl_Image, Fl_Hold_Browser_icon)(fl_Hold_Browser hold_browser, int line);
-  FL_EXPORT_C(void, Fl_Hold_Browser_remove_icon)(fl_Hold_Browser hold_browser, int line);
-  FL_EXPORT_C(int, Fl_Hold_Browser_select_only)(fl_Hold_Browser hold_browser,void *item);
-  FL_EXPORT_C(int, Fl_Hold_Browser_select_only_with_docallbacks)(fl_Hold_Browser hold_browser,void *item,int docallbacks);
-  FL_EXPORT_C(int, Fl_Hold_Browser_deselect)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(int, Fl_Hold_Browser_deselect_with_docallbacks)(fl_Hold_Browser hold_browser,int docallbacks);
-  FL_EXPORT_C(int, Fl_Hold_Browser_position)(fl_Hold_Browser hold_browser); 
+  FL_EXPORT_C_HEADER(void*,Fl_Hold_Browser_other_data,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_other_data,(fl_Hold_Browser hold_browser, void* v));
+  FL_EXPORT_C(fl_Hold_Browser, Fl_Hold_Browser_New_WithLabel)(int x, int y, int w, int h, const char* label);
+  FL_EXPORT_C(fl_Hold_Browser, Fl_Hold_Browser_New)(int x, int y, int w, int h);
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_Destroy,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_remove,(fl_Hold_Browser hold_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_add,(fl_Hold_Browser hold_browser, const char* newtext));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_add_with_d,(fl_Hold_Browser hold_browser, const char* newtext, void* d));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_insert,(fl_Hold_Browser hold_browser, int line, const char* newtext));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_insert_with_d,(fl_Hold_Browser hold_browser, int line, const char* newtext, void* d));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_move,(fl_Hold_Browser hold_browser, int to, int from));
+  FL_EXPORT_C_HEADER(int ,Fl_Hold_Browser_load,(fl_Hold_Browser hold_browser, const char* filename));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_swap,(fl_Hold_Browser hold_browser, int a, int b));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_clear,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(int,Fl_Hold_Browser_size,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_size,(fl_Hold_Browser hold_browser, int W, int H));
+  FL_EXPORT_C_HEADER(int,Fl_Hold_Browser_topline,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_lineposition,(fl_Hold_Browser hold_browser, int line, Fl_Line_Position pos));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_topline,(fl_Hold_Browser hold_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_bottomline,(fl_Hold_Browser hold_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_middleline,(fl_Hold_Browser hold_browser, int line));
+  FL_EXPORT_C_HEADER(int,Fl_Hold_Browser_select,(fl_Hold_Browser hold_browser, int line));
+  FL_EXPORT_C_HEADER(int,Fl_Hold_Browser_select_with_val,(fl_Hold_Browser hold_browser, int line, int val));
+  FL_EXPORT_C_HEADER(int,Fl_Hold_Browser_selected,(fl_Hold_Browser hold_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_show_with_line,(fl_Hold_Browser hold_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_show,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_hide_with_line,(fl_Hold_Browser hold_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_hide,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(int,Fl_Hold_Browser_visible,(fl_Hold_Browser hold_browser, int line));
+  FL_EXPORT_C_HEADER(int,Fl_Hold_Browser_value,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_value,(fl_Hold_Browser hold_browser, int line));
+  FL_EXPORT_C_HEADER(const char*,Fl_Hold_Browser_text,(fl_Hold_Browser hold_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_text,(fl_Hold_Browser hold_browser, int line, const char* newtext));
+  FL_EXPORT_C_HEADER(void*,Fl_Hold_Browser_data,(fl_Hold_Browser hold_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_data,(fl_Hold_Browser hold_browser, int line, void* d));
+  FL_EXPORT_C_HEADER(char,Fl_Hold_Browser_format_char,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_format_char,(fl_Hold_Browser hold_browser, char c));
+  FL_EXPORT_C_HEADER(char,Fl_Hold_Browser_column_char,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_column_char,(fl_Hold_Browser hold_browser, char c));
+  FL_EXPORT_C_HEADER(const int*,Fl_Hold_Browser_column_widths,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_column_widths,(fl_Hold_Browser hold_browser, const int* arr));
+  FL_EXPORT_C_HEADER(int,Fl_Hold_Browser_displayed,(fl_Hold_Browser hold_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_make_visible,(fl_Hold_Browser hold_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_icon,(fl_Hold_Browser hold_browser, int line, fl_Image icon));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Hold_Browser_icon,(fl_Hold_Browser hold_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_remove_icon,(fl_Hold_Browser hold_browser, int line));
+  FL_EXPORT_C_HEADER(int,Fl_Hold_Browser_select_only,(fl_Hold_Browser hold_browser,void *item));
+  FL_EXPORT_C_HEADER(int,Fl_Hold_Browser_select_only_with_docallbacks,(fl_Hold_Browser hold_browser,void *item,int docallbacks));
+  FL_EXPORT_C_HEADER(int,Fl_Hold_Browser_deselect,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(int,Fl_Hold_Browser_deselect_with_docallbacks,(fl_Hold_Browser hold_browser,int docallbacks));
+  FL_EXPORT_C(int, Fl_Hold_Browser_position)(fl_Hold_Browser hold_browser);
   FL_EXPORT_C(void, Fl_Hold_Browser_set_position)(fl_Hold_Browser hold_browser,int pos); // scroll to here
-  FL_EXPORT_C(int, Fl_Hold_Browser_hposition)(fl_Hold_Browser hold_browser); 
+  FL_EXPORT_C(int, Fl_Hold_Browser_hposition)(fl_Hold_Browser hold_browser);
   FL_EXPORT_C(void, Fl_Hold_Browser_set_hposition)(fl_Hold_Browser hold_browser,int); // pan to here
-  FL_EXPORT_C(uchar, Fl_Hold_Browser_has_scrollbar)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void, Fl_Hold_Browser_set_has_scrollbar)(fl_Hold_Browser hold_browser,uchar mode); 
-  FL_EXPORT_C(Fl_Font, Fl_Hold_Browser_textfont)(fl_Hold_Browser hold_browser); 
-  FL_EXPORT_C(void, Fl_Hold_Browser_set_textfont)(fl_Hold_Browser hold_browser,Fl_Font font); 
-  FL_EXPORT_C(Fl_Fontsize, Fl_Hold_Browser_textsize)(fl_Hold_Browser hold_browser);  
-  FL_EXPORT_C(void, Fl_Hold_Browser_set_textsize)(fl_Hold_Browser hold_browser,Fl_Fontsize newSize); 
-  FL_EXPORT_C(Fl_Color, Fl_Hold_Browser_textcolor)(fl_Hold_Browser hold_browser); 
-  FL_EXPORT_C(void, Fl_Hold_Browser_set_textcolor)(fl_Hold_Browser hold_browser,Fl_Color col); 
-  FL_EXPORT_C(int, Fl_Hold_Browser_scrollbar_size)(fl_Hold_Browser hold_browser); 
-  FL_EXPORT_C(void, Fl_Hold_Browser_set_scrollbar_size)(fl_Hold_Browser hold_browser,int newSize); 
-  FL_EXPORT_C(int, Fl_Hold_Browser_scrollbar_width)(fl_Hold_Browser hold_browser); 
-  FL_EXPORT_C(void, Fl_Hold_Browser_set_scrollbar_width)(fl_Hold_Browser hold_browser,int width); 
-  FL_EXPORT_C(void, Fl_Hold_Browser_scrollbar_right)(fl_Hold_Browser hold_browser); 
-  FL_EXPORT_C(void, Fl_Hold_Browser_set_scrollbar_left)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void, Fl_Hold_Browser_sort)(fl_Hold_Browser hold_browser);
-  FL_EXPORT_C(void, Fl_Hold_Browser_sort_with_flags)(fl_Hold_Browser hold_browser,int flags);
+  FL_EXPORT_C_HEADER(uchar,Fl_Hold_Browser_has_scrollbar,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C(void, Fl_Hold_Browser_set_has_scrollbar)(fl_Hold_Browser hold_browser,uchar mode);
+  FL_EXPORT_C(Fl_Font, Fl_Hold_Browser_textfont)(fl_Hold_Browser hold_browser);
+  FL_EXPORT_C(void, Fl_Hold_Browser_set_textfont)(fl_Hold_Browser hold_browser,Fl_Font font);
+  FL_EXPORT_C(Fl_Fontsize, Fl_Hold_Browser_textsize)(fl_Hold_Browser hold_browser);
+  FL_EXPORT_C(void, Fl_Hold_Browser_set_textsize)(fl_Hold_Browser hold_browser,Fl_Fontsize newSize);
+  FL_EXPORT_C(Fl_Color, Fl_Hold_Browser_textcolor)(fl_Hold_Browser hold_browser);
+  FL_EXPORT_C(void, Fl_Hold_Browser_set_textcolor)(fl_Hold_Browser hold_browser,Fl_Color col);
+  FL_EXPORT_C(int, Fl_Hold_Browser_scrollbar_size)(fl_Hold_Browser hold_browser);
+  FL_EXPORT_C(void, Fl_Hold_Browser_set_scrollbar_size)(fl_Hold_Browser hold_browser,int newSize);
+  FL_EXPORT_C(int, Fl_Hold_Browser_scrollbar_width)(fl_Hold_Browser hold_browser);
+  FL_EXPORT_C(void, Fl_Hold_Browser_set_scrollbar_width)(fl_Hold_Browser hold_browser,int width);
+  FL_EXPORT_C(void, Fl_Hold_Browser_scrollbar_right)(fl_Hold_Browser hold_browser);
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_set_scrollbar_left,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_sort,(fl_Hold_Browser hold_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Hold_Browser_sort_with_flags,(fl_Hold_Browser hold_browser,int flags));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_ImageC.h b/c-src/Fl_ImageC.h
--- a/c-src/Fl_ImageC.h
+++ b/c-src/Fl_ImageC.h
@@ -39,30 +39,30 @@
     ERR_FORMAT      = -3
   } Image_Fail_Type;
 #endif
-  FL_EXPORT_C(fl_Image_Virtual_Funcs*, Fl_Image_default_virtual_funcs)();
-  FL_EXPORT_C(void*, Fl_Image_other_data)(fl_Image image);
-  FL_EXPORT_C(void, Fl_Image_set_other_data)(fl_Image image, void* v);
-  FL_EXPORT_C(fl_Image, Fl_Image_New)(int W, int H, int D);
-  FL_EXPORT_C(fl_Image, Fl_OverriddenImage_New)(int W, int H, int D, fl_Image_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Image_Destroy)(fl_Image image);
-  FL_EXPORT_C(int, Fl_Image_w)(fl_Image image);
-  FL_EXPORT_C(int, Fl_Image_h)(fl_Image image);
-  FL_EXPORT_C(int, Fl_Image_d)(fl_Image image);
-  FL_EXPORT_C(int, Fl_Image_ld)(fl_Image image);
-  FL_EXPORT_C(int, Fl_Image_count)(fl_Image image);
-  FL_EXPORT_C(fl_Image, Fl_Image_copy_with_w_h)(fl_Image image,int W, int H);
-  FL_EXPORT_C(fl_Image, Fl_Image_copy)(fl_Image image);
-  FL_EXPORT_C(void, Fl_Image_color_average)(fl_Image image,Fl_Color c, float i);
-  FL_EXPORT_C(void, Fl_Image_inactive)(fl_Image image);
-  FL_EXPORT_C(void, Fl_Image_desaturate)(fl_Image image);
-  FL_EXPORT_C(void, Fl_Image_draw_with_cx_cy)(fl_Image image,int X, int Y, int W, int H, int cx, int cy);
-  FL_EXPORT_C(void, Fl_Image_draw_with_cx)(fl_Image image,int X, int Y, int W, int H, int cx);
-  FL_EXPORT_C(void, Fl_Image_draw_with_cy)(fl_Image image,int X, int Y, int W, int H, int cy);
-  FL_EXPORT_C(void,Fl_Image_draw_with)(fl_Image image,int X,int Y,int W,int H);
-  FL_EXPORT_C(void, Fl_Image_draw)(fl_Image image,int X, int Y);
-  FL_EXPORT_C(void, Fl_Image_uncache)(fl_Image image);
+  FL_EXPORT_C_HEADER(fl_Image_Virtual_Funcs*,Fl_Image_default_virtual_funcs,());
+  FL_EXPORT_C_HEADER(void*,Fl_Image_other_data,(fl_Image image));
+  FL_EXPORT_C_HEADER(void,Fl_Image_set_other_data,(fl_Image image, void* v));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Image_New,(int W, int H, int D));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_OverriddenImage_New,(int W, int H, int D, fl_Image_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Image_Destroy,(fl_Image image));
+  FL_EXPORT_C_HEADER(int,Fl_Image_w,(fl_Image image));
+  FL_EXPORT_C_HEADER(int,Fl_Image_h,(fl_Image image));
+  FL_EXPORT_C_HEADER(int,Fl_Image_d,(fl_Image image));
+  FL_EXPORT_C_HEADER(int,Fl_Image_ld,(fl_Image image));
+  FL_EXPORT_C_HEADER(int,Fl_Image_count,(fl_Image image));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Image_copy_with_w_h,(fl_Image image,int W, int H));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Image_copy,(fl_Image image));
+  FL_EXPORT_C_HEADER(void,Fl_Image_color_average,(fl_Image image,Fl_Color c, float i));
+  FL_EXPORT_C_HEADER(void,Fl_Image_inactive,(fl_Image image));
+  FL_EXPORT_C_HEADER(void,Fl_Image_desaturate,(fl_Image image));
+  FL_EXPORT_C_HEADER(void,Fl_Image_draw_with_cx_cy,(fl_Image image,int X, int Y, int W, int H, int cx, int cy));
+  FL_EXPORT_C_HEADER(void,Fl_Image_draw_with_cx,(fl_Image image,int X, int Y, int W, int H, int cx));
+  FL_EXPORT_C_HEADER(void,Fl_Image_draw_with_cy,(fl_Image image,int X, int Y, int W, int H, int cy));
+  FL_EXPORT_C_HEADER(void,Fl_Image_draw_with,(fl_Image image,int X,int Y,int W,int H));
+  FL_EXPORT_C_HEADER(void,Fl_Image_draw,(fl_Image image,int X, int Y));
+  FL_EXPORT_C_HEADER(void,Fl_Image_uncache,(fl_Image image));
 #if FL_API_VERSION >= 10304
-  FL_EXPORT_C(int, Fl_Image_fail)(fl_Image image);
+  FL_EXPORT_C_HEADER(int,Fl_Image_fail,(fl_Image image));
 #endif
 #ifdef __cplusplus
 }
diff --git a/c-src/Fl_Image_SurfaceC.h b/c-src/Fl_Image_SurfaceC.h
--- a/c-src/Fl_Image_SurfaceC.h
+++ b/c-src/Fl_Image_SurfaceC.h
@@ -10,12 +10,12 @@
 #include "FL/Fl_Image_Surface.H"
 EXPORT {
 #endif
-  FL_EXPORT_C(const char* ,Fl_Image_Surface_class_name)(fl_Image_Surface image_surface);
-  FL_EXPORT_C(void        ,Fl_Image_Surface_set_current)(fl_Image_Surface image_surface);
-  FL_EXPORT_C(void        ,Fl_Image_Surface_draw)(fl_Image_Surface image_surface, fl_Widget widget, int x, int y);
-  FL_EXPORT_C(fl_Image_Surface, Fl_Image_Surface_New)(int w, int h);
-  FL_EXPORT_C(void, Fl_Image_Surface_Destroy)(fl_Image_Surface image_surface);
-  FL_EXPORT_C(fl_Image, Fl_Image_Surface_image)(fl_Image_Surface image_surface);
+  FL_EXPORT_C_HEADER(const char* ,Fl_Image_Surface_class_name,(fl_Image_Surface image_surface));
+  FL_EXPORT_C_HEADER(void        ,Fl_Image_Surface_set_current,(fl_Image_Surface image_surface));
+  FL_EXPORT_C_HEADER(void        ,Fl_Image_Surface_draw,(fl_Image_Surface image_surface, fl_Widget widget, int x, int y));
+  FL_EXPORT_C_HEADER(fl_Image_Surface,Fl_Image_Surface_New,(int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Image_Surface_Destroy,(fl_Image_Surface image_surface));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Image_Surface_image,(fl_Image_Surface image_surface));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_InputC.h b/c-src/Fl_InputC.h
--- a/c-src/Fl_InputC.h
+++ b/c-src/Fl_InputC.h
@@ -29,152 +29,152 @@
   };
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,Fl_Input_handle)(fl_Input self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Input_parent)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_set_parent)(fl_Input input, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Input_type)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_set_type)(fl_Input input, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Input_handle,(fl_Input self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Input_parent,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_parent,(fl_Input input, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Input_type,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_type,(fl_Input input, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Input_x)(fl_Input input);
-  FL_EXPORT_C(int,          Fl_Input_y)(fl_Input input);
-  FL_EXPORT_C(int,          Fl_Input_w)(fl_Input input);
-  FL_EXPORT_C(int,          Fl_Input_h)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_set_align)(fl_Input input, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Input_align)(fl_Input input);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Input_box)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_set_box)(fl_Input input, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Input_color)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_set_color)(fl_Input input, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Input_set_color_with_bg_sel)(fl_Input input,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Input_selection_color)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_set_selection_color)(fl_Input input, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Input_label)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_copy_label)(fl_Input input, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Input_set_label)(fl_Input input, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Input_labeltype)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_set_labeltype)(fl_Input input, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Input_labelcolor)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_set_labelcolor)(fl_Input input, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Input_labelfont)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_set_labelfont)(fl_Input input, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Input_labelsize)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_set_labelsize)(fl_Input input, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Input_image)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_set_image)(fl_Input input, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Input_deimage)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_set_deimage)(fl_Input input, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Input_tooltip)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_copy_tooltip)(fl_Input input, const char* text);
-  FL_EXPORT_C(void,         Fl_Input_set_tooltip)(fl_Input input, const char* text);
-  FL_EXPORT_C(void,         Fl_Input_set_callback_with_user_data)(fl_Input input, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Input_set_callback)(fl_Input input, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Input_user_data)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_set_user_data)(fl_Input input, void* v);
-  FL_EXPORT_C(long,         Fl_Input_argument)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_set_argument)(fl_Input input, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Input_when)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_set_when)(fl_Input input, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Input_visible)(fl_Input input);
-  FL_EXPORT_C(int,          Fl_Input_visible_r)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_set_visible)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_clear_visible)(fl_Input input);
-  FL_EXPORT_C(unsigned int, Fl_Input_active)(fl_Input input);
-  FL_EXPORT_C(int,          Fl_Input_active_r)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_activate)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_deactivate)(fl_Input input);
-  FL_EXPORT_C(unsigned int, Fl_Input_output)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_set_output)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_clear_output)(fl_Input input);
-  FL_EXPORT_C(unsigned int, Fl_Input_takesevents)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_set_changed)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_clear_changed)(fl_Input input);
-  FL_EXPORT_C(int,          Fl_Input_take_focus)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_set_visible_focus)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_clear_visible_focus)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_modify_visible_focus)(fl_Input input, int v);
-  FL_EXPORT_C(unsigned int, Fl_Input_visible_focus)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_do_callback)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_do_callback_with_widget_and_user_data)(fl_Input input, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Input_do_callback_with_widget_and_default_user_data)(fl_Input input, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Input_contains)(fl_Input input, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Input_inside)(fl_Input input, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Input_redraw)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_redraw_label)(fl_Input input);
-  FL_EXPORT_C(uchar,        Fl_Input_damage)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_clear_damage_with_bitmask)(fl_Input input, uchar c);
-  FL_EXPORT_C(void,         Fl_Input_clear_damage)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_damage_with_text)(fl_Input input, uchar c);
-  FL_EXPORT_C(void,         Fl_Input_damage_inside_widget)(fl_Input input, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Input_draw_label_with_xywh_alignment)(fl_Input input, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Input_measure_label)(fl_Input input, int* ww , int* hh);
+  FL_EXPORT_C_HEADER(int,Fl_Input_x,(fl_Input input));
+  FL_EXPORT_C_HEADER(int,Fl_Input_y,(fl_Input input));
+  FL_EXPORT_C_HEADER(int,Fl_Input_w,(fl_Input input));
+  FL_EXPORT_C_HEADER(int,Fl_Input_h,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_align,(fl_Input input, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Input_align,(fl_Input input));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Input_box,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_box,(fl_Input input, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Input_color,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_color,(fl_Input input, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_color_with_bg_sel,(fl_Input input,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Input_selection_color,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_selection_color,(fl_Input input, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Input_label,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_copy_label,(fl_Input input, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_label,(fl_Input input, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Input_labeltype,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_labeltype,(fl_Input input, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Input_labelcolor,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_labelcolor,(fl_Input input, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Input_labelfont,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_labelfont,(fl_Input input, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Input_labelsize,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_labelsize,(fl_Input input, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Input_image,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_image,(fl_Input input, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Input_deimage,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_deimage,(fl_Input input, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Input_tooltip,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_copy_tooltip,(fl_Input input, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_tooltip,(fl_Input input, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_callback_with_user_data,(fl_Input input, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_callback,(fl_Input input, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Input_user_data,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_user_data,(fl_Input input, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Input_argument,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_argument,(fl_Input input, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Input_when,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_when,(fl_Input input, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Input_visible,(fl_Input input));
+  FL_EXPORT_C_HEADER(int,Fl_Input_visible_r,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_visible,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_clear_visible,(fl_Input input));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Input_active,(fl_Input input));
+  FL_EXPORT_C_HEADER(int,Fl_Input_active_r,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_activate,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_deactivate,(fl_Input input));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Input_output,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_output,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_clear_output,(fl_Input input));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Input_takesevents,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_changed,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_clear_changed,(fl_Input input));
+  FL_EXPORT_C_HEADER(int,Fl_Input_take_focus,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_visible_focus,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_clear_visible_focus,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_modify_visible_focus,(fl_Input input, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Input_visible_focus,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_do_callback,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_do_callback_with_widget_and_user_data,(fl_Input input, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Input_do_callback_with_widget_and_default_user_data,(fl_Input input, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Input_contains,(fl_Input input, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Input_inside,(fl_Input input, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Input_redraw,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_redraw_label,(fl_Input input));
+  FL_EXPORT_C_HEADER(uchar,Fl_Input_damage,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_clear_damage_with_bitmask,(fl_Input input, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Input_clear_damage,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_damage_with_text,(fl_Input input, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Input_damage_inside_widget,(fl_Input input, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Input_draw_label_with_xywh_alignment,(fl_Input input, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Input_measure_label,(fl_Input input, int* ww , int* hh));
 
-  FL_EXPORT_C(fl_Window,    Fl_Input_window)(fl_Input input);
-  FL_EXPORT_C(fl_Window,    Fl_Input_top_window)(fl_Input input);
-  FL_EXPORT_C(fl_Window ,   Fl_Input_top_window_offset)(fl_Input input, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Input_as_group)(fl_Input input);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Input_as_gl_window)(fl_Input input);
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Input_window,(fl_Input input));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Input_top_window,(fl_Input input));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Input_top_window_offset,(fl_Input input, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Input_as_group,(fl_Input input));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Input_as_gl_window,(fl_Input input));
   /* Fl_Input specific functions */
-  FL_EXPORT_C(int,      Fl_Input_handle)(fl_Input input, int event);
-  FL_EXPORT_C(fl_Input, Fl_Input_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Input, Fl_Input_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(void,     Fl_Input_Destroy)(fl_Input input);
+  FL_EXPORT_C_HEADER(int,Fl_Input_handle,(fl_Input input, int event));
+  FL_EXPORT_C_HEADER(fl_Input,Fl_Input_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Input,Fl_Input_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Input_Destroy,(fl_Input input));
 
-  FL_EXPORT_C(void,         Fl_Input_resize)(fl_Input input, int X, int Y, int W, int H);
-  FL_EXPORT_C(int,          Fl_Input_set_value)(fl_Input input, const char* text);
-  FL_EXPORT_C(int,          Fl_Input_set_value_with_length)(fl_Input input, const char* text, int length);
-  FL_EXPORT_C(int,          Fl_Input_static_value)(fl_Input input, const char* text);
-  FL_EXPORT_C(int,          Fl_Input_static_value_with_length)(fl_Input input, const char* text, int length);
-  FL_EXPORT_C(const char*,  Fl_Input_value)(fl_Input input);
-  FL_EXPORT_C(Fl_Char,      Fl_Input_index)(fl_Input input, int i);
-  FL_EXPORT_C(int,          Fl_Input_size)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_set_size)(fl_Input input, int w, int h);
-  FL_EXPORT_C(int,          Fl_Input_maximum_size)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_set_maximum_size)(fl_Input input, int m);
-  FL_EXPORT_C(int,          Fl_Input_position)(fl_Input input);
-  FL_EXPORT_C(int,          Fl_Input_mark)(fl_Input input);
-  FL_EXPORT_C(int,          Fl_Input_set_position_with_cursor_mark)(fl_Input input,int p, int m);
-  FL_EXPORT_C(int,          Fl_Input_set_position_n_n)(fl_Input input,int p);
-  FL_EXPORT_C(int,          Fl_Input_set_mark)(fl_Input input,int m);
-  FL_EXPORT_C(int,          Fl_Input_replace)(fl_Input input,int b, int e, const char *text);
-  FL_EXPORT_C(int,          Fl_Input_replace_with_ilen)(fl_Input input,int b, int e, const char* text, int ilen);
-  FL_EXPORT_C(int,          Fl_Input_cut)(fl_Input input);
-  FL_EXPORT_C(int,          Fl_Input_cut_bytes)(fl_Input input,int n);
-  FL_EXPORT_C(int,          Fl_Input_cut_range)(fl_Input input,int a, int b);
-  FL_EXPORT_C(int,          Fl_Input_insert)(fl_Input input,const char* t);
-  FL_EXPORT_C(int,          Fl_Input_insert_with_length)(fl_Input input,const char* t, int l);
-  FL_EXPORT_C(int,          Fl_Input_copy)(fl_Input input,int clipboard);
-  FL_EXPORT_C(int,          Fl_Input_undo)(fl_Input input);
-  FL_EXPORT_C(int,          Fl_Input_copy_cuts)(fl_Input input);
-  FL_EXPORT_C(int,          Fl_Input_shortcut)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_set_shortcut)(fl_Input input,int s);
-  FL_EXPORT_C(Fl_Font,      Fl_Input_textfont)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_set_textfont)(fl_Input input,Fl_Font s);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Input_textsize)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_set_textsize)(fl_Input input,Fl_Fontsize s);
-  FL_EXPORT_C(Fl_Color,     Fl_Input_textcolor)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_set_textcolor)(fl_Input input,Fl_Color n);
-  FL_EXPORT_C(Fl_Color,     Fl_Input_cursor_color)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_set_cursor_color)(fl_Input input,Fl_Color n);
-  FL_EXPORT_C(int,          Fl_Input_input_type)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_set_input_type)(fl_Input input,int t);
-  FL_EXPORT_C(int,          Fl_Input_readonly)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_set_readonly)(fl_Input input,int b);
-  FL_EXPORT_C(int,          Fl_Input_wrap)(fl_Input input);
-  FL_EXPORT_C(void,         Fl_Input_set_wrap)(fl_Input input,int b);
-  FL_EXPORT_C(void,         Fl_Input_tab_nav)(fl_Input input,int val);
-  FL_EXPORT_C(int,          Fl_Input_set_tab_nav)(fl_Input input);
-  FL_EXPORT_C(fl_Input,    Fl_OverriddenInput_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Input,    Fl_OverriddenInput_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Input_draw)(fl_Input o);
-  FL_EXPORT_C(void, Fl_Input_draw_super)(fl_Input o);
-  FL_EXPORT_C(int, Fl_Input_handle)(fl_Input o, int event);
-  FL_EXPORT_C(int, Fl_Input_handle_super)(fl_Input o, int event);
-  FL_EXPORT_C(void, Fl_Input_resize)(fl_Input o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Input_resize_super)(fl_Input o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Input_show)(fl_Input o);
-  FL_EXPORT_C(void, Fl_Input_show_super)(fl_Input o);
-  FL_EXPORT_C(void, Fl_Input_hide)(fl_Input o);
-  FL_EXPORT_C(void, Fl_Input_hide_super)(fl_Input o);
+  FL_EXPORT_C_HEADER(void,Fl_Input_resize,(fl_Input input, int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(int,Fl_Input_set_value,(fl_Input input, const char* text));
+  FL_EXPORT_C_HEADER(int,Fl_Input_set_value_with_length,(fl_Input input, const char* text, int length));
+  FL_EXPORT_C_HEADER(int,Fl_Input_static_value,(fl_Input input, const char* text));
+  FL_EXPORT_C_HEADER(int,Fl_Input_static_value_with_length,(fl_Input input, const char* text, int length));
+  FL_EXPORT_C_HEADER(const char*,Fl_Input_value,(fl_Input input));
+  FL_EXPORT_C_HEADER(Fl_Char,Fl_Input_index,(fl_Input input, int i));
+  FL_EXPORT_C_HEADER(int,Fl_Input_size,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_size,(fl_Input input, int w, int h));
+  FL_EXPORT_C_HEADER(int,Fl_Input_maximum_size,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_maximum_size,(fl_Input input, int m));
+  FL_EXPORT_C_HEADER(int,Fl_Input_position,(fl_Input input));
+  FL_EXPORT_C_HEADER(int,Fl_Input_mark,(fl_Input input));
+  FL_EXPORT_C_HEADER(int,Fl_Input_set_position_with_cursor_mark,(fl_Input input,int p, int m));
+  FL_EXPORT_C_HEADER(int,Fl_Input_set_position_n_n,(fl_Input input,int p));
+  FL_EXPORT_C_HEADER(int,Fl_Input_set_mark,(fl_Input input,int m));
+  FL_EXPORT_C_HEADER(int,Fl_Input_replace,(fl_Input input,int b, int e, const char *text));
+  FL_EXPORT_C_HEADER(int,Fl_Input_replace_with_ilen,(fl_Input input,int b, int e, const char* text, int ilen));
+  FL_EXPORT_C_HEADER(int,Fl_Input_cut,(fl_Input input));
+  FL_EXPORT_C_HEADER(int,Fl_Input_cut_bytes,(fl_Input input,int n));
+  FL_EXPORT_C_HEADER(int,Fl_Input_cut_range,(fl_Input input,int a, int b));
+  FL_EXPORT_C_HEADER(int,Fl_Input_insert,(fl_Input input,const char* t));
+  FL_EXPORT_C_HEADER(int,Fl_Input_insert_with_length,(fl_Input input,const char* t, int l));
+  FL_EXPORT_C_HEADER(int,Fl_Input_copy,(fl_Input input,int clipboard));
+  FL_EXPORT_C_HEADER(int,Fl_Input_undo,(fl_Input input));
+  FL_EXPORT_C_HEADER(int,Fl_Input_copy_cuts,(fl_Input input));
+  FL_EXPORT_C_HEADER(int,Fl_Input_shortcut,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_shortcut,(fl_Input input,int s));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Input_textfont,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_textfont,(fl_Input input,Fl_Font s));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Input_textsize,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_textsize,(fl_Input input,Fl_Fontsize s));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Input_textcolor,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_textcolor,(fl_Input input,Fl_Color n));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Input_cursor_color,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_cursor_color,(fl_Input input,Fl_Color n));
+  FL_EXPORT_C_HEADER(int,Fl_Input_input_type,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_input_type,(fl_Input input,int t));
+  FL_EXPORT_C_HEADER(int,Fl_Input_readonly,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_readonly,(fl_Input input,int b));
+  FL_EXPORT_C_HEADER(int,Fl_Input_wrap,(fl_Input input));
+  FL_EXPORT_C_HEADER(void,Fl_Input_set_wrap,(fl_Input input,int b));
+  FL_EXPORT_C_HEADER(void,Fl_Input_tab_nav,(fl_Input input,int val));
+  FL_EXPORT_C_HEADER(int,Fl_Input_set_tab_nav,(fl_Input input));
+  FL_EXPORT_C_HEADER(fl_Input,Fl_OverriddenInput_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Input,Fl_OverriddenInput_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Input_draw,(fl_Input o));
+  FL_EXPORT_C_HEADER(void,Fl_Input_draw_super,(fl_Input o));
+  FL_EXPORT_C_HEADER(int,Fl_Input_handle,(fl_Input o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Input_handle_super,(fl_Input o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Input_resize,(fl_Input o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Input_resize_super,(fl_Input o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Input_show,(fl_Input o));
+  FL_EXPORT_C_HEADER(void,Fl_Input_show_super,(fl_Input o));
+  FL_EXPORT_C_HEADER(void,Fl_Input_hide,(fl_Input o));
+  FL_EXPORT_C_HEADER(void,Fl_Input_hide_super,(fl_Input o));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Input_C.h b/c-src/Fl_Input_C.h
--- a/c-src/Fl_Input_C.h
+++ b/c-src/Fl_Input_C.h
@@ -21,134 +21,134 @@
  #define FL_MULTILINE_OUTPUT	(FL_MULTILINE_INPUT | FL_INPUT_READONLY)
 #endif /* INTERNAL_LINKAGE */
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,Fl_Input__handle)(fl_Input_ self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Input__parent)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__set_parent)(fl_Input_ input_, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Input__type)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__set_type)(fl_Input_ input_, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Input__handle,(fl_Input_ self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Input__parent,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_parent,(fl_Input_ input_, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Input__type,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_type,(fl_Input_ input_, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Input__x)(fl_Input_ input_);
-  FL_EXPORT_C(int,          Fl_Input__y)(fl_Input_ input_);
-  FL_EXPORT_C(int,          Fl_Input__w)(fl_Input_ input_);
-  FL_EXPORT_C(int,          Fl_Input__h)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__set_align)(fl_Input_ input_, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Input__align)(fl_Input_ input_);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Input__box)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__set_box)(fl_Input_ input_, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Input__color)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__set_color)(fl_Input_ input_, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Input__set_color_with_bg_sel)(fl_Input_ input_,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Input__selection_color)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__set_selection_color)(fl_Input_ input_, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Input__label)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__copy_label)(fl_Input_ input_, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Input__set_label)(fl_Input_ input_, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Input__labeltype)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__set_labeltype)(fl_Input_ input_, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Input__labelcolor)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__set_labelcolor)(fl_Input_ input_, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Input__labelfont)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__set_labelfont)(fl_Input_ input_, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Input__labelsize)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__set_labelsize)(fl_Input_ input_, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Input__image)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__set_image)(fl_Input_ input_, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Input__deimage)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__set_deimage)(fl_Input_ input_, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Input__tooltip)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__copy_tooltip)(fl_Input_ input_, const char* text);
-  FL_EXPORT_C(void,         Fl_Input__set_tooltip)(fl_Input_ input_, const char* text);
-  FL_EXPORT_C(void,         Fl_Input__set_callback_with_user_data)(fl_Input_ input_, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Input__set_callback)(fl_Input_ input_, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Input__user_data)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__set_user_data)(fl_Input_ input_, void* v);
-  FL_EXPORT_C(long,         Fl_Input__argument)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__set_argument)(fl_Input_ input_, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Input__when)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__set_when)(fl_Input_ input_, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Input__visible)(fl_Input_ input_);
-  FL_EXPORT_C(int,          Fl_Input__visible_r)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__set_visible)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__clear_visible)(fl_Input_ input_);
-  FL_EXPORT_C(unsigned int, Fl_Input__active)(fl_Input_ input_);
-  FL_EXPORT_C(int,          Fl_Input__active_r)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__activate)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__deactivate)(fl_Input_ input_);
-  FL_EXPORT_C(unsigned int, Fl_Input__output)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__set_output)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__clear_output)(fl_Input_ input_);
-  FL_EXPORT_C(unsigned int, Fl_Input__takesevents)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__set_changed)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__clear_changed)(fl_Input_ input_);
-  FL_EXPORT_C(int,          Fl_Input__take_focus)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__set_visible_focus)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__clear_visible_focus)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__modify_visible_focus)(fl_Input_ input_, int v);
-  FL_EXPORT_C(unsigned int, Fl_Input__visible_focus)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__do_callback)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__do_callback_with_widget_and_user_data)(fl_Input_ input_, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Input__do_callback_with_widget_and_default_user_data)(fl_Input_ input_, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Input__contains)(fl_Input_ input_, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Input__inside)(fl_Input_ input_, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Input__redraw)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__redraw_label)(fl_Input_ input_);
-  FL_EXPORT_C(uchar,        Fl_Input__damage)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__clear_damage_with_bitmask)(fl_Input_ input_, uchar c);
-  FL_EXPORT_C(void,         Fl_Input__clear_damage)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__damage_with_text)(fl_Input_ input_, uchar c);
-  FL_EXPORT_C(void,         Fl_Input__damage_inside_widget)(fl_Input_ input_, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Input__draw_label_with_xywh_alignment)(fl_Input_ input_, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Input__measure_label)(fl_Input_ input_, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Input__window)(fl_Input_ input_);
-  FL_EXPORT_C(fl_Window,    Fl_Input__top_window)(fl_Input_ input_);
-  FL_EXPORT_C(fl_Window ,   Fl_Input__top_window_offset)(fl_Input_ input_, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Input__as_group)(fl_Input_ input_);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Input__as_gl_window)(fl_Input_ input_);
+  FL_EXPORT_C_HEADER(int,Fl_Input__x,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(int,Fl_Input__y,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(int,Fl_Input__w,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(int,Fl_Input__h,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_align,(fl_Input_ input_, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Input__align,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Input__box,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_box,(fl_Input_ input_, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Input__color,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_color,(fl_Input_ input_, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_color_with_bg_sel,(fl_Input_ input_,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Input__selection_color,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_selection_color,(fl_Input_ input_, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Input__label,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__copy_label,(fl_Input_ input_, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_label,(fl_Input_ input_, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Input__labeltype,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_labeltype,(fl_Input_ input_, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Input__labelcolor,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_labelcolor,(fl_Input_ input_, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Input__labelfont,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_labelfont,(fl_Input_ input_, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Input__labelsize,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_labelsize,(fl_Input_ input_, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Input__image,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_image,(fl_Input_ input_, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Input__deimage,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_deimage,(fl_Input_ input_, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Input__tooltip,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__copy_tooltip,(fl_Input_ input_, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_tooltip,(fl_Input_ input_, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_callback_with_user_data,(fl_Input_ input_, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_callback,(fl_Input_ input_, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Input__user_data,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_user_data,(fl_Input_ input_, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Input__argument,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_argument,(fl_Input_ input_, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Input__when,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_when,(fl_Input_ input_, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Input__visible,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(int,Fl_Input__visible_r,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_visible,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__clear_visible,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Input__active,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(int,Fl_Input__active_r,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__activate,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__deactivate,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Input__output,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_output,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__clear_output,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Input__takesevents,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_changed,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__clear_changed,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(int,Fl_Input__take_focus,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_visible_focus,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__clear_visible_focus,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__modify_visible_focus,(fl_Input_ input_, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Input__visible_focus,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__do_callback,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__do_callback_with_widget_and_user_data,(fl_Input_ input_, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Input__do_callback_with_widget_and_default_user_data,(fl_Input_ input_, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Input__contains,(fl_Input_ input_, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Input__inside,(fl_Input_ input_, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Input__redraw,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__redraw_label,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(uchar,Fl_Input__damage,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__clear_damage_with_bitmask,(fl_Input_ input_, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Input__clear_damage,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__damage_with_text,(fl_Input_ input_, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Input__damage_inside_widget,(fl_Input_ input_, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Input__draw_label_with_xywh_alignment,(fl_Input_ input_, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Input__measure_label,(fl_Input_ input_, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Input__window,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Input__top_window,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Input__top_window_offset,(fl_Input_ input_, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Input__as_group,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Input__as_gl_window,(fl_Input_ input_));
   /* Fl_Input_ specific functions */
-  FL_EXPORT_C(void,         Fl_Input__resize)(fl_Input_ input_, int X, int Y, int W, int H);
-  FL_EXPORT_C(int,          Fl_Input__set_value)(fl_Input_ input_, const char*);
-  FL_EXPORT_C(int,          Fl_Input__set_value_with_length)(fl_Input_ input_, const char* text, int length);
-  FL_EXPORT_C(int,          Fl_Input__static_value)(fl_Input_ input_, const char* text);
-  FL_EXPORT_C(int,          Fl_Input__static_value_with_length)(fl_Input_ input_, const char* text, int length);
-  FL_EXPORT_C(const char*,  Fl_Input__value)(fl_Input_ input_);
-  FL_EXPORT_C(Fl_Char,      Fl_Input__index)(fl_Input_ input_, int i);
-  FL_EXPORT_C(int,          Fl_Input__size)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__set_size)(fl_Input_ input_, int W, int H);
-  FL_EXPORT_C(int,          Fl_Input__maximum_size)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__set_maximum_size)(fl_Input_ input_, int m);
-  FL_EXPORT_C(int,          Fl_Input__position)(fl_Input_ input_);
-  FL_EXPORT_C(int,          Fl_Input__mark)(fl_Input_ input_);
-  FL_EXPORT_C(int,          Fl_Input__set_position_with_cursor_mark)(fl_Input_ input_,int p, int m);
-  FL_EXPORT_C(int,          Fl_Input__set_position_n_n)(fl_Input_ input_,int p);
-  FL_EXPORT_C(int,          Fl_Input__set_mark)(fl_Input_ input_,int m);
-  FL_EXPORT_C(int,          Fl_Input__replace)(fl_Input_ input_,int b, int e, const char *text);
-  FL_EXPORT_C(int,          Fl_Input__replace_with_ilen)(fl_Input_ input_,int b, int e, const char *text, int ilen);
-  FL_EXPORT_C(int,          Fl_Input__cut)(fl_Input_ input_);
-  FL_EXPORT_C(int,          Fl_Input__cut_bytes)(fl_Input_ input_,int n);
-  FL_EXPORT_C(int,          Fl_Input__cut_range)(fl_Input_ input_,int a, int b);
-  FL_EXPORT_C(int,          Fl_Input__insert)(fl_Input_ input_,const char* t);
-  FL_EXPORT_C(int,          Fl_Input__insert_with_length)(fl_Input_ input_,const char* t, int l);
-  FL_EXPORT_C(int,          Fl_Input__copy)(fl_Input_ input_,int clipboard);
-  FL_EXPORT_C(int,          Fl_Input__undo)(fl_Input_ input_);
-  FL_EXPORT_C(int,          Fl_Input__copy_cuts)(fl_Input_ input_);
-  FL_EXPORT_C(int,          Fl_Input__shortcut)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__set_shortcut)(fl_Input_ input_,int s);
-  FL_EXPORT_C(Fl_Font,      Fl_Input__textfont)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__set_textfont)(fl_Input_ input_,Fl_Font s);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Input__textsize)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__set_textsize)(fl_Input_ input_,Fl_Fontsize s);
-  FL_EXPORT_C(Fl_Color,     Fl_Input__textcolor)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__set_textcolor)(fl_Input_ input_,Fl_Color n);
-  FL_EXPORT_C(Fl_Color,     Fl_Input__cursor_color)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__set_cursor_color)(fl_Input_ input_,Fl_Color n);
-  FL_EXPORT_C(int,          Fl_Input__input_type)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__set_input_type)(fl_Input_ input_,int t);
-  FL_EXPORT_C(int,          Fl_Input__readonly)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__set_readonly)(fl_Input_ input_,int b);
-  FL_EXPORT_C(int,          Fl_Input__wrap)(fl_Input_ input_);
-  FL_EXPORT_C(void,         Fl_Input__set_wrap)(fl_Input_ input_,int b);
-  FL_EXPORT_C(void,         Fl_Input__tab_nav)(fl_Input_ input_,int val);
-  FL_EXPORT_C(int,          Fl_Input__set_tab_nav)(fl_Input_ input_);
+  FL_EXPORT_C_HEADER(void,Fl_Input__resize,(fl_Input_ input_, int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(int,Fl_Input__set_value,(fl_Input_ input_, const char*));
+  FL_EXPORT_C_HEADER(int,Fl_Input__set_value_with_length,(fl_Input_ input_, const char* text, int length));
+  FL_EXPORT_C_HEADER(int,Fl_Input__static_value,(fl_Input_ input_, const char* text));
+  FL_EXPORT_C_HEADER(int,Fl_Input__static_value_with_length,(fl_Input_ input_, const char* text, int length));
+  FL_EXPORT_C_HEADER(const char*,Fl_Input__value,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(Fl_Char,Fl_Input__index,(fl_Input_ input_, int i));
+  FL_EXPORT_C_HEADER(int,Fl_Input__size,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_size,(fl_Input_ input_, int W, int H));
+  FL_EXPORT_C_HEADER(int,Fl_Input__maximum_size,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_maximum_size,(fl_Input_ input_, int m));
+  FL_EXPORT_C_HEADER(int,Fl_Input__position,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(int,Fl_Input__mark,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(int,Fl_Input__set_position_with_cursor_mark,(fl_Input_ input_,int p, int m));
+  FL_EXPORT_C_HEADER(int,Fl_Input__set_position_n_n,(fl_Input_ input_,int p));
+  FL_EXPORT_C_HEADER(int,Fl_Input__set_mark,(fl_Input_ input_,int m));
+  FL_EXPORT_C_HEADER(int,Fl_Input__replace,(fl_Input_ input_,int b, int e, const char *text));
+  FL_EXPORT_C_HEADER(int,Fl_Input__replace_with_ilen,(fl_Input_ input_,int b, int e, const char *text, int ilen));
+  FL_EXPORT_C_HEADER(int,Fl_Input__cut,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(int,Fl_Input__cut_bytes,(fl_Input_ input_,int n));
+  FL_EXPORT_C_HEADER(int,Fl_Input__cut_range,(fl_Input_ input_,int a, int b));
+  FL_EXPORT_C_HEADER(int,Fl_Input__insert,(fl_Input_ input_,const char* t));
+  FL_EXPORT_C_HEADER(int,Fl_Input__insert_with_length,(fl_Input_ input_,const char* t, int l));
+  FL_EXPORT_C_HEADER(int,Fl_Input__copy,(fl_Input_ input_,int clipboard));
+  FL_EXPORT_C_HEADER(int,Fl_Input__undo,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(int,Fl_Input__copy_cuts,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(int,Fl_Input__shortcut,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_shortcut,(fl_Input_ input_,int s));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Input__textfont,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_textfont,(fl_Input_ input_,Fl_Font s));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Input__textsize,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_textsize,(fl_Input_ input_,Fl_Fontsize s));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Input__textcolor,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_textcolor,(fl_Input_ input_,Fl_Color n));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Input__cursor_color,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_cursor_color,(fl_Input_ input_,Fl_Color n));
+  FL_EXPORT_C_HEADER(int,Fl_Input__input_type,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_input_type,(fl_Input_ input_,int t));
+  FL_EXPORT_C_HEADER(int,Fl_Input__readonly,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_readonly,(fl_Input_ input_,int b));
+  FL_EXPORT_C_HEADER(int,Fl_Input__wrap,(fl_Input_ input_));
+  FL_EXPORT_C_HEADER(void,Fl_Input__set_wrap,(fl_Input_ input_,int b));
+  FL_EXPORT_C_HEADER(void,Fl_Input__tab_nav,(fl_Input_ input_,int val));
+  FL_EXPORT_C_HEADER(int,Fl_Input__set_tab_nav,(fl_Input_ input_));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Int_InputC.h b/c-src/Fl_Int_InputC.h
--- a/c-src/Fl_Int_InputC.h
+++ b/c-src/Fl_Int_InputC.h
@@ -10,96 +10,96 @@
 EXPORT {
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,Fl_Int_Input_handle_super)(fl_Int_Input self, int event);
-  FL_EXPORT_C(int,Fl_Int_Input_handle)(fl_Int_Input self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Int_Input_parent)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_parent)(fl_Int_Input int_input, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Int_Input_type)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_type)(fl_Int_Input int_input, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_handle_super,(fl_Int_Input self, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_handle,(fl_Int_Input self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Int_Input_parent,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_parent,(fl_Int_Input int_input, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Int_Input_type,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_type,(fl_Int_Input int_input, uchar t));
 
-FL_EXPORT_C(void, Fl_Int_Input_draw_box)(fl_Int_Input Int_Input);
-FL_EXPORT_C(void, Fl_Int_Input_draw_box_with_tc)(fl_Int_Input Int_Input,Fl_Boxtype t, Fl_Color c);
-FL_EXPORT_C(void, Fl_Int_Input_draw_box_with_txywhc)(fl_Int_Input Int_Input,Fl_Boxtype t, int x,int y,int w,int h, Fl_Color c);
-FL_EXPORT_C(void, Fl_Int_Input_draw_backdrop)(fl_Int_Input Int_Input);
-FL_EXPORT_C(void, Fl_Int_Input_draw_focus)(fl_Int_Input Int_Input);
-FL_EXPORT_C(void, Fl_Int_Input_draw_focus_with_txywh)(fl_Int_Input Int_Input,Fl_Boxtype t, int x,int y,int w,int h);
-FL_EXPORT_C(void, Fl_Int_Input_draw_label)(fl_Int_Input Int_Input);
-  FL_EXPORT_C(int,          Fl_Int_Input_x)(fl_Int_Input int_input);
-  FL_EXPORT_C(int,          Fl_Int_Input_y)(fl_Int_Input int_input);
-  FL_EXPORT_C(int,          Fl_Int_Input_w)(fl_Int_Input int_input);
-  FL_EXPORT_C(int,          Fl_Int_Input_h)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_align)(fl_Int_Input int_input, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Int_Input_align)(fl_Int_Input int_input);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Int_Input_box)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_box)(fl_Int_Input int_input, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Int_Input_color)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_color)(fl_Int_Input int_input, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_color_with_bg_sel)(fl_Int_Input int_input,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Int_Input_selection_color)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_selection_color)(fl_Int_Input int_input, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Int_Input_label)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_copy_label)(fl_Int_Input int_input, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_label)(fl_Int_Input int_input, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Int_Input_labeltype)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_labeltype)(fl_Int_Input int_input, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Int_Input_labelcolor)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_labelcolor)(fl_Int_Input int_input, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Int_Input_labelfont)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_labelfont)(fl_Int_Input int_input, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Int_Input_labelsize)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_labelsize)(fl_Int_Input int_input, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Int_Input_image)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_image)(fl_Int_Input int_input, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Int_Input_deimage)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_deimage)(fl_Int_Input int_input, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Int_Input_tooltip)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_copy_tooltip)(fl_Int_Input int_input, const char* text);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_tooltip)(fl_Int_Input int_input, const char* text);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_callback_with_user_data)(fl_Int_Input int_input, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_callback)(fl_Int_Input int_input, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Int_Input_user_data)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_user_data)(fl_Int_Input int_input, void* v);
-  FL_EXPORT_C(long,         Fl_Int_Input_argument)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_argument)(fl_Int_Input int_input, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Int_Input_when)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_when)(fl_Int_Input int_input, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Int_Input_visible)(fl_Int_Input int_input);
-  FL_EXPORT_C(int,          Fl_Int_Input_visible_r)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_visible)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_clear_visible)(fl_Int_Input int_input);
-  FL_EXPORT_C(unsigned int, Fl_Int_Input_active)(fl_Int_Input int_input);
-  FL_EXPORT_C(int,          Fl_Int_Input_active_r)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_activate)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_deactivate)(fl_Int_Input int_input);
-  FL_EXPORT_C(unsigned int, Fl_Int_Input_output)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_output)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_clear_output)(fl_Int_Input int_input);
-  FL_EXPORT_C(unsigned int, Fl_Int_Input_takesevents)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_changed)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_clear_changed)(fl_Int_Input int_input);
-  FL_EXPORT_C(int,          Fl_Int_Input_take_focus)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_visible_focus)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_clear_visible_focus)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_modify_visible_focus)(fl_Int_Input int_input, int v);
-  FL_EXPORT_C(unsigned int, Fl_Int_Input_visible_focus)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_do_callback)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_do_callback_with_widget_and_user_data)(fl_Int_Input int_input, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Int_Input_do_callback_with_widget_and_default_user_data)(fl_Int_Input int_input, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Int_Input_contains)(fl_Int_Input int_input, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Int_Input_inside)(fl_Int_Input int_input, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Int_Input_redraw)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_redraw_label)(fl_Int_Input int_input);
-  FL_EXPORT_C(uchar,        Fl_Int_Input_damage)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_clear_damage_with_bitmask)(fl_Int_Input int_input, uchar c);
-  FL_EXPORT_C(void,         Fl_Int_Input_clear_damage)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_damage_with_text)(fl_Int_Input int_input, uchar c);
-  FL_EXPORT_C(void,         Fl_Int_Input_damage_inside_widget)(fl_Int_Input int_input, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Int_Input_draw_label_with_xywh_alignment)(fl_Int_Input int_input, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Int_Input_measure_label)(fl_Int_Input int_input, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Int_Input_window)(fl_Int_Input int_input);
-  FL_EXPORT_C(fl_Window,    Fl_Int_Input_top_window)(fl_Int_Input int_input);
-  FL_EXPORT_C(fl_Window ,   Fl_Int_Input_top_window_offset)(fl_Int_Input int_input, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Int_Input_as_group)(fl_Int_Input int_input);
+FL_EXPORT_C_HEADER(void,Fl_Int_Input_draw_box,(fl_Int_Input Int_Input));
+FL_EXPORT_C_HEADER(void,Fl_Int_Input_draw_box_with_tc,(fl_Int_Input Int_Input,Fl_Boxtype t, Fl_Color c));
+FL_EXPORT_C_HEADER(void,Fl_Int_Input_draw_box_with_txywhc,(fl_Int_Input Int_Input,Fl_Boxtype t, int x,int y,int w,int h, Fl_Color c));
+FL_EXPORT_C_HEADER(void,Fl_Int_Input_draw_backdrop,(fl_Int_Input Int_Input));
+FL_EXPORT_C_HEADER(void,Fl_Int_Input_draw_focus,(fl_Int_Input Int_Input));
+FL_EXPORT_C_HEADER(void,Fl_Int_Input_draw_focus_with_txywh,(fl_Int_Input Int_Input,Fl_Boxtype t, int x,int y,int w,int h));
+FL_EXPORT_C_HEADER(void,Fl_Int_Input_draw_label,(fl_Int_Input Int_Input));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_x,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_y,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_w,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_h,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_align,(fl_Int_Input int_input, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Int_Input_align,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Int_Input_box,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_box,(fl_Int_Input int_input, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Int_Input_color,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_color,(fl_Int_Input int_input, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_color_with_bg_sel,(fl_Int_Input int_input,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Int_Input_selection_color,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_selection_color,(fl_Int_Input int_input, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Int_Input_label,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_copy_label,(fl_Int_Input int_input, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_label,(fl_Int_Input int_input, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Int_Input_labeltype,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_labeltype,(fl_Int_Input int_input, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Int_Input_labelcolor,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_labelcolor,(fl_Int_Input int_input, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Int_Input_labelfont,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_labelfont,(fl_Int_Input int_input, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Int_Input_labelsize,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_labelsize,(fl_Int_Input int_input, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Int_Input_image,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_image,(fl_Int_Input int_input, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Int_Input_deimage,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_deimage,(fl_Int_Input int_input, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Int_Input_tooltip,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_copy_tooltip,(fl_Int_Input int_input, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_tooltip,(fl_Int_Input int_input, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_callback_with_user_data,(fl_Int_Input int_input, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_callback,(fl_Int_Input int_input, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Int_Input_user_data,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_user_data,(fl_Int_Input int_input, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Int_Input_argument,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_argument,(fl_Int_Input int_input, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Int_Input_when,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_when,(fl_Int_Input int_input, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Int_Input_visible,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_visible_r,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_visible,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_clear_visible,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Int_Input_active,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_active_r,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_activate,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_deactivate,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Int_Input_output,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_output,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_clear_output,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Int_Input_takesevents,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_changed,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_clear_changed,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_take_focus,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_visible_focus,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_clear_visible_focus,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_modify_visible_focus,(fl_Int_Input int_input, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Int_Input_visible_focus,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_do_callback,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_do_callback_with_widget_and_user_data,(fl_Int_Input int_input, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_do_callback_with_widget_and_default_user_data,(fl_Int_Input int_input, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_contains,(fl_Int_Input int_input, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_inside,(fl_Int_Input int_input, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_redraw,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_redraw_label,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(uchar,Fl_Int_Input_damage,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_clear_damage_with_bitmask,(fl_Int_Input int_input, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_clear_damage,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_damage_with_text,(fl_Int_Input int_input, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_damage_inside_widget,(fl_Int_Input int_input, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_draw_label_with_xywh_alignment,(fl_Int_Input int_input, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_measure_label,(fl_Int_Input int_input, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Int_Input_window,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Int_Input_top_window,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Int_Input_top_window_offset,(fl_Int_Input int_input, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Int_Input_as_group,(fl_Int_Input int_input));
   /* Fl_Int_Input specific functions */
 #ifdef __cplusplus
   class Fl_DerivedInt_Input : public Fl_Int_Input {
@@ -127,69 +127,69 @@
     Fl_DerivedInt_Input(int X, int Y, int W, int H, fl_Int_Input_Virtual_Funcs* funcs);
     ~Fl_DerivedInt_Input();
   };
-#endif  
-  FL_EXPORT_C(int ,         Fl_Int_Input_handle_super)(fl_Int_Input int_input,int event);
-  FL_EXPORT_C(int ,         Fl_Int_Input_handle )(fl_Int_Input int_input,int event);
-  FL_EXPORT_C(void,         Fl_Int_Input_resize_super)(fl_Int_Input int_input,int x, int y, int w, int h);
-  FL_EXPORT_C(void,         Fl_Int_Input_resize )(fl_Int_Input int_input,int x, int y, int w, int h);
-  FL_EXPORT_C(void,         Fl_Int_Input_show_super)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_show )(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_hide_super)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_hide )(fl_Int_Input int_input);
-  FL_EXPORT_C(fl_Window,    Fl_Int_Input_as_window_super)(fl_Int_Input int_input);
-  FL_EXPORT_C(fl_Window,    Fl_Int_Input_as_window )(fl_Int_Input int_input);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Int_Input_as_gl_window_super)(fl_Int_Input int_input);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Int_Input_as_gl_window)(fl_Int_Input int_input);
-  FL_EXPORT_C(void*, Fl_Int_Input_other_data)(fl_Int_Input int_input);
-  FL_EXPORT_C(void, Fl_Int_Input_set_other_data)(fl_Int_Input int_input, void* v);
-  FL_EXPORT_C(fl_Float_Input, Fl_Int_Input_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Float_Input, Fl_Int_Input_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(void,     Fl_Int_Input_Destroy)(fl_Int_Input int_input);
+#endif
+  FL_EXPORT_C_HEADER(int ,Fl_Int_Input_handle_super,(fl_Int_Input int_input,int event));
+  FL_EXPORT_C_HEADER(int ,Fl_Int_Input_handle ,(fl_Int_Input int_input,int event));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_resize_super,(fl_Int_Input int_input,int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_resize ,(fl_Int_Input int_input,int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_show_super,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_show ,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_hide_super,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_hide ,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Int_Input_as_window_super,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Int_Input_as_window ,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Int_Input_as_gl_window_super,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Int_Input_as_gl_window,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void*,Fl_Int_Input_other_data,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_other_data,(fl_Int_Input int_input, void* v));
+  FL_EXPORT_C_HEADER(fl_Float_Input,Fl_Int_Input_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Float_Input,Fl_Int_Input_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_Destroy,(fl_Int_Input int_input));
 
-  FL_EXPORT_C(void,         Fl_Int_Input_resize)(fl_Int_Input int_input, int X, int Y, int W, int H);
-  FL_EXPORT_C(int,          Fl_Int_Input_set_value)(fl_Int_Input int_input, const char*);
-  FL_EXPORT_C(int,          Fl_Int_Input_set_value_with_length)(fl_Int_Input int_input, const char* text, int length);
-  FL_EXPORT_C(int,          Fl_Int_Input_static_value)(fl_Int_Input int_input, const char* text);
-  FL_EXPORT_C(int,          Fl_Int_Input_static_value_with_length)(fl_Int_Input int_input, const char* text, int length);
-  FL_EXPORT_C(const char*,  Fl_Int_Input_value)(fl_Int_Input int_input);
-  FL_EXPORT_C(Fl_Char,      Fl_Int_Input_index)(fl_Int_Input int_input, int i);
-  FL_EXPORT_C(int,          Fl_Int_Input_size)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_size)(fl_Int_Input int_input, int W, int H);
-  FL_EXPORT_C(int,          Fl_Int_Input_maximum_size)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_maximum_size)(fl_Int_Input int_input, int m);
-  FL_EXPORT_C(int,          Fl_Int_Input_position)(fl_Int_Input int_input);
-  FL_EXPORT_C(int,          Fl_Int_Input_mark)(fl_Int_Input int_input);
-  FL_EXPORT_C(int,          Fl_Int_Input_set_position_with_cursor_mark)(fl_Int_Input int_input,int p, int m);
-  FL_EXPORT_C(int,          Fl_Int_Input_set_position_n_n)(fl_Int_Input int_input,int p);
-  FL_EXPORT_C(int,          Fl_Int_Input_set_mark)(fl_Int_Input int_input,int m);
-  FL_EXPORT_C(int,          Fl_Int_Input_replace)(fl_Int_Input int_input,int b, int e, const char *text);
-  FL_EXPORT_C(int,          Fl_Int_Input_replace_with_ilen)(fl_Int_Input int_input,int b, int e, const char *text, int ilen);
-  FL_EXPORT_C(int,          Fl_Int_Input_cut)(fl_Int_Input int_input);
-  FL_EXPORT_C(int,          Fl_Int_Input_cut_bytes)(fl_Int_Input int_input,int n);
-  FL_EXPORT_C(int,          Fl_Int_Input_cut_range)(fl_Int_Input int_input,int a, int b);
-  FL_EXPORT_C(int,          Fl_Int_Input_insert)(fl_Int_Input int_input,const char* t);
-  FL_EXPORT_C(int,          Fl_Int_Input_insert_with_length)(fl_Int_Input int_input,const char* t, int l);
-  FL_EXPORT_C(int,          Fl_Int_Input_copy)(fl_Int_Input int_input,int clipboard);
-  FL_EXPORT_C(int,          Fl_Int_Input_undo)(fl_Int_Input int_input);
-  FL_EXPORT_C(int,          Fl_Int_Input_copy_cuts)(fl_Int_Input int_input);
-  FL_EXPORT_C(int,          Fl_Int_Input_shortcut)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_shortcut)(fl_Int_Input int_input,int s);
-  FL_EXPORT_C(Fl_Font,      Fl_Int_Input_textfont)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_textfont)(fl_Int_Input int_input,Fl_Font s);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Int_Input_textsize)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_textsize)(fl_Int_Input int_input,Fl_Fontsize s);
-  FL_EXPORT_C(Fl_Color,     Fl_Int_Input_textcolor)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_textcolor)(fl_Int_Input int_input,Fl_Color n);
-  FL_EXPORT_C(Fl_Color,     Fl_Int_Input_cursor_color)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_cursor_color)(fl_Int_Input int_input,Fl_Color n);
-  FL_EXPORT_C(int,          Fl_Int_Input_input_type)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_input_type)(fl_Int_Input int_input,int t);
-  FL_EXPORT_C(int,          Fl_Int_Input_readonly)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_readonly)(fl_Int_Input int_input,int b);
-  FL_EXPORT_C(int,          Fl_Int_Input_wrap)(fl_Int_Input int_input);
-  FL_EXPORT_C(void,         Fl_Int_Input_set_wrap)(fl_Int_Input int_input,int b);
-  FL_EXPORT_C(void,         Fl_Int_Input_tab_nav)(fl_Int_Input int_input,int val);
-  FL_EXPORT_C(int,          Fl_Int_Input_set_tab_nav)(fl_Int_Input int_input);
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_resize,(fl_Int_Input int_input, int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_set_value,(fl_Int_Input int_input, const char*));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_set_value_with_length,(fl_Int_Input int_input, const char* text, int length));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_static_value,(fl_Int_Input int_input, const char* text));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_static_value_with_length,(fl_Int_Input int_input, const char* text, int length));
+  FL_EXPORT_C_HEADER(const char*,Fl_Int_Input_value,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(Fl_Char,Fl_Int_Input_index,(fl_Int_Input int_input, int i));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_size,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_size,(fl_Int_Input int_input, int W, int H));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_maximum_size,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_maximum_size,(fl_Int_Input int_input, int m));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_position,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_mark,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_set_position_with_cursor_mark,(fl_Int_Input int_input,int p, int m));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_set_position_n_n,(fl_Int_Input int_input,int p));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_set_mark,(fl_Int_Input int_input,int m));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_replace,(fl_Int_Input int_input,int b, int e, const char *text));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_replace_with_ilen,(fl_Int_Input int_input,int b, int e, const char *text, int ilen));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_cut,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_cut_bytes,(fl_Int_Input int_input,int n));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_cut_range,(fl_Int_Input int_input,int a, int b));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_insert,(fl_Int_Input int_input,const char* t));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_insert_with_length,(fl_Int_Input int_input,const char* t, int l));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_copy,(fl_Int_Input int_input,int clipboard));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_undo,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_copy_cuts,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_shortcut,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_shortcut,(fl_Int_Input int_input,int s));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Int_Input_textfont,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_textfont,(fl_Int_Input int_input,Fl_Font s));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Int_Input_textsize,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_textsize,(fl_Int_Input int_input,Fl_Fontsize s));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Int_Input_textcolor,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_textcolor,(fl_Int_Input int_input,Fl_Color n));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Int_Input_cursor_color,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_cursor_color,(fl_Int_Input int_input,Fl_Color n));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_input_type,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_input_type,(fl_Int_Input int_input,int t));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_readonly,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_readonly,(fl_Int_Input int_input,int b));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_wrap,(fl_Int_Input int_input));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_set_wrap,(fl_Int_Input int_input,int b));
+  FL_EXPORT_C_HEADER(void,Fl_Int_Input_tab_nav,(fl_Int_Input int_input,int val));
+  FL_EXPORT_C_HEADER(int,Fl_Int_Input_set_tab_nav,(fl_Int_Input int_input));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_JPEG_ImageC.h b/c-src/Fl_JPEG_ImageC.h
--- a/c-src/Fl_JPEG_ImageC.h
+++ b/c-src/Fl_JPEG_ImageC.h
@@ -6,8 +6,8 @@
 #include "Fl_CallbackC.h"
 EXPORT {
 #endif
-  FL_EXPORT_C(fl_JPEG_Image, Fl_JPEG_Image_New_WithData)(const char* name, const unsigned char* data);
-  FL_EXPORT_C(fl_JPEG_Image, Fl_JPEG_Image_New)(const char* filename);
+  FL_EXPORT_C_HEADER(fl_JPEG_Image,Fl_JPEG_Image_New_WithData,(const char* name, const unsigned char* data));
+  FL_EXPORT_C_HEADER(fl_JPEG_Image,Fl_JPEG_Image_New,(const char* filename));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Light_ButtonC.h b/c-src/Fl_Light_ButtonC.h
--- a/c-src/Fl_Light_ButtonC.h
+++ b/c-src/Fl_Light_ButtonC.h
@@ -29,117 +29,117 @@
   };
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,Fl_Light_Button_handle)(fl_Light_Button self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Light_Button_parent)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_set_parent)(fl_Light_Button light_button, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Light_Button_type)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_set_type)(fl_Light_Button light_button, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Light_Button_handle,(fl_Light_Button self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Light_Button_parent,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_set_parent,(fl_Light_Button light_button, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Light_Button_type,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_set_type,(fl_Light_Button light_button, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Light_Button_x)(fl_Light_Button light_button);
-  FL_EXPORT_C(int,          Fl_Light_Button_y)(fl_Light_Button light_button);
-  FL_EXPORT_C(int,          Fl_Light_Button_w)(fl_Light_Button light_button);
-  FL_EXPORT_C(int,          Fl_Light_Button_h)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_set_align)(fl_Light_Button light_button, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Light_Button_align)(fl_Light_Button light_button);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Light_Button_box)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_set_box)(fl_Light_Button light_button, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Light_Button_color)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_set_color)(fl_Light_Button light_button, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Light_Button_set_color_with_bg_sel)(fl_Light_Button light_button,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Light_Button_selection_color)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_set_selection_color)(fl_Light_Button light_button, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Light_Button_label)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_copy_label)(fl_Light_Button light_button, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Light_Button_set_label)(fl_Light_Button light_button, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Light_Button_labeltype)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_set_labeltype)(fl_Light_Button light_button, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Light_Button_labelcolor)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_set_labelcolor)(fl_Light_Button light_button, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Light_Button_labelfont)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_set_labelfont)(fl_Light_Button light_button, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Light_Button_labelsize)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_set_labelsize)(fl_Light_Button light_button, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Light_Button_image)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_set_image)(fl_Light_Button light_button, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Light_Button_deimage)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_set_deimage)(fl_Light_Button light_button, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Light_Button_tooltip)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_copy_tooltip)(fl_Light_Button light_button, const char* text);
-  FL_EXPORT_C(void,         Fl_Light_Button_set_tooltip)(fl_Light_Button light_button, const char* text);
-  FL_EXPORT_C(void,         Fl_Light_Button_set_callback_with_user_data)(fl_Light_Button light_button, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Light_Button_set_callback)(fl_Light_Button light_button, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Light_Button_user_data)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_set_user_data)(fl_Light_Button light_button, void* v);
-  FL_EXPORT_C(long,         Fl_Light_Button_argument)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_set_argument)(fl_Light_Button light_button, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Light_Button_when)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_set_when)(fl_Light_Button light_button, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Light_Button_visible)(fl_Light_Button light_button);
-  FL_EXPORT_C(int,          Fl_Light_Button_visible_r)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_set_visible)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_clear_visible)(fl_Light_Button light_button);
-  FL_EXPORT_C(unsigned int, Fl_Light_Button_active)(fl_Light_Button light_button);
-  FL_EXPORT_C(int,          Fl_Light_Button_active_r)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_activate)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_deactivate)(fl_Light_Button light_button);
-  FL_EXPORT_C(unsigned int, Fl_Light_Button_output)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_set_output)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_clear_output)(fl_Light_Button light_button);
-  FL_EXPORT_C(unsigned int, Fl_Light_Button_takesevents)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_set_changed)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_clear_changed)(fl_Light_Button light_button);
-  FL_EXPORT_C(int,          Fl_Light_Button_take_focus)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_set_visible_focus)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_clear_visible_focus)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_modify_visible_focus)(fl_Light_Button light_button, int v);
-  FL_EXPORT_C(unsigned int, Fl_Light_Button_visible_focus)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_do_callback)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_do_callback_with_widget_and_user_data)(fl_Light_Button light_button, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Light_Button_do_callback_with_widget_and_default_user_data)(fl_Light_Button light_button, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Light_Button_contains)(fl_Light_Button light_button, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Light_Button_inside)(fl_Light_Button light_button, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Light_Button_redraw)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_redraw_label)(fl_Light_Button light_button);
-  FL_EXPORT_C(uchar,        Fl_Light_Button_damage)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_clear_damage_with_bitmask)(fl_Light_Button light_button, uchar c);
-  FL_EXPORT_C(void,         Fl_Light_Button_clear_damage)(fl_Light_Button light_button);
-  FL_EXPORT_C(void,         Fl_Light_Button_damage_with_text)(fl_Light_Button light_button, uchar c);
-  FL_EXPORT_C(void,         Fl_Light_Button_damage_inside_widget)(fl_Light_Button light_button, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Light_Button_draw_label_with_xywh_alignment)(fl_Light_Button light_button, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Light_Button_measure_label)(fl_Light_Button light_button, int* ww , int* hh);
+  FL_EXPORT_C_HEADER(int,Fl_Light_Button_x,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(int,Fl_Light_Button_y,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(int,Fl_Light_Button_w,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(int,Fl_Light_Button_h,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_set_align,(fl_Light_Button light_button, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Light_Button_align,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Light_Button_box,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_set_box,(fl_Light_Button light_button, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Light_Button_color,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_set_color,(fl_Light_Button light_button, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_set_color_with_bg_sel,(fl_Light_Button light_button,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Light_Button_selection_color,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_set_selection_color,(fl_Light_Button light_button, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Light_Button_label,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_copy_label,(fl_Light_Button light_button, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_set_label,(fl_Light_Button light_button, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Light_Button_labeltype,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_set_labeltype,(fl_Light_Button light_button, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Light_Button_labelcolor,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_set_labelcolor,(fl_Light_Button light_button, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Light_Button_labelfont,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_set_labelfont,(fl_Light_Button light_button, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Light_Button_labelsize,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_set_labelsize,(fl_Light_Button light_button, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Light_Button_image,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_set_image,(fl_Light_Button light_button, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Light_Button_deimage,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_set_deimage,(fl_Light_Button light_button, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Light_Button_tooltip,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_copy_tooltip,(fl_Light_Button light_button, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_set_tooltip,(fl_Light_Button light_button, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_set_callback_with_user_data,(fl_Light_Button light_button, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_set_callback,(fl_Light_Button light_button, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Light_Button_user_data,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_set_user_data,(fl_Light_Button light_button, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Light_Button_argument,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_set_argument,(fl_Light_Button light_button, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Light_Button_when,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_set_when,(fl_Light_Button light_button, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Light_Button_visible,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(int,Fl_Light_Button_visible_r,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_set_visible,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_clear_visible,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Light_Button_active,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(int,Fl_Light_Button_active_r,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_activate,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_deactivate,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Light_Button_output,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_set_output,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_clear_output,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Light_Button_takesevents,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_set_changed,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_clear_changed,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(int,Fl_Light_Button_take_focus,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_set_visible_focus,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_clear_visible_focus,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_modify_visible_focus,(fl_Light_Button light_button, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Light_Button_visible_focus,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_do_callback,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_do_callback_with_widget_and_user_data,(fl_Light_Button light_button, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_do_callback_with_widget_and_default_user_data,(fl_Light_Button light_button, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Light_Button_contains,(fl_Light_Button light_button, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Light_Button_inside,(fl_Light_Button light_button, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_redraw,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_redraw_label,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(uchar,Fl_Light_Button_damage,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_clear_damage_with_bitmask,(fl_Light_Button light_button, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_clear_damage,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_damage_with_text,(fl_Light_Button light_button, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_damage_inside_widget,(fl_Light_Button light_button, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_draw_label_with_xywh_alignment,(fl_Light_Button light_button, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_measure_label,(fl_Light_Button light_button, int* ww , int* hh));
 
-  FL_EXPORT_C(fl_Window,    Fl_Light_Button_window)(fl_Light_Button light_button);
-  FL_EXPORT_C(fl_Window,    Fl_Light_Button_top_window)(fl_Light_Button light_button);
-  FL_EXPORT_C(fl_Window ,   Fl_Light_Button_top_window_offset)(fl_Light_Button light_button, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Light_Button_as_group)(fl_Light_Button light_button);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Light_Button_as_gl_window)(fl_Light_Button light_button);
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Light_Button_window,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Light_Button_top_window,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Light_Button_top_window_offset,(fl_Light_Button light_button, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Light_Button_as_group,(fl_Light_Button light_button));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Light_Button_as_gl_window,(fl_Light_Button light_button));
   /* Fl_Light_Button specific functions */
-  FL_EXPORT_C(fl_Light_Button,    Fl_Light_Button_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Light_Button,    Fl_Light_Button_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(void,Fl_Light_Button_Destroy)(fl_Light_Button button);
-  FL_EXPORT_C(char        , Fl_Light_Button_value)(fl_Light_Button b);
-  FL_EXPORT_C(int         , Fl_Light_Button_set_value)(fl_Light_Button b, int v);
-  FL_EXPORT_C(int         , Fl_Light_Button_set)(fl_Light_Button b);
-  FL_EXPORT_C(int         , Fl_Light_Button_clear)(fl_Light_Button b);
-  FL_EXPORT_C(void        , Fl_Light_Button_setonly)(fl_Light_Button b);
-  FL_EXPORT_C(int         , Fl_Light_Button_get_shortcut )(fl_Light_Button b);
-  FL_EXPORT_C(void        , Fl_Light_Button_set_shortcut )(fl_Light_Button b, int s);
-  FL_EXPORT_C(Fl_Boxtype  , Fl_Light_Button_down_box)(fl_Light_Button b);
-  FL_EXPORT_C(void        , Fl_Light_Button_set_down_box)(fl_Light_Button b,Fl_Boxtype boxtype);
-  FL_EXPORT_C(Fl_Color    , Fl_Light_Button_down_color )(fl_Light_Button b);
-  FL_EXPORT_C(void        , Fl_Light_Button_set_down_color)(fl_Light_Button b, Fl_Color c);
-  FL_EXPORT_C(fl_Light_Button,    Fl_OverriddenLight_Button_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Light_Button,    Fl_OverriddenLight_Button_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Light_Button_draw)(fl_Light_Button o);
-  FL_EXPORT_C(void, Fl_Light_Button_draw_super)(fl_Light_Button o);
-  FL_EXPORT_C(int, Fl_Light_Button_handle)(fl_Light_Button o, int event);
-  FL_EXPORT_C(int, Fl_Light_Button_handle_super)(fl_Light_Button o, int event);
-  FL_EXPORT_C(void, Fl_Light_Button_resize)(fl_Light_Button o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Light_Button_resize_super)(fl_Light_Button o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Light_Button_show)(fl_Light_Button o);
-  FL_EXPORT_C(void, Fl_Light_Button_show_super)(fl_Light_Button o);
-  FL_EXPORT_C(void, Fl_Light_Button_hide)(fl_Light_Button o);
-  FL_EXPORT_C(void, Fl_Light_Button_hide_super)(fl_Light_Button o);
+  FL_EXPORT_C_HEADER(fl_Light_Button,Fl_Light_Button_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Light_Button,Fl_Light_Button_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_Destroy,(fl_Light_Button button));
+  FL_EXPORT_C_HEADER(char        ,Fl_Light_Button_value,(fl_Light_Button b));
+  FL_EXPORT_C_HEADER(int         ,Fl_Light_Button_set_value,(fl_Light_Button b, int v));
+  FL_EXPORT_C_HEADER(int         ,Fl_Light_Button_set,(fl_Light_Button b));
+  FL_EXPORT_C_HEADER(int         ,Fl_Light_Button_clear,(fl_Light_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Light_Button_setonly,(fl_Light_Button b));
+  FL_EXPORT_C_HEADER(int         ,Fl_Light_Button_get_shortcut ,(fl_Light_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Light_Button_set_shortcut ,(fl_Light_Button b, int s));
+  FL_EXPORT_C_HEADER(Fl_Boxtype  ,Fl_Light_Button_down_box,(fl_Light_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Light_Button_set_down_box,(fl_Light_Button b,Fl_Boxtype boxtype));
+  FL_EXPORT_C_HEADER(Fl_Color    ,Fl_Light_Button_down_color ,(fl_Light_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Light_Button_set_down_color,(fl_Light_Button b, Fl_Color c));
+  FL_EXPORT_C_HEADER(fl_Light_Button,Fl_OverriddenLight_Button_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Light_Button,Fl_OverriddenLight_Button_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_draw,(fl_Light_Button o));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_draw_super,(fl_Light_Button o));
+  FL_EXPORT_C_HEADER(int,Fl_Light_Button_handle,(fl_Light_Button o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Light_Button_handle_super,(fl_Light_Button o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_resize,(fl_Light_Button o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_resize_super,(fl_Light_Button o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_show,(fl_Light_Button o));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_show_super,(fl_Light_Button o));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_hide,(fl_Light_Button o));
+  FL_EXPORT_C_HEADER(void,Fl_Light_Button_hide_super,(fl_Light_Button o));
 
 #ifdef __cplusplus
 }
diff --git a/c-src/Fl_Menu_BarC.h b/c-src/Fl_Menu_BarC.h
--- a/c-src/Fl_Menu_BarC.h
+++ b/c-src/Fl_Menu_BarC.h
@@ -28,22 +28,22 @@
     ~Fl_DerivedMenu_Bar();
   };
 #endif
-  FL_EXPORT_C(int,          Fl_Menu_Bar_handle)(fl_Group self, int event);
-  FL_EXPORT_C(fl_Menu_Bar,   Fl_Menu_Bar_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Menu_Bar   , Fl_Menu_Bar_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(void   , Fl_Menu_Bar_Destroy)(fl_Menu_Bar menu_bar);
-  FL_EXPORT_C(fl_Menu_Bar,    Fl_OverriddenMenu_Bar_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Menu_Bar,    Fl_OverriddenMenu_Bar_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Menu_Bar_draw)(fl_Menu_Bar o);
-  FL_EXPORT_C(void, Fl_Menu_Bar_draw_super)(fl_Menu_Bar o);
-  FL_EXPORT_C(int, Fl_Menu_Bar_handle)(fl_Menu_Bar o, int event);
-  FL_EXPORT_C(int, Fl_Menu_Bar_handle_super)(fl_Menu_Bar o, int event);
-  FL_EXPORT_C(void, Fl_Menu_Bar_resize)(fl_Menu_Bar o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Menu_Bar_resize_super)(fl_Menu_Bar o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Menu_Bar_show)(fl_Menu_Bar o);
-  FL_EXPORT_C(void, Fl_Menu_Bar_show_super)(fl_Menu_Bar o);
-  FL_EXPORT_C(void, Fl_Menu_Bar_hide)(fl_Menu_Bar o);
-  FL_EXPORT_C(void, Fl_Menu_Bar_hide_super)(fl_Menu_Bar o);
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Bar_handle,(fl_Group self, int event));
+  FL_EXPORT_C_HEADER(fl_Menu_Bar,Fl_Menu_Bar_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Menu_Bar   ,Fl_Menu_Bar_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void   ,Fl_Menu_Bar_Destroy,(fl_Menu_Bar menu_bar));
+  FL_EXPORT_C_HEADER(fl_Menu_Bar,Fl_OverriddenMenu_Bar_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Menu_Bar,Fl_OverriddenMenu_Bar_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Bar_draw,(fl_Menu_Bar o));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Bar_draw_super,(fl_Menu_Bar o));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Bar_handle,(fl_Menu_Bar o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Bar_handle_super,(fl_Menu_Bar o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Bar_resize,(fl_Menu_Bar o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Bar_resize_super,(fl_Menu_Bar o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Bar_show,(fl_Menu_Bar o));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Bar_show_super,(fl_Menu_Bar o));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Bar_hide,(fl_Menu_Bar o));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Bar_hide_super,(fl_Menu_Bar o));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Menu_ButtonC.h b/c-src/Fl_Menu_ButtonC.h
--- a/c-src/Fl_Menu_ButtonC.h
+++ b/c-src/Fl_Menu_ButtonC.h
@@ -42,166 +42,164 @@
   } Menu_Button_Type;
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,          Fl_Menu_Button_handle)(fl_Group self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Menu_Button_parent)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_set_parent)(fl_Menu_Button menu_button, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Menu_Button_type)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_set_type)(fl_Menu_Button menu_button, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_handle,(fl_Group self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Menu_Button_parent,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_set_parent,(fl_Menu_Button menu_button, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Menu_Button_type,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_set_type,(fl_Menu_Button menu_button, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Menu_Button_x)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(int,          Fl_Menu_Button_y)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(int,          Fl_Menu_Button_w)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(int,          Fl_Menu_Button_h)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_set_align)(fl_Menu_Button menu_button, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Menu_Button_align)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Menu_Button_box)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_set_box)(fl_Menu_Button menu_button, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Menu_Button_color)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_set_color)(fl_Menu_Button menu_button, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Menu_Button_set_color_with_bg_sel)(fl_Menu_Button menu_button,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Menu_Button_selection_color)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_set_selection_color)(fl_Menu_Button menu_button, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Menu_Button_label)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_copy_label)(fl_Menu_Button menu_button, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Menu_Button_set_label)(fl_Menu_Button menu_button, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Menu_Button_labeltype)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_set_labeltype)(fl_Menu_Button menu_button, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Menu_Button_labelcolor)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_set_labelcolor)(fl_Menu_Button menu_button, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Menu_Button_item_labelfont)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_set_item_labelfont)(fl_Menu_Button menu_button, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Menu_Button_item_labelsize)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_set_item_labelsize)(fl_Menu_Button menu_button, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Menu_Button_image)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_set_image)(fl_Menu_Button menu_button, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Menu_Button_deimage)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_set_deimage)(fl_Menu_Button menu_button, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Menu_Button_tooltip)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_copy_tooltip)(fl_Menu_Button menu_button, const char* text);
-  FL_EXPORT_C(void,         Fl_Menu_Button_set_tooltip)(fl_Menu_Button menu_button, const char* text);
-  FL_EXPORT_C(void,         Fl_Menu_Button_set_callback_with_user_data)(fl_Menu_Button menu_button, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Menu_Button_set_callback)(fl_Menu_Button menu_button, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Menu_Button_other_data)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_set_other_data)(fl_Menu_Button menu_button, void* v);
-  FL_EXPORT_C(void*,        Fl_Menu_Button_user_data)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_set_user_data)(fl_Menu_Button menu_button, void* v);
-  FL_EXPORT_C(long,         Fl_Menu_Button_argument)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_set_argument)(fl_Menu_Button menu_button, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Menu_Button_when)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_set_when)(fl_Menu_Button menu_button, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Menu_Button_visible)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(int,          Fl_Menu_Button_visible_r)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_show)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_hide)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_set_visible)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_clear_visible)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(unsigned int, Fl_Menu_Button_active)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(int,          Fl_Menu_Button_active_r)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_activate)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_deactivate)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(unsigned int, Fl_Menu_Button_output)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_set_output)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_clear_output)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(unsigned int, Fl_Menu_Button_takesevents)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_set_changed)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_clear_changed)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(int,          Fl_Menu_Button_take_focus)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_set_visible_focus)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_clear_visible_focus)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_modify_visible_focus)(fl_Menu_Button menu_button, int v);
-  FL_EXPORT_C(unsigned int, Fl_Menu_Button_visible_focus)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(int,          Fl_Menu_Button_contains)(fl_Menu_Button menu_button, fl_Group w);
-  FL_EXPORT_C(int,          Fl_Menu_Button_inside)(fl_Menu_Button menu_button, fl_Group w);
-  FL_EXPORT_C(void,         Fl_Menu_Button_redraw)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_redraw_label)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(uchar,        Fl_Menu_Button_damage)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_clear_damage_with_bitmask)(fl_Menu_Button menu_button, uchar c);
-  FL_EXPORT_C(void,         Fl_Menu_Button_clear_damage)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_damage_with_text)(fl_Menu_Button menu_button, uchar c);
-  FL_EXPORT_C(void,         Fl_Menu_Button_damage_inside_group)(fl_Menu_Button menu_button, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Menu_Button_draw_label_with_xywh_alignment)(fl_Menu_Button menu_button, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Menu_Button_measure_label)(fl_Menu_Button menu_button, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Menu_Button_window)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(fl_Window,    Fl_Menu_Button_top_window)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(fl_Window ,   Fl_Menu_Button_top_window_offset)(fl_Menu_Button menu_button, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Menu_Button_as_group)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Menu_Button_as_gl_window)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void,         Fl_Menu_Button_resize)(fl_Menu_Button menu_button,int X, int Y, int W, int H);
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_x,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_y,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_w,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_h,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_set_align,(fl_Menu_Button menu_button, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Menu_Button_align,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Menu_Button_box,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_set_box,(fl_Menu_Button menu_button, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Menu_Button_color,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_set_color,(fl_Menu_Button menu_button, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_set_color_with_bg_sel,(fl_Menu_Button menu_button,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Menu_Button_selection_color,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_set_selection_color,(fl_Menu_Button menu_button, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Menu_Button_label,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_copy_label,(fl_Menu_Button menu_button, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_set_label,(fl_Menu_Button menu_button, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Menu_Button_labeltype,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_set_labeltype,(fl_Menu_Button menu_button, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Menu_Button_labelcolor,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_set_labelcolor,(fl_Menu_Button menu_button, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Menu_Button_item_labelfont,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_set_item_labelfont,(fl_Menu_Button menu_button, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Menu_Button_item_labelsize,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_set_item_labelsize,(fl_Menu_Button menu_button, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Menu_Button_image,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_set_image,(fl_Menu_Button menu_button, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Menu_Button_deimage,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_set_deimage,(fl_Menu_Button menu_button, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Menu_Button_tooltip,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_copy_tooltip,(fl_Menu_Button menu_button, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_set_tooltip,(fl_Menu_Button menu_button, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_set_callback_with_user_data,(fl_Menu_Button menu_button, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_set_callback,(fl_Menu_Button menu_button, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Menu_Button_other_data,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_set_other_data,(fl_Menu_Button menu_button, void* v));
+  FL_EXPORT_C_HEADER(void*,Fl_Menu_Button_user_data,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_set_user_data,(fl_Menu_Button menu_button, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Menu_Button_argument,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_set_argument,(fl_Menu_Button menu_button, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Menu_Button_when,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_set_when,(fl_Menu_Button menu_button, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Menu_Button_visible,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_visible_r,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_show,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_hide,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_set_visible,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_clear_visible,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Menu_Button_active,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_active_r,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_activate,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_deactivate,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Menu_Button_output,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_set_output,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_clear_output,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Menu_Button_takesevents,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_set_changed,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_clear_changed,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_take_focus,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_set_visible_focus,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_clear_visible_focus,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_modify_visible_focus,(fl_Menu_Button menu_button, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Menu_Button_visible_focus,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_contains,(fl_Menu_Button menu_button, fl_Group w));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_inside,(fl_Menu_Button menu_button, fl_Group w));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_redraw,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_redraw_label,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(uchar,Fl_Menu_Button_damage,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_clear_damage_with_bitmask,(fl_Menu_Button menu_button, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_clear_damage,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_damage_with_text,(fl_Menu_Button menu_button, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_damage_inside_group,(fl_Menu_Button menu_button, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_draw_label_with_xywh_alignment,(fl_Menu_Button menu_button, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_measure_label,(fl_Menu_Button menu_button, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Menu_Button_window,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Menu_Button_top_window,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Menu_Button_top_window_offset,(fl_Menu_Button menu_button, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Menu_Button_as_group,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Menu_Button_as_gl_window,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_resize,(fl_Menu_Button menu_button,int X, int Y, int W, int H));
 
   /* Fl_Menu_Button specific */
-  FL_EXPORT_C(fl_Menu_Button,    Fl_Menu_Button_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Menu_Button, Fl_Menu_Button_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Menu_Button_Destroy)(fl_Menu_Button menu_button);
+  FL_EXPORT_C_HEADER(fl_Menu_Button,Fl_Menu_Button_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Menu_Button,Fl_Menu_Button_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_Destroy,(fl_Menu_Button menu_button));
 
-  FL_EXPORT_C(int, Fl_Menu_Button_item_pathname_with_finditem)(fl_Menu_Button menu_button, char* name, int namelen,  fl_Menu_Item finditem);
-  FL_EXPORT_C(int, Fl_Menu_Button_item_pathname)(fl_Menu_Button menu_button, char* name, int namelen);
-  FL_EXPORT_C( fl_Menu_Item, Fl_Menu_Button_picked)(fl_Menu_Button menu_button,  const fl_Menu_Item item);
-  FL_EXPORT_C( fl_Menu_Item, Fl_Menu_Button_find_item_with_name)(fl_Menu_Button menu_button,  char* name);
-  //  FL_EXPORT_C( fl_Menu_Item, Fl_Menu_Button_find_item_with_cb)(fl_Menu_Button menu_button, fl_Callback cb); Don't know how to do this
-  FL_EXPORT_C(int, Fl_Menu_Button_find_index_with_name)(fl_Menu_Button menu_button,  char* name);
-  FL_EXPORT_C(int, Fl_Menu_Button_find_index_with_item)(fl_Menu_Button menu_button,  fl_Menu_Item item);
-  //  FL_EXPORT_C(int, Fl_Menu_Button_find_index_with_cb)(fl_Menu_Button menu_button, fl_Callback cb); Don't know how to do this
-  FL_EXPORT_C( fl_Menu_Item, Fl_Menu_Button_test_shortcut)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void, Fl_Menu_Button_global)(fl_Menu_Button menu_button);
-  FL_EXPORT_C( fl_Menu_Item, Fl_Menu_Button_menu)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void, Fl_Menu_Button_menu_with_m)(fl_Menu_Button menu_button,  fl_Menu_Item* items, int size);
-  FL_EXPORT_C(void, Fl_Menu_Button_copy)(fl_Menu_Button menu_button,  fl_Menu_Item m);
-  FL_EXPORT_C(void, Fl_Menu_Button_copy_with_user_data)(fl_Menu_Button menu_button,  fl_Menu_Item m, void* user_data);
-  FL_EXPORT_C(int, Fl_Menu_Button_insert)(fl_Menu_Button menu_button, int index,  char* name, int shortcut, fl_Callback cb);
-  FL_EXPORT_C(int, Fl_Menu_Button_insert_with_user_data)(fl_Menu_Button menu_button, int index,  char*, int shortcut, fl_Callback* cb, void* user_data);
-  FL_EXPORT_C(int, Fl_Menu_Button_insert_with_flags)(fl_Menu_Button menu_button, int index,  char* name, int shortcut, fl_Callback* cb, int flags);
-  FL_EXPORT_C(int, Fl_Menu_Button_insert_with_user_data_flags)(fl_Menu_Button menu_button, int index,  char* name, int shortcut, fl_Callback* cb, void* user_data, int flags);
-  FL_EXPORT_C(int, Fl_Menu_Button_insert_with_shortcutname)(fl_Menu_Button menu_button, int index,  char* name, char* shortcut);
-  FL_EXPORT_C(int, Fl_Menu_Button_insert_with_shortcutname_user_data)(fl_Menu_Button menu_button, int index,  char* name,   char* shortcut, fl_Callback* cb, void* user_data);
-  FL_EXPORT_C(int, Fl_Menu_Button_insert_with_shortcutname_flags)(fl_Menu_Button menu_button, int index,  char* name,   char* shortcut, fl_Callback* cb, int flags);
-  FL_EXPORT_C(int, Fl_Menu_Button_insert_with_shortcutname_user_data_flags)(fl_Menu_Button menu_button, int index,  char* name,   char* shortcut, fl_Callback* cb, void* user_data, int flags);
-  FL_EXPORT_C(int, Fl_Menu_Button_add)(fl_Menu_Button menu_button, char* name, int shortcut, fl_Callback);
-  FL_EXPORT_C(int, Fl_Menu_Button_add_with_user_data)(fl_Menu_Button menu_button, char* name, int shortcut, fl_Callback* cb, void* user_data);
-  FL_EXPORT_C(int, Fl_Menu_Button_add_with_flags)(fl_Menu_Button menu_button, char* name, int shortcut, fl_Callback* cb, int flags);
-  FL_EXPORT_C(int, Fl_Menu_Button_add_with_user_data_flags)(fl_Menu_Button menu_button, char* name, int shortcut, fl_Callback* cb, void* user_data, int flags);
-  FL_EXPORT_C(int, Fl_Menu_Button_add_with_shortcutname)(fl_Menu_Button menu_button, char* name,   char* shortcut, fl_Callback* cb);
-  FL_EXPORT_C(int, Fl_Menu_Button_add_with_shortcutname_user_data)(fl_Menu_Button menu_button, char* name,   char* shortcut, fl_Callback* cb, void* user_data);
-  FL_EXPORT_C(int, Fl_Menu_Button_add_with_shortcutname_flags)(fl_Menu_Button menu_button, char* name,   char* shortcut, fl_Callback* cb, int flags);
-  FL_EXPORT_C(int, Fl_Menu_Button_add_with_shortcutname_user_data_flags)(fl_Menu_Button menu_button, char* name,  char* shortcut, fl_Callback* cb, void* user_data, int flags);
-  FL_EXPORT_C(int, Fl_Menu_Button_add_with_name)(fl_Menu_Button menu_button,  char* name);
-  FL_EXPORT_C(int , Fl_Menu_Button_size)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void, Fl_Menu_Button_set_size)(fl_Menu_Button menu_button, int W, int H);
-  FL_EXPORT_C(void, Fl_Menu_Button_clear)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(int, Fl_Menu_Button_clear_submenu)(fl_Menu_Button menu_button, int index);
-  FL_EXPORT_C(void, Fl_Menu_Button_replace)(fl_Menu_Button menu_button, int, char* name);
-  FL_EXPORT_C(void, Fl_Menu_Button_remove)(fl_Menu_Button menu_button, int);
-  FL_EXPORT_C(void, Fl_Menu_Button_shortcut)(fl_Menu_Button menu_button, int i, int s);
-  FL_EXPORT_C(void, Fl_Menu_Button_set_mode)(fl_Menu_Button menu_button, int i,int fl);
-  FL_EXPORT_C(int , Fl_Menu_Button_mode)(fl_Menu_Button menu_button, int i);
-  FL_EXPORT_C(fl_Menu_Item, Fl_Menu_Button_mvalue)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(int, Fl_Menu_Button_value)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(int, Fl_Menu_Button_value_with_item)(fl_Menu_Button menu_button,  fl_Menu_Item item);
-  FL_EXPORT_C(int, Fl_Menu_Button_value_with_index)(fl_Menu_Button menu_button, int index);
-  FL_EXPORT_C(char*, Fl_Menu_Button_text)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(char*, Fl_Menu_Button_text_with_index)(fl_Menu_Button menu_button, int i);
-  FL_EXPORT_C(Fl_Font, Fl_Menu_Button_textfont)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void, Fl_Menu_Button_set_textfont)(fl_Menu_Button menu_button, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize, Fl_Menu_Button_textsize)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void, Fl_Menu_Button_set_textsize)(fl_Menu_Button menu_button, Fl_Fontsize c);
-  FL_EXPORT_C(Fl_Color, Fl_Menu_Button_textcolor)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void, Fl_Menu_Button_set_textcolor)(fl_Menu_Button menu_button, Fl_Color c);
-  FL_EXPORT_C(Fl_Boxtype, Fl_Menu_Button_down_box)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void, Fl_Menu_Button_set_down_box)(fl_Menu_Button menu_button, Fl_Boxtype b);
-  FL_EXPORT_C(Fl_Color, Fl_Menu_Button_down_color)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(void, Fl_Menu_Button_set_down_color)(fl_Menu_Button menu_button, unsigned c);
-  FL_EXPORT_C(fl_Menu_Item, Fl_Menu_Button_popup)(fl_Menu_Button menu_button);
-  FL_EXPORT_C(fl_Menu_Button,    Fl_OverriddenMenu_Button_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Menu_Button,    Fl_OverriddenMenu_Button_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Menu_Button_draw)(fl_Menu_Button o);
-  FL_EXPORT_C(void, Fl_Menu_Button_draw_super)(fl_Menu_Button o);
-  FL_EXPORT_C(int, Fl_Menu_Button_handle)(fl_Menu_Button o, int event);
-  FL_EXPORT_C(int, Fl_Menu_Button_handle_super)(fl_Menu_Button o, int event);
-  FL_EXPORT_C(void, Fl_Menu_Button_resize)(fl_Menu_Button o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Menu_Button_resize_super)(fl_Menu_Button o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Menu_Button_show)(fl_Menu_Button o);
-  FL_EXPORT_C(void, Fl_Menu_Button_show_super)(fl_Menu_Button o);
-  FL_EXPORT_C(void, Fl_Menu_Button_hide)(fl_Menu_Button o);
-  FL_EXPORT_C(void, Fl_Menu_Button_hide_super)(fl_Menu_Button o);
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_item_pathname_with_finditem,(fl_Menu_Button menu_button, char* name, int namelen,  fl_Menu_Item finditem));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_item_pathname,(fl_Menu_Button menu_button, char* name, int namelen));
+  FL_EXPORT_C_HEADER( fl_Menu_Item,Fl_Menu_Button_picked,(fl_Menu_Button menu_button,  const fl_Menu_Item item));
+  FL_EXPORT_C_HEADER( fl_Menu_Item,Fl_Menu_Button_find_item_with_name,(fl_Menu_Button menu_button,  char* name));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_find_index_with_name,(fl_Menu_Button menu_button,  char* name));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_find_index_with_item,(fl_Menu_Button menu_button,  fl_Menu_Item item));
+  FL_EXPORT_C_HEADER( fl_Menu_Item,Fl_Menu_Button_test_shortcut,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_global,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER( fl_Menu_Item,Fl_Menu_Button_menu,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_menu_with_m,(fl_Menu_Button menu_button,  fl_Menu_Item* items, int size));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_copy,(fl_Menu_Button menu_button,  fl_Menu_Item m));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_copy_with_user_data,(fl_Menu_Button menu_button,  fl_Menu_Item m, void* user_data));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_insert,(fl_Menu_Button menu_button, int index,  char* name, int shortcut, fl_Callback cb));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_insert_with_user_data,(fl_Menu_Button menu_button, int index,  char*, int shortcut, fl_Callback* cb, void* user_data));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_insert_with_flags,(fl_Menu_Button menu_button, int index,  char* name, int shortcut, fl_Callback* cb, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_insert_with_user_data_flags,(fl_Menu_Button menu_button, int index,  char* name, int shortcut, fl_Callback* cb, void* user_data, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_insert_with_shortcutname,(fl_Menu_Button menu_button, int index,  char* name, char* shortcut));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_insert_with_shortcutname_user_data,(fl_Menu_Button menu_button, int index,  char* name,   char* shortcut, fl_Callback* cb, void* user_data));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_insert_with_shortcutname_flags,(fl_Menu_Button menu_button, int index,  char* name,   char* shortcut, fl_Callback* cb, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_insert_with_shortcutname_user_data_flags,(fl_Menu_Button menu_button, int index,  char* name,   char* shortcut, fl_Callback* cb, void* user_data, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_add,(fl_Menu_Button menu_button, char* name, int shortcut, fl_Callback));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_add_with_user_data,(fl_Menu_Button menu_button, char* name, int shortcut, fl_Callback* cb, void* user_data));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_add_with_flags,(fl_Menu_Button menu_button, char* name, int shortcut, fl_Callback* cb, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_add_with_user_data_flags,(fl_Menu_Button menu_button, char* name, int shortcut, fl_Callback* cb, void* user_data, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_add_with_shortcutname,(fl_Menu_Button menu_button, char* name,   char* shortcut, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_add_with_shortcutname_user_data,(fl_Menu_Button menu_button, char* name,   char* shortcut, fl_Callback* cb, void* user_data));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_add_with_shortcutname_flags,(fl_Menu_Button menu_button, char* name,   char* shortcut, fl_Callback* cb, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_add_with_shortcutname_user_data_flags,(fl_Menu_Button menu_button, char* name,  char* shortcut, fl_Callback* cb, void* user_data, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_add_with_name,(fl_Menu_Button menu_button,  char* name));
+  FL_EXPORT_C_HEADER(int ,Fl_Menu_Button_size,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_set_size,(fl_Menu_Button menu_button, int W, int H));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_clear,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_clear_submenu,(fl_Menu_Button menu_button, int index));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_replace,(fl_Menu_Button menu_button, int, char* name));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_remove,(fl_Menu_Button menu_button, int));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_shortcut,(fl_Menu_Button menu_button, int i, int s));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_set_mode,(fl_Menu_Button menu_button, int i,int fl));
+  FL_EXPORT_C_HEADER(int ,Fl_Menu_Button_mode,(fl_Menu_Button menu_button, int i));
+  FL_EXPORT_C_HEADER(fl_Menu_Item,Fl_Menu_Button_mvalue,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_value,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_value_with_item,(fl_Menu_Button menu_button,  fl_Menu_Item item));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_value_with_index,(fl_Menu_Button menu_button, int index));
+  FL_EXPORT_C_HEADER(char*,Fl_Menu_Button_text,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(char*,Fl_Menu_Button_text_with_index,(fl_Menu_Button menu_button, int i));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Menu_Button_textfont,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_set_textfont,(fl_Menu_Button menu_button, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Menu_Button_textsize,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_set_textsize,(fl_Menu_Button menu_button, Fl_Fontsize c));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Menu_Button_textcolor,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_set_textcolor,(fl_Menu_Button menu_button, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Menu_Button_down_box,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_set_down_box,(fl_Menu_Button menu_button, Fl_Boxtype b));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Menu_Button_down_color,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_set_down_color,(fl_Menu_Button menu_button, unsigned c));
+  FL_EXPORT_C_HEADER(fl_Menu_Item,Fl_Menu_Button_popup,(fl_Menu_Button menu_button));
+  FL_EXPORT_C_HEADER(fl_Menu_Button,Fl_OverriddenMenu_Button_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Menu_Button,Fl_OverriddenMenu_Button_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_draw,(fl_Menu_Button o));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_draw_super,(fl_Menu_Button o));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_handle,(fl_Menu_Button o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Button_handle_super,(fl_Menu_Button o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_resize,(fl_Menu_Button o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_resize_super,(fl_Menu_Button o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_show,(fl_Menu_Button o));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_show_super,(fl_Menu_Button o));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_hide,(fl_Menu_Button o));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Button_hide_super,(fl_Menu_Button o));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Menu_C.h b/c-src/Fl_Menu_C.h
--- a/c-src/Fl_Menu_C.h
+++ b/c-src/Fl_Menu_C.h
@@ -40,175 +40,175 @@
   };
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,          Fl_Menu__handle_super)(fl_Group self, int event);
-  FL_EXPORT_C(int,          Fl_Menu__handle)(fl_Group self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Menu__parent)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__set_parent)(fl_Menu_ menu_, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Menu__type)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__set_type)(fl_Menu_ menu_, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Menu__handle_super,(fl_Group self, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Menu__handle,(fl_Group self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Menu__parent,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_parent,(fl_Menu_ menu_, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Menu__type,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_type,(fl_Menu_ menu_, uchar t));
 
-  FL_EXPORT_C(void, Fl_Menu__draw_box)(fl_Menu_ Menu_);
-  FL_EXPORT_C(void, Fl_Menu__draw_box_with_tc)(fl_Menu_ Menu_,Fl_Boxtype t, Fl_Color c);
-  FL_EXPORT_C(void, Fl_Menu__draw_box_with_txywhc)(fl_Menu_ Menu_,Fl_Boxtype t, int x,int y,int w,int h, Fl_Color c);
-  FL_EXPORT_C(void, Fl_Menu__draw_backdrop)(fl_Menu_ Menu_);
-  FL_EXPORT_C(void, Fl_Menu__draw_focus)(fl_Menu_ Menu_);
-  FL_EXPORT_C(void, Fl_Menu__draw_focus_with_txywh)(fl_Menu_ Menu_,Fl_Boxtype t, int x,int y,int w,int h);
-  FL_EXPORT_C(void, Fl_Menu__draw_label)(fl_Menu_ Menu_);
-  FL_EXPORT_C(int,          Fl_Menu__x)(fl_Menu_ menu_);
-  FL_EXPORT_C(int,          Fl_Menu__y)(fl_Menu_ menu_);
-  FL_EXPORT_C(int,          Fl_Menu__w)(fl_Menu_ menu_);
-  FL_EXPORT_C(int,          Fl_Menu__h)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__set_align)(fl_Menu_ menu_, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Menu__align)(fl_Menu_ menu_);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Menu__box)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__set_box)(fl_Menu_ menu_, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Menu__color)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__set_color)(fl_Menu_ menu_, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Menu__set_color_with_bg_sel)(fl_Menu_ menu_,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Menu__selection_color)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__set_selection_color)(fl_Menu_ menu_, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Menu__label)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__copy_label)(fl_Menu_ menu_, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Menu__set_label)(fl_Menu_ menu_, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Menu__labeltype)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__set_labeltype)(fl_Menu_ menu_, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Menu__labelcolor)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__set_labelcolor)(fl_Menu_ menu_, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Menu__item_labelfont)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__set_item_labelfont)(fl_Menu_ menu_, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Menu__item_labelsize)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__set_item_labelsize)(fl_Menu_ menu_, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Menu__image)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__set_image)(fl_Menu_ menu_, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Menu__deimage)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__set_deimage)(fl_Menu_ menu_, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Menu__tooltip)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__copy_tooltip)(fl_Menu_ menu_, const char* text);
-  FL_EXPORT_C(void,         Fl_Menu__set_tooltip)(fl_Menu_ menu_, const char* text);
-  FL_EXPORT_C(void,         Fl_Menu__set_callback_with_user_data)(fl_Menu_ menu_, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Menu__set_callback)(fl_Menu_ menu_, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Menu__other_data)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__set_other_data)(fl_Menu_ menu_, void* v);
-  FL_EXPORT_C(void*,        Fl_Menu__user_data)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__set_user_data)(fl_Menu_ menu_, void* v);
-  FL_EXPORT_C(long,         Fl_Menu__argument)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__set_argument)(fl_Menu_ menu_, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Menu__when)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__set_when)(fl_Menu_ menu_, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Menu__visible)(fl_Menu_ menu_);
-  FL_EXPORT_C(int,          Fl_Menu__visible_r)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__show_super)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__show)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__hide_super)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__hide)(fl_Menu_ menu_);
-  FL_EXPORT_C(fl_Window,    Fl_Menu__as_window_super)(fl_Menu_ menu_);
-  FL_EXPORT_C(fl_Window,    Fl_Menu__as_window )(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__set_visible)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__clear_visible)(fl_Menu_ menu_);
-  FL_EXPORT_C(unsigned int, Fl_Menu__active)(fl_Menu_ menu_);
-  FL_EXPORT_C(int,          Fl_Menu__active_r)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__activate)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__deactivate)(fl_Menu_ menu_);
-  FL_EXPORT_C(unsigned int, Fl_Menu__output)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__set_output)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__clear_output)(fl_Menu_ menu_);
-  FL_EXPORT_C(unsigned int, Fl_Menu__takesevents)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__set_changed)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__clear_changed)(fl_Menu_ menu_);
-  FL_EXPORT_C(int,          Fl_Menu__take_focus)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__set_visible_focus)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__clear_visible_focus)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__modify_visible_focus)(fl_Menu_ menu_, int v);
-  FL_EXPORT_C(unsigned int, Fl_Menu__visible_focus)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu_do_callback)(fl_Menu menu);
-  FL_EXPORT_C(void,         Fl_Menu_do_callback_with_widget_and_user_data)(fl_Menu menu, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Menu_do_callback_with_widget_and_default_user_data)(fl_Menu menu, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Menu__contains)(fl_Menu_ menu_, fl_Group w);
-  FL_EXPORT_C(int,          Fl_Menu__inside)(fl_Menu_ menu_, fl_Group w);
-  FL_EXPORT_C(void,         Fl_Menu__redraw)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__redraw_label)(fl_Menu_ menu_);
-  FL_EXPORT_C(uchar,        Fl_Menu__damage)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__clear_damage_with_bitmask)(fl_Menu_ menu_, uchar c);
-  FL_EXPORT_C(void,         Fl_Menu__clear_damage)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__damage_with_text)(fl_Menu_ menu_, uchar c);
-  FL_EXPORT_C(void,         Fl_Menu__damage_inside_group)(fl_Menu_ menu_, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Menu__draw_label_with_xywh_alignment)(fl_Menu_ menu_, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Menu__measure_label)(fl_Menu_ menu_, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Menu__window)(fl_Menu_ menu_);
-  FL_EXPORT_C(fl_Window,    Fl_Menu__top_window)(fl_Menu_ menu_);
-  FL_EXPORT_C(fl_Window ,   Fl_Menu__top_window_offset)(fl_Menu_ menu_, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Menu__as_group_super)(fl_Menu_ menu_);
-  FL_EXPORT_C(fl_Group,     Fl_Menu__as_group)(fl_Menu_ menu_);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Menu__as_gl_window_super)(fl_Menu_ menu_);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Menu__as_gl_window)(fl_Menu_ menu_);
-  FL_EXPORT_C(void,         Fl_Menu__resize_super)(fl_Menu_ menu_,int X, int Y, int W, int H);
-  FL_EXPORT_C(void,         Fl_Menu__resize)(fl_Menu_ menu_,int X, int Y, int W, int H);
+  FL_EXPORT_C_HEADER(void,Fl_Menu__draw_box,(fl_Menu_ Menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__draw_box_with_tc,(fl_Menu_ Menu_,Fl_Boxtype t, Fl_Color c));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__draw_box_with_txywhc,(fl_Menu_ Menu_,Fl_Boxtype t, int x,int y,int w,int h, Fl_Color c));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__draw_backdrop,(fl_Menu_ Menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__draw_focus,(fl_Menu_ Menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__draw_focus_with_txywh,(fl_Menu_ Menu_,Fl_Boxtype t, int x,int y,int w,int h));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__draw_label,(fl_Menu_ Menu_));
+  FL_EXPORT_C_HEADER(int,Fl_Menu__x,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(int,Fl_Menu__y,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(int,Fl_Menu__w,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(int,Fl_Menu__h,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_align,(fl_Menu_ menu_, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Menu__align,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Menu__box,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_box,(fl_Menu_ menu_, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Menu__color,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_color,(fl_Menu_ menu_, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_color_with_bg_sel,(fl_Menu_ menu_,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Menu__selection_color,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_selection_color,(fl_Menu_ menu_, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Menu__label,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__copy_label,(fl_Menu_ menu_, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_label,(fl_Menu_ menu_, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Menu__labeltype,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_labeltype,(fl_Menu_ menu_, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Menu__labelcolor,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_labelcolor,(fl_Menu_ menu_, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Menu__item_labelfont,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_item_labelfont,(fl_Menu_ menu_, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Menu__item_labelsize,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_item_labelsize,(fl_Menu_ menu_, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Menu__image,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_image,(fl_Menu_ menu_, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Menu__deimage,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_deimage,(fl_Menu_ menu_, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Menu__tooltip,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__copy_tooltip,(fl_Menu_ menu_, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_tooltip,(fl_Menu_ menu_, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_callback_with_user_data,(fl_Menu_ menu_, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_callback,(fl_Menu_ menu_, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Menu__other_data,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_other_data,(fl_Menu_ menu_, void* v));
+  FL_EXPORT_C_HEADER(void*,Fl_Menu__user_data,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_user_data,(fl_Menu_ menu_, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Menu__argument,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_argument,(fl_Menu_ menu_, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Menu__when,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_when,(fl_Menu_ menu_, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Menu__visible,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(int,Fl_Menu__visible_r,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__show_super,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__show,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__hide_super,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__hide,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Menu__as_window_super,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Menu__as_window ,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_visible,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__clear_visible,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Menu__active,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(int,Fl_Menu__active_r,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__activate,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__deactivate,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Menu__output,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_output,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__clear_output,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Menu__takesevents,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_changed,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__clear_changed,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(int,Fl_Menu__take_focus,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_visible_focus,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__clear_visible_focus,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__modify_visible_focus,(fl_Menu_ menu_, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Menu__visible_focus,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_do_callback,(fl_Menu menu));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_do_callback_with_widget_and_user_data,(fl_Menu menu, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_do_callback_with_widget_and_default_user_data,(fl_Menu menu, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Menu__contains,(fl_Menu_ menu_, fl_Group w));
+  FL_EXPORT_C_HEADER(int,Fl_Menu__inside,(fl_Menu_ menu_, fl_Group w));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__redraw,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__redraw_label,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(uchar,Fl_Menu__damage,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__clear_damage_with_bitmask,(fl_Menu_ menu_, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__clear_damage,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__damage_with_text,(fl_Menu_ menu_, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__damage_inside_group,(fl_Menu_ menu_, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__draw_label_with_xywh_alignment,(fl_Menu_ menu_, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__measure_label,(fl_Menu_ menu_, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Menu__window,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Menu__top_window,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Menu__top_window_offset,(fl_Menu_ menu_, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Menu__as_group_super,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Menu__as_group,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Menu__as_gl_window_super,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Menu__as_gl_window,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__resize_super,(fl_Menu_ menu_,int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__resize,(fl_Menu_ menu_,int X, int Y, int W, int H));
 
   /* Fl_Menu_ specific */
-  FL_EXPORT_C(void*, Fl_Menu__other_data)(fl_Menu_ menu_);
-  FL_EXPORT_C(void, Fl_Menu__set_other_data)(fl_Menu_ menu_, void* v);
-  FL_EXPORT_C(fl_Menu_,    Fl_Menu__New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Menu_, Fl_OverriddenMenu__New_WithLabel)(int x, int y, int w, int h, const char* label, fl_Menu__Virtual_Funcs* funcs);
-  FL_EXPORT_C(fl_Menu_   , Fl_Menu__New)(int x, int y, int w, int h);
-  FL_EXPORT_C(fl_Menu_   , Fl_OverriddenMenu__New)(int x, int y, int w, int h, fl_Menu__Virtual_Funcs* funcs);
-  FL_EXPORT_C(void   , Fl_Menu__Destroy)(fl_Menu_ menu_);
-  FL_EXPORT_C(int, Fl_Menu__item_pathname_with_finditem)(fl_Menu_ menu_, char* name, int namelen,  fl_Menu_Item finditem);
-  FL_EXPORT_C(int, Fl_Menu__item_pathname)(fl_Menu_ menu_, char* name, int namelen);
-  FL_EXPORT_C( fl_Menu_Item, Fl_Menu__picked)(fl_Menu_ menu_,  const fl_Menu_Item item);
-  FL_EXPORT_C( fl_Menu_Item, Fl_Menu__find_item_with_name)(fl_Menu_ menu_,  char* name);
+  FL_EXPORT_C_HEADER(void*,Fl_Menu__other_data,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_other_data,(fl_Menu_ menu_, void* v));
+  FL_EXPORT_C_HEADER(fl_Menu_,Fl_Menu__New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Menu_,Fl_OverriddenMenu__New_WithLabel,(int x, int y, int w, int h, const char* label, fl_Menu__Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(fl_Menu_   ,Fl_Menu__New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(fl_Menu_   ,Fl_OverriddenMenu__New,(int x, int y, int w, int h, fl_Menu__Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(void   ,Fl_Menu__Destroy,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(int,Fl_Menu__item_pathname_with_finditem,(fl_Menu_ menu_, char* name, int namelen,  fl_Menu_Item finditem));
+  FL_EXPORT_C_HEADER(int,Fl_Menu__item_pathname,(fl_Menu_ menu_, char* name, int namelen));
+  FL_EXPORT_C_HEADER( fl_Menu_Item,Fl_Menu__picked,(fl_Menu_ menu_,  const fl_Menu_Item item));
+  FL_EXPORT_C_HEADER( fl_Menu_Item,Fl_Menu__find_item_with_name,(fl_Menu_ menu_,  char* name));
   //  FL_EXPORT_C( fl_Menu_Item, Fl_Menu__find_item_with_cb)(fl_Menu_ menu_, fl_Callback cb); Don't know how to do this
-  FL_EXPORT_C(int, Fl_Menu__find_index_with_name)(fl_Menu_ menu_,  char* name);
-  FL_EXPORT_C(int, Fl_Menu__find_index_with_item)(fl_Menu_ menu_,  fl_Menu_Item item);
+  FL_EXPORT_C_HEADER(int,Fl_Menu__find_index_with_name,(fl_Menu_ menu_,  char* name));
+  FL_EXPORT_C_HEADER(int,Fl_Menu__find_index_with_item,(fl_Menu_ menu_,  fl_Menu_Item item));
   //  FL_EXPORT_C(int, Fl_Menu__find_index_with_cb)(fl_Menu_ menu_, fl_Callback cb); Don't know how to do this
-  FL_EXPORT_C( fl_Menu_Item, Fl_Menu__test_shortcut)(fl_Menu_ menu_);
-  FL_EXPORT_C(void, Fl_Menu__global)(fl_Menu_ menu_);
-  FL_EXPORT_C(fl_Menu_Item, Fl_Menu__menu)(fl_Menu_ menu_);
-  FL_EXPORT_C(void, Fl_Menu__menu_with_m)(fl_Menu_ menu_,  fl_Menu_Item* item, int size);
-  FL_EXPORT_C(void, Fl_Menu__copy)(fl_Menu_ menu_,  fl_Menu_Item m);
-  FL_EXPORT_C(void, Fl_Menu__copy_with_user_data)(fl_Menu_ menu_,  fl_Menu_Item m, void* user_data);
-  FL_EXPORT_C(int, Fl_Menu__insert)(fl_Menu_ menu_, int index,  char* name, int shortcut, fl_Callback cb);
-  FL_EXPORT_C(int, Fl_Menu__insert_with_user_data)(fl_Menu_ menu_, int index,  char*, int shortcut, fl_Callback* cb, void* user_data);
-  FL_EXPORT_C(int, Fl_Menu__insert_with_flags)(fl_Menu_ menu_, int index,  char* name, int shortcut, fl_Callback* cb, int flags);
-  FL_EXPORT_C(int, Fl_Menu__insert_with_user_data_flags)(fl_Menu_ menu_, int index,  char* name, int shortcut, fl_Callback* cb, void* user_data, int flags);
-  FL_EXPORT_C(int, Fl_Menu__insert_with_shortcutname)(fl_Menu_ menu_, int index,  char* name, char* shortcut, fl_Callback* cb);
-  FL_EXPORT_C(int, Fl_Menu__insert_with_shortcutname_flags)(fl_Menu_ menu_, int index,  char* name,   char* shortcut, fl_Callback* cb, int flags);
-  FL_EXPORT_C(int, Fl_Menu__add)(fl_Menu_ menu_, char* name, int shortcut, fl_Callback);
-  FL_EXPORT_C(int, Fl_Menu__add_with_user_data)(fl_Menu_ menu_, char* name, int shortcut, fl_Callback* cb, void* user_data);
-  FL_EXPORT_C(int, Fl_Menu__add_with_flags)(fl_Menu_ menu_, char* name, int shortcut, fl_Callback* cb, int flags);
-  FL_EXPORT_C(int, Fl_Menu__add_with_user_data_flags)(fl_Menu_ menu_, char* name, int shortcut, fl_Callback* cb, void* user_data, int flags);
-  FL_EXPORT_C(int, Fl_Menu__add_with_shortcutname)(fl_Menu_ menu_, char* name,   char* shortcut, fl_Callback* cb);
-  FL_EXPORT_C(int, Fl_Menu__add_with_shortcutname_user_data)(fl_Menu_ menu_, char* name,   char* shortcut, fl_Callback* cb, void* user_data);
-  FL_EXPORT_C(int, Fl_Menu__add_with_shortcutname_flags)(fl_Menu_ menu_, char* name,   char* shortcut, fl_Callback* cb, int flags);
-  FL_EXPORT_C(int, Fl_Menu__add_with_shortcutname_user_data_flags)(fl_Menu_ menu_, char* name,  char* shortcut, fl_Callback* cb, void* user_data, int flags);
-  FL_EXPORT_C(int, Fl_Menu__add_with_name)(fl_Menu_ menu_,  char* name);
-  FL_EXPORT_C(int , Fl_Menu__size)(fl_Menu_ menu_);
-  FL_EXPORT_C(void, Fl_Menu__set_size)(fl_Menu_ menu_, int W, int H);
-  FL_EXPORT_C(void, Fl_Menu__clear)(fl_Menu_ menu_);
-  FL_EXPORT_C(int, Fl_Menu__clear_submenu)(fl_Menu_ menu_, int index);
-  FL_EXPORT_C(void, Fl_Menu__replace)(fl_Menu_ menu_, int, char* name);
-  FL_EXPORT_C(void, Fl_Menu__remove)(fl_Menu_ menu_, int);
-  FL_EXPORT_C(void, Fl_Menu__shortcut)(fl_Menu_ menu_, int i, int s);
-  FL_EXPORT_C(void, Fl_Menu__set_mode)(fl_Menu_ menu_, int i,int fl);
-  FL_EXPORT_C(int , Fl_Menu__mode)(fl_Menu_ menu_, int i);
-  FL_EXPORT_C(fl_Menu_Item, Fl_Menu__mvalue)(fl_Menu_ menu_);
-  FL_EXPORT_C(int, Fl_Menu__value)(fl_Menu_ menu_);
-  FL_EXPORT_C(int, Fl_Menu__value_with_item)(fl_Menu_ menu_,  fl_Menu_Item item);
-  FL_EXPORT_C(fl_Menu_Item, Fl_Menu__get_menu_item_by_index)(fl_Menu_ menu_,  int i);
-  FL_EXPORT_C(int, Fl_Menu__value_with_index)(fl_Menu_ menu_, int index);
-  FL_EXPORT_C(char*, Fl_Menu__text)(fl_Menu_ menu_);
-  FL_EXPORT_C(char*, Fl_Menu__text_with_index)(fl_Menu_ menu_, int i);
-  FL_EXPORT_C(Fl_Font, Fl_Menu__textfont)(fl_Menu_ menu_);
-  FL_EXPORT_C(void, Fl_Menu__set_textfont)(fl_Menu_ menu_, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize, Fl_Menu__textsize)(fl_Menu_ menu_);
-  FL_EXPORT_C(void, Fl_Menu__set_textsize)(fl_Menu_ menu_, Fl_Fontsize c);
-  FL_EXPORT_C(Fl_Color, Fl_Menu__textcolor)(fl_Menu_ menu_);
-  FL_EXPORT_C(void, Fl_Menu__set_textcolor)(fl_Menu_ menu_, Fl_Color c);
-  FL_EXPORT_C(Fl_Boxtype, Fl_Menu__down_box)(fl_Menu_ menu_);
-  FL_EXPORT_C(void, Fl_Menu__set_down_box)(fl_Menu_ menu_, Fl_Boxtype b);
-  FL_EXPORT_C(Fl_Color, Fl_Menu__down_color)(fl_Menu_ menu_);
-  FL_EXPORT_C(void, Fl_Menu__set_down_color)(fl_Menu_ menu_, unsigned c);
+  FL_EXPORT_C_HEADER( fl_Menu_Item,Fl_Menu__test_shortcut,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__global,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(fl_Menu_Item,Fl_Menu__menu,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__menu_with_m,(fl_Menu_ menu_,  fl_Menu_Item* item, int size));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__copy,(fl_Menu_ menu_,  fl_Menu_Item m));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__copy_with_user_data,(fl_Menu_ menu_,  fl_Menu_Item m, void* user_data));
+  FL_EXPORT_C_HEADER(int,Fl_Menu__insert,(fl_Menu_ menu_, int index,  char* name, int shortcut, fl_Callback cb));
+  FL_EXPORT_C_HEADER(int,Fl_Menu__insert_with_user_data,(fl_Menu_ menu_, int index,  char*, int shortcut, fl_Callback* cb, void* user_data));
+  FL_EXPORT_C_HEADER(int,Fl_Menu__insert_with_flags,(fl_Menu_ menu_, int index,  char* name, int shortcut, fl_Callback* cb, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Menu__insert_with_user_data_flags,(fl_Menu_ menu_, int index,  char* name, int shortcut, fl_Callback* cb, void* user_data, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Menu__insert_with_shortcutname,(fl_Menu_ menu_, int index,  char* name, char* shortcut, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(int,Fl_Menu__insert_with_shortcutname_flags,(fl_Menu_ menu_, int index,  char* name,   char* shortcut, fl_Callback* cb, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Menu__add,(fl_Menu_ menu_, char* name, int shortcut, fl_Callback));
+  FL_EXPORT_C_HEADER(int,Fl_Menu__add_with_user_data,(fl_Menu_ menu_, char* name, int shortcut, fl_Callback* cb, void* user_data));
+  FL_EXPORT_C_HEADER(int,Fl_Menu__add_with_flags,(fl_Menu_ menu_, char* name, int shortcut, fl_Callback* cb, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Menu__add_with_user_data_flags,(fl_Menu_ menu_, char* name, int shortcut, fl_Callback* cb, void* user_data, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Menu__add_with_shortcutname,(fl_Menu_ menu_, char* name,   char* shortcut, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(int,Fl_Menu__add_with_shortcutname_user_data,(fl_Menu_ menu_, char* name,   char* shortcut, fl_Callback* cb, void* user_data));
+  FL_EXPORT_C_HEADER(int,Fl_Menu__add_with_shortcutname_flags,(fl_Menu_ menu_, char* name,   char* shortcut, fl_Callback* cb, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Menu__add_with_shortcutname_user_data_flags,(fl_Menu_ menu_, char* name,  char* shortcut, fl_Callback* cb, void* user_data, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Menu__add_with_name,(fl_Menu_ menu_,  char* name));
+  FL_EXPORT_C_HEADER(int ,Fl_Menu__size,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_size,(fl_Menu_ menu_, int W, int H));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__clear,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(int,Fl_Menu__clear_submenu,(fl_Menu_ menu_, int index));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__replace,(fl_Menu_ menu_, int, char* name));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__remove,(fl_Menu_ menu_, int));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__shortcut,(fl_Menu_ menu_, int i, int s));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_mode,(fl_Menu_ menu_, int i,int fl));
+  FL_EXPORT_C_HEADER(int ,Fl_Menu__mode,(fl_Menu_ menu_, int i));
+  FL_EXPORT_C_HEADER(fl_Menu_Item,Fl_Menu__mvalue,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(int,Fl_Menu__value,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(int,Fl_Menu__value_with_item,(fl_Menu_ menu_,  fl_Menu_Item item));
+  FL_EXPORT_C_HEADER(fl_Menu_Item,Fl_Menu__get_menu_item_by_index,(fl_Menu_ menu_,  int i));
+  FL_EXPORT_C_HEADER(int,Fl_Menu__value_with_index,(fl_Menu_ menu_, int index));
+  FL_EXPORT_C_HEADER(char*,Fl_Menu__text,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(char*,Fl_Menu__text_with_index,(fl_Menu_ menu_, int i));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Menu__textfont,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_textfont,(fl_Menu_ menu_, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Menu__textsize,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_textsize,(fl_Menu_ menu_, Fl_Fontsize c));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Menu__textcolor,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_textcolor,(fl_Menu_ menu_, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Menu__down_box,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_down_box,(fl_Menu_ menu_, Fl_Boxtype b));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Menu__down_color,(fl_Menu_ menu_));
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_down_color,(fl_Menu_ menu_, unsigned c));
 #if FL_API_VERSION >= 10304
-  FL_EXPORT_C(void, Fl_Menu__set_only)(fl_Menu_ menu_, fl_Menu_Item m);
+  FL_EXPORT_C_HEADER(void,Fl_Menu__set_only,(fl_Menu_ menu_, fl_Menu_Item m));
 #endif
 #ifdef __cplusplus
 }
diff --git a/c-src/Fl_Menu_ItemC.h b/c-src/Fl_Menu_ItemC.h
--- a/c-src/Fl_Menu_ItemC.h
+++ b/c-src/Fl_Menu_ItemC.h
@@ -9,78 +9,78 @@
 #include "Fl_CallbackC.h"
 EXPORT {
 #endif
-  FL_EXPORT_C(fl_Menu_Item, Fl_Menu_Item_next_with_step)(fl_Menu_Item menu_item, int step);
-  FL_EXPORT_C(fl_Menu_Item, Fl_Menu_Item_next)(fl_Menu_Item menu_item);
-  FL_EXPORT_C(fl_Menu_Item, Fl_Menu_Item_first)(fl_Menu_Item menu_item);
-  FL_EXPORT_C(const char*, Fl_Menu_Item_label)(fl_Menu_Item menu_item);
-  FL_EXPORT_C(void, Fl_Menu_Item_set_label)(fl_Menu_Item menu_item, const char* a);
-  FL_EXPORT_C(void, Fl_Menu_Item_set_label_with_labeltype)(fl_Menu_Item menu_item, Fl_Labeltype labeltype,const char* b);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Menu_Item_labeltype)(fl_Menu_Item menu_item);
-  FL_EXPORT_C(void, Fl_Menu_Item_set_labeltype)(fl_Menu_Item menu_item, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color, Fl_Menu_Item_labelcolor)(fl_Menu_Item menu_item);
-  FL_EXPORT_C(void, Fl_Menu_Item_set_labelcolor)(fl_Menu_Item menu_item, Fl_Color a);
-  FL_EXPORT_C(Fl_Font, Fl_Menu_Item_labelfont)(fl_Menu_Item menu_item);
-  FL_EXPORT_C(void, Fl_Menu_Item_set_labelfont)(fl_Menu_Item menu_item, Fl_Font a);
-  FL_EXPORT_C(Fl_Fontsize, Fl_Menu_Item_labelsize)(fl_Menu_Item menu_item);
-  FL_EXPORT_C(void, Fl_Menu_Item_set_labelsize)(fl_Menu_Item menu_item, Fl_Fontsize a);
+  FL_EXPORT_C_HEADER(fl_Menu_Item,Fl_Menu_Item_next_with_step,(fl_Menu_Item menu_item, int step));
+  FL_EXPORT_C_HEADER(fl_Menu_Item,Fl_Menu_Item_next,(fl_Menu_Item menu_item));
+  FL_EXPORT_C_HEADER(fl_Menu_Item,Fl_Menu_Item_first,(fl_Menu_Item menu_item));
+  FL_EXPORT_C_HEADER(const char*,Fl_Menu_Item_label,(fl_Menu_Item menu_item));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Item_set_label,(fl_Menu_Item menu_item, const char* a));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Item_set_label_with_labeltype,(fl_Menu_Item menu_item, Fl_Labeltype labeltype,const char* b));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Menu_Item_labeltype,(fl_Menu_Item menu_item));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Item_set_labeltype,(fl_Menu_Item menu_item, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Menu_Item_labelcolor,(fl_Menu_Item menu_item));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Item_set_labelcolor,(fl_Menu_Item menu_item, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Menu_Item_labelfont,(fl_Menu_Item menu_item));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Item_set_labelfont,(fl_Menu_Item menu_item, Fl_Font a));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Menu_Item_labelsize,(fl_Menu_Item menu_item));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Item_set_labelsize,(fl_Menu_Item menu_item, Fl_Fontsize a));
   //  fl_Callback* callback(); commented until I figure out how to do this
-  FL_EXPORT_C(void, Fl_Menu_Item_set_callback_with_user_data)(fl_Menu_Item menu_item, fl_Callback* c, void* user_data);
-  FL_EXPORT_C(void, Fl_Menu_Item_set_callback)(fl_Menu_Item menu_item, fl_Callback* c);
-  FL_EXPORT_C(int,  Fl_Menu_Item_has_callback)(fl_Menu_Item menu_item);
-  FL_EXPORT_C(void*, Fl_Menu_Item_user_data)(fl_Menu_Item menu_item);
-  FL_EXPORT_C(void, Fl_Menu_Item_set_user_data)(fl_Menu_Item menu_item, void* v);
-  FL_EXPORT_C(long, Fl_Menu_Item_argument)(fl_Menu_Item menu_item);
-  FL_EXPORT_C(void, Fl_Menu_Item_set_argument)(fl_Menu_Item menu_item, long v);
-  FL_EXPORT_C(int, Fl_Menu_Item_shortcut)(fl_Menu_Item menu_item);
-  FL_EXPORT_C(void, Fl_Menu_Item_set_shortcut)(fl_Menu_Item menu_item, int s);
-  FL_EXPORT_C(int, Fl_Menu_Item_submenu)(fl_Menu_Item menu_item);
-  FL_EXPORT_C(int, Fl_Menu_Item_checkbox)(fl_Menu_Item menu_item);
-  FL_EXPORT_C(int, Fl_Menu_Item_radio)(fl_Menu_Item menu_item);
-  FL_EXPORT_C(int, Fl_Menu_Item_value)(fl_Menu_Item menu_item);
-  FL_EXPORT_C(void, Fl_Menu_Item_set)(fl_Menu_Item menu_item);
-  FL_EXPORT_C(void, Fl_Menu_Item_clear)(fl_Menu_Item menu_item);
-  FL_EXPORT_C(void, Fl_Menu_Item_setonly)(fl_Menu_Item menu_item);
-  FL_EXPORT_C(int, Fl_Menu_Item_visible)(fl_Menu_Item menu_item);
-  FL_EXPORT_C(void, Fl_Menu_Item_show)(fl_Menu_Item menu_item);
-  FL_EXPORT_C(void, Fl_Menu_Item_hide)(fl_Menu_Item menu_item);
-  FL_EXPORT_C(int, Fl_Menu_Item_active)(fl_Menu_Item menu_item);
-  FL_EXPORT_C(void, Fl_Menu_Item_activate)(fl_Menu_Item menu_item);
-  FL_EXPORT_C(void, Fl_Menu_Item_deactivate)(fl_Menu_Item menu_item);
-  FL_EXPORT_C(int, Fl_Menu_Item_activevisible)(fl_Menu_Item menu_item);
-  FL_EXPORT_C(void, Fl_Menu_Item_image)(fl_Menu_Item menu_item, fl_Image a);
-  FL_EXPORT_C(int, Fl_Menu_Item_measure)(fl_Menu_Item menu_item, int* h, fl_Menu_ menu);
-  FL_EXPORT_C(void, Fl_Menu_Item_draw_with_t)(fl_Menu_Item menu_item, int x, int y, int w, int h, fl_Menu_, int t);
-  FL_EXPORT_C(void, Fl_Menu_Item_draw)(fl_Menu_Item menu_item, int x, int y, int w, int h, fl_Menu_ menu);
-  FL_EXPORT_C(int, Fl_Menu_Item_flags)(fl_Menu_Item menu_item);
-  FL_EXPORT_C(void, Fl_Menu_Item_set_flags)(fl_Menu_Item menu_item,int flags);
-  FL_EXPORT_C(char*, Fl_Menu_Item_text)(fl_Menu_Item menu_item);
-  FL_EXPORT_C(fl_Menu_Item, Fl_Menu_Item_popup)(fl_Menu_Item menu_item, int X, int Y);
-  FL_EXPORT_C(fl_Menu_Item, Fl_Menu_Item_pulldown)(fl_Menu_Item menu_item, int X, int Y, int W, int H);
-  FL_EXPORT_C(fl_Menu_Item,Fl_Menu_Item_popup_with_args)(fl_Menu_Item menu_item,int X,int Y, char* title, fl_Menu_Item picked, fl_Menu_ menu);
-  FL_EXPORT_C(fl_Menu_Item,Fl_Menu_Item_pulldown_with_args)(fl_Menu_Item menu_item,int X,int Y,int W, int H, fl_Menu_Item picked, fl_Menu_ menu, fl_Menu_Item title, int menubar);
-  FL_EXPORT_C(fl_Menu_Item, Fl_Menu_Item_test_shortcut)(fl_Menu_Item menu_item);
-  FL_EXPORT_C(fl_Menu_Item, Fl_Menu_Item_find_shortcut_with_ip_require_alt)(fl_Menu_Item menu_item, int* ip, int require_alt);
-  FL_EXPORT_C(fl_Menu_Item, Fl_Menu_Item_find_shortcut_with_ip)(fl_Menu_Item menu_item, int* ip);
-  FL_EXPORT_C(fl_Menu_Item, Fl_Menu_Item_find_shortcut_with_require_alt)(fl_Menu_Item menu_item, int require_alt);
-  FL_EXPORT_C(void, Fl_Menu_Item_do_callback)(fl_Menu_Item menu_item, fl_Widget o);
-  FL_EXPORT_C(void, Fl_Menu_Item_do_callback_with_user_data)(fl_Menu_Item menu_item, fl_Widget o,void* arg);
-  FL_EXPORT_C(int, Fl_Menu_Item_checked)(fl_Menu_Item menu_item);
-  FL_EXPORT_C(void, Fl_Menu_Item_check)(fl_Menu_Item menu_item);
-  FL_EXPORT_C(void, Fl_Menu_Item_uncheck)(fl_Menu_Item menu_item);
-  FL_EXPORT_C(int, Fl_Menu_Item_insert)(fl_Menu_Item menu_item, int index,  char* name , int shortcut, fl_Callback* cb);
-  FL_EXPORT_C(int, Fl_Menu_Item_insert_with_user_data)(fl_Menu_Item menu_item, int index,  char* name, int shortcut, fl_Callback* cb, void* user_data);
-  FL_EXPORT_C(int, Fl_Menu_Item_insert_with_flags)(fl_Menu_Item menu_item, int index,  char* name, int shortcut, fl_Callback* cb, int flags);
-  FL_EXPORT_C(int, Fl_Menu_Item_insert_with_user_data_flags)(fl_Menu_Item menu_item, int index,  char* name, int shortcut, fl_Callback* cb, void* user_data, int flags);
-  FL_EXPORT_C(int, Fl_Menu_Item_add)(fl_Menu_Item menu_item, char* name, int shortcut, fl_Callback* cb);
-  FL_EXPORT_C(int, Fl_Menu_Item_add_with_user_data)(fl_Menu_Item menu_item,   char* name, int shortcut, fl_Callback* cb, void* user_data);
-  FL_EXPORT_C(int, Fl_Menu_Item_add_with_flags)(fl_Menu_Item menu_item,   char* name, int shortcut, fl_Callback* cb, int flags);
-  FL_EXPORT_C(int, Fl_Menu_Item_add_with_user_data_flags)(fl_Menu_Item menu_item,   char* name, int shortcut, fl_Callback* cb, void* user_data, int flags);
-  FL_EXPORT_C(int, Fl_Menu_Item_add_with_shortcutname_user_data)(fl_Menu_Item menu_item,   char* name,   char* shortcut, fl_Callback* cb, void* user_data);
-  FL_EXPORT_C(int, Fl_Menu_Item_add_with_shortcutname_flags)(fl_Menu_Item menu_item,   char* name,   char* shortcut, fl_Callback* cb, int flags);
-  FL_EXPORT_C(int, Fl_Menu_Item_add_with_shortcutname_user_data_flags)(fl_Menu_Item menu_item,   char* name,   char* shortcut, fl_Callback* cb, void* user_data, int flags);
-  FL_EXPORT_C(int, Fl_Menu_Item_size)(fl_Menu_Item menu_item);
-  FL_EXPORT_C(fl_Menu_Item, Fl_Menu_Item_New)();
-  FL_EXPORT_C(void, Fl_Menu_Item_Destroy)(fl_Menu_Item menu_item);
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Item_set_callback_with_user_data,(fl_Menu_Item menu_item, fl_Callback* c, void* user_data));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Item_set_callback,(fl_Menu_Item menu_item, fl_Callback* c));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Item_has_callback,(fl_Menu_Item menu_item));
+  FL_EXPORT_C_HEADER(void*,Fl_Menu_Item_user_data,(fl_Menu_Item menu_item));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Item_set_user_data,(fl_Menu_Item menu_item, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Menu_Item_argument,(fl_Menu_Item menu_item));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Item_set_argument,(fl_Menu_Item menu_item, long v));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Item_shortcut,(fl_Menu_Item menu_item));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Item_set_shortcut,(fl_Menu_Item menu_item, int s));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Item_submenu,(fl_Menu_Item menu_item));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Item_checkbox,(fl_Menu_Item menu_item));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Item_radio,(fl_Menu_Item menu_item));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Item_value,(fl_Menu_Item menu_item));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Item_set,(fl_Menu_Item menu_item));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Item_clear,(fl_Menu_Item menu_item));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Item_setonly,(fl_Menu_Item menu_item));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Item_visible,(fl_Menu_Item menu_item));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Item_show,(fl_Menu_Item menu_item));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Item_hide,(fl_Menu_Item menu_item));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Item_active,(fl_Menu_Item menu_item));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Item_activate,(fl_Menu_Item menu_item));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Item_deactivate,(fl_Menu_Item menu_item));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Item_activevisible,(fl_Menu_Item menu_item));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Item_image,(fl_Menu_Item menu_item, fl_Image a));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Item_measure,(fl_Menu_Item menu_item, int* h, fl_Menu_ menu));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Item_draw_with_t,(fl_Menu_Item menu_item, int x, int y, int w, int h, fl_Menu_, int t));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Item_draw,(fl_Menu_Item menu_item, int x, int y, int w, int h, fl_Menu_ menu));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Item_flags,(fl_Menu_Item menu_item));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Item_set_flags,(fl_Menu_Item menu_item,int flags));
+  FL_EXPORT_C_HEADER(char*,Fl_Menu_Item_text,(fl_Menu_Item menu_item));
+  FL_EXPORT_C_HEADER(fl_Menu_Item,Fl_Menu_Item_popup,(fl_Menu_Item menu_item, int X, int Y));
+  FL_EXPORT_C_HEADER(fl_Menu_Item,Fl_Menu_Item_pulldown,(fl_Menu_Item menu_item, int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(fl_Menu_Item,Fl_Menu_Item_popup_with_args,(fl_Menu_Item menu_item,int X,int Y, char* title, fl_Menu_Item picked, fl_Menu_ menu));
+  FL_EXPORT_C_HEADER(fl_Menu_Item,Fl_Menu_Item_pulldown_with_args,(fl_Menu_Item menu_item,int X,int Y,int W, int H, fl_Menu_Item picked, fl_Menu_ menu, fl_Menu_Item title, int menubar));
+  FL_EXPORT_C_HEADER(fl_Menu_Item,Fl_Menu_Item_test_shortcut,(fl_Menu_Item menu_item));
+  FL_EXPORT_C_HEADER(fl_Menu_Item,Fl_Menu_Item_find_shortcut_with_ip_require_alt,(fl_Menu_Item menu_item, int* ip, int require_alt));
+  FL_EXPORT_C_HEADER(fl_Menu_Item,Fl_Menu_Item_find_shortcut_with_ip,(fl_Menu_Item menu_item, int* ip));
+  FL_EXPORT_C_HEADER(fl_Menu_Item,Fl_Menu_Item_find_shortcut_with_require_alt,(fl_Menu_Item menu_item, int require_alt));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Item_do_callback,(fl_Menu_Item menu_item, fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Item_do_callback_with_user_data,(fl_Menu_Item menu_item, fl_Widget o,void* arg));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Item_checked,(fl_Menu_Item menu_item));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Item_check,(fl_Menu_Item menu_item));
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Item_uncheck,(fl_Menu_Item menu_item));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Item_insert,(fl_Menu_Item menu_item, int index,  char* name , int shortcut, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Item_insert_with_user_data,(fl_Menu_Item menu_item, int index,  char* name, int shortcut, fl_Callback* cb, void* user_data));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Item_insert_with_flags,(fl_Menu_Item menu_item, int index,  char* name, int shortcut, fl_Callback* cb, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Item_insert_with_user_data_flags,(fl_Menu_Item menu_item, int index,  char* name, int shortcut, fl_Callback* cb, void* user_data, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Item_add,(fl_Menu_Item menu_item, char* name, int shortcut, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Item_add_with_user_data,(fl_Menu_Item menu_item,   char* name, int shortcut, fl_Callback* cb, void* user_data));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Item_add_with_flags,(fl_Menu_Item menu_item,   char* name, int shortcut, fl_Callback* cb, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Item_add_with_user_data_flags,(fl_Menu_Item menu_item,   char* name, int shortcut, fl_Callback* cb, void* user_data, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Item_add_with_shortcutname_user_data,(fl_Menu_Item menu_item,   char* name,   char* shortcut, fl_Callback* cb, void* user_data));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Item_add_with_shortcutname_flags,(fl_Menu_Item menu_item,   char* name,   char* shortcut, fl_Callback* cb, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Item_add_with_shortcutname_user_data_flags,(fl_Menu_Item menu_item,   char* name,   char* shortcut, fl_Callback* cb, void* user_data, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Menu_Item_size,(fl_Menu_Item menu_item));
+  FL_EXPORT_C_HEADER(fl_Menu_Item,Fl_Menu_Item_New,());
+  FL_EXPORT_C_HEADER(void,Fl_Menu_Item_Destroy,(fl_Menu_Item menu_item));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Multi_BrowserC.h b/c-src/Fl_Multi_BrowserC.h
--- a/c-src/Fl_Multi_BrowserC.h
+++ b/c-src/Fl_Multi_BrowserC.h
@@ -40,202 +40,202 @@
 #endif
 
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int ,         Fl_Multi_Browser_handle_super)(fl_Multi_Browser multi_browser,int event);
-  FL_EXPORT_C(int ,         Fl_Multi_Browser_handle )(fl_Multi_Browser multi_browser,int event);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_resize_super)(fl_Multi_Browser multi_browser,int x, int y, int w, int h);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_resize )(fl_Multi_Browser multi_browser,int x, int y, int w, int h);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_show_super)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_show )(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_hide_super)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_hide )(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(fl_Window,    Fl_Multi_Browser_as_window_super)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(fl_Window,    Fl_Multi_Browser_as_window )(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Multi_Browser_as_gl_window_super)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Multi_Browser_as_gl_window)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(fl_Group,     Fl_Multi_Browser_parent)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_set_parent)(fl_Multi_Browser multi_browser, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Multi_Browser_type)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_set_type)(fl_Multi_Browser multi_browser, uchar t);
+  FL_EXPORT_C_HEADER(int ,Fl_Multi_Browser_handle_super,(fl_Multi_Browser multi_browser,int event));
+  FL_EXPORT_C_HEADER(int ,Fl_Multi_Browser_handle ,(fl_Multi_Browser multi_browser,int event));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_resize_super,(fl_Multi_Browser multi_browser,int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_resize ,(fl_Multi_Browser multi_browser,int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_show_super,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_show ,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_hide_super,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_hide ,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Multi_Browser_as_window_super,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Multi_Browser_as_window ,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Multi_Browser_as_gl_window_super,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Multi_Browser_as_gl_window,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Multi_Browser_parent,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_parent,(fl_Multi_Browser multi_browser, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Multi_Browser_type,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_type,(fl_Multi_Browser multi_browser, uchar t));
 
-FL_EXPORT_C(void, Fl_Multi_Browser_draw_box)(fl_Multi_Browser Multi_Browser);
-FL_EXPORT_C(void, Fl_Multi_Browser_draw_box_with_tc)(fl_Multi_Browser Multi_Browser,Fl_Boxtype t, Fl_Color c);
-FL_EXPORT_C(void, Fl_Multi_Browser_draw_box_with_txywhc)(fl_Multi_Browser Multi_Browser,Fl_Boxtype t, int x,int y,int w,int h, Fl_Color c);
-FL_EXPORT_C(void, Fl_Multi_Browser_draw_backdrop)(fl_Multi_Browser Multi_Browser);
-FL_EXPORT_C(void, Fl_Multi_Browser_draw_focus)(fl_Multi_Browser Multi_Browser);
-FL_EXPORT_C(void, Fl_Multi_Browser_draw_focus_with_txywh)(fl_Multi_Browser Multi_Browser,Fl_Boxtype t, int x,int y,int w,int h);
-FL_EXPORT_C(void, Fl_Multi_Browser_draw_label)(fl_Multi_Browser Multi_Browser);
-  FL_EXPORT_C(int,          Fl_Multi_Browser_x)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(int,          Fl_Multi_Browser_y)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(int,          Fl_Multi_Browser_w)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(int,          Fl_Multi_Browser_h)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_set_align)(fl_Multi_Browser multi_browser, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Multi_Browser_align)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Multi_Browser_box)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_set_box)(fl_Multi_Browser multi_browser, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Multi_Browser_color)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_set_color)(fl_Multi_Browser multi_browser, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_set_color_with_bg_sel)(fl_Multi_Browser multi_browser,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Multi_Browser_selection_color)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_set_selection_color)(fl_Multi_Browser multi_browser, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Multi_Browser_label)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_copy_label)(fl_Multi_Browser multi_browser, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_set_label)(fl_Multi_Browser multi_browser, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Multi_Browser_labeltype)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_set_labeltype)(fl_Multi_Browser multi_browser, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Multi_Browser_labelcolor)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_set_labelcolor)(fl_Multi_Browser multi_browser, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Multi_Browser_labelfont)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_set_labelfont)(fl_Multi_Browser multi_browser, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Multi_Browser_labelsize)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_set_labelsize)(fl_Multi_Browser multi_browser, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Multi_Browser_image)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_set_image)(fl_Multi_Browser multi_browser, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Multi_Browser_deimage)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_set_deimage)(fl_Multi_Browser multi_browser, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Multi_Browser_tooltip)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_copy_tooltip)(fl_Multi_Browser multi_browser, const char* text);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_set_tooltip)(fl_Multi_Browser multi_browser, const char* text);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_set_callback_with_user_data)(fl_Multi_Browser multi_browser, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_set_callback)(fl_Multi_Browser multi_browser, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Multi_Browser_user_data)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_set_user_data)(fl_Multi_Browser multi_browser, void* v);
-  FL_EXPORT_C(long,         Fl_Multi_Browser_argument)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_set_argument)(fl_Multi_Browser multi_browser, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Multi_Browser_when)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_set_when)(fl_Multi_Browser multi_browser, uchar i);
-  FL_EXPORT_C(int,          Fl_Multi_Browser_visible_r)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_set_visible)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_clear_visible)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(unsigned int, Fl_Multi_Browser_active)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(int,          Fl_Multi_Browser_active_r)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_activate)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_deactivate)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(unsigned int, Fl_Multi_Browser_output)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_set_output)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_clear_output)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(unsigned int, Fl_Multi_Browser_takesevents)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_set_changed)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_clear_changed)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(int,          Fl_Multi_Browser_take_focus)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_set_visible_focus)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_clear_visible_focus)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_modify_visible_focus)(fl_Multi_Browser multi_browser, int v);
-  FL_EXPORT_C(unsigned int, Fl_Multi_Browser_visible_focus)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_do_callback)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_do_callback_with_widget_and_user_data)(fl_Multi_Browser multi_browser, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_do_callback_with_widget_and_default_user_data)(fl_Multi_Browser multi_browser, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Multi_Browser_contains)(fl_Multi_Browser multi_browser, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Multi_Browser_inside)(fl_Multi_Browser multi_browser, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_redraw)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_redraw_label)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(uchar,        Fl_Multi_Browser_damage)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_clear_damage_with_bitmask)(fl_Multi_Browser multi_browser, uchar c);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_clear_damage)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_damage_with_text)(fl_Multi_Browser multi_browser, uchar c);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_damage_inside_widget)(fl_Multi_Browser multi_browser, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_draw_label_with_xywh_alignment)(fl_Multi_Browser multi_browser, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_measure_label)(fl_Multi_Browser multi_browser, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Multi_Browser_window)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(fl_Window,    Fl_Multi_Browser_top_window)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(fl_Window ,   Fl_Multi_Browser_top_window_offset)(fl_Multi_Browser multi_browser, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Multi_Browser_as_group)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Multi_Browser_as_gl_window)(fl_Multi_Browser multi_browser);
+FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_draw_box,(fl_Multi_Browser Multi_Browser));
+FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_draw_box_with_tc,(fl_Multi_Browser Multi_Browser,Fl_Boxtype t, Fl_Color c));
+FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_draw_box_with_txywhc,(fl_Multi_Browser Multi_Browser,Fl_Boxtype t, int x,int y,int w,int h, Fl_Color c));
+FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_draw_backdrop,(fl_Multi_Browser Multi_Browser));
+FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_draw_focus,(fl_Multi_Browser Multi_Browser));
+FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_draw_focus_with_txywh,(fl_Multi_Browser Multi_Browser,Fl_Boxtype t, int x,int y,int w,int h));
+FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_draw_label,(fl_Multi_Browser Multi_Browser));
+  FL_EXPORT_C_HEADER(int,Fl_Multi_Browser_x,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(int,Fl_Multi_Browser_y,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(int,Fl_Multi_Browser_w,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(int,Fl_Multi_Browser_h,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_align,(fl_Multi_Browser multi_browser, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Multi_Browser_align,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Multi_Browser_box,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_box,(fl_Multi_Browser multi_browser, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Multi_Browser_color,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_color,(fl_Multi_Browser multi_browser, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_color_with_bg_sel,(fl_Multi_Browser multi_browser,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Multi_Browser_selection_color,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_selection_color,(fl_Multi_Browser multi_browser, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Multi_Browser_label,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_copy_label,(fl_Multi_Browser multi_browser, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_label,(fl_Multi_Browser multi_browser, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Multi_Browser_labeltype,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_labeltype,(fl_Multi_Browser multi_browser, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Multi_Browser_labelcolor,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_labelcolor,(fl_Multi_Browser multi_browser, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Multi_Browser_labelfont,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_labelfont,(fl_Multi_Browser multi_browser, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Multi_Browser_labelsize,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_labelsize,(fl_Multi_Browser multi_browser, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Multi_Browser_image,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_image,(fl_Multi_Browser multi_browser, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Multi_Browser_deimage,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_deimage,(fl_Multi_Browser multi_browser, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Multi_Browser_tooltip,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_copy_tooltip,(fl_Multi_Browser multi_browser, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_tooltip,(fl_Multi_Browser multi_browser, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_callback_with_user_data,(fl_Multi_Browser multi_browser, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_callback,(fl_Multi_Browser multi_browser, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Multi_Browser_user_data,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_user_data,(fl_Multi_Browser multi_browser, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Multi_Browser_argument,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_argument,(fl_Multi_Browser multi_browser, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Multi_Browser_when,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_when,(fl_Multi_Browser multi_browser, uchar i));
+  FL_EXPORT_C_HEADER(int,Fl_Multi_Browser_visible_r,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_visible,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_clear_visible,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Multi_Browser_active,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(int,Fl_Multi_Browser_active_r,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_activate,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_deactivate,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Multi_Browser_output,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_output,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_clear_output,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Multi_Browser_takesevents,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_changed,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_clear_changed,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(int,Fl_Multi_Browser_take_focus,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_visible_focus,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_clear_visible_focus,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_modify_visible_focus,(fl_Multi_Browser multi_browser, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Multi_Browser_visible_focus,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_do_callback,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_do_callback_with_widget_and_user_data,(fl_Multi_Browser multi_browser, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_do_callback_with_widget_and_default_user_data,(fl_Multi_Browser multi_browser, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Multi_Browser_contains,(fl_Multi_Browser multi_browser, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Multi_Browser_inside,(fl_Multi_Browser multi_browser, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_redraw,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_redraw_label,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(uchar,Fl_Multi_Browser_damage,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_clear_damage_with_bitmask,(fl_Multi_Browser multi_browser, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_clear_damage,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_damage_with_text,(fl_Multi_Browser multi_browser, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_damage_inside_widget,(fl_Multi_Browser multi_browser, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_draw_label_with_xywh_alignment,(fl_Multi_Browser multi_browser, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_measure_label,(fl_Multi_Browser multi_browser, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Multi_Browser_window,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Multi_Browser_top_window,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Multi_Browser_top_window_offset,(fl_Multi_Browser multi_browser, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Multi_Browser_as_group,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Multi_Browser_as_gl_window,(fl_Multi_Browser multi_browser));
 
   /* Inherited from Fl_Group */
-  FL_EXPORT_C(void,         Fl_Multi_Browser_begin)(fl_Multi_Browser self);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_end)(fl_Multi_Browser self);
-  FL_EXPORT_C(int,          Fl_Multi_Browser_find)(fl_Multi_Browser self, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_remove_index)(fl_Multi_Browser self, int index);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_remove_widget)(fl_Multi_Browser self, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_clear)(fl_Multi_Browser self);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_set_resizable_by_reference)(fl_Multi_Browser self,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_set_resizable)(fl_Multi_Browser self,fl_Widget o);
-  FL_EXPORT_C(fl_Widget,    Fl_Multi_Browser_resizable)(fl_Multi_Browser self);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_add_resizable)(fl_Multi_Browser self,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_init_sizes)(fl_Multi_Browser self);
-  FL_EXPORT_C(int,          Fl_Multi_Browser_children)(fl_Multi_Browser self);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_set_clip_children)(fl_Multi_Browser self,int c);
-  FL_EXPORT_C(unsigned int, Fl_Multi_Browser_clip_children)(fl_Multi_Browser self);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_focus)(fl_Multi_Browser self,fl_Widget W);
-  FL_EXPORT_C(fl_Widget,    Fl_Multi_Browser__ddfdesign_kludge)(fl_Multi_Browser self);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_insert_with_before)(fl_Multi_Browser self, fl_Widget w, fl_Widget before);
-  FL_EXPORT_C(fl_Widget*,   Fl_Multi_Browser_array)(fl_Multi_Browser self);
-  FL_EXPORT_C(fl_Widget,    Fl_Multi_Browser_child)(fl_Multi_Browser self, int n);
-  FL_EXPORT_C(void,         Fl_Multi_Browser_forms_end)(fl_Multi_Browser self);
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_begin,(fl_Multi_Browser self));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_end,(fl_Multi_Browser self));
+  FL_EXPORT_C_HEADER(int,Fl_Multi_Browser_find,(fl_Multi_Browser self, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_remove_index,(fl_Multi_Browser self, int index));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_remove_widget,(fl_Multi_Browser self, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_clear,(fl_Multi_Browser self));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_resizable_by_reference,(fl_Multi_Browser self,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_resizable,(fl_Multi_Browser self,fl_Widget o));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Multi_Browser_resizable,(fl_Multi_Browser self));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_add_resizable,(fl_Multi_Browser self,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_init_sizes,(fl_Multi_Browser self));
+  FL_EXPORT_C_HEADER(int,Fl_Multi_Browser_children,(fl_Multi_Browser self));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_clip_children,(fl_Multi_Browser self,int c));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Multi_Browser_clip_children,(fl_Multi_Browser self));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_focus,(fl_Multi_Browser self,fl_Widget W));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Multi_Browser__ddfdesign_kludge,(fl_Multi_Browser self));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_insert_with_before,(fl_Multi_Browser self, fl_Widget w, fl_Widget before));
+  FL_EXPORT_C_HEADER(fl_Widget*,Fl_Multi_Browser_array,(fl_Multi_Browser self));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Multi_Browser_child,(fl_Multi_Browser self, int n));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_forms_end,(fl_Multi_Browser self));
 
   /* Fl_Multi_Browser specific functions */
-  FL_EXPORT_C(void*, Fl_Multi_Browser_other_data)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void, Fl_Multi_Browser_set_other_data)(fl_Multi_Browser multi_browser, void* v);
-  FL_EXPORT_C(fl_Multi_Browser, Fl_Multi_Browser_New_WithLabel)(int x, int y, int w, int h, const char* label); 
-  FL_EXPORT_C(fl_Multi_Browser, Fl_Multi_Browser_New)(int x, int y, int w, int h); 
-  FL_EXPORT_C(fl_Multi_Browser, Fl_OverriddenMulti_Browser_New_WithLabel)(int x, int y, int w, int h, const char* label, fl_Multi_Browser_Virtual_Funcs* funcs); 
-  FL_EXPORT_C(fl_Multi_Browser, Fl_OverriddenMulti_Browser_New)(int x, int y, int w, int h, fl_Multi_Browser_Virtual_Funcs* funcs); 
-  FL_EXPORT_C(void,Fl_Multi_Browser_Destroy)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void,Fl_Multi_Browser_remove)(fl_Multi_Browser multi_browser, int line);
-  FL_EXPORT_C(void, Fl_Multi_Browser_add)(fl_Multi_Browser multi_browser, const char* newtext);
-  FL_EXPORT_C(void, Fl_Multi_Browser_add_with_d)(fl_Multi_Browser multi_browser, const char* newtext, void* d);
-  FL_EXPORT_C(void, Fl_Multi_Browser_insert)(fl_Multi_Browser multi_browser, int line, const char* newtext);
-  FL_EXPORT_C(void, Fl_Multi_Browser_insert_with_d)(fl_Multi_Browser multi_browser, int line, const char* newtext, void* d);
-  FL_EXPORT_C(void, Fl_Multi_Browser_move)(fl_Multi_Browser multi_browser, int to, int from);
-  FL_EXPORT_C(int , Fl_Multi_Browser_load)(fl_Multi_Browser multi_browser, const char* filename);
-  FL_EXPORT_C(void, Fl_Multi_Browser_swap)(fl_Multi_Browser multi_browser, int a, int b);
-  FL_EXPORT_C(void, Fl_Multi_Browser_clear)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(int, Fl_Multi_Browser_size)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void, Fl_Multi_Browser_set_size)(fl_Multi_Browser multi_browser, int W, int H);
-  FL_EXPORT_C(int, Fl_Multi_Browser_topline)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void, Fl_Multi_Browser_lineposition)(fl_Multi_Browser multi_browser, int line, Fl_Line_Position pos);
-  FL_EXPORT_C(void, Fl_Multi_Browser_set_topline)(fl_Multi_Browser multi_browser, int line);
-  FL_EXPORT_C(void, Fl_Multi_Browser_bottomline)(fl_Multi_Browser multi_browser, int line);
-  FL_EXPORT_C(void, Fl_Multi_Browser_middleline)(fl_Multi_Browser multi_browser, int line);
-  FL_EXPORT_C(int, Fl_Multi_Browser_select)(fl_Multi_Browser multi_browser, int line);
-  FL_EXPORT_C(int, Fl_Multi_Browser_select_with_val)(fl_Multi_Browser multi_browser, int line, int val);
-  FL_EXPORT_C(int, Fl_Multi_Browser_selected)(fl_Multi_Browser multi_browser, int line);
-  FL_EXPORT_C(void, Fl_Multi_Browser_show_with_line)(fl_Multi_Browser multi_browser, int line);
-  FL_EXPORT_C(void, Fl_Multi_Browser_show)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void, Fl_Multi_Browser_hide_with_line)(fl_Multi_Browser multi_browser, int line);
-  FL_EXPORT_C(void, Fl_Multi_Browser_hide)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(int, Fl_Multi_Browser_visible)(fl_Multi_Browser multi_browser, int line);
-  FL_EXPORT_C(int, Fl_Multi_Browser_value)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void, Fl_Multi_Browser_set_value)(fl_Multi_Browser multi_browser, int line);
-  FL_EXPORT_C(const char*, Fl_Multi_Browser_text)(fl_Multi_Browser multi_browser, int line);
-  FL_EXPORT_C(void, Fl_Multi_Browser_set_text)(fl_Multi_Browser multi_browser, int line, const char* newtext);
-  FL_EXPORT_C(void*, Fl_Multi_Browser_data)(fl_Multi_Browser multi_browser, int line);
-  FL_EXPORT_C(void, Fl_Multi_Browser_set_data)(fl_Multi_Browser multi_browser, int line, void* d);
-  FL_EXPORT_C(char, Fl_Multi_Browser_format_char)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void, Fl_Multi_Browser_set_format_char)(fl_Multi_Browser multi_browser, char c);
-  FL_EXPORT_C(char, Fl_Multi_Browser_column_char)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void, Fl_Multi_Browser_set_column_char)(fl_Multi_Browser multi_browser, char c);
-  FL_EXPORT_C(const int*, Fl_Multi_Browser_column_widths)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void, Fl_Multi_Browser_set_column_widths)(fl_Multi_Browser multi_browser, const int* arr);
-  FL_EXPORT_C(int, Fl_Multi_Browser_displayed)(fl_Multi_Browser multi_browser, int line);
-  FL_EXPORT_C(void, Fl_Multi_Browser_make_visible)(fl_Multi_Browser multi_browser, int line);
-  FL_EXPORT_C(void, Fl_Multi_Browser_set_icon)(fl_Multi_Browser multi_browser, int line, fl_Image icon);
-  FL_EXPORT_C(fl_Image, Fl_Multi_Browser_icon)(fl_Multi_Browser multi_browser, int line);
-  FL_EXPORT_C(void, Fl_Multi_Browser_remove_icon)(fl_Multi_Browser multi_browser, int line);
-  FL_EXPORT_C(int, Fl_Multi_Browser_select_only)(fl_Multi_Browser multi_browser,void *item);
-  FL_EXPORT_C(int, Fl_Multi_Browser_select_only_with_docallbacks)(fl_Multi_Browser multi_browser,void *item,int docallbacks);
-  FL_EXPORT_C(int, Fl_Multi_Browser_deselect)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(int, Fl_Multi_Browser_deselect_with_docallbacks)(fl_Multi_Browser multi_browser,int docallbacks);
-  FL_EXPORT_C(int, Fl_Multi_Browser_position)(fl_Multi_Browser multi_browser); 
+  FL_EXPORT_C_HEADER(void*,Fl_Multi_Browser_other_data,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_other_data,(fl_Multi_Browser multi_browser, void* v));
+  FL_EXPORT_C(fl_Multi_Browser, Fl_Multi_Browser_New_WithLabel)(int x, int y, int w, int h, const char* label);
+  FL_EXPORT_C(fl_Multi_Browser, Fl_Multi_Browser_New)(int x, int y, int w, int h);
+  FL_EXPORT_C(fl_Multi_Browser, Fl_OverriddenMulti_Browser_New_WithLabel)(int x, int y, int w, int h, const char* label, fl_Multi_Browser_Virtual_Funcs* funcs);
+  FL_EXPORT_C(fl_Multi_Browser, Fl_OverriddenMulti_Browser_New)(int x, int y, int w, int h, fl_Multi_Browser_Virtual_Funcs* funcs);
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_Destroy,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_remove,(fl_Multi_Browser multi_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_add,(fl_Multi_Browser multi_browser, const char* newtext));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_add_with_d,(fl_Multi_Browser multi_browser, const char* newtext, void* d));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_insert,(fl_Multi_Browser multi_browser, int line, const char* newtext));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_insert_with_d,(fl_Multi_Browser multi_browser, int line, const char* newtext, void* d));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_move,(fl_Multi_Browser multi_browser, int to, int from));
+  FL_EXPORT_C_HEADER(int ,Fl_Multi_Browser_load,(fl_Multi_Browser multi_browser, const char* filename));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_swap,(fl_Multi_Browser multi_browser, int a, int b));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_clear,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(int,Fl_Multi_Browser_size,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_size,(fl_Multi_Browser multi_browser, int W, int H));
+  FL_EXPORT_C_HEADER(int,Fl_Multi_Browser_topline,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_lineposition,(fl_Multi_Browser multi_browser, int line, Fl_Line_Position pos));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_topline,(fl_Multi_Browser multi_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_bottomline,(fl_Multi_Browser multi_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_middleline,(fl_Multi_Browser multi_browser, int line));
+  FL_EXPORT_C_HEADER(int,Fl_Multi_Browser_select,(fl_Multi_Browser multi_browser, int line));
+  FL_EXPORT_C_HEADER(int,Fl_Multi_Browser_select_with_val,(fl_Multi_Browser multi_browser, int line, int val));
+  FL_EXPORT_C_HEADER(int,Fl_Multi_Browser_selected,(fl_Multi_Browser multi_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_show_with_line,(fl_Multi_Browser multi_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_show,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_hide_with_line,(fl_Multi_Browser multi_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_hide,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(int,Fl_Multi_Browser_visible,(fl_Multi_Browser multi_browser, int line));
+  FL_EXPORT_C_HEADER(int,Fl_Multi_Browser_value,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_value,(fl_Multi_Browser multi_browser, int line));
+  FL_EXPORT_C_HEADER(const char*,Fl_Multi_Browser_text,(fl_Multi_Browser multi_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_text,(fl_Multi_Browser multi_browser, int line, const char* newtext));
+  FL_EXPORT_C_HEADER(void*,Fl_Multi_Browser_data,(fl_Multi_Browser multi_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_data,(fl_Multi_Browser multi_browser, int line, void* d));
+  FL_EXPORT_C_HEADER(char,Fl_Multi_Browser_format_char,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_format_char,(fl_Multi_Browser multi_browser, char c));
+  FL_EXPORT_C_HEADER(char,Fl_Multi_Browser_column_char,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_column_char,(fl_Multi_Browser multi_browser, char c));
+  FL_EXPORT_C_HEADER(const int*,Fl_Multi_Browser_column_widths,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_column_widths,(fl_Multi_Browser multi_browser, const int* arr));
+  FL_EXPORT_C_HEADER(int,Fl_Multi_Browser_displayed,(fl_Multi_Browser multi_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_make_visible,(fl_Multi_Browser multi_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_icon,(fl_Multi_Browser multi_browser, int line, fl_Image icon));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Multi_Browser_icon,(fl_Multi_Browser multi_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_remove_icon,(fl_Multi_Browser multi_browser, int line));
+  FL_EXPORT_C_HEADER(int,Fl_Multi_Browser_select_only,(fl_Multi_Browser multi_browser,void *item));
+  FL_EXPORT_C_HEADER(int,Fl_Multi_Browser_select_only_with_docallbacks,(fl_Multi_Browser multi_browser,void *item,int docallbacks));
+  FL_EXPORT_C_HEADER(int,Fl_Multi_Browser_deselect,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(int,Fl_Multi_Browser_deselect_with_docallbacks,(fl_Multi_Browser multi_browser,int docallbacks));
+  FL_EXPORT_C(int, Fl_Multi_Browser_position)(fl_Multi_Browser multi_browser);
   FL_EXPORT_C(void, Fl_Multi_Browser_set_position)(fl_Multi_Browser multi_browser,int pos); // scroll to here
-  FL_EXPORT_C(int, Fl_Multi_Browser_hposition)(fl_Multi_Browser multi_browser); 
+  FL_EXPORT_C(int, Fl_Multi_Browser_hposition)(fl_Multi_Browser multi_browser);
   FL_EXPORT_C(void, Fl_Multi_Browser_set_hposition)(fl_Multi_Browser multi_browser,int); // pan to here
-  FL_EXPORT_C(uchar, Fl_Multi_Browser_has_scrollbar)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void, Fl_Multi_Browser_set_has_scrollbar)(fl_Multi_Browser multi_browser,uchar mode); 
-  FL_EXPORT_C(Fl_Font, Fl_Multi_Browser_textfont)(fl_Multi_Browser multi_browser); 
-  FL_EXPORT_C(void, Fl_Multi_Browser_set_textfont)(fl_Multi_Browser multi_browser,Fl_Font font); 
-  FL_EXPORT_C(Fl_Fontsize, Fl_Multi_Browser_textsize)(fl_Multi_Browser multi_browser);  
-  FL_EXPORT_C(void, Fl_Multi_Browser_set_textsize)(fl_Multi_Browser multi_browser,Fl_Fontsize newSize); 
-  FL_EXPORT_C(Fl_Color, Fl_Multi_Browser_textcolor)(fl_Multi_Browser multi_browser); 
-  FL_EXPORT_C(void, Fl_Multi_Browser_set_textcolor)(fl_Multi_Browser multi_browser,Fl_Color col); 
-  FL_EXPORT_C(int, Fl_Multi_Browser_scrollbar_size)(fl_Multi_Browser multi_browser); 
-  FL_EXPORT_C(void, Fl_Multi_Browser_set_scrollbar_size)(fl_Multi_Browser multi_browser,int newSize); 
-  FL_EXPORT_C(int, Fl_Multi_Browser_scrollbar_width)(fl_Multi_Browser multi_browser); 
-  FL_EXPORT_C(void, Fl_Multi_Browser_set_scrollbar_width)(fl_Multi_Browser multi_browser,int width); 
-  FL_EXPORT_C(void, Fl_Multi_Browser_scrollbar_right)(fl_Multi_Browser multi_browser); 
-  FL_EXPORT_C(void, Fl_Multi_Browser_set_scrollbar_left)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void, Fl_Multi_Browser_sort)(fl_Multi_Browser multi_browser);
-  FL_EXPORT_C(void, Fl_Multi_Browser_sort_with_flags)(fl_Multi_Browser multi_browser,int flags);
+  FL_EXPORT_C_HEADER(uchar,Fl_Multi_Browser_has_scrollbar,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C(void, Fl_Multi_Browser_set_has_scrollbar)(fl_Multi_Browser multi_browser,uchar mode);
+  FL_EXPORT_C(Fl_Font, Fl_Multi_Browser_textfont)(fl_Multi_Browser multi_browser);
+  FL_EXPORT_C(void, Fl_Multi_Browser_set_textfont)(fl_Multi_Browser multi_browser,Fl_Font font);
+  FL_EXPORT_C(Fl_Fontsize, Fl_Multi_Browser_textsize)(fl_Multi_Browser multi_browser);
+  FL_EXPORT_C(void, Fl_Multi_Browser_set_textsize)(fl_Multi_Browser multi_browser,Fl_Fontsize newSize);
+  FL_EXPORT_C(Fl_Color, Fl_Multi_Browser_textcolor)(fl_Multi_Browser multi_browser);
+  FL_EXPORT_C(void, Fl_Multi_Browser_set_textcolor)(fl_Multi_Browser multi_browser,Fl_Color col);
+  FL_EXPORT_C(int, Fl_Multi_Browser_scrollbar_size)(fl_Multi_Browser multi_browser);
+  FL_EXPORT_C(void, Fl_Multi_Browser_set_scrollbar_size)(fl_Multi_Browser multi_browser,int newSize);
+  FL_EXPORT_C(int, Fl_Multi_Browser_scrollbar_width)(fl_Multi_Browser multi_browser);
+  FL_EXPORT_C(void, Fl_Multi_Browser_set_scrollbar_width)(fl_Multi_Browser multi_browser,int width);
+  FL_EXPORT_C(void, Fl_Multi_Browser_scrollbar_right)(fl_Multi_Browser multi_browser);
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_set_scrollbar_left,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_sort,(fl_Multi_Browser multi_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Multi_Browser_sort_with_flags,(fl_Multi_Browser multi_browser,int flags));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Multiline_InputC.h b/c-src/Fl_Multiline_InputC.h
--- a/c-src/Fl_Multiline_InputC.h
+++ b/c-src/Fl_Multiline_InputC.h
@@ -10,140 +10,140 @@
 EXPORT {
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,Fl_Multiline_Input_handle)(fl_Multiline_Input self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Multiline_Input_parent)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_parent)(fl_Multiline_Input multiline_input, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Multiline_Input_type)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_type)(fl_Multiline_Input multiline_input, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_handle,(fl_Multiline_Input self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Multiline_Input_parent,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_parent,(fl_Multiline_Input multiline_input, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Multiline_Input_type,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_type,(fl_Multiline_Input multiline_input, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Multiline_Input_x)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_y)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_w)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_h)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_align)(fl_Multiline_Input multiline_input, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Multiline_Input_align)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Multiline_Input_box)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_box)(fl_Multiline_Input multiline_input, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Multiline_Input_color)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_color)(fl_Multiline_Input multiline_input, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_color_with_bg_sel)(fl_Multiline_Input multiline_input,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Multiline_Input_selection_color)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_selection_color)(fl_Multiline_Input multiline_input, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Multiline_Input_label)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_copy_label)(fl_Multiline_Input multiline_input, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_label)(fl_Multiline_Input multiline_input, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Multiline_Input_labeltype)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_labeltype)(fl_Multiline_Input multiline_input, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Multiline_Input_labelcolor)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_labelcolor)(fl_Multiline_Input multiline_input, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Multiline_Input_labelfont)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_labelfont)(fl_Multiline_Input multiline_input, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Multiline_Input_labelsize)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_labelsize)(fl_Multiline_Input multiline_input, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Multiline_Input_image)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_image)(fl_Multiline_Input multiline_input, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Multiline_Input_deimage)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_deimage)(fl_Multiline_Input multiline_input, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Multiline_Input_tooltip)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_copy_tooltip)(fl_Multiline_Input multiline_input, const char* text);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_tooltip)(fl_Multiline_Input multiline_input, const char* text);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_callback_with_user_data)(fl_Multiline_Input multiline_input, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_callback)(fl_Multiline_Input multiline_input, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Multiline_Input_user_data)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_user_data)(fl_Multiline_Input multiline_input, void* v);
-  FL_EXPORT_C(long,         Fl_Multiline_Input_argument)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_argument)(fl_Multiline_Input multiline_input, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Multiline_Input_when)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_when)(fl_Multiline_Input multiline_input, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Multiline_Input_visible)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_visible_r)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_visible)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_clear_visible)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(unsigned int, Fl_Multiline_Input_active)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_active_r)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_activate)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_deactivate)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(unsigned int, Fl_Multiline_Input_output)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_output)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_clear_output)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(unsigned int, Fl_Multiline_Input_takesevents)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_changed)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_clear_changed)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_take_focus)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_visible_focus)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_clear_visible_focus)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_modify_visible_focus)(fl_Multiline_Input multiline_input, int v);
-  FL_EXPORT_C(unsigned int, Fl_Multiline_Input_visible_focus)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_do_callback)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_do_callback_with_widget_and_user_data)(fl_Multiline_Input multiline_input, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_do_callback_with_widget_and_default_user_data)(fl_Multiline_Input multiline_input, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_contains)(fl_Multiline_Input multiline_input, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_inside)(fl_Multiline_Input multiline_input, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_redraw)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_redraw_label)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(uchar,        Fl_Multiline_Input_damage)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_clear_damage_with_bitmask)(fl_Multiline_Input multiline_input, uchar c);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_clear_damage)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_damage_with_text)(fl_Multiline_Input multiline_input, uchar c);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_damage_inside_widget)(fl_Multiline_Input multiline_input, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_draw_label_with_xywh_alignment)(fl_Multiline_Input multiline_input, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_measure_label)(fl_Multiline_Input multiline_input, int* ww , int* hh);
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_x,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_y,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_w,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_h,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_align,(fl_Multiline_Input multiline_input, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Multiline_Input_align,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Multiline_Input_box,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_box,(fl_Multiline_Input multiline_input, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Multiline_Input_color,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_color,(fl_Multiline_Input multiline_input, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_color_with_bg_sel,(fl_Multiline_Input multiline_input,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Multiline_Input_selection_color,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_selection_color,(fl_Multiline_Input multiline_input, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Multiline_Input_label,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_copy_label,(fl_Multiline_Input multiline_input, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_label,(fl_Multiline_Input multiline_input, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Multiline_Input_labeltype,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_labeltype,(fl_Multiline_Input multiline_input, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Multiline_Input_labelcolor,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_labelcolor,(fl_Multiline_Input multiline_input, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Multiline_Input_labelfont,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_labelfont,(fl_Multiline_Input multiline_input, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Multiline_Input_labelsize,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_labelsize,(fl_Multiline_Input multiline_input, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Multiline_Input_image,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_image,(fl_Multiline_Input multiline_input, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Multiline_Input_deimage,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_deimage,(fl_Multiline_Input multiline_input, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Multiline_Input_tooltip,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_copy_tooltip,(fl_Multiline_Input multiline_input, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_tooltip,(fl_Multiline_Input multiline_input, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_callback_with_user_data,(fl_Multiline_Input multiline_input, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_callback,(fl_Multiline_Input multiline_input, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Multiline_Input_user_data,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_user_data,(fl_Multiline_Input multiline_input, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Multiline_Input_argument,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_argument,(fl_Multiline_Input multiline_input, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Multiline_Input_when,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_when,(fl_Multiline_Input multiline_input, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Multiline_Input_visible,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_visible_r,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_visible,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_clear_visible,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Multiline_Input_active,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_active_r,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_activate,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_deactivate,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Multiline_Input_output,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_output,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_clear_output,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Multiline_Input_takesevents,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_changed,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_clear_changed,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_take_focus,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_visible_focus,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_clear_visible_focus,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_modify_visible_focus,(fl_Multiline_Input multiline_input, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Multiline_Input_visible_focus,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_do_callback,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_do_callback_with_widget_and_user_data,(fl_Multiline_Input multiline_input, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_do_callback_with_widget_and_default_user_data,(fl_Multiline_Input multiline_input, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_contains,(fl_Multiline_Input multiline_input, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_inside,(fl_Multiline_Input multiline_input, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_redraw,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_redraw_label,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(uchar,Fl_Multiline_Input_damage,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_clear_damage_with_bitmask,(fl_Multiline_Input multiline_input, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_clear_damage,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_damage_with_text,(fl_Multiline_Input multiline_input, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_damage_inside_widget,(fl_Multiline_Input multiline_input, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_draw_label_with_xywh_alignment,(fl_Multiline_Input multiline_input, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_measure_label,(fl_Multiline_Input multiline_input, int* ww , int* hh));
 
-  FL_EXPORT_C(fl_Window,    Fl_Multiline_Input_window)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(fl_Window,    Fl_Multiline_Input_top_window)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(fl_Window ,   Fl_Multiline_Input_top_window_offset)(fl_Multiline_Input multiline_input, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Multiline_Input_as_group)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Multiline_Input_as_gl_window)(fl_Multiline_Input multiline_input);
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Multiline_Input_window,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Multiline_Input_top_window,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Multiline_Input_top_window_offset,(fl_Multiline_Input multiline_input, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Multiline_Input_as_group,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Multiline_Input_as_gl_window,(fl_Multiline_Input multiline_input));
   /* Fl_Multiline_Input specific functions */
-  FL_EXPORT_C(int,      Fl_Multiline_Input_handle)(fl_Multiline_Input multiline_input, int event);
-  FL_EXPORT_C(fl_Float_Input, Fl_Multiline_Input_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Float_Input, Fl_Multiline_Input_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(void,     Fl_Multiline_Input_Destroy)(fl_Multiline_Input multiline_input);
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_handle,(fl_Multiline_Input multiline_input, int event));
+  FL_EXPORT_C_HEADER(fl_Float_Input,Fl_Multiline_Input_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Float_Input,Fl_Multiline_Input_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_Destroy,(fl_Multiline_Input multiline_input));
 
-  FL_EXPORT_C(void,         Fl_Multiline_Input_resize)(fl_Multiline_Input multiline_input, int X, int Y, int W, int H);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_set_value)(fl_Multiline_Input multiline_input, const char*);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_set_value_with_length)(fl_Multiline_Input multiline_input, const char* text, int length);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_static_value)(fl_Multiline_Input multiline_input, const char* text);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_static_value_with_length)(fl_Multiline_Input multiline_input, const char* text, int length);
-  FL_EXPORT_C(const char*,  Fl_Multiline_Input_value)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(Fl_Char,      Fl_Multiline_Input_index)(fl_Multiline_Input multiline_input, int i);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_size)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_size)(fl_Multiline_Input multiline_input, int W, int H);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_maximum_size)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_maximum_size)(fl_Multiline_Input multiline_input, int m);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_position)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_mark)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_set_position_with_cursor_mark)(fl_Multiline_Input multiline_input,int p, int m);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_set_position_n_n)(fl_Multiline_Input multiline_input,int p);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_set_mark)(fl_Multiline_Input multiline_input,int m);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_replace)(fl_Multiline_Input multiline_input,int b, int e, const char *text);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_replace_with_ilen)(fl_Multiline_Input multiline_input,int b, int e, const char *text, int ilen);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_cut)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_cut_bytes)(fl_Multiline_Input multiline_input,int n);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_cut_range)(fl_Multiline_Input multiline_input,int a, int b);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_insert)(fl_Multiline_Input multiline_input,const char* t);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_insert_with_length)(fl_Multiline_Input multiline_input,const char* t, int l);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_copy)(fl_Multiline_Input multiline_input,int clipboard);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_undo)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_copy_cuts)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_shortcut)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_shortcut)(fl_Multiline_Input multiline_input,int s);
-  FL_EXPORT_C(Fl_Font,      Fl_Multiline_Input_textfont)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_textfont)(fl_Multiline_Input multiline_input,Fl_Font s);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Multiline_Input_textsize)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_textsize)(fl_Multiline_Input multiline_input,Fl_Fontsize s);
-  FL_EXPORT_C(Fl_Color,     Fl_Multiline_Input_textcolor)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_textcolor)(fl_Multiline_Input multiline_input,Fl_Color n);
-  FL_EXPORT_C(Fl_Color,     Fl_Multiline_Input_cursor_color)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_cursor_color)(fl_Multiline_Input multiline_input,Fl_Color n);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_input_type)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_input_type)(fl_Multiline_Input multiline_input,int t);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_readonly)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_readonly)(fl_Multiline_Input multiline_input,int b);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_wrap)(fl_Multiline_Input multiline_input);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_set_wrap)(fl_Multiline_Input multiline_input,int b);
-  FL_EXPORT_C(void,         Fl_Multiline_Input_tab_nav)(fl_Multiline_Input multiline_input,int val);
-  FL_EXPORT_C(int,          Fl_Multiline_Input_set_tab_nav)(fl_Multiline_Input multiline_input);
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_resize,(fl_Multiline_Input multiline_input, int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_set_value,(fl_Multiline_Input multiline_input, const char*));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_set_value_with_length,(fl_Multiline_Input multiline_input, const char* text, int length));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_static_value,(fl_Multiline_Input multiline_input, const char* text));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_static_value_with_length,(fl_Multiline_Input multiline_input, const char* text, int length));
+  FL_EXPORT_C_HEADER(const char*,Fl_Multiline_Input_value,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(Fl_Char,Fl_Multiline_Input_index,(fl_Multiline_Input multiline_input, int i));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_size,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_size,(fl_Multiline_Input multiline_input, int W, int H));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_maximum_size,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_maximum_size,(fl_Multiline_Input multiline_input, int m));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_position,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_mark,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_set_position_with_cursor_mark,(fl_Multiline_Input multiline_input,int p, int m));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_set_position_n_n,(fl_Multiline_Input multiline_input,int p));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_set_mark,(fl_Multiline_Input multiline_input,int m));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_replace,(fl_Multiline_Input multiline_input,int b, int e, const char *text));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_replace_with_ilen,(fl_Multiline_Input multiline_input,int b, int e, const char *text, int ilen));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_cut,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_cut_bytes,(fl_Multiline_Input multiline_input,int n));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_cut_range,(fl_Multiline_Input multiline_input,int a, int b));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_insert,(fl_Multiline_Input multiline_input,const char* t));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_insert_with_length,(fl_Multiline_Input multiline_input,const char* t, int l));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_copy,(fl_Multiline_Input multiline_input,int clipboard));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_undo,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_copy_cuts,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_shortcut,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_shortcut,(fl_Multiline_Input multiline_input,int s));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Multiline_Input_textfont,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_textfont,(fl_Multiline_Input multiline_input,Fl_Font s));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Multiline_Input_textsize,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_textsize,(fl_Multiline_Input multiline_input,Fl_Fontsize s));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Multiline_Input_textcolor,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_textcolor,(fl_Multiline_Input multiline_input,Fl_Color n));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Multiline_Input_cursor_color,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_cursor_color,(fl_Multiline_Input multiline_input,Fl_Color n));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_input_type,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_input_type,(fl_Multiline_Input multiline_input,int t));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_readonly,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_readonly,(fl_Multiline_Input multiline_input,int b));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_wrap,(fl_Multiline_Input multiline_input));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_set_wrap,(fl_Multiline_Input multiline_input,int b));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Input_tab_nav,(fl_Multiline_Input multiline_input,int val));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Input_set_tab_nav,(fl_Multiline_Input multiline_input));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Multiline_OutputC.h b/c-src/Fl_Multiline_OutputC.h
--- a/c-src/Fl_Multiline_OutputC.h
+++ b/c-src/Fl_Multiline_OutputC.h
@@ -10,140 +10,140 @@
 EXPORT {
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,Fl_Multiline_Output_handle)(fl_Multiline_Output self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Multiline_Output_parent)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_parent)(fl_Multiline_Output multiline_output, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Multiline_Output_type)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_type)(fl_Multiline_Output multiline_output, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_handle,(fl_Multiline_Output self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Multiline_Output_parent,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_parent,(fl_Multiline_Output multiline_output, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Multiline_Output_type,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_type,(fl_Multiline_Output multiline_output, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Multiline_Output_x)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_y)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_w)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_h)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_align)(fl_Multiline_Output multiline_output, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Multiline_Output_align)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Multiline_Output_box)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_box)(fl_Multiline_Output multiline_output, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Multiline_Output_color)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_color)(fl_Multiline_Output multiline_output, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_color_with_bg_sel)(fl_Multiline_Output multiline_output,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Multiline_Output_selection_color)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_selection_color)(fl_Multiline_Output multiline_output, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Multiline_Output_label)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_copy_label)(fl_Multiline_Output multiline_output, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_label)(fl_Multiline_Output multiline_output, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Multiline_Output_labeltype)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_labeltype)(fl_Multiline_Output multiline_output, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Multiline_Output_labelcolor)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_labelcolor)(fl_Multiline_Output multiline_output, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Multiline_Output_labelfont)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_labelfont)(fl_Multiline_Output multiline_output, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Multiline_Output_labelsize)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_labelsize)(fl_Multiline_Output multiline_output, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Multiline_Output_image)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_image)(fl_Multiline_Output multiline_output, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Multiline_Output_deimage)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_deimage)(fl_Multiline_Output multiline_output, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Multiline_Output_tooltip)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_copy_tooltip)(fl_Multiline_Output multiline_output, const char* text);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_tooltip)(fl_Multiline_Output multiline_output, const char* text);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_callback_with_user_data)(fl_Multiline_Output multiline_output, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_callback)(fl_Multiline_Output multiline_output, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Multiline_Output_user_data)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_user_data)(fl_Multiline_Output multiline_output, void* v);
-  FL_EXPORT_C(long,         Fl_Multiline_Output_argument)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_argument)(fl_Multiline_Output multiline_output, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Multiline_Output_when)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_when)(fl_Multiline_Output multiline_output, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Multiline_Output_visible)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_visible_r)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_visible)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_clear_visible)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(unsigned int, Fl_Multiline_Output_active)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_active_r)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_activate)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_deactivate)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(unsigned int, Fl_Multiline_Output_multiline_output)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_multiline_output)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_clear_multiline_output)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(unsigned int, Fl_Multiline_Output_takesevents)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_changed)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_clear_changed)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_take_focus)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_visible_focus)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_clear_visible_focus)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_modify_visible_focus)(fl_Multiline_Output multiline_output, int v);
-  FL_EXPORT_C(unsigned int, Fl_Multiline_Output_visible_focus)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_do_callback)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_do_callback_with_widget_and_user_data)(fl_Multiline_Output multiline_output, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_do_callback_with_widget_and_default_user_data)(fl_Multiline_Output multiline_output, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_contains)(fl_Multiline_Output multiline_output, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_inside)(fl_Multiline_Output multiline_output, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_redraw)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_redraw_label)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(uchar,        Fl_Multiline_Output_damage)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_clear_damage_with_bitmask)(fl_Multiline_Output multiline_output, uchar c);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_clear_damage)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_damage_with_text)(fl_Multiline_Output multiline_output, uchar c);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_damage_inside_widget)(fl_Multiline_Output multiline_output, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_draw_label_with_xywh_alignment)(fl_Multiline_Output multiline_output, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_measure_label)(fl_Multiline_Output multiline_output, int* ww , int* hh);
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_x,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_y,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_w,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_h,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_align,(fl_Multiline_Output multiline_output, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Multiline_Output_align,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Multiline_Output_box,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_box,(fl_Multiline_Output multiline_output, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Multiline_Output_color,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_color,(fl_Multiline_Output multiline_output, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_color_with_bg_sel,(fl_Multiline_Output multiline_output,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Multiline_Output_selection_color,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_selection_color,(fl_Multiline_Output multiline_output, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Multiline_Output_label,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_copy_label,(fl_Multiline_Output multiline_output, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_label,(fl_Multiline_Output multiline_output, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Multiline_Output_labeltype,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_labeltype,(fl_Multiline_Output multiline_output, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Multiline_Output_labelcolor,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_labelcolor,(fl_Multiline_Output multiline_output, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Multiline_Output_labelfont,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_labelfont,(fl_Multiline_Output multiline_output, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Multiline_Output_labelsize,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_labelsize,(fl_Multiline_Output multiline_output, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Multiline_Output_image,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_image,(fl_Multiline_Output multiline_output, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Multiline_Output_deimage,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_deimage,(fl_Multiline_Output multiline_output, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Multiline_Output_tooltip,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_copy_tooltip,(fl_Multiline_Output multiline_output, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_tooltip,(fl_Multiline_Output multiline_output, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_callback_with_user_data,(fl_Multiline_Output multiline_output, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_callback,(fl_Multiline_Output multiline_output, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Multiline_Output_user_data,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_user_data,(fl_Multiline_Output multiline_output, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Multiline_Output_argument,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_argument,(fl_Multiline_Output multiline_output, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Multiline_Output_when,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_when,(fl_Multiline_Output multiline_output, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Multiline_Output_visible,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_visible_r,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_visible,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_clear_visible,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Multiline_Output_active,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_active_r,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_activate,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_deactivate,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Multiline_Output_multiline_output,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_multiline_output,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_clear_multiline_output,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Multiline_Output_takesevents,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_changed,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_clear_changed,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_take_focus,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_visible_focus,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_clear_visible_focus,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_modify_visible_focus,(fl_Multiline_Output multiline_output, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Multiline_Output_visible_focus,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_do_callback,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_do_callback_with_widget_and_user_data,(fl_Multiline_Output multiline_output, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_do_callback_with_widget_and_default_user_data,(fl_Multiline_Output multiline_output, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_contains,(fl_Multiline_Output multiline_output, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_inside,(fl_Multiline_Output multiline_output, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_redraw,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_redraw_label,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(uchar,Fl_Multiline_Output_damage,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_clear_damage_with_bitmask,(fl_Multiline_Output multiline_output, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_clear_damage,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_damage_with_text,(fl_Multiline_Output multiline_output, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_damage_inside_widget,(fl_Multiline_Output multiline_output, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_draw_label_with_xywh_alignment,(fl_Multiline_Output multiline_output, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_measure_label,(fl_Multiline_Output multiline_output, int* ww , int* hh));
 
-  FL_EXPORT_C(fl_Window,    Fl_Multiline_Output_window)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(fl_Window,    Fl_Multiline_Output_top_window)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(fl_Window ,   Fl_Multiline_Output_top_window_offset)(fl_Multiline_Output multiline_output, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Multiline_Output_as_group)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Multiline_Output_as_gl_window)(fl_Multiline_Output multiline_output);
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Multiline_Output_window,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Multiline_Output_top_window,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Multiline_Output_top_window_offset,(fl_Multiline_Output multiline_output, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Multiline_Output_as_group,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Multiline_Output_as_gl_window,(fl_Multiline_Output multiline_output));
   /* Fl_Multiline_Output specific functions */
-  FL_EXPORT_C(int,      Fl_Multiline_Output_handle)(fl_Multiline_Output multiline_output, int event);
-  FL_EXPORT_C(fl_Multiline_Output, Fl_Multiline_Output_New_WithLabel)(int x, int y, int w, int h, const char* label); 
-  FL_EXPORT_C(fl_Multiline_Output, Fl_Multiline_Output_New)(int x, int y, int w, int h); 
-  FL_EXPORT_C(void,     Fl_Multiline_Output_Destroy)(fl_Multiline_Output multiline_output);
-  
-  FL_EXPORT_C(void,         Fl_Multiline_Output_resize)(fl_Multiline_Output multiline_output, int X, int Y, int W, int H);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_set_value)(fl_Multiline_Output multiline_output, const char*);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_set_value_with_length)(fl_Multiline_Output multiline_output, const char* text, int length);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_static_value)(fl_Multiline_Output multiline_output, const char* text);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_static_value_with_length)(fl_Multiline_Output multiline_output, const char* text, int length);
-  FL_EXPORT_C(const char*,  Fl_Multiline_Output_value)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(Fl_Char,      Fl_Multiline_Output_index)(fl_Multiline_Output multiline_output, int i);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_size)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_size)(fl_Multiline_Output multiline_output, int W, int H);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_maximum_size)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_maximum_size)(fl_Multiline_Output multiline_output, int m);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_position)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_mark)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_set_position_with_cursor_mark)(fl_Multiline_Output multiline_output,int p, int m);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_set_position_n_n)(fl_Multiline_Output multiline_output,int p);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_set_mark)(fl_Multiline_Output multiline_output,int m);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_replace)(fl_Multiline_Output multiline_output,int b, int e, const char *text);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_replace_with_ilen)(fl_Multiline_Output multiline_output,int b, int e, const char *text, int ilen);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_cut)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_cut_bytes)(fl_Multiline_Output multiline_output,int n);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_cut_range)(fl_Multiline_Output multiline_output,int a, int b);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_insert)(fl_Multiline_Output multiline_output,const char* t);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_insert_with_length)(fl_Multiline_Output multiline_output,const char* t, int l);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_copy)(fl_Multiline_Output multiline_output,int clipboard);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_undo)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_copy_cuts)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_shortcut)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_shortcut)(fl_Multiline_Output multiline_output,int s);
-  FL_EXPORT_C(Fl_Font,      Fl_Multiline_Output_textfont)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_textfont)(fl_Multiline_Output multiline_output,Fl_Font s);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Multiline_Output_textsize)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_textsize)(fl_Multiline_Output multiline_output,Fl_Fontsize s);
-  FL_EXPORT_C(Fl_Color,     Fl_Multiline_Output_textcolor)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_textcolor)(fl_Multiline_Output multiline_output,Fl_Color n);
-  FL_EXPORT_C(Fl_Color,     Fl_Multiline_Output_cursor_color)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_cursor_color)(fl_Multiline_Output multiline_output,Fl_Color n);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_input_type)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_input_type)(fl_Multiline_Output multiline_output,int t);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_readonly)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_readonly)(fl_Multiline_Output multiline_output,int b);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_wrap)(fl_Multiline_Output multiline_output);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_set_wrap)(fl_Multiline_Output multiline_output,int b);
-  FL_EXPORT_C(void,         Fl_Multiline_Output_tab_nav)(fl_Multiline_Output multiline_output,int val);
-  FL_EXPORT_C(int,          Fl_Multiline_Output_set_tab_nav)(fl_Multiline_Output multiline_output);
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_handle,(fl_Multiline_Output multiline_output, int event));
+  FL_EXPORT_C(fl_Multiline_Output, Fl_Multiline_Output_New_WithLabel)(int x, int y, int w, int h, const char* label);
+  FL_EXPORT_C(fl_Multiline_Output, Fl_Multiline_Output_New)(int x, int y, int w, int h);
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_Destroy,(fl_Multiline_Output multiline_output));
+
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_resize,(fl_Multiline_Output multiline_output, int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_set_value,(fl_Multiline_Output multiline_output, const char*));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_set_value_with_length,(fl_Multiline_Output multiline_output, const char* text, int length));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_static_value,(fl_Multiline_Output multiline_output, const char* text));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_static_value_with_length,(fl_Multiline_Output multiline_output, const char* text, int length));
+  FL_EXPORT_C_HEADER(const char*,Fl_Multiline_Output_value,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(Fl_Char,Fl_Multiline_Output_index,(fl_Multiline_Output multiline_output, int i));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_size,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_size,(fl_Multiline_Output multiline_output, int W, int H));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_maximum_size,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_maximum_size,(fl_Multiline_Output multiline_output, int m));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_position,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_mark,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_set_position_with_cursor_mark,(fl_Multiline_Output multiline_output,int p, int m));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_set_position_n_n,(fl_Multiline_Output multiline_output,int p));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_set_mark,(fl_Multiline_Output multiline_output,int m));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_replace,(fl_Multiline_Output multiline_output,int b, int e, const char *text));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_replace_with_ilen,(fl_Multiline_Output multiline_output,int b, int e, const char *text, int ilen));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_cut,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_cut_bytes,(fl_Multiline_Output multiline_output,int n));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_cut_range,(fl_Multiline_Output multiline_output,int a, int b));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_insert,(fl_Multiline_Output multiline_output,const char* t));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_insert_with_length,(fl_Multiline_Output multiline_output,const char* t, int l));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_copy,(fl_Multiline_Output multiline_output,int clipboard));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_undo,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_copy_cuts,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_shortcut,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_shortcut,(fl_Multiline_Output multiline_output,int s));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Multiline_Output_textfont,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_textfont,(fl_Multiline_Output multiline_output,Fl_Font s));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Multiline_Output_textsize,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_textsize,(fl_Multiline_Output multiline_output,Fl_Fontsize s));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Multiline_Output_textcolor,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_textcolor,(fl_Multiline_Output multiline_output,Fl_Color n));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Multiline_Output_cursor_color,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_cursor_color,(fl_Multiline_Output multiline_output,Fl_Color n));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_input_type,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_input_type,(fl_Multiline_Output multiline_output,int t));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_readonly,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_readonly,(fl_Multiline_Output multiline_output,int b));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_wrap,(fl_Multiline_Output multiline_output));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_set_wrap,(fl_Multiline_Output multiline_output,int b));
+  FL_EXPORT_C_HEADER(void,Fl_Multiline_Output_tab_nav,(fl_Multiline_Output multiline_output,int val));
+  FL_EXPORT_C_HEADER(int,Fl_Multiline_Output_set_tab_nav,(fl_Multiline_Output multiline_output));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Native_File_ChooserC.h b/c-src/Fl_Native_File_ChooserC.h
--- a/c-src/Fl_Native_File_ChooserC.h
+++ b/c-src/Fl_Native_File_ChooserC.h
@@ -26,29 +26,29 @@
     USE_FILTER_EXT = 0x0008
   };
 #endif
-  FL_EXPORT_C(fl_Native_File_Chooser, Fl_Native_File_Chooser_New_WithVal)(int val);
-  FL_EXPORT_C(fl_Native_File_Chooser, Fl_Native_File_Chooser_New)();
-  FL_EXPORT_C(void, Fl_Native_File_Chooser_Destroy)(fl_Native_File_Chooser chooser);
-  FL_EXPORT_C(void, Fl_Native_File_Chooser_set_type)(fl_Native_File_Chooser chooser, int type);
-  FL_EXPORT_C(int, Fl_Native_File_Chooser_type)(fl_Native_File_Chooser chooser);
-  FL_EXPORT_C(void, Fl_Native_File_Chooser_set_options)(fl_Native_File_Chooser chooser, int options);
-  FL_EXPORT_C(int, Fl_Native_File_Chooser_options)(fl_Native_File_Chooser chooser);
-  FL_EXPORT_C(int, Fl_Native_File_Chooser_count)(fl_Native_File_Chooser chooser);
-  FL_EXPORT_C(const char*, Fl_Native_File_Chooser_filename)(fl_Native_File_Chooser chooser);
-  FL_EXPORT_C(const char*, Fl_Native_File_Chooser_filename_with_i)(fl_Native_File_Chooser chooser, int i);
-  FL_EXPORT_C(void, Fl_Native_File_Chooser_set_directory)(fl_Native_File_Chooser chooser, const char *val);
-  FL_EXPORT_C(const char*, Fl_Native_File_Chooser_directory)(fl_Native_File_Chooser chooser);
-  FL_EXPORT_C(void, Fl_Native_File_Chooser_set_title)(fl_Native_File_Chooser chooser, const char *);
-  FL_EXPORT_C(const char*, Fl_Native_File_Chooser_title)(fl_Native_File_Chooser chooser);
-  FL_EXPORT_C(const char*, Fl_Native_File_Chooser_filter)(fl_Native_File_Chooser chooser);
-  FL_EXPORT_C(void, Fl_Native_File_Chooser_set_filter)(fl_Native_File_Chooser chooser, const char *);
-  FL_EXPORT_C(int, Fl_Native_File_Chooser_filters)(fl_Native_File_Chooser chooser);
-  FL_EXPORT_C(void, Fl_Native_File_Chooser_set_filter_value)(fl_Native_File_Chooser chooser, int i);
-  FL_EXPORT_C(int, Fl_Native_File_Chooser_filter_value)(fl_Native_File_Chooser chooser);
-  FL_EXPORT_C(void, Fl_Native_File_Chooser_set_preset_file)(fl_Native_File_Chooser chooser, const char*);
-  FL_EXPORT_C(const char*, Fl_Native_File_Chooser_preset_file)(fl_Native_File_Chooser chooser);
-  FL_EXPORT_C(const char*, Fl_Native_File_Chooser_errmsg)(fl_Native_File_Chooser chooser);
-  FL_EXPORT_C(int, Fl_Native_File_Chooser_show)(fl_Native_File_Chooser chooser);
+  FL_EXPORT_C_HEADER(fl_Native_File_Chooser,Fl_Native_File_Chooser_New_WithVal,(int val));
+  FL_EXPORT_C_HEADER(fl_Native_File_Chooser,Fl_Native_File_Chooser_New,());
+  FL_EXPORT_C_HEADER(void,Fl_Native_File_Chooser_Destroy,(fl_Native_File_Chooser chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Native_File_Chooser_set_type,(fl_Native_File_Chooser chooser, int type));
+  FL_EXPORT_C_HEADER(int,Fl_Native_File_Chooser_type,(fl_Native_File_Chooser chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Native_File_Chooser_set_options,(fl_Native_File_Chooser chooser, int options));
+  FL_EXPORT_C_HEADER(int,Fl_Native_File_Chooser_options,(fl_Native_File_Chooser chooser));
+  FL_EXPORT_C_HEADER(int,Fl_Native_File_Chooser_count,(fl_Native_File_Chooser chooser));
+  FL_EXPORT_C_HEADER(const char*,Fl_Native_File_Chooser_filename,(fl_Native_File_Chooser chooser));
+  FL_EXPORT_C_HEADER(const char*,Fl_Native_File_Chooser_filename_with_i,(fl_Native_File_Chooser chooser, int i));
+  FL_EXPORT_C_HEADER(void,Fl_Native_File_Chooser_set_directory,(fl_Native_File_Chooser chooser, const char *val));
+  FL_EXPORT_C_HEADER(const char*,Fl_Native_File_Chooser_directory,(fl_Native_File_Chooser chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Native_File_Chooser_set_title,(fl_Native_File_Chooser chooser, const char *));
+  FL_EXPORT_C_HEADER(const char*,Fl_Native_File_Chooser_title,(fl_Native_File_Chooser chooser));
+  FL_EXPORT_C_HEADER(const char*,Fl_Native_File_Chooser_filter,(fl_Native_File_Chooser chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Native_File_Chooser_set_filter,(fl_Native_File_Chooser chooser, const char *));
+  FL_EXPORT_C_HEADER(int,Fl_Native_File_Chooser_filters,(fl_Native_File_Chooser chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Native_File_Chooser_set_filter_value,(fl_Native_File_Chooser chooser, int i));
+  FL_EXPORT_C_HEADER(int,Fl_Native_File_Chooser_filter_value,(fl_Native_File_Chooser chooser));
+  FL_EXPORT_C_HEADER(void,Fl_Native_File_Chooser_set_preset_file,(fl_Native_File_Chooser chooser, const char*));
+  FL_EXPORT_C_HEADER(const char*,Fl_Native_File_Chooser_preset_file,(fl_Native_File_Chooser chooser));
+  FL_EXPORT_C_HEADER(const char*,Fl_Native_File_Chooser_errmsg,(fl_Native_File_Chooser chooser));
+  FL_EXPORT_C_HEADER(int,Fl_Native_File_Chooser_show,(fl_Native_File_Chooser chooser));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_OutputC.h b/c-src/Fl_OutputC.h
--- a/c-src/Fl_OutputC.h
+++ b/c-src/Fl_OutputC.h
@@ -30,152 +30,152 @@
 
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,Fl_Output_handle)(fl_Output self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Output_parent)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_set_parent)(fl_Output output, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Output_type)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_set_type)(fl_Output output, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Output_handle,(fl_Output self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Output_parent,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_parent,(fl_Output output, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Output_type,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_type,(fl_Output output, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Output_x)(fl_Output output);
-  FL_EXPORT_C(int,          Fl_Output_y)(fl_Output output);
-  FL_EXPORT_C(int,          Fl_Output_w)(fl_Output output);
-  FL_EXPORT_C(int,          Fl_Output_h)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_set_align)(fl_Output output, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Output_align)(fl_Output output);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Output_box)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_set_box)(fl_Output output, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Output_color)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_set_color)(fl_Output output, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Output_set_color_with_bg_sel)(fl_Output output,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Output_selection_color)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_set_selection_color)(fl_Output output, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Output_label)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_copy_label)(fl_Output output, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Output_set_label)(fl_Output output, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Output_labeltype)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_set_labeltype)(fl_Output output, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Output_labelcolor)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_set_labelcolor)(fl_Output output, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Output_labelfont)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_set_labelfont)(fl_Output output, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Output_labelsize)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_set_labelsize)(fl_Output output, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Output_image)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_set_image)(fl_Output output, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Output_deimage)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_set_deimage)(fl_Output output, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Output_tooltip)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_copy_tooltip)(fl_Output output, const char* text);
-  FL_EXPORT_C(void,         Fl_Output_set_tooltip)(fl_Output output, const char* text);
-  FL_EXPORT_C(void,         Fl_Output_set_callback_with_user_data)(fl_Output output, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Output_set_callback)(fl_Output output, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Output_user_data)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_set_user_data)(fl_Output output, void* v);
-  FL_EXPORT_C(long,         Fl_Output_argument)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_set_argument)(fl_Output output, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Output_when)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_set_when)(fl_Output output, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Output_visible)(fl_Output output);
-  FL_EXPORT_C(int,          Fl_Output_visible_r)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_set_visible)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_clear_visible)(fl_Output output);
-  FL_EXPORT_C(unsigned int, Fl_Output_active)(fl_Output output);
-  FL_EXPORT_C(int,          Fl_Output_active_r)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_activate)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_deactivate)(fl_Output output);
-  FL_EXPORT_C(unsigned int, Fl_Output_output)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_set_output)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_clear_output)(fl_Output output);
-  FL_EXPORT_C(unsigned int, Fl_Output_takesevents)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_set_changed)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_clear_changed)(fl_Output output);
-  FL_EXPORT_C(int,          Fl_Output_take_focus)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_set_visible_focus)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_clear_visible_focus)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_modify_visible_focus)(fl_Output output, int v);
-  FL_EXPORT_C(unsigned int, Fl_Output_visible_focus)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_do_callback)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_do_callback_with_widget_and_user_data)(fl_Output output, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Output_do_callback_with_widget_and_default_user_data)(fl_Output output, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Output_contains)(fl_Output output, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Output_inside)(fl_Output output, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Output_redraw)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_redraw_label)(fl_Output output);
-  FL_EXPORT_C(uchar,        Fl_Output_damage)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_clear_damage_with_bitmask)(fl_Output output, uchar c);
-  FL_EXPORT_C(void,         Fl_Output_clear_damage)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_damage_with_text)(fl_Output output, uchar c);
-  FL_EXPORT_C(void,         Fl_Output_damage_inside_widget)(fl_Output output, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Output_draw_label_with_xywh_alignment)(fl_Output output, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Output_measure_label)(fl_Output output, int* ww , int* hh);
+  FL_EXPORT_C_HEADER(int,Fl_Output_x,(fl_Output output));
+  FL_EXPORT_C_HEADER(int,Fl_Output_y,(fl_Output output));
+  FL_EXPORT_C_HEADER(int,Fl_Output_w,(fl_Output output));
+  FL_EXPORT_C_HEADER(int,Fl_Output_h,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_align,(fl_Output output, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Output_align,(fl_Output output));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Output_box,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_box,(fl_Output output, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Output_color,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_color,(fl_Output output, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_color_with_bg_sel,(fl_Output output,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Output_selection_color,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_selection_color,(fl_Output output, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Output_label,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_copy_label,(fl_Output output, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_label,(fl_Output output, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Output_labeltype,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_labeltype,(fl_Output output, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Output_labelcolor,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_labelcolor,(fl_Output output, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Output_labelfont,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_labelfont,(fl_Output output, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Output_labelsize,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_labelsize,(fl_Output output, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Output_image,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_image,(fl_Output output, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Output_deimage,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_deimage,(fl_Output output, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Output_tooltip,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_copy_tooltip,(fl_Output output, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_tooltip,(fl_Output output, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_callback_with_user_data,(fl_Output output, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_callback,(fl_Output output, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Output_user_data,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_user_data,(fl_Output output, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Output_argument,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_argument,(fl_Output output, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Output_when,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_when,(fl_Output output, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Output_visible,(fl_Output output));
+  FL_EXPORT_C_HEADER(int,Fl_Output_visible_r,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_visible,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_clear_visible,(fl_Output output));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Output_active,(fl_Output output));
+  FL_EXPORT_C_HEADER(int,Fl_Output_active_r,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_activate,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_deactivate,(fl_Output output));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Output_output,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_output,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_clear_output,(fl_Output output));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Output_takesevents,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_changed,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_clear_changed,(fl_Output output));
+  FL_EXPORT_C_HEADER(int,Fl_Output_take_focus,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_visible_focus,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_clear_visible_focus,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_modify_visible_focus,(fl_Output output, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Output_visible_focus,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_do_callback,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_do_callback_with_widget_and_user_data,(fl_Output output, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Output_do_callback_with_widget_and_default_user_data,(fl_Output output, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Output_contains,(fl_Output output, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Output_inside,(fl_Output output, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Output_redraw,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_redraw_label,(fl_Output output));
+  FL_EXPORT_C_HEADER(uchar,Fl_Output_damage,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_clear_damage_with_bitmask,(fl_Output output, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Output_clear_damage,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_damage_with_text,(fl_Output output, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Output_damage_inside_widget,(fl_Output output, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Output_draw_label_with_xywh_alignment,(fl_Output output, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Output_measure_label,(fl_Output output, int* ww , int* hh));
 
-  FL_EXPORT_C(fl_Window,    Fl_Output_window)(fl_Output output);
-  FL_EXPORT_C(fl_Window,    Fl_Output_top_window)(fl_Output output);
-  FL_EXPORT_C(fl_Window ,   Fl_Output_top_window_offset)(fl_Output output, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Output_as_group)(fl_Output output);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Output_as_gl_window)(fl_Output output);
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Output_window,(fl_Output output));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Output_top_window,(fl_Output output));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Output_top_window_offset,(fl_Output output, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Output_as_group,(fl_Output output));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Output_as_gl_window,(fl_Output output));
   /* Fl_Output specific functions */
-  FL_EXPORT_C(int,      Fl_Output_handle)(fl_Output output, int event);
-  FL_EXPORT_C(fl_Output, Fl_Output_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Output, Fl_Output_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(void,     Fl_Output_Destroy)(fl_Output output);
+  FL_EXPORT_C_HEADER(int,Fl_Output_handle,(fl_Output output, int event));
+  FL_EXPORT_C_HEADER(fl_Output,Fl_Output_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Output,Fl_Output_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Output_Destroy,(fl_Output output));
 
-  FL_EXPORT_C(void,         Fl_Output_resize)(fl_Output output, int X, int Y, int W, int H);
-  FL_EXPORT_C(int,          Fl_Output_set_value)(fl_Output output, const char*);
-  FL_EXPORT_C(int,          Fl_Output_set_value_with_length)(fl_Output output, const char* text, int length);
-  FL_EXPORT_C(int,          Fl_Output_static_value)(fl_Output output, const char* text);
-  FL_EXPORT_C(int,          Fl_Output_static_value_with_length)(fl_Output output, const char* text, int length);
-  FL_EXPORT_C(const char*,  Fl_Output_value)(fl_Output output);
-  FL_EXPORT_C(Fl_Char,      Fl_Output_index)(fl_Output output, int i);
-  FL_EXPORT_C(int,          Fl_Output_size)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_set_size)(fl_Output output, int W, int H);
-  FL_EXPORT_C(int,          Fl_Output_maximum_size)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_set_maximum_size)(fl_Output output, int m);
-  FL_EXPORT_C(int,          Fl_Output_position)(fl_Output output);
-  FL_EXPORT_C(int,          Fl_Output_mark)(fl_Output output);
-  FL_EXPORT_C(int,          Fl_Output_set_position_with_cursor_mark)(fl_Output output,int p, int m);
-  FL_EXPORT_C(int,          Fl_Output_set_position_n_n)(fl_Output output,int p);
-  FL_EXPORT_C(int,          Fl_Output_set_mark)(fl_Output output,int m);
-  FL_EXPORT_C(int,          Fl_Output_replace)(fl_Output output,int b, int e, const char *text);
-  FL_EXPORT_C(int,          Fl_Output_replace_with_ilen)(fl_Output output,int b, int e, const char *text, int ilen);
-  FL_EXPORT_C(int,          Fl_Output_cut)(fl_Output output);
-  FL_EXPORT_C(int,          Fl_Output_cut_bytes)(fl_Output output,int n);
-  FL_EXPORT_C(int,          Fl_Output_cut_range)(fl_Output output,int a, int b);
-  FL_EXPORT_C(int,          Fl_Output_insert)(fl_Output output,const char* t);
-  FL_EXPORT_C(int,          Fl_Output_insert_with_length)(fl_Output output,const char* t, int l);
-  FL_EXPORT_C(int,          Fl_Output_copy)(fl_Output output,int clipboard);
-  FL_EXPORT_C(int,          Fl_Output_undo)(fl_Output output);
-  FL_EXPORT_C(int,          Fl_Output_copy_cuts)(fl_Output output);
-  FL_EXPORT_C(int,          Fl_Output_shortcut)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_set_shortcut)(fl_Output output,int s);
-  FL_EXPORT_C(Fl_Font,      Fl_Output_textfont)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_set_textfont)(fl_Output output,Fl_Font s);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Output_textsize)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_set_textsize)(fl_Output output,Fl_Fontsize s);
-  FL_EXPORT_C(Fl_Color,     Fl_Output_textcolor)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_set_textcolor)(fl_Output output,Fl_Color n);
-  FL_EXPORT_C(Fl_Color,     Fl_Output_cursor_color)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_set_cursor_color)(fl_Output output,Fl_Color n);
-  FL_EXPORT_C(int,          Fl_Output_input_type)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_set_input_type)(fl_Output output,int t);
-  FL_EXPORT_C(int,          Fl_Output_readonly)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_set_readonly)(fl_Output output,int b);
-  FL_EXPORT_C(int,          Fl_Output_wrap)(fl_Output output);
-  FL_EXPORT_C(void,         Fl_Output_set_wrap)(fl_Output output,int b);
-  FL_EXPORT_C(void,         Fl_Output_tab_nav)(fl_Output output,int val);
-  FL_EXPORT_C(int,          Fl_Output_set_tab_nav)(fl_Output output);
-  FL_EXPORT_C(fl_Output,    Fl_OverriddenOutput_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Output,    Fl_OverriddenOutput_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Output_draw)(fl_Output o);
-  FL_EXPORT_C(void, Fl_Output_draw_super)(fl_Output o);
-  FL_EXPORT_C(int, Fl_Output_handle)(fl_Output o, int event);
-  FL_EXPORT_C(int, Fl_Output_handle_super)(fl_Output o, int event);
-  FL_EXPORT_C(void, Fl_Output_resize)(fl_Output o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Output_resize_super)(fl_Output o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Output_show)(fl_Output o);
-  FL_EXPORT_C(void, Fl_Output_show_super)(fl_Output o);
-  FL_EXPORT_C(void, Fl_Output_hide)(fl_Output o);
-  FL_EXPORT_C(void, Fl_Output_hide_super)(fl_Output o);
+  FL_EXPORT_C_HEADER(void,Fl_Output_resize,(fl_Output output, int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(int,Fl_Output_set_value,(fl_Output output, const char*));
+  FL_EXPORT_C_HEADER(int,Fl_Output_set_value_with_length,(fl_Output output, const char* text, int length));
+  FL_EXPORT_C_HEADER(int,Fl_Output_static_value,(fl_Output output, const char* text));
+  FL_EXPORT_C_HEADER(int,Fl_Output_static_value_with_length,(fl_Output output, const char* text, int length));
+  FL_EXPORT_C_HEADER(const char*,Fl_Output_value,(fl_Output output));
+  FL_EXPORT_C_HEADER(Fl_Char,Fl_Output_index,(fl_Output output, int i));
+  FL_EXPORT_C_HEADER(int,Fl_Output_size,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_size,(fl_Output output, int W, int H));
+  FL_EXPORT_C_HEADER(int,Fl_Output_maximum_size,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_maximum_size,(fl_Output output, int m));
+  FL_EXPORT_C_HEADER(int,Fl_Output_position,(fl_Output output));
+  FL_EXPORT_C_HEADER(int,Fl_Output_mark,(fl_Output output));
+  FL_EXPORT_C_HEADER(int,Fl_Output_set_position_with_cursor_mark,(fl_Output output,int p, int m));
+  FL_EXPORT_C_HEADER(int,Fl_Output_set_position_n_n,(fl_Output output,int p));
+  FL_EXPORT_C_HEADER(int,Fl_Output_set_mark,(fl_Output output,int m));
+  FL_EXPORT_C_HEADER(int,Fl_Output_replace,(fl_Output output,int b, int e, const char *text));
+  FL_EXPORT_C_HEADER(int,Fl_Output_replace_with_ilen,(fl_Output output,int b, int e, const char *text, int ilen));
+  FL_EXPORT_C_HEADER(int,Fl_Output_cut,(fl_Output output));
+  FL_EXPORT_C_HEADER(int,Fl_Output_cut_bytes,(fl_Output output,int n));
+  FL_EXPORT_C_HEADER(int,Fl_Output_cut_range,(fl_Output output,int a, int b));
+  FL_EXPORT_C_HEADER(int,Fl_Output_insert,(fl_Output output,const char* t));
+  FL_EXPORT_C_HEADER(int,Fl_Output_insert_with_length,(fl_Output output,const char* t, int l));
+  FL_EXPORT_C_HEADER(int,Fl_Output_copy,(fl_Output output,int clipboard));
+  FL_EXPORT_C_HEADER(int,Fl_Output_undo,(fl_Output output));
+  FL_EXPORT_C_HEADER(int,Fl_Output_copy_cuts,(fl_Output output));
+  FL_EXPORT_C_HEADER(int,Fl_Output_shortcut,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_shortcut,(fl_Output output,int s));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Output_textfont,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_textfont,(fl_Output output,Fl_Font s));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Output_textsize,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_textsize,(fl_Output output,Fl_Fontsize s));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Output_textcolor,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_textcolor,(fl_Output output,Fl_Color n));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Output_cursor_color,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_cursor_color,(fl_Output output,Fl_Color n));
+  FL_EXPORT_C_HEADER(int,Fl_Output_input_type,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_input_type,(fl_Output output,int t));
+  FL_EXPORT_C_HEADER(int,Fl_Output_readonly,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_readonly,(fl_Output output,int b));
+  FL_EXPORT_C_HEADER(int,Fl_Output_wrap,(fl_Output output));
+  FL_EXPORT_C_HEADER(void,Fl_Output_set_wrap,(fl_Output output,int b));
+  FL_EXPORT_C_HEADER(void,Fl_Output_tab_nav,(fl_Output output,int val));
+  FL_EXPORT_C_HEADER(int,Fl_Output_set_tab_nav,(fl_Output output));
+  FL_EXPORT_C_HEADER(fl_Output,Fl_OverriddenOutput_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Output,Fl_OverriddenOutput_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Output_draw,(fl_Output o));
+  FL_EXPORT_C_HEADER(void,Fl_Output_draw_super,(fl_Output o));
+  FL_EXPORT_C_HEADER(int,Fl_Output_handle,(fl_Output o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Output_handle_super,(fl_Output o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Output_resize,(fl_Output o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Output_resize_super,(fl_Output o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Output_show,(fl_Output o));
+  FL_EXPORT_C_HEADER(void,Fl_Output_show_super,(fl_Output o));
+  FL_EXPORT_C_HEADER(void,Fl_Output_hide,(fl_Output o));
+  FL_EXPORT_C_HEADER(void,Fl_Output_hide_super,(fl_Output o));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Overlay_WindowC.h b/c-src/Fl_Overlay_WindowC.h
--- a/c-src/Fl_Overlay_WindowC.h
+++ b/c-src/Fl_Overlay_WindowC.h
@@ -21,185 +21,185 @@
   };
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,Fl_Overlay_Window_handle)(fl_Overlay_Window self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Overlay_Window_parent)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_set_parent)(fl_Overlay_Window win, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Overlay_Window_type)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_set_type)(fl_Overlay_Window win, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Overlay_Window_handle,(fl_Overlay_Window self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Overlay_Window_parent,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_parent,(fl_Overlay_Window win, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Overlay_Window_type,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_type,(fl_Overlay_Window win, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Overlay_Window_x)(fl_Overlay_Window win);
-  FL_EXPORT_C(int,          Fl_Overlay_Window_y)(fl_Overlay_Window win);
-  FL_EXPORT_C(int,          Fl_Overlay_Window_w)(fl_Overlay_Window win);
-  FL_EXPORT_C(int,          Fl_Overlay_Window_h)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_set_align)(fl_Overlay_Window double_window, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Overlay_Window_align)(fl_Overlay_Window win);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Overlay_Window_box)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_set_box)(fl_Overlay_Window win, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Overlay_Window_color)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_set_color)(fl_Overlay_Window win, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_set_color_with_bg_sel)(fl_Overlay_Window win,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Overlay_Window_selection_color)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_set_selection_color)(fl_Overlay_Window win, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Overlay_Window_label)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_copy_label)(fl_Overlay_Window win, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_set_label)(fl_Overlay_Window win, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Overlay_Window_labeltype)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_set_labeltype)(fl_Overlay_Window win, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Overlay_Window_labelcolor)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_set_labelcolor)(fl_Overlay_Window win, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Overlay_Window_labelfont)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_set_labelfont)(fl_Overlay_Window win, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Overlay_Window_labelsize)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_set_labelsize)(fl_Overlay_Window win, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Overlay_Window_image)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_set_image)(fl_Overlay_Window win, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Overlay_Window_deimage)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_set_deimage)(fl_Overlay_Window win, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Overlay_Window_tooltip)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_copy_tooltip)(fl_Overlay_Window win, const char* text);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_set_tooltip)(fl_Overlay_Window win, const char* text);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_set_callback_with_user_data)(fl_Overlay_Window win, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_set_callback)(fl_Overlay_Window win, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Overlay_Window_user_data)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_set_user_data)(fl_Overlay_Window win, void* v);
-  FL_EXPORT_C(long,         Fl_Overlay_Window_argument)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_set_argument)(fl_Overlay_Window win, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Overlay_Window_when)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_set_when)(fl_Overlay_Window win, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Overlay_Window_visible)(fl_Overlay_Window win);
-  FL_EXPORT_C(int,          Fl_Overlay_Window_visible_r)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_set_visible)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_clear_visible)(fl_Overlay_Window win);
-  FL_EXPORT_C(unsigned int, Fl_Overlay_Window_active)(fl_Overlay_Window win);
-  FL_EXPORT_C(int,          Fl_Overlay_Window_active_r)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_activate)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_deactivate)(fl_Overlay_Window win);
-  FL_EXPORT_C(unsigned int, Fl_Overlay_Window_output)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_set_output)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_clear_output)(fl_Overlay_Window win);
-  FL_EXPORT_C(unsigned int, Fl_Overlay_Window_takesevents)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_set_changed)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_clear_changed)(fl_Overlay_Window win);
-  FL_EXPORT_C(int,          Fl_Overlay_Window_take_focus)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_set_visible_focus)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_clear_visible_focus)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_modify_visible_focus)(fl_Overlay_Window win, int v);
-  FL_EXPORT_C(unsigned int, Fl_Overlay_Window_visible_focus)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_do_callback)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_do_callback_with_widget_and_user_data)(fl_Overlay_Window win, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_do_callback_with_widget_and_default_user_data)(fl_Overlay_Window win, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Overlay_Window_contains)(fl_Overlay_Window win, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Overlay_Window_inside)(fl_Overlay_Window win, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_redraw)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_redraw_label)(fl_Overlay_Window win);
-  FL_EXPORT_C(uchar,        Fl_Overlay_Window_damage)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_clear_damage_with_bitmask)(fl_Overlay_Window win, uchar c);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_clear_damage)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_damage_with_text)(fl_Overlay_Window win, uchar c);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_damage_inside_widget)(fl_Overlay_Window win, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_draw_label_with_xywh_alignment)(fl_Overlay_Window win, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_measure_label)(fl_Overlay_Window win, int* ww , int* hh);
-  FL_EXPORT_C(fl_Group,     Fl_Overlay_Window_as_group)(fl_Overlay_Window win);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Overlay_Window_as_gl_window)(fl_Overlay_Window win);
-  FL_EXPORT_C(fl_Window, Fl_Overlay_Window_as_window)(fl_Overlay_Window win);
-  FL_EXPORT_C(fl_Window,    Fl_Overlay_Window_window)(fl_Overlay_Window double_window);
-  FL_EXPORT_C(fl_Window,    Fl_Overlay_Window_top_window)(fl_Overlay_Window double_window);
-  FL_EXPORT_C(fl_Window ,   Fl_Overlay_Window_top_window_offset)(fl_Overlay_Window double_window, int* xoff, int* yoff);
+  FL_EXPORT_C_HEADER(int,Fl_Overlay_Window_x,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Overlay_Window_y,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Overlay_Window_w,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Overlay_Window_h,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_align,(fl_Overlay_Window double_window, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Overlay_Window_align,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Overlay_Window_box,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_box,(fl_Overlay_Window win, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Overlay_Window_color,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_color,(fl_Overlay_Window win, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_color_with_bg_sel,(fl_Overlay_Window win,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Overlay_Window_selection_color,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_selection_color,(fl_Overlay_Window win, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Overlay_Window_label,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_copy_label,(fl_Overlay_Window win, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_label,(fl_Overlay_Window win, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Overlay_Window_labeltype,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_labeltype,(fl_Overlay_Window win, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Overlay_Window_labelcolor,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_labelcolor,(fl_Overlay_Window win, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Overlay_Window_labelfont,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_labelfont,(fl_Overlay_Window win, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Overlay_Window_labelsize,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_labelsize,(fl_Overlay_Window win, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Overlay_Window_image,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_image,(fl_Overlay_Window win, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Overlay_Window_deimage,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_deimage,(fl_Overlay_Window win, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Overlay_Window_tooltip,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_copy_tooltip,(fl_Overlay_Window win, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_tooltip,(fl_Overlay_Window win, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_callback_with_user_data,(fl_Overlay_Window win, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_callback,(fl_Overlay_Window win, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Overlay_Window_user_data,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_user_data,(fl_Overlay_Window win, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Overlay_Window_argument,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_argument,(fl_Overlay_Window win, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Overlay_Window_when,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_when,(fl_Overlay_Window win, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Overlay_Window_visible,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Overlay_Window_visible_r,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_visible,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_clear_visible,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Overlay_Window_active,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Overlay_Window_active_r,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_activate,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_deactivate,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Overlay_Window_output,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_output,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_clear_output,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Overlay_Window_takesevents,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_changed,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_clear_changed,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Overlay_Window_take_focus,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_visible_focus,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_clear_visible_focus,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_modify_visible_focus,(fl_Overlay_Window win, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Overlay_Window_visible_focus,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_do_callback,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_do_callback_with_widget_and_user_data,(fl_Overlay_Window win, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_do_callback_with_widget_and_default_user_data,(fl_Overlay_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Overlay_Window_contains,(fl_Overlay_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Overlay_Window_inside,(fl_Overlay_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_redraw,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_redraw_label,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(uchar,Fl_Overlay_Window_damage,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_clear_damage_with_bitmask,(fl_Overlay_Window win, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_clear_damage,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_damage_with_text,(fl_Overlay_Window win, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_damage_inside_widget,(fl_Overlay_Window win, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_draw_label_with_xywh_alignment,(fl_Overlay_Window win, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_measure_label,(fl_Overlay_Window win, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Overlay_Window_as_group,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Overlay_Window_as_gl_window,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Overlay_Window_as_window,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Overlay_Window_window,(fl_Overlay_Window double_window));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Overlay_Window_top_window,(fl_Overlay_Window double_window));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Overlay_Window_top_window_offset,(fl_Overlay_Window double_window, int* xoff, int* yoff));
   /* Inherited from Fl_Group */
-  FL_EXPORT_C(void,         Fl_Overlay_Window_begin)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_end)(fl_Overlay_Window win);
-  FL_EXPORT_C(int,          Fl_Overlay_Window_find)(fl_Overlay_Window win, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_add)(fl_Overlay_Window win, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_insert)(fl_Overlay_Window win, fl_Widget w, int i);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_remove_index)(fl_Overlay_Window win, int index);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_remove_widget)(fl_Overlay_Window win, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_clear)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_set_resizable_by_reference)(fl_Overlay_Window win,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_set_resizable)(fl_Overlay_Window win,fl_Widget o);
-  FL_EXPORT_C(fl_Widget,         Fl_Overlay_Window_resizable)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_add_resizable)(fl_Overlay_Window win,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_init_sizes)(fl_Overlay_Window win);
-  FL_EXPORT_C(int,          Fl_Overlay_Window_children)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_set_clip_children)(fl_Overlay_Window win,int c);
-  FL_EXPORT_C(unsigned int, Fl_Overlay_Window_clip_children)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_focus)(fl_Overlay_Window win,fl_Widget W);
-  FL_EXPORT_C(fl_Widget,    Fl_Overlay_Window__ddfdesign_kludge)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_insert_with_before)(fl_Overlay_Window self, fl_Widget w, fl_Widget before);
-  FL_EXPORT_C(fl_Widget*,   Fl_Overlay_Window_array)(fl_Overlay_Window self);
-  FL_EXPORT_C(fl_Widget,    Fl_Overlay_Window_child)(fl_Overlay_Window self, int n);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_forms_end)(fl_Overlay_Window self);
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_begin,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_end,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Overlay_Window_find,(fl_Overlay_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_add,(fl_Overlay_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_insert,(fl_Overlay_Window win, fl_Widget w, int i));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_remove_index,(fl_Overlay_Window win, int index));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_remove_widget,(fl_Overlay_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_clear,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_resizable_by_reference,(fl_Overlay_Window win,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_resizable,(fl_Overlay_Window win,fl_Widget o));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Overlay_Window_resizable,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_add_resizable,(fl_Overlay_Window win,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_init_sizes,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Overlay_Window_children,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_clip_children,(fl_Overlay_Window win,int c));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Overlay_Window_clip_children,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_focus,(fl_Overlay_Window win,fl_Widget W));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Overlay_Window__ddfdesign_kludge,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_insert_with_before,(fl_Overlay_Window self, fl_Widget w, fl_Widget before));
+  FL_EXPORT_C_HEADER(fl_Widget*,Fl_Overlay_Window_array,(fl_Overlay_Window self));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Overlay_Window_child,(fl_Overlay_Window self, int n));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_forms_end,(fl_Overlay_Window self));
   /* FL_EXPORT_C(void,         Fl_Overlay_Window_forms_end)(fl_Overlay_Window win); */
   /* Fl_Window inherited */
-  FL_EXPORT_C(unsigned int, Fl_Overlay_Window_changed)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_fullscreen)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_fullscreen_off)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_fullscreen_off_with_resize)(fl_Overlay_Window win,int X,int Y,int W,int H);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_iconize)(fl_Overlay_Window win);
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Overlay_Window_changed,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_fullscreen,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_fullscreen_off,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_fullscreen_off_with_resize,(fl_Overlay_Window win,int X,int Y,int W,int H));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_iconize,(fl_Overlay_Window win));
 
-  FL_EXPORT_C(int ,Fl_Overlay_Window_handle)(fl_Overlay_Window win, int event);
-  FL_EXPORT_C(void ,Fl_Overlay_Window_set_border)(fl_Overlay_Window win, int b);
-  FL_EXPORT_C(void ,Fl_Overlay_Window_clear_border)(fl_Overlay_Window win);
-  FL_EXPORT_C(unsigned int ,Fl_Overlay_Window_border)(fl_Overlay_Window win);
-  FL_EXPORT_C(void ,Fl_Overlay_Window_set_override)(fl_Overlay_Window win);
-  FL_EXPORT_C(unsigned int,Fl_Overlay_Window_override)(fl_Overlay_Window win);
-  FL_EXPORT_C(void ,Fl_Overlay_Window_set_modal)(fl_Overlay_Window win);
-  FL_EXPORT_C(unsigned int,Fl_Overlay_Window_modal)(fl_Overlay_Window win);
-  FL_EXPORT_C(void ,Fl_Overlay_Window_set_non_modal)(fl_Overlay_Window win);
-  FL_EXPORT_C(unsigned int ,Fl_Overlay_Window_non_modal)(fl_Overlay_Window win);
-  FL_EXPORT_C(void ,Fl_Overlay_Window_set_menu_window)(fl_Overlay_Window win);
-  FL_EXPORT_C(unsigned int,Fl_Overlay_Window_menu_window)(fl_Overlay_Window win);
-  FL_EXPORT_C(void ,Fl_Overlay_Window_set_tooltip_window)(fl_Overlay_Window win);
-  FL_EXPORT_C(unsigned int,Fl_Overlay_Window_tooltip_window)(fl_Overlay_Window win);
-  FL_EXPORT_C(void ,Fl_Overlay_Window_hotspot_with_x_y)(fl_Overlay_Window win, int x, int y);
-  FL_EXPORT_C(void ,Fl_Overlay_Window_hotspot_with_x_y_with_offscreen)(fl_Overlay_Window win, int x, int y, int offscreen);
-  FL_EXPORT_C(void ,Fl_Overlay_Window_hotspot_with_widget)(fl_Overlay_Window win, fl_Widget w);//, int offscreen = 0);
-  FL_EXPORT_C(void ,Fl_Overlay_Window_hotspot_with_widget_with_offscreen)(fl_Overlay_Window win, fl_Widget w, int offscreen);
-  FL_EXPORT_C(void ,Fl_Overlay_Window_free_position)(fl_Overlay_Window win);
-  FL_EXPORT_C(void ,Fl_Overlay_Window_size_range)(fl_Overlay_Window win, int minw, int minh);
-  FL_EXPORT_C(void ,Fl_Overlay_Window_size_range_with_args)(fl_Window win, int minw, int minh, fl_Window_size_range_args* args);//int maxw=0, int maxh=0, int dw=0, int dh=0, int aspect=0);
-  FL_EXPORT_C(const char*, Fl_Overlay_Window_label)(fl_Overlay_Window win);
-  FL_EXPORT_C(const char*, Fl_Overlay_Window_iconlabel)(fl_Overlay_Window win);
-  FL_EXPORT_C(void, Fl_Overlay_Window_set_label)(fl_Overlay_Window win,const char*);
-  FL_EXPORT_C(void, Fl_Overlay_Window_set_iconlabel)(fl_Overlay_Window win,const char*);
-  FL_EXPORT_C(void, Fl_Overlay_Window_set_label_with_iconlabel)(fl_Overlay_Window win,const char* label, const char* iconlabel);
-  FL_EXPORT_C(void, Fl_Overlay_Window_copy_label)(fl_Overlay_Window win,const char* a);
-  FL_EXPORT_C(void, Fl_Overlay_Window_set_default_xclass)(const char* label);
-  FL_EXPORT_C(const char*, Fl_Overlay_Window_default_xclass)();
-  FL_EXPORT_C(const char*, Fl_Overlay_Window_xclass)(fl_Overlay_Window win);
-  FL_EXPORT_C(void, Fl_Overlay_Window_set_xclass)(fl_Overlay_Window win,const char* c);
-  FL_EXPORT_C(const void*, Fl_Overlay_Window_icon)(fl_Overlay_Window win);
-  FL_EXPORT_C(void, Fl_Overlay_Window_set_icon)(fl_Overlay_Window win,const void * ic);
-  FL_EXPORT_C(int, Fl_Overlay_Window_shown)(fl_Overlay_Window win);
-  FL_EXPORT_C(void, Fl_Overlay_Window_iconize)(fl_Overlay_Window win);
-  FL_EXPORT_C(int, Fl_Overlay_Window_x_root)(fl_Overlay_Window win);
-  FL_EXPORT_C(int, Fl_Overlay_Window_y_root)(fl_Overlay_Window win);
-  FL_EXPORT_C(fl_Overlay_Window, Fl_Overlay_Window_current)();
-  FL_EXPORT_C(void, Fl_Overlay_Window_make_current)(fl_Overlay_Window win);
-  FL_EXPORT_C(void, Fl_Overlay_Window_set_cursor_with_bg)(fl_Overlay_Window win, Fl_Cursor cursor, Fl_Color bg);
-  FL_EXPORT_C(void, Fl_Overlay_Window_set_cursor_with_fg)(fl_Overlay_Window win,Fl_Cursor cursor, Fl_Color fg);
+  FL_EXPORT_C_HEADER(int ,Fl_Overlay_Window_handle,(fl_Overlay_Window win, int event));
+  FL_EXPORT_C_HEADER(void ,Fl_Overlay_Window_set_border,(fl_Overlay_Window win, int b));
+  FL_EXPORT_C_HEADER(void ,Fl_Overlay_Window_clear_border,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(unsigned int ,Fl_Overlay_Window_border,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Overlay_Window_set_override,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Overlay_Window_override,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Overlay_Window_set_modal,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Overlay_Window_modal,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Overlay_Window_set_non_modal,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(unsigned int ,Fl_Overlay_Window_non_modal,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Overlay_Window_set_menu_window,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Overlay_Window_menu_window,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Overlay_Window_set_tooltip_window,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Overlay_Window_tooltip_window,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Overlay_Window_hotspot_with_x_y,(fl_Overlay_Window win, int x, int y));
+  FL_EXPORT_C_HEADER(void ,Fl_Overlay_Window_hotspot_with_x_y_with_offscreen,(fl_Overlay_Window win, int x, int y, int offscreen));
+  FL_EXPORT_C_HEADER(void ,Fl_Overlay_Window_hotspot_with_widget,(fl_Overlay_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void ,Fl_Overlay_Window_hotspot_with_widget_with_offscreen,(fl_Overlay_Window win, fl_Widget w, int offscreen));
+  FL_EXPORT_C_HEADER(void ,Fl_Overlay_Window_free_position,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Overlay_Window_size_range,(fl_Overlay_Window win, int minw, int minh));
+  FL_EXPORT_C_HEADER(void ,Fl_Overlay_Window_size_range_with_args,(fl_Window win, int minw, int minh, fl_Window_size_range_args* args));
+  FL_EXPORT_C_HEADER(const char*,Fl_Overlay_Window_label,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(const char*,Fl_Overlay_Window_iconlabel,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_label,(fl_Overlay_Window win,const char*));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_iconlabel,(fl_Overlay_Window win,const char*));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_label_with_iconlabel,(fl_Overlay_Window win,const char* label, const char* iconlabel));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_copy_label,(fl_Overlay_Window win,const char* a));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_default_xclass,(const char* label));
+  FL_EXPORT_C_HEADER(const char*,Fl_Overlay_Window_default_xclass,());
+  FL_EXPORT_C_HEADER(const char*,Fl_Overlay_Window_xclass,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_xclass,(fl_Overlay_Window win,const char* c));
+  FL_EXPORT_C_HEADER(const void*,Fl_Overlay_Window_icon,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_icon,(fl_Overlay_Window win,const void * ic));
+  FL_EXPORT_C_HEADER(int,Fl_Overlay_Window_shown,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_iconize,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Overlay_Window_x_root,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Overlay_Window_y_root,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(fl_Overlay_Window,Fl_Overlay_Window_current,());
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_make_current,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_cursor_with_bg,(fl_Overlay_Window win, Fl_Cursor cursor, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_cursor_with_fg,(fl_Overlay_Window win,Fl_Cursor cursor, Fl_Color fg));
   FL_EXPORT_C(void, Fl_Overlay_Window_set_cursor_with_fg_bg)(fl_Overlay_Window win,Fl_Cursor cursor, Fl_Color fg , Fl_Color bg );/* =FL_BLACK *//*=FL_WHITE*/
-  FL_EXPORT_C(void, Fl_Overlay_Window_set_cursor)(fl_Overlay_Window win,Fl_Cursor cursor);
-  FL_EXPORT_C(void, Fl_Overlay_Window_set_default_cursor_with_bg)(fl_Overlay_Window win,Fl_Cursor cursor, Fl_Color bg);
-  FL_EXPORT_C(void, Fl_Overlay_Window_set_default_cursor_with_fg)(fl_Overlay_Window win, Fl_Cursor cursor, Fl_Color fg);
-  FL_EXPORT_C(void, Fl_Overlay_Window_set_default_cursor_with_fg_bg)(fl_Overlay_Window win,Fl_Cursor cursor, Fl_Color fg , Fl_Color bg );
-  FL_EXPORT_C(void, Fl_Overlay_Window_set_default_cursor)(fl_Overlay_Window win,Fl_Cursor cursor);
-  FL_EXPORT_C(void, Fl_Overlay_Window_default_callback)(fl_Overlay_Window win, void* v);
-  FL_EXPORT_C(int, Fl_Overlay_Window_decorated_w)(fl_Overlay_Window win);
-  FL_EXPORT_C(int, Fl_Overlay_Window_decorated_h)(fl_Overlay_Window win);
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_cursor,(fl_Overlay_Window win,Fl_Cursor cursor));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_default_cursor_with_bg,(fl_Overlay_Window win,Fl_Cursor cursor, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_default_cursor_with_fg,(fl_Overlay_Window win, Fl_Cursor cursor, Fl_Color fg));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_default_cursor_with_fg_bg,(fl_Overlay_Window win,Fl_Cursor cursor, Fl_Color fg , Fl_Color bg ));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_set_default_cursor,(fl_Overlay_Window win,Fl_Cursor cursor));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_default_callback,(fl_Overlay_Window win, void* v));
+  FL_EXPORT_C_HEADER(int,Fl_Overlay_Window_decorated_w,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Overlay_Window_decorated_h,(fl_Overlay_Window win));
   /* Fl_Overlay_Window specific */
-  FL_EXPORT_C(void,         Fl_Overlay_Window_show)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_show_with_args)(fl_Overlay_Window win, int argc, char** argv);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_flush)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_resize)(fl_Overlay_Window win, int X, int Y, int W, int H);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_hide)(fl_Overlay_Window win);
-  FL_EXPORT_C(int,          Fl_Overlay_Window_can_do_overlay)(fl_Overlay_Window win);
-  FL_EXPORT_C(void,         Fl_Overlay_Window_redraw_overlay)(fl_Overlay_Window win);
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_show,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_show_with_args,(fl_Overlay_Window win, int argc, char** argv));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_flush,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_resize,(fl_Overlay_Window win, int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_hide,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Overlay_Window_can_do_overlay,(fl_Overlay_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_redraw_overlay,(fl_Overlay_Window win));
 
-  FL_EXPORT_C(fl_Overlay_Window,    Fl_Overlay_Window_New_WithLabel)(int w, int h, const char* title, void (*draw_overlay_fp)(fl_Overlay_Window));
-  FL_EXPORT_C(fl_Overlay_Window,    Fl_Overlay_Window_New)(int w, int h, void (*draw_overlay_fp)(fl_Overlay_Window));
-  FL_EXPORT_C(fl_Overlay_Window,    Fl_Overlay_Window_NewXY_WithLabel)(int x, int y, int w, int h, const char* title, void (*draw_overlay_fp)(fl_Overlay_Window));
-  FL_EXPORT_C(fl_Overlay_Window,    Fl_Overlay_Window_NewXY)(int x, int y, int w, int h, void (*draw_overlay_fp)(fl_Overlay_Window));
-  FL_EXPORT_C(void,         Fl_Overlay_Window_Destroy)(fl_Overlay_Window win);
+  FL_EXPORT_C_HEADER(fl_Overlay_Window,Fl_Overlay_Window_New_WithLabel,(int w, int h, const char* title, void (*draw_overlay_fp)(fl_Overlay_Window)));
+  FL_EXPORT_C_HEADER(fl_Overlay_Window,Fl_Overlay_Window_New,(int w, int h, void (*draw_overlay_fp)(fl_Overlay_Window)));
+  FL_EXPORT_C_HEADER(fl_Overlay_Window,Fl_Overlay_Window_NewXY_WithLabel,(int x, int y, int w, int h, const char* title, void (*draw_overlay_fp)(fl_Overlay_Window)));
+  FL_EXPORT_C_HEADER(fl_Overlay_Window,Fl_Overlay_Window_NewXY,(int x, int y, int w, int h, void (*draw_overlay_fp)(fl_Overlay_Window)));
+  FL_EXPORT_C_HEADER(void,Fl_Overlay_Window_Destroy,(fl_Overlay_Window win));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_PNG_ImageC.h b/c-src/Fl_PNG_ImageC.h
--- a/c-src/Fl_PNG_ImageC.h
+++ b/c-src/Fl_PNG_ImageC.h
@@ -6,8 +6,8 @@
 #include "Fl_CallbackC.h"
 EXPORT {
 #endif
-  FL_EXPORT_C(fl_PNG_Image, Fl_PNG_Image_New_WithData)(const char* name, const unsigned char* data, int datasize);
-  FL_EXPORT_C(fl_PNG_Image, Fl_PNG_Image_New)(const char* filename);
+  FL_EXPORT_C_HEADER(fl_PNG_Image,Fl_PNG_Image_New_WithData,(const char* name, const unsigned char* data, int datasize));
+  FL_EXPORT_C_HEADER(fl_PNG_Image,Fl_PNG_Image_New,(const char* filename));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_PNM_ImageC.h b/c-src/Fl_PNM_ImageC.h
--- a/c-src/Fl_PNM_ImageC.h
+++ b/c-src/Fl_PNM_ImageC.h
@@ -9,25 +9,25 @@
 #include "Fl_CallbackC.h"
 EXPORT {
 #endif
-  FL_EXPORT_C(fl_PNM_Image, Fl_PNM_Image_New)(const char* filename);
-  FL_EXPORT_C(void, Fl_PNM_Image_Destroy)(fl_PNM_Image image);
-  FL_EXPORT_C(int, Fl_PNM_Image_w)(fl_PNM_Image image);
-  FL_EXPORT_C(int, Fl_PNM_Image_h)(fl_PNM_Image image);
-  FL_EXPORT_C(int, Fl_PNM_Image_d)(fl_PNM_Image image);
-  FL_EXPORT_C(int, Fl_PNM_Image_ld)(fl_PNM_Image image);
-  FL_EXPORT_C(int, Fl_PNM_Image_count)(fl_PNM_Image image);
-  FL_EXPORT_C(fl_PNM_Image, Fl_PNM_Image_copy_with_w_h)(fl_PNM_Image image,int W, int H);
-  FL_EXPORT_C(fl_PNM_Image, Fl_PNM_Image_copy)(fl_PNM_Image image);
-  FL_EXPORT_C(void, Fl_PNM_Image_color_average)(fl_PNM_Image image,Fl_Color c, float i);
-  FL_EXPORT_C(void, Fl_PNM_Image_inactive)(fl_PNM_Image image);
-  FL_EXPORT_C(void, Fl_PNM_Image_desaturate)(fl_PNM_Image image);
-  FL_EXPORT_C(void, Fl_PNM_Image_label)(fl_PNM_Image image,fl_Widget w);
-  FL_EXPORT_C(void, Fl_PNM_Image_label_with_menu_item)(fl_PNM_Image image,fl_Menu_Item m);
-  FL_EXPORT_C(void, Fl_PNM_Image_draw_with_cx_cy)(fl_PNM_Image image,int X, int Y, int W, int H, int cx, int cy);
-  FL_EXPORT_C(void, Fl_PNM_Image_draw_with_cx)(fl_PNM_Image image,int X, int Y, int W, int H, int cx);
-  FL_EXPORT_C(void, Fl_PNM_Image_draw_with_cy)(fl_PNM_Image image,int X, int Y, int W, int H, int cy);
-  FL_EXPORT_C(void, Fl_PNM_Image_draw)(fl_PNM_Image image,int X, int Y);
-  FL_EXPORT_C(void, Fl_PNM_Image_uncache)(fl_PNM_Image image);
+  FL_EXPORT_C_HEADER(fl_PNM_Image,Fl_PNM_Image_New,(const char* filename));
+  FL_EXPORT_C_HEADER(void,Fl_PNM_Image_Destroy,(fl_PNM_Image image));
+  FL_EXPORT_C_HEADER(int,Fl_PNM_Image_w,(fl_PNM_Image image));
+  FL_EXPORT_C_HEADER(int,Fl_PNM_Image_h,(fl_PNM_Image image));
+  FL_EXPORT_C_HEADER(int,Fl_PNM_Image_d,(fl_PNM_Image image));
+  FL_EXPORT_C_HEADER(int,Fl_PNM_Image_ld,(fl_PNM_Image image));
+  FL_EXPORT_C_HEADER(int,Fl_PNM_Image_count,(fl_PNM_Image image));
+  FL_EXPORT_C_HEADER(fl_PNM_Image,Fl_PNM_Image_copy_with_w_h,(fl_PNM_Image image,int W, int H));
+  FL_EXPORT_C_HEADER(fl_PNM_Image,Fl_PNM_Image_copy,(fl_PNM_Image image));
+  FL_EXPORT_C_HEADER(void,Fl_PNM_Image_color_average,(fl_PNM_Image image,Fl_Color c, float i));
+  FL_EXPORT_C_HEADER(void,Fl_PNM_Image_inactive,(fl_PNM_Image image));
+  FL_EXPORT_C_HEADER(void,Fl_PNM_Image_desaturate,(fl_PNM_Image image));
+  FL_EXPORT_C_HEADER(void,Fl_PNM_Image_label,(fl_PNM_Image image,fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_PNM_Image_label_with_menu_item,(fl_PNM_Image image,fl_Menu_Item m));
+  FL_EXPORT_C_HEADER(void,Fl_PNM_Image_draw_with_cx_cy,(fl_PNM_Image image,int X, int Y, int W, int H, int cx, int cy));
+  FL_EXPORT_C_HEADER(void,Fl_PNM_Image_draw_with_cx,(fl_PNM_Image image,int X, int Y, int W, int H, int cx));
+  FL_EXPORT_C_HEADER(void,Fl_PNM_Image_draw_with_cy,(fl_PNM_Image image,int X, int Y, int W, int H, int cy));
+  FL_EXPORT_C_HEADER(void,Fl_PNM_Image_draw,(fl_PNM_Image image,int X, int Y));
+  FL_EXPORT_C_HEADER(void,Fl_PNM_Image_uncache,(fl_PNM_Image image));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_PackC.h b/c-src/Fl_PackC.h
--- a/c-src/Fl_PackC.h
+++ b/c-src/Fl_PackC.h
@@ -28,25 +28,25 @@
     ~Fl_DerivedPack();
   };
 #endif
-  FL_EXPORT_C(uchar,   Fl_Pack_type)(fl_Pack pack);
-  FL_EXPORT_C(void,    Fl_Pack_set_type)(fl_Pack pack, uchar);
-  FL_EXPORT_C(int,     Fl_Pack_get_spacing)(fl_Pack p);
-  FL_EXPORT_C(void,    Fl_Pack_set_spacing)(fl_Pack p, int pixels);
-  FL_EXPORT_C(uchar,   Fl_Pack_horizontal)(fl_Pack p);
-  FL_EXPORT_C(fl_Pack, Fl_Pack_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(fl_Pack, Fl_Pack_New_WithLabel)(int x, int y, int w, int h, const char* t);
-  FL_EXPORT_C(fl_Pack,    Fl_OverriddenPack_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Pack,    Fl_OverriddenPack_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Pack_draw)(fl_Pack o);
-  FL_EXPORT_C(void, Fl_Pack_draw_super)(fl_Pack o);
-  FL_EXPORT_C(int, Fl_Pack_handle)(fl_Pack o, int event);
-  FL_EXPORT_C(int, Fl_Pack_handle_super)(fl_Pack o, int event);
-  FL_EXPORT_C(void, Fl_Pack_resize)(fl_Pack o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Pack_resize_super)(fl_Pack o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Pack_show)(fl_Pack o);
-  FL_EXPORT_C(void, Fl_Pack_show_super)(fl_Pack o);
-  FL_EXPORT_C(void, Fl_Pack_hide)(fl_Pack o);
-  FL_EXPORT_C(void, Fl_Pack_hide_super)(fl_Pack o);
+  FL_EXPORT_C_HEADER(uchar,Fl_Pack_type,(fl_Pack pack));
+  FL_EXPORT_C_HEADER(void,Fl_Pack_set_type,(fl_Pack pack, uchar));
+  FL_EXPORT_C_HEADER(int,Fl_Pack_get_spacing,(fl_Pack p));
+  FL_EXPORT_C_HEADER(void,Fl_Pack_set_spacing,(fl_Pack p, int pixels));
+  FL_EXPORT_C_HEADER(uchar,Fl_Pack_horizontal,(fl_Pack p));
+  FL_EXPORT_C_HEADER(fl_Pack,Fl_Pack_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(fl_Pack,Fl_Pack_New_WithLabel,(int x, int y, int w, int h, const char* t));
+  FL_EXPORT_C_HEADER(fl_Pack,Fl_OverriddenPack_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Pack,Fl_OverriddenPack_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Pack_draw,(fl_Pack o));
+  FL_EXPORT_C_HEADER(void,Fl_Pack_draw_super,(fl_Pack o));
+  FL_EXPORT_C_HEADER(int,Fl_Pack_handle,(fl_Pack o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Pack_handle_super,(fl_Pack o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Pack_resize,(fl_Pack o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Pack_resize_super,(fl_Pack o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Pack_show,(fl_Pack o));
+  FL_EXPORT_C_HEADER(void,Fl_Pack_show_super,(fl_Pack o));
+  FL_EXPORT_C_HEADER(void,Fl_Pack_hide,(fl_Pack o));
+  FL_EXPORT_C_HEADER(void,Fl_Pack_hide_super,(fl_Pack o));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Paged_DeviceC.h b/c-src/Fl_Paged_DeviceC.h
--- a/c-src/Fl_Paged_DeviceC.h
+++ b/c-src/Fl_Paged_DeviceC.h
@@ -10,40 +10,40 @@
 EXPORT {
 #endif
   // Inherited from Fl_Surface_Driver
-  FL_EXPORT_C(const char*, Fl_Paged_Device_class_id)();
-  FL_EXPORT_C(const char*, Fl_Paged_Device_class_name)(fl_Paged_Device paged_device);
-  FL_EXPORT_C(void, Fl_Paged_Device_set_current)(fl_Paged_Device paged_device);
-  FL_EXPORT_C(void, Fl_Paged_Device_set_driver)(fl_Paged_Device paged_device,fl_Graphics_Driver graphics_driver);
-  FL_EXPORT_C(fl_Graphics_Driver, Fl_Paged_Device_driver)(fl_Paged_Device paged_device);
-  FL_EXPORT_C(fl_Surface_Device, Fl_Paged_Device_surface)();
+  FL_EXPORT_C_HEADER(const char*,Fl_Paged_Device_class_id,());
+  FL_EXPORT_C_HEADER(const char*,Fl_Paged_Device_class_name,(fl_Paged_Device paged_device));
+  FL_EXPORT_C_HEADER(void,Fl_Paged_Device_set_current,(fl_Paged_Device paged_device));
+  FL_EXPORT_C_HEADER(void,Fl_Paged_Device_set_driver,(fl_Paged_Device paged_device,fl_Graphics_Driver graphics_driver));
+  FL_EXPORT_C_HEADER(fl_Graphics_Driver,Fl_Paged_Device_driver,(fl_Paged_Device paged_device));
+  FL_EXPORT_C_HEADER(fl_Surface_Device,Fl_Paged_Device_surface,());
   // Fl_Paged_Device specific
-  FL_EXPORT_C(int, Fl_Paged_Device_start_job)(fl_Paged_Device paged_device,int pagecount);
-  FL_EXPORT_C(int, Fl_Paged_Device_start_job_with_frompage)(fl_Paged_Device paged_device,int pagecount, int* frompage);
-  FL_EXPORT_C(int, Fl_Paged_Device_start_job_with_topage)(fl_Paged_Device paged_device,int pagecount, int* topage);
-  FL_EXPORT_C(int, Fl_Paged_Device_start_job_with_frompage_topage)(fl_Paged_Device paged_device,int pagecount, int* frompage, int* topage);
-  FL_EXPORT_C(int, Fl_Paged_Device_start_page)(fl_Paged_Device paged_device);
-  FL_EXPORT_C(int, Fl_Paged_Device_printable_rect)(fl_Paged_Device paged_device,int* w, int* h);
-  FL_EXPORT_C(void, Fl_Paged_Device_margins)(fl_Paged_Device paged_device,int* left, int* top, int* right, int* bottom);
-  FL_EXPORT_C(void, Fl_Paged_Device_origin)(fl_Paged_Device paged_device,int* x, int* y);
-  FL_EXPORT_C(void, Fl_Paged_Device_scale)(fl_Paged_Device paged_device,float scale_x);
-  FL_EXPORT_C(void, Fl_Paged_Device_scale_with_scaly_y)(fl_Paged_Device paged_device,float scale_x, float scale_y);
-  FL_EXPORT_C(void, Fl_Paged_Device_rotate)(fl_Paged_Device paged_device,float angle);
-  FL_EXPORT_C(void, Fl_Paged_Device_translate)(fl_Paged_Device paged_device,int x, int y);
-  FL_EXPORT_C(void, Fl_Paged_Device_untranslate)(fl_Paged_Device paged_device);
-  FL_EXPORT_C(void, Fl_Paged_Device_print_widget)(fl_Paged_Device paged_device,fl_Widget widget);
-  FL_EXPORT_C(void, Fl_Paged_Device_print_widget_with_delta_x)(fl_Paged_Device paged_device,fl_Widget widget, int delta_x);
-  FL_EXPORT_C(void, Fl_Paged_Device_print_widget_with_delta_y)(fl_Paged_Device paged_device,fl_Widget widget, int delta_y);
-  FL_EXPORT_C(void, Fl_Paged_Device_print_widget_with_delta_x_delta_y)(fl_Paged_Device paged_device,fl_Widget widget, int delta_x, int delta_y);
-  FL_EXPORT_C(void, Fl_Paged_Device_print_window)(fl_Paged_Device paged_device,fl_Window win);
-  FL_EXPORT_C(void, Fl_Paged_Device_print_window_with_x_offset)(fl_Paged_Device paged_device,fl_Window win, int x_offset);
-  FL_EXPORT_C(void, Fl_Paged_Device_print_window_with_y_offset)(fl_Paged_Device paged_device,fl_Window win, int y_offset);
-  FL_EXPORT_C(void, Fl_Paged_Device_print_window_with_x_offset_y_offset)(fl_Paged_Device paged_device,fl_Window win, int x_offset, int y_offset);
-  FL_EXPORT_C(void, Fl_Paged_Device_print_window_part)(fl_Paged_Device paged_device,fl_Window win, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Paged_Device_print_window_part_with_delta_x)(fl_Paged_Device paged_device,fl_Window win, int x, int y, int w, int h, int delta_x);
-  FL_EXPORT_C(void, Fl_Paged_Device_print_window_part_with_delta_y)(fl_Paged_Device paged_device,fl_Window win, int x, int y, int w, int h, int delta_y);
-  FL_EXPORT_C(void, Fl_Paged_Device_print_window_part_with_delta_xy)(fl_Paged_Device paged_device,fl_Window win, int x, int y, int w, int h, int delta_x, int delta_y);
-  FL_EXPORT_C(int,  Fl_Paged_Device_end_page)(fl_Paged_Device paged_device);
-  FL_EXPORT_C(void, Fl_Paged_Device_end_job)(fl_Paged_Device paged_device);
+  FL_EXPORT_C_HEADER(int,Fl_Paged_Device_start_job,(fl_Paged_Device paged_device,int pagecount));
+  FL_EXPORT_C_HEADER(int,Fl_Paged_Device_start_job_with_frompage,(fl_Paged_Device paged_device,int pagecount, int* frompage));
+  FL_EXPORT_C_HEADER(int,Fl_Paged_Device_start_job_with_topage,(fl_Paged_Device paged_device,int pagecount, int* topage));
+  FL_EXPORT_C_HEADER(int,Fl_Paged_Device_start_job_with_frompage_topage,(fl_Paged_Device paged_device,int pagecount, int* frompage, int* topage));
+  FL_EXPORT_C_HEADER(int,Fl_Paged_Device_start_page,(fl_Paged_Device paged_device));
+  FL_EXPORT_C_HEADER(int,Fl_Paged_Device_printable_rect,(fl_Paged_Device paged_device,int* w, int* h));
+  FL_EXPORT_C_HEADER(void,Fl_Paged_Device_margins,(fl_Paged_Device paged_device,int* left, int* top, int* right, int* bottom));
+  FL_EXPORT_C_HEADER(void,Fl_Paged_Device_origin,(fl_Paged_Device paged_device,int* x, int* y));
+  FL_EXPORT_C_HEADER(void,Fl_Paged_Device_scale,(fl_Paged_Device paged_device,float scale_x));
+  FL_EXPORT_C_HEADER(void,Fl_Paged_Device_scale_with_scaly_y,(fl_Paged_Device paged_device,float scale_x, float scale_y));
+  FL_EXPORT_C_HEADER(void,Fl_Paged_Device_rotate,(fl_Paged_Device paged_device,float angle));
+  FL_EXPORT_C_HEADER(void,Fl_Paged_Device_translate,(fl_Paged_Device paged_device,int x, int y));
+  FL_EXPORT_C_HEADER(void,Fl_Paged_Device_untranslate,(fl_Paged_Device paged_device));
+  FL_EXPORT_C_HEADER(void,Fl_Paged_Device_print_widget,(fl_Paged_Device paged_device,fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Paged_Device_print_widget_with_delta_x,(fl_Paged_Device paged_device,fl_Widget widget, int delta_x));
+  FL_EXPORT_C_HEADER(void,Fl_Paged_Device_print_widget_with_delta_y,(fl_Paged_Device paged_device,fl_Widget widget, int delta_y));
+  FL_EXPORT_C_HEADER(void,Fl_Paged_Device_print_widget_with_delta_x_delta_y,(fl_Paged_Device paged_device,fl_Widget widget, int delta_x, int delta_y));
+  FL_EXPORT_C_HEADER(void,Fl_Paged_Device_print_window,(fl_Paged_Device paged_device,fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Paged_Device_print_window_with_x_offset,(fl_Paged_Device paged_device,fl_Window win, int x_offset));
+  FL_EXPORT_C_HEADER(void,Fl_Paged_Device_print_window_with_y_offset,(fl_Paged_Device paged_device,fl_Window win, int y_offset));
+  FL_EXPORT_C_HEADER(void,Fl_Paged_Device_print_window_with_x_offset_y_offset,(fl_Paged_Device paged_device,fl_Window win, int x_offset, int y_offset));
+  FL_EXPORT_C_HEADER(void,Fl_Paged_Device_print_window_part,(fl_Paged_Device paged_device,fl_Window win, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Paged_Device_print_window_part_with_delta_x,(fl_Paged_Device paged_device,fl_Window win, int x, int y, int w, int h, int delta_x));
+  FL_EXPORT_C_HEADER(void,Fl_Paged_Device_print_window_part_with_delta_y,(fl_Paged_Device paged_device,fl_Window win, int x, int y, int w, int h, int delta_y));
+  FL_EXPORT_C_HEADER(void,Fl_Paged_Device_print_window_part_with_delta_xy,(fl_Paged_Device paged_device,fl_Window win, int x, int y, int w, int h, int delta_x, int delta_y));
+  FL_EXPORT_C_HEADER(int,Fl_Paged_Device_end_page,(fl_Paged_Device paged_device));
+  FL_EXPORT_C_HEADER(void,Fl_Paged_Device_end_job,(fl_Paged_Device paged_device));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_PixmapC.h b/c-src/Fl_PixmapC.h
--- a/c-src/Fl_PixmapC.h
+++ b/c-src/Fl_PixmapC.h
@@ -9,27 +9,27 @@
 #include "Fl_CallbackC.h"
 EXPORT {
 #endif
-  FL_EXPORT_C(fl_Pixmap, Fl_Pixmap_New)(char** bits);
-  FL_EXPORT_C(fl_Pixmap, Fl_Pixmap_New_With_UChar)(uchar** bits);
-  FL_EXPORT_C(void, Fl_Pixmap_Destroy)(fl_Pixmap pixmap);
-  FL_EXPORT_C(int, Fl_Pixmap_w)(fl_Pixmap pixmap);
-  FL_EXPORT_C(int, Fl_Pixmap_h)(fl_Pixmap pixmap);
-  FL_EXPORT_C(int, Fl_Pixmap_d)(fl_Pixmap pixmap);
-  FL_EXPORT_C(int, Fl_Pixmap_ld)(fl_Pixmap pixmap);
-  FL_EXPORT_C(int, Fl_Pixmap_count)(fl_Pixmap pixmap);
-  FL_EXPORT_C(fl_Image, Fl_Pixmap_copy_with_w_h)(fl_Pixmap pixmap,int w, int h);
-  FL_EXPORT_C(fl_Image, Fl_Pixmap_copy)(fl_Pixmap pixmap);
-  FL_EXPORT_C(void, Fl_Pixmap_color_average)(fl_Pixmap pixmap,Fl_Color c, float i);
-  FL_EXPORT_C(void, Fl_Pixmap_inactive)(fl_Pixmap pixmap);
-  FL_EXPORT_C(void, Fl_Pixmap_desaturate)(fl_Pixmap pixmap);
-  FL_EXPORT_C(void, Fl_Pixmap_label)(fl_Pixmap pixmap,fl_Widget w);
-  FL_EXPORT_C(void, Fl_Pixmap_label_with_menu_item)(fl_Pixmap pixmap,fl_Menu_Item m);
-  FL_EXPORT_C(void, Fl_Pixmap_draw_with_cx_cy)(fl_Pixmap pixmap,int X, int Y, int W, int H, int cx, int cy);
-  FL_EXPORT_C(void, Fl_Pixmap_draw_with_cx)(fl_Pixmap pixmap,int X, int Y, int W, int H, int cx);
-  FL_EXPORT_C(void, Fl_Pixmap_draw_with_cy)(fl_Pixmap pixmap,int X, int Y, int W, int H, int cy);
-  FL_EXPORT_C(void, Fl_Pixmap_draw_with)(fl_Pixmap pixmap,int X, int Y, int W, int H);
-  FL_EXPORT_C(void, Fl_Pixmap_draw)(fl_Pixmap pixmap,int X, int Y);
-  FL_EXPORT_C(void, Fl_Pixmap_uncache)(fl_Pixmap pixmap);
+  FL_EXPORT_C_HEADER(fl_Pixmap,Fl_Pixmap_New,(char** bits));
+  FL_EXPORT_C_HEADER(fl_Pixmap,Fl_Pixmap_New_With_UChar,(uchar** bits));
+  FL_EXPORT_C_HEADER(void,Fl_Pixmap_Destroy,(fl_Pixmap pixmap));
+  FL_EXPORT_C_HEADER(int,Fl_Pixmap_w,(fl_Pixmap pixmap));
+  FL_EXPORT_C_HEADER(int,Fl_Pixmap_h,(fl_Pixmap pixmap));
+  FL_EXPORT_C_HEADER(int,Fl_Pixmap_d,(fl_Pixmap pixmap));
+  FL_EXPORT_C_HEADER(int,Fl_Pixmap_ld,(fl_Pixmap pixmap));
+  FL_EXPORT_C_HEADER(int,Fl_Pixmap_count,(fl_Pixmap pixmap));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Pixmap_copy_with_w_h,(fl_Pixmap pixmap,int w, int h));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Pixmap_copy,(fl_Pixmap pixmap));
+  FL_EXPORT_C_HEADER(void,Fl_Pixmap_color_average,(fl_Pixmap pixmap,Fl_Color c, float i));
+  FL_EXPORT_C_HEADER(void,Fl_Pixmap_inactive,(fl_Pixmap pixmap));
+  FL_EXPORT_C_HEADER(void,Fl_Pixmap_desaturate,(fl_Pixmap pixmap));
+  FL_EXPORT_C_HEADER(void,Fl_Pixmap_label,(fl_Pixmap pixmap,fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Pixmap_label_with_menu_item,(fl_Pixmap pixmap,fl_Menu_Item m));
+  FL_EXPORT_C_HEADER(void,Fl_Pixmap_draw_with_cx_cy,(fl_Pixmap pixmap,int X, int Y, int W, int H, int cx, int cy));
+  FL_EXPORT_C_HEADER(void,Fl_Pixmap_draw_with_cx,(fl_Pixmap pixmap,int X, int Y, int W, int H, int cx));
+  FL_EXPORT_C_HEADER(void,Fl_Pixmap_draw_with_cy,(fl_Pixmap pixmap,int X, int Y, int W, int H, int cy));
+  FL_EXPORT_C_HEADER(void,Fl_Pixmap_draw_with,(fl_Pixmap pixmap,int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(void,Fl_Pixmap_draw,(fl_Pixmap pixmap,int X, int Y));
+  FL_EXPORT_C_HEADER(void,Fl_Pixmap_uncache,(fl_Pixmap pixmap));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_PositionerC.h b/c-src/Fl_PositionerC.h
--- a/c-src/Fl_PositionerC.h
+++ b/c-src/Fl_PositionerC.h
@@ -29,123 +29,123 @@
   };
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(fl_Window,    Fl_Positioner_as_window )(fl_Positioner positioner);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Positioner_as_gl_window)(fl_Positioner positioner);
-  FL_EXPORT_C(fl_Group,     Fl_Positioner_parent)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_set_parent)(fl_Positioner positioner, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Positioner_type)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_set_type)(fl_Positioner positioner, uchar t);
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Positioner_as_window ,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Positioner_as_gl_window,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Positioner_parent,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_set_parent,(fl_Positioner positioner, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Positioner_type,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_set_type,(fl_Positioner positioner, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Positioner_x)(fl_Positioner positioner);
-  FL_EXPORT_C(int,          Fl_Positioner_y)(fl_Positioner positioner);
-  FL_EXPORT_C(int,          Fl_Positioner_w)(fl_Positioner positioner);
-  FL_EXPORT_C(int,          Fl_Positioner_h)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_set_align)(fl_Positioner positioner, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Positioner_align)(fl_Positioner positioner);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Positioner_box)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_set_box)(fl_Positioner positioner, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Positioner_color)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_set_color)(fl_Positioner positioner, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Positioner_set_color_with_bg_sel)(fl_Positioner positioner,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Positioner_selection_color)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_set_selection_color)(fl_Positioner positioner, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Positioner_label)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_copy_label)(fl_Positioner positioner, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Positioner_set_label)(fl_Positioner positioner, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Positioner_labeltype)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_set_labeltype)(fl_Positioner positioner, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Positioner_labelcolor)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_set_labelcolor)(fl_Positioner positioner, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Positioner_labelfont)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_set_labelfont)(fl_Positioner positioner, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Positioner_labelsize)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_set_labelsize)(fl_Positioner positioner, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Positioner_image)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_set_image)(fl_Positioner positioner, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Positioner_deimage)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_set_deimage)(fl_Positioner positioner, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Positioner_tooltip)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_copy_tooltip)(fl_Positioner positioner, const char* text);
-  FL_EXPORT_C(void,         Fl_Positioner_set_tooltip)(fl_Positioner positioner, const char* text);
-  FL_EXPORT_C(void,         Fl_Positioner_set_callback_with_user_data)(fl_Positioner positioner, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Positioner_set_callback)(fl_Positioner positioner, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Positioner_user_data)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_set_user_data)(fl_Positioner positioner, void* v);
-  FL_EXPORT_C(long,         Fl_Positioner_argument)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_set_argument)(fl_Positioner positioner, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Positioner_when)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_set_when)(fl_Positioner positioner, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Positioner_visible)(fl_Positioner positioner);
-  FL_EXPORT_C(int,          Fl_Positioner_visible_r)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_set_visible)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_clear_visible)(fl_Positioner positioner);
-  FL_EXPORT_C(unsigned int, Fl_Positioner_active)(fl_Positioner positioner);
-  FL_EXPORT_C(int,          Fl_Positioner_active_r)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_activate)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_deactivate)(fl_Positioner positioner);
-  FL_EXPORT_C(unsigned int, Fl_Positioner_output)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_set_output)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_clear_output)(fl_Positioner positioner);
-  FL_EXPORT_C(unsigned int, Fl_Positioner_takesevents)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_set_changed)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_clear_changed)(fl_Positioner positioner);
-  FL_EXPORT_C(int,          Fl_Positioner_take_focus)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_set_visible_focus)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_clear_visible_focus)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_modify_visible_focus)(fl_Positioner positioner, int v);
-  FL_EXPORT_C(unsigned int, Fl_Positioner_visible_focus)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_do_callback)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_do_callback_with_widget_and_user_data)(fl_Positioner positioner, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Positioner_do_callback_with_widget_and_default_user_data)(fl_Positioner positioner, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Positioner_contains)(fl_Positioner positioner, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Positioner_inside)(fl_Positioner positioner, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Positioner_redraw)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_redraw_label)(fl_Positioner positioner);
-  FL_EXPORT_C(uchar,        Fl_Positioner_damage)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_clear_damage_with_bitmask)(fl_Positioner positioner, uchar c);
-  FL_EXPORT_C(void,         Fl_Positioner_clear_damage)(fl_Positioner positioner);
-  FL_EXPORT_C(void,         Fl_Positioner_damage_with_text)(fl_Positioner positioner, uchar c);
-  FL_EXPORT_C(void,         Fl_Positioner_damage_inside_widget)(fl_Positioner positioner, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Positioner_draw_label_with_xywh_alignment)(fl_Positioner positioner, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Positioner_measure_label)(fl_Positioner positioner, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Positioner_window)(fl_Positioner positioner);
-  FL_EXPORT_C(fl_Window,    Fl_Positioner_top_window)(fl_Positioner positioner);
-  FL_EXPORT_C(fl_Window ,   Fl_Positioner_top_window_offset)(fl_Positioner positioner, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Positioner_as_group)(fl_Positioner positioner);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Positioner_as_gl_window)(fl_Positioner positioner);
+  FL_EXPORT_C_HEADER(int,Fl_Positioner_x,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(int,Fl_Positioner_y,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(int,Fl_Positioner_w,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(int,Fl_Positioner_h,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_set_align,(fl_Positioner positioner, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Positioner_align,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Positioner_box,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_set_box,(fl_Positioner positioner, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Positioner_color,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_set_color,(fl_Positioner positioner, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_set_color_with_bg_sel,(fl_Positioner positioner,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Positioner_selection_color,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_set_selection_color,(fl_Positioner positioner, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Positioner_label,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_copy_label,(fl_Positioner positioner, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_set_label,(fl_Positioner positioner, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Positioner_labeltype,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_set_labeltype,(fl_Positioner positioner, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Positioner_labelcolor,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_set_labelcolor,(fl_Positioner positioner, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Positioner_labelfont,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_set_labelfont,(fl_Positioner positioner, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Positioner_labelsize,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_set_labelsize,(fl_Positioner positioner, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Positioner_image,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_set_image,(fl_Positioner positioner, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Positioner_deimage,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_set_deimage,(fl_Positioner positioner, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Positioner_tooltip,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_copy_tooltip,(fl_Positioner positioner, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_set_tooltip,(fl_Positioner positioner, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_set_callback_with_user_data,(fl_Positioner positioner, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_set_callback,(fl_Positioner positioner, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Positioner_user_data,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_set_user_data,(fl_Positioner positioner, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Positioner_argument,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_set_argument,(fl_Positioner positioner, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Positioner_when,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_set_when,(fl_Positioner positioner, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Positioner_visible,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(int,Fl_Positioner_visible_r,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_set_visible,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_clear_visible,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Positioner_active,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(int,Fl_Positioner_active_r,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_activate,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_deactivate,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Positioner_output,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_set_output,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_clear_output,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Positioner_takesevents,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_set_changed,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_clear_changed,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(int,Fl_Positioner_take_focus,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_set_visible_focus,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_clear_visible_focus,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_modify_visible_focus,(fl_Positioner positioner, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Positioner_visible_focus,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_do_callback,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_do_callback_with_widget_and_user_data,(fl_Positioner positioner, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_do_callback_with_widget_and_default_user_data,(fl_Positioner positioner, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Positioner_contains,(fl_Positioner positioner, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Positioner_inside,(fl_Positioner positioner, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_redraw,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_redraw_label,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(uchar,Fl_Positioner_damage,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_clear_damage_with_bitmask,(fl_Positioner positioner, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_clear_damage,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_damage_with_text,(fl_Positioner positioner, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_damage_inside_widget,(fl_Positioner positioner, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_draw_label_with_xywh_alignment,(fl_Positioner positioner, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_measure_label,(fl_Positioner positioner, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Positioner_window,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Positioner_top_window,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Positioner_top_window_offset,(fl_Positioner positioner, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Positioner_as_group,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Positioner_as_gl_window,(fl_Positioner positioner));
 
-  FL_EXPORT_C(fl_Positioner, Fl_Positioner_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(fl_Positioner, Fl_Positioner_New_WithLabel)(int x, int y, int w, int h,const char *l);
+  FL_EXPORT_C_HEADER(fl_Positioner,Fl_Positioner_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(fl_Positioner,Fl_Positioner_New_WithLabel,(int x, int y, int w, int h,const char *l));
 
-  FL_EXPORT_C(void, Fl_Positioner_Destroy)(fl_Positioner positioner);
-  FL_EXPORT_C(void, Fl_Positioner_set_xvalue)(fl_Positioner positioner, double xvalue);
-  FL_EXPORT_C(double, Fl_Positioner_xvalue)(fl_Positioner positioner);
-  FL_EXPORT_C(void, Fl_Positioner_set_yvalue)(fl_Positioner positioner, double yvalue);
-  FL_EXPORT_C(double, Fl_Positioner_yvalue)(fl_Positioner positioner);
-  FL_EXPORT_C(void, Fl_Positioner_set_xminimum)(fl_Positioner positioner, double xminimum);
-  FL_EXPORT_C(double, Fl_Positioner_xminimum)(fl_Positioner positioner);
-  FL_EXPORT_C(void, Fl_Positioner_set_yminimum)(fl_Positioner positioner, double yminimum);
-  FL_EXPORT_C(double, Fl_Positioner_yminimum)(fl_Positioner positioner);
-  FL_EXPORT_C(void, Fl_Positioner_set_xmaximum)(fl_Positioner positioner, double xmaximum);
-  FL_EXPORT_C(double, Fl_Positioner_xmaximum)(fl_Positioner positioner);
-  FL_EXPORT_C(void, Fl_Positioner_set_ymaximum)(fl_Positioner positioner, double ymaximum);
-  FL_EXPORT_C(double, Fl_Positioner_ymaximum)(fl_Positioner positioner);
-  FL_EXPORT_C(void, Fl_Positioner_xbounds)(fl_Positioner positioner, double xstart, double xend);
-  FL_EXPORT_C(void, Fl_Positioner_ybounds)(fl_Positioner positioner, double ystart, double yend);
-  FL_EXPORT_C(void, Fl_Positioner_xstep)(fl_Positioner positioner, double xstep);
-  FL_EXPORT_C(void, Fl_Positioner_ystep)(fl_Positioner positioner, double ystep);
-  FL_EXPORT_C(fl_Positioner,    Fl_OverriddenPositioner_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Positioner,    Fl_OverriddenPositioner_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Positioner_draw)(fl_Positioner o);
-  FL_EXPORT_C(void, Fl_Positioner_draw_super)(fl_Positioner o);
-  FL_EXPORT_C(int, Fl_Positioner_handle)(fl_Positioner o, int event);
-  FL_EXPORT_C(int, Fl_Positioner_handle_super)(fl_Positioner o, int event);
-  FL_EXPORT_C(void, Fl_Positioner_resize)(fl_Positioner o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Positioner_resize_super)(fl_Positioner o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Positioner_show)(fl_Positioner o);
-  FL_EXPORT_C(void, Fl_Positioner_show_super)(fl_Positioner o);
-  FL_EXPORT_C(void, Fl_Positioner_hide)(fl_Positioner o);
-  FL_EXPORT_C(void, Fl_Positioner_hide_super)(fl_Positioner o);
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_Destroy,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_set_xvalue,(fl_Positioner positioner, double xvalue));
+  FL_EXPORT_C_HEADER(double,Fl_Positioner_xvalue,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_set_yvalue,(fl_Positioner positioner, double yvalue));
+  FL_EXPORT_C_HEADER(double,Fl_Positioner_yvalue,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_set_xminimum,(fl_Positioner positioner, double xminimum));
+  FL_EXPORT_C_HEADER(double,Fl_Positioner_xminimum,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_set_yminimum,(fl_Positioner positioner, double yminimum));
+  FL_EXPORT_C_HEADER(double,Fl_Positioner_yminimum,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_set_xmaximum,(fl_Positioner positioner, double xmaximum));
+  FL_EXPORT_C_HEADER(double,Fl_Positioner_xmaximum,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_set_ymaximum,(fl_Positioner positioner, double ymaximum));
+  FL_EXPORT_C_HEADER(double,Fl_Positioner_ymaximum,(fl_Positioner positioner));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_xbounds,(fl_Positioner positioner, double xstart, double xend));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_ybounds,(fl_Positioner positioner, double ystart, double yend));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_xstep,(fl_Positioner positioner, double xstep));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_ystep,(fl_Positioner positioner, double ystep));
+  FL_EXPORT_C_HEADER(fl_Positioner,Fl_OverriddenPositioner_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Positioner,Fl_OverriddenPositioner_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_draw,(fl_Positioner o));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_draw_super,(fl_Positioner o));
+  FL_EXPORT_C_HEADER(int,Fl_Positioner_handle,(fl_Positioner o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Positioner_handle_super,(fl_Positioner o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_resize,(fl_Positioner o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_resize_super,(fl_Positioner o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_show,(fl_Positioner o));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_show_super,(fl_Positioner o));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_hide,(fl_Positioner o));
+  FL_EXPORT_C_HEADER(void,Fl_Positioner_hide_super,(fl_Positioner o));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_PreferencesC.h b/c-src/Fl_PreferencesC.h
--- a/c-src/Fl_PreferencesC.h
+++ b/c-src/Fl_PreferencesC.h
@@ -13,49 +13,49 @@
     SYSTEM=0,
     USER
   } Root;
-  FL_EXPORT_C(fl_Preferences, Fl_Preferences_With_Root)( Root root, const char *vendor, const char *application );
-  FL_EXPORT_C(fl_Preferences, Fl_Preferences_With_Path)( const char* path, const char *vendor, const char *application );
-  FL_EXPORT_C(fl_Preferences, Fl_Preferences_With_Parent_Group)( fl_Preferences parent, const char *group );
-  FL_EXPORT_C(fl_Preferences, Fl_Preferences_With_Parent_GroupIndex)( fl_Preferences parent, int groupIndex);
-  FL_EXPORT_C(fl_Preferences, Fl_Preferences_With_Parent)( fl_Preferences parent);
-  FL_EXPORT_C(const char*, Fl_newUUID)();
-  FL_EXPORT_C(fl_Preferences, Fl_Preferences_With_Id)(ID id);
-  FL_EXPORT_C(void,Fl_Preferences_Destroy)(fl_Preferences preferences);
-  FL_EXPORT_C(ID, Fl_Preferences_id)(fl_Preferences preferences);
-  FL_EXPORT_C(char, Fl_Preferences_remove)(fl_Preferences preferences, ID id_);
-  FL_EXPORT_C(const char*, Fl_Preferences_name)(fl_Preferences preferences);
-  FL_EXPORT_C(const char*, Fl_Preferences_path)(fl_Preferences preferences);
-  FL_EXPORT_C(int, Fl_Preferences_groups)(fl_Preferences preferences);
-  FL_EXPORT_C(const char*, Fl_Preferences_group)(fl_Preferences preferences,  int num_group );
-  FL_EXPORT_C(char, Fl_Preferences_groupExists)(fl_Preferences preferences,  const char *key );
-  FL_EXPORT_C(char, Fl_Preferences_deleteGroup)(fl_Preferences preferences,  const char *group );
-  FL_EXPORT_C(char, Fl_Preferences_deleteAllGroups)(fl_Preferences preferences);
-  FL_EXPORT_C(int, Fl_Preferences_entries)(fl_Preferences preferences);
-  FL_EXPORT_C(const char*, Fl_Preferences_entry)(fl_Preferences preferences,  int index );
-  FL_EXPORT_C(char, Fl_Preferences_entryExists)(fl_Preferences preferences,  const char *key );
-  FL_EXPORT_C(char, Fl_Preferences_deleteEntry)(fl_Preferences preferences,  const char *entry );
-  FL_EXPORT_C(char, Fl_Preferences_deleteAllEntries)(fl_Preferences preferences);
-  FL_EXPORT_C(char, Fl_Preferences_clear)(fl_Preferences preferences);
-  FL_EXPORT_C(char, Fl_Preferences_set_int)(fl_Preferences preferences, const char* entry, int value);
-  FL_EXPORT_C(char, Fl_Preferences_set_float)(fl_Preferences preferences, const char* entry, float value);
-  FL_EXPORT_C(char, Fl_Preferences_set_float_with_precision)(fl_Preferences preferences, const char* entry, float value, int precision);
-  FL_EXPORT_C(char, Fl_Preferences_set_double)(fl_Preferences preferences, const char* entry, double value);
-  FL_EXPORT_C(char, Fl_Preferences_set_double_with_precision)(fl_Preferences preferences, const char* entry, double value, int precision);
-  FL_EXPORT_C(char, Fl_Preferences_set_char)(fl_Preferences preferences, const char* entry, char value);
-  FL_EXPORT_C(char, Fl_Preferences_set_char_with_size)(fl_Preferences preferences, const char* entry, const char* value, int size);
-  FL_EXPORT_C(char, Fl_Preferences_set_void)(fl_Preferences preferences, const char* entry, const void* value, int size);
-  FL_EXPORT_C(char, Fl_Preferences_get_int)(fl_Preferences preferences, const char* entry, int *value, int defaultValue);
-  FL_EXPORT_C(char, Fl_Preferences_get_float)(fl_Preferences preferences, const char* entry, float *value, float defaultValue);
-  FL_EXPORT_C(char, Fl_Preferences_get_double)(fl_Preferences preferences, const char* entry, double *value, double defaultValue);
-  FL_EXPORT_C(char, Fl_Preferences_get_char)(fl_Preferences preferences, const char* entry, char* value, const char* defaultValue);
-  FL_EXPORT_C(char, Fl_Preferences_get_char_with_maxSize)(fl_Preferences preferences, const char* entry, char* value, const char* defaultValue, int maxSize);
-  FL_EXPORT_C(char, Fl_Preferences_get_char_with_defaultSize)(fl_Preferences preferences, const char* entry, char* value, const char* defaultValue, int defaultSize);
-  FL_EXPORT_C(char, Fl_Preferences_get_void)(fl_Preferences preferences, const char* entry, char* value, const char* defaultValue, int defaultSize);
-  FL_EXPORT_C(char, Fl_Preferences_get_void_with_defaultSize_maxSize)(fl_Preferences preferences, const char* entry, char* value, const char* defaultValue, int defaultSize, int maxSize);
-  FL_EXPORT_C(char, Fl_Preferences_get_void_with_defaultSize)(fl_Preferences preferences, const char* entry, char* value, const char* defaultValue, int defaultSize);
-  FL_EXPORT_C(int, Fl_Preferences_size)(fl_Preferences preferences,const char *entry );
-  FL_EXPORT_C(char, Fl_Preferences_getUserdataPath)(fl_Preferences preferences, char *path, int pathlen );
-  FL_EXPORT_C(void, Fl_Preferences_flush)(fl_Preferences preferences);
+  FL_EXPORT_C_HEADER(fl_Preferences,Fl_Preferences_With_Root,( Root root, const char *vendor, const char *application ));
+  FL_EXPORT_C_HEADER(fl_Preferences,Fl_Preferences_With_Path,( const char* path, const char *vendor, const char *application ));
+  FL_EXPORT_C_HEADER(fl_Preferences,Fl_Preferences_With_Parent_Group,( fl_Preferences parent, const char *group ));
+  FL_EXPORT_C_HEADER(fl_Preferences,Fl_Preferences_With_Parent_GroupIndex,( fl_Preferences parent, int groupIndex));
+  FL_EXPORT_C_HEADER(fl_Preferences,Fl_Preferences_With_Parent,( fl_Preferences parent));
+  FL_EXPORT_C_HEADER(const char*,Fl_newUUID,());
+  FL_EXPORT_C_HEADER(fl_Preferences,Fl_Preferences_With_Id,(ID id));
+  FL_EXPORT_C_HEADER(void,Fl_Preferences_Destroy,(fl_Preferences preferences));
+  FL_EXPORT_C_HEADER(ID,Fl_Preferences_id,(fl_Preferences preferences));
+  FL_EXPORT_C_HEADER(char,Fl_Preferences_remove,(fl_Preferences preferences, ID id_));
+  FL_EXPORT_C_HEADER(const char*,Fl_Preferences_name,(fl_Preferences preferences));
+  FL_EXPORT_C_HEADER(const char*,Fl_Preferences_path,(fl_Preferences preferences));
+  FL_EXPORT_C_HEADER(int,Fl_Preferences_groups,(fl_Preferences preferences));
+  FL_EXPORT_C_HEADER(const char*,Fl_Preferences_group,(fl_Preferences preferences,  int num_group ));
+  FL_EXPORT_C_HEADER(char,Fl_Preferences_groupExists,(fl_Preferences preferences,  const char *key ));
+  FL_EXPORT_C_HEADER(char,Fl_Preferences_deleteGroup,(fl_Preferences preferences,  const char *group ));
+  FL_EXPORT_C_HEADER(char,Fl_Preferences_deleteAllGroups,(fl_Preferences preferences));
+  FL_EXPORT_C_HEADER(int,Fl_Preferences_entries,(fl_Preferences preferences));
+  FL_EXPORT_C_HEADER(const char*,Fl_Preferences_entry,(fl_Preferences preferences,  int index ));
+  FL_EXPORT_C_HEADER(char,Fl_Preferences_entryExists,(fl_Preferences preferences,  const char *key ));
+  FL_EXPORT_C_HEADER(char,Fl_Preferences_deleteEntry,(fl_Preferences preferences,  const char *entry ));
+  FL_EXPORT_C_HEADER(char,Fl_Preferences_deleteAllEntries,(fl_Preferences preferences));
+  FL_EXPORT_C_HEADER(char,Fl_Preferences_clear,(fl_Preferences preferences));
+  FL_EXPORT_C_HEADER(char,Fl_Preferences_set_int,(fl_Preferences preferences, const char* entry, int value));
+  FL_EXPORT_C_HEADER(char,Fl_Preferences_set_float,(fl_Preferences preferences, const char* entry, float value));
+  FL_EXPORT_C_HEADER(char,Fl_Preferences_set_float_with_precision,(fl_Preferences preferences, const char* entry, float value, int precision));
+  FL_EXPORT_C_HEADER(char,Fl_Preferences_set_double,(fl_Preferences preferences, const char* entry, double value));
+  FL_EXPORT_C_HEADER(char,Fl_Preferences_set_double_with_precision,(fl_Preferences preferences, const char* entry, double value, int precision));
+  FL_EXPORT_C_HEADER(char,Fl_Preferences_set_char,(fl_Preferences preferences, const char* entry, char value));
+  FL_EXPORT_C_HEADER(char,Fl_Preferences_set_char_with_size,(fl_Preferences preferences, const char* entry, const char* value, int size));
+  FL_EXPORT_C_HEADER(char,Fl_Preferences_set_void,(fl_Preferences preferences, const char* entry, const void* value, int size));
+  FL_EXPORT_C_HEADER(char,Fl_Preferences_get_int,(fl_Preferences preferences, const char* entry, int *value, int defaultValue));
+  FL_EXPORT_C_HEADER(char,Fl_Preferences_get_float,(fl_Preferences preferences, const char* entry, float *value, float defaultValue));
+  FL_EXPORT_C_HEADER(char,Fl_Preferences_get_double,(fl_Preferences preferences, const char* entry, double *value, double defaultValue));
+  FL_EXPORT_C_HEADER(char,Fl_Preferences_get_char,(fl_Preferences preferences, const char* entry, char* value, const char* defaultValue));
+  FL_EXPORT_C_HEADER(char,Fl_Preferences_get_char_with_maxSize,(fl_Preferences preferences, const char* entry, char* value, const char* defaultValue, int maxSize));
+  FL_EXPORT_C_HEADER(char,Fl_Preferences_get_char_with_defaultSize,(fl_Preferences preferences, const char* entry, char* value, const char* defaultValue, int defaultSize));
+  FL_EXPORT_C_HEADER(char,Fl_Preferences_get_void,(fl_Preferences preferences, const char* entry, char* value, const char* defaultValue, int defaultSize));
+  FL_EXPORT_C_HEADER(char,Fl_Preferences_get_void_with_defaultSize_maxSize,(fl_Preferences preferences, const char* entry, char* value, const char* defaultValue, int defaultSize, int maxSize));
+  FL_EXPORT_C_HEADER(char,Fl_Preferences_get_void_with_defaultSize,(fl_Preferences preferences, const char* entry, char* value, const char* defaultValue, int defaultSize));
+  FL_EXPORT_C_HEADER(int,Fl_Preferences_size,(fl_Preferences preferences,const char *entry ));
+  FL_EXPORT_C_HEADER(char,Fl_Preferences_getUserdataPath,(fl_Preferences preferences, char *path, int pathlen ));
+  FL_EXPORT_C_HEADER(void,Fl_Preferences_flush,(fl_Preferences preferences));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_PrinterC.h b/c-src/Fl_PrinterC.h
--- a/c-src/Fl_PrinterC.h
+++ b/c-src/Fl_PrinterC.h
@@ -10,41 +10,41 @@
 EXPORT {
 #endif
   // Inherited from Fl_Surface_Driver
-  FL_EXPORT_C(const char*, Fl_Printer_class_id)();
-  FL_EXPORT_C(const char*, Fl_Printer_class_name)(fl_Printer printer);
-  FL_EXPORT_C(void, Fl_Printer_set_current)(fl_Printer printer);
-  FL_EXPORT_C(fl_Graphics_Driver, Fl_Printer_driver)(fl_Printer printer);
-  FL_EXPORT_C(fl_Surface_Device, Fl_Printer_surface)();
+  FL_EXPORT_C_HEADER(const char*,Fl_Printer_class_id,());
+  FL_EXPORT_C_HEADER(const char*,Fl_Printer_class_name,(fl_Printer printer));
+  FL_EXPORT_C_HEADER(void,Fl_Printer_set_current,(fl_Printer printer));
+  FL_EXPORT_C_HEADER(fl_Graphics_Driver,Fl_Printer_driver,(fl_Printer printer));
+  FL_EXPORT_C_HEADER(fl_Surface_Device,Fl_Printer_surface,());
   // Inherited from Fl_Printer
-  FL_EXPORT_C(int, Fl_Printer_start_job)(fl_Printer printer,int pagecount);
-  FL_EXPORT_C(int, Fl_Printer_start_job_with_frompage)(fl_Printer printer,int pagecount, int* frompage);
-  FL_EXPORT_C(int, Fl_Printer_start_job_with_topage)(fl_Printer printer,int pagecount, int* topage);
-  FL_EXPORT_C(int, Fl_Printer_start_job_with_frompage_topage)(fl_Printer printer,int pagecount, int* frompage, int* topage);
-  FL_EXPORT_C(int, Fl_Printer_start_page)(fl_Printer printer);
-  FL_EXPORT_C(int, Fl_Printer_printable_rect)(fl_Printer printer,int* w, int* h);
-  FL_EXPORT_C(void, Fl_Printer_margins)(fl_Printer printer,int* left, int* top, int* right, int* bottom);
-  FL_EXPORT_C(void, Fl_Printer_origin)(fl_Printer printer,int* x, int* y);
-  FL_EXPORT_C(void, Fl_Printer_scale)(fl_Printer printer,float scale_x);
-  FL_EXPORT_C(void, Fl_Printer_scale_with_scale_y)(fl_Printer printer,float scale_x, float scale_y);
-  FL_EXPORT_C(void, Fl_Printer_rotate)(fl_Printer printer,float angle);
-  FL_EXPORT_C(void, Fl_Printer_translate)(fl_Printer printer,int x, int y);
-  FL_EXPORT_C(void, Fl_Printer_untranslate)(fl_Printer printer);
-  FL_EXPORT_C(void, Fl_Printer_print_widget)(fl_Printer printer,fl_Widget widget);
-  FL_EXPORT_C(void, Fl_Printer_print_widget_with_delta_x)(fl_Printer printer,fl_Widget widget, int delta_x);
-  FL_EXPORT_C(void, Fl_Printer_print_widget_with_delta_y)(fl_Printer printer,fl_Widget widget, int delta_y);
-  FL_EXPORT_C(void, Fl_Printer_print_widget_with_delta_x_delta_y)(fl_Printer printer,fl_Widget widget, int delta_x, int delta_y);
-  FL_EXPORT_C(void, Fl_Printer_print_window)(fl_Printer printer,fl_Window win);
-  FL_EXPORT_C(void, Fl_Printer_print_window_with_x_offset)(fl_Printer printer,fl_Window win, int x_offset);
-  FL_EXPORT_C(void, Fl_Printer_print_window_with_y_offset)(fl_Printer printer,fl_Window win, int y_offset);
-  FL_EXPORT_C(void, Fl_Printer_print_window_with_x_offset_y_offset)(fl_Printer printer,fl_Window win, int x_offset, int y_offset);
-  FL_EXPORT_C(void, Fl_Printer_print_window_part)(fl_Printer printer,fl_Window win, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Printer_print_window_part_with_delta_x)(fl_Printer printer,fl_Window win, int x, int y, int w, int h, int delta_x);
-  FL_EXPORT_C(void, Fl_Printer_print_window_part_with_delta_y)(fl_Printer printer,fl_Window win, int x, int y, int w, int h, int delta_y);
-  FL_EXPORT_C(void, Fl_Printer_print_window_part_with_delta_xy)(fl_Printer printer,fl_Window win, int x, int y, int w, int h, int delta_x, int delta_y);
-  FL_EXPORT_C(int,  Fl_Printer_end_page)(fl_Printer printer);
-  FL_EXPORT_C(void, Fl_Printer_end_job)(fl_Printer printer);
-  FL_EXPORT_C(fl_Printer, Fl_Printer_New)();
-  FL_EXPORT_C(void, Fl_Printer_Destroy)(fl_Printer printer);
+  FL_EXPORT_C_HEADER(int,Fl_Printer_start_job,(fl_Printer printer,int pagecount));
+  FL_EXPORT_C_HEADER(int,Fl_Printer_start_job_with_frompage,(fl_Printer printer,int pagecount, int* frompage));
+  FL_EXPORT_C_HEADER(int,Fl_Printer_start_job_with_topage,(fl_Printer printer,int pagecount, int* topage));
+  FL_EXPORT_C_HEADER(int,Fl_Printer_start_job_with_frompage_topage,(fl_Printer printer,int pagecount, int* frompage, int* topage));
+  FL_EXPORT_C_HEADER(int,Fl_Printer_start_page,(fl_Printer printer));
+  FL_EXPORT_C_HEADER(int,Fl_Printer_printable_rect,(fl_Printer printer,int* w, int* h));
+  FL_EXPORT_C_HEADER(void,Fl_Printer_margins,(fl_Printer printer,int* left, int* top, int* right, int* bottom));
+  FL_EXPORT_C_HEADER(void,Fl_Printer_origin,(fl_Printer printer,int* x, int* y));
+  FL_EXPORT_C_HEADER(void,Fl_Printer_scale,(fl_Printer printer,float scale_x));
+  FL_EXPORT_C_HEADER(void,Fl_Printer_scale_with_scale_y,(fl_Printer printer,float scale_x, float scale_y));
+  FL_EXPORT_C_HEADER(void,Fl_Printer_rotate,(fl_Printer printer,float angle));
+  FL_EXPORT_C_HEADER(void,Fl_Printer_translate,(fl_Printer printer,int x, int y));
+  FL_EXPORT_C_HEADER(void,Fl_Printer_untranslate,(fl_Printer printer));
+  FL_EXPORT_C_HEADER(void,Fl_Printer_print_widget,(fl_Printer printer,fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Printer_print_widget_with_delta_x,(fl_Printer printer,fl_Widget widget, int delta_x));
+  FL_EXPORT_C_HEADER(void,Fl_Printer_print_widget_with_delta_y,(fl_Printer printer,fl_Widget widget, int delta_y));
+  FL_EXPORT_C_HEADER(void,Fl_Printer_print_widget_with_delta_x_delta_y,(fl_Printer printer,fl_Widget widget, int delta_x, int delta_y));
+  FL_EXPORT_C_HEADER(void,Fl_Printer_print_window,(fl_Printer printer,fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Printer_print_window_with_x_offset,(fl_Printer printer,fl_Window win, int x_offset));
+  FL_EXPORT_C_HEADER(void,Fl_Printer_print_window_with_y_offset,(fl_Printer printer,fl_Window win, int y_offset));
+  FL_EXPORT_C_HEADER(void,Fl_Printer_print_window_with_x_offset_y_offset,(fl_Printer printer,fl_Window win, int x_offset, int y_offset));
+  FL_EXPORT_C_HEADER(void,Fl_Printer_print_window_part,(fl_Printer printer,fl_Window win, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Printer_print_window_part_with_delta_x,(fl_Printer printer,fl_Window win, int x, int y, int w, int h, int delta_x));
+  FL_EXPORT_C_HEADER(void,Fl_Printer_print_window_part_with_delta_y,(fl_Printer printer,fl_Window win, int x, int y, int w, int h, int delta_y));
+  FL_EXPORT_C_HEADER(void,Fl_Printer_print_window_part_with_delta_xy,(fl_Printer printer,fl_Window win, int x, int y, int w, int h, int delta_x, int delta_y));
+  FL_EXPORT_C_HEADER(int,Fl_Printer_end_page,(fl_Printer printer));
+  FL_EXPORT_C_HEADER(void,Fl_Printer_end_job,(fl_Printer printer));
+  FL_EXPORT_C_HEADER(fl_Printer,Fl_Printer_New,());
+  FL_EXPORT_C_HEADER(void,Fl_Printer_Destroy,(fl_Printer printer));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_ProgressC.h b/c-src/Fl_ProgressC.h
--- a/c-src/Fl_ProgressC.h
+++ b/c-src/Fl_ProgressC.h
@@ -30,117 +30,117 @@
 
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int ,         Fl_Progress_handle )(fl_Progress progress,int event);
-  FL_EXPORT_C(void,         Fl_Progress_resize )(fl_Progress progress,int x, int y, int w, int h);
-  FL_EXPORT_C(void,         Fl_Progress_show )(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_hide )(fl_Progress progress);
-  FL_EXPORT_C(fl_Window,    Fl_Progress_as_window )(fl_Progress progress);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Progress_as_gl_window)(fl_Progress progress);
-  FL_EXPORT_C(fl_Group,     Fl_Progress_parent)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_set_parent)(fl_Progress progress, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Progress_type)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_set_type)(fl_Progress progress, uchar t);
+  FL_EXPORT_C_HEADER(int ,Fl_Progress_handle ,(fl_Progress progress,int event));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_resize ,(fl_Progress progress,int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_show ,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_hide ,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Progress_as_window ,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Progress_as_gl_window,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Progress_parent,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_set_parent,(fl_Progress progress, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Progress_type,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_set_type,(fl_Progress progress, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Progress_x)(fl_Progress progress);
-  FL_EXPORT_C(int,          Fl_Progress_y)(fl_Progress progress);
-  FL_EXPORT_C(int,          Fl_Progress_w)(fl_Progress progress);
-  FL_EXPORT_C(int,          Fl_Progress_h)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_set_align)(fl_Progress progress, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Progress_align)(fl_Progress progress);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Progress_box)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_set_box)(fl_Progress progress, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Progress_color)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_set_color)(fl_Progress progress, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Progress_set_color_with_bg_sel)(fl_Progress progress,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Progress_selection_color)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_set_selection_color)(fl_Progress progress, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Progress_label)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_copy_label)(fl_Progress progress, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Progress_set_label)(fl_Progress progress, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Progress_labeltype)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_set_labeltype)(fl_Progress progress, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Progress_labelcolor)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_set_labelcolor)(fl_Progress progress, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Progress_labelfont)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_set_labelfont)(fl_Progress progress, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Progress_labelsize)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_set_labelsize)(fl_Progress progress, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Progress_image)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_set_image)(fl_Progress progress, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Progress_deimage)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_set_deimage)(fl_Progress progress, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Progress_tooltip)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_copy_tooltip)(fl_Progress progress, const char* text);
-  FL_EXPORT_C(void,         Fl_Progress_set_tooltip)(fl_Progress progress, const char* text);
-  FL_EXPORT_C(void,         Fl_Progress_set_callback_with_user_data)(fl_Progress progress, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Progress_set_callback)(fl_Progress progress, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Progress_user_data)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_set_user_data)(fl_Progress progress, void* v);
-  FL_EXPORT_C(long,         Fl_Progress_argument)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_set_argument)(fl_Progress progress, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Progress_when)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_set_when)(fl_Progress progress, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Progress_visible)(fl_Progress progress);
-  FL_EXPORT_C(int,          Fl_Progress_visible_r)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_set_visible)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_clear_visible)(fl_Progress progress);
-  FL_EXPORT_C(unsigned int, Fl_Progress_active)(fl_Progress progress);
-  FL_EXPORT_C(int,          Fl_Progress_active_r)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_activate)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_deactivate)(fl_Progress progress);
-  FL_EXPORT_C(unsigned int, Fl_Progress_output)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_set_output)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_clear_output)(fl_Progress progress);
-  FL_EXPORT_C(unsigned int, Fl_Progress_takesevents)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_set_changed)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_clear_changed)(fl_Progress progress);
-  FL_EXPORT_C(int,          Fl_Progress_take_focus)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_set_visible_focus)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_clear_visible_focus)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_modify_visible_focus)(fl_Progress progress, int v);
-  FL_EXPORT_C(unsigned int, Fl_Progress_visible_focus)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_do_callback)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_do_callback_with_widget_and_user_data)(fl_Progress progress, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Progress_do_callback_with_widget_and_default_user_data)(fl_Progress progress, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Progress_contains)(fl_Progress progress, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Progress_inside)(fl_Progress progress, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Progress_redraw)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_redraw_label)(fl_Progress progress);
-  FL_EXPORT_C(uchar,        Fl_Progress_damage)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_clear_damage_with_bitmask)(fl_Progress progress, uchar c);
-  FL_EXPORT_C(void,         Fl_Progress_clear_damage)(fl_Progress progress);
-  FL_EXPORT_C(void,         Fl_Progress_damage_with_text)(fl_Progress progress, uchar c);
-  FL_EXPORT_C(void,         Fl_Progress_damage_inside_widget)(fl_Progress progress, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Progress_draw_label_with_xywh_alignment)(fl_Progress progress, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Progress_measure_label)(fl_Progress progress, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Progress_window)(fl_Progress progress);
-  FL_EXPORT_C(fl_Window,    Fl_Progress_top_window)(fl_Progress progress);
-  FL_EXPORT_C(fl_Window ,   Fl_Progress_top_window_offset)(fl_Progress progress, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Progress_as_group)(fl_Progress progress);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Progress_as_gl_window)(fl_Progress progress);
+  FL_EXPORT_C_HEADER(int,Fl_Progress_x,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(int,Fl_Progress_y,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(int,Fl_Progress_w,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(int,Fl_Progress_h,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_set_align,(fl_Progress progress, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Progress_align,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Progress_box,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_set_box,(fl_Progress progress, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Progress_color,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_set_color,(fl_Progress progress, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_set_color_with_bg_sel,(fl_Progress progress,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Progress_selection_color,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_set_selection_color,(fl_Progress progress, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Progress_label,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_copy_label,(fl_Progress progress, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_set_label,(fl_Progress progress, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Progress_labeltype,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_set_labeltype,(fl_Progress progress, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Progress_labelcolor,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_set_labelcolor,(fl_Progress progress, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Progress_labelfont,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_set_labelfont,(fl_Progress progress, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Progress_labelsize,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_set_labelsize,(fl_Progress progress, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Progress_image,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_set_image,(fl_Progress progress, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Progress_deimage,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_set_deimage,(fl_Progress progress, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Progress_tooltip,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_copy_tooltip,(fl_Progress progress, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_set_tooltip,(fl_Progress progress, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_set_callback_with_user_data,(fl_Progress progress, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_set_callback,(fl_Progress progress, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Progress_user_data,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_set_user_data,(fl_Progress progress, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Progress_argument,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_set_argument,(fl_Progress progress, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Progress_when,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_set_when,(fl_Progress progress, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Progress_visible,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(int,Fl_Progress_visible_r,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_set_visible,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_clear_visible,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Progress_active,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(int,Fl_Progress_active_r,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_activate,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_deactivate,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Progress_output,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_set_output,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_clear_output,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Progress_takesevents,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_set_changed,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_clear_changed,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(int,Fl_Progress_take_focus,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_set_visible_focus,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_clear_visible_focus,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_modify_visible_focus,(fl_Progress progress, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Progress_visible_focus,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_do_callback,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_do_callback_with_widget_and_user_data,(fl_Progress progress, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_do_callback_with_widget_and_default_user_data,(fl_Progress progress, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Progress_contains,(fl_Progress progress, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Progress_inside,(fl_Progress progress, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_redraw,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_redraw_label,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(uchar,Fl_Progress_damage,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_clear_damage_with_bitmask,(fl_Progress progress, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_clear_damage,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_damage_with_text,(fl_Progress progress, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_damage_inside_widget,(fl_Progress progress, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_draw_label_with_xywh_alignment,(fl_Progress progress, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_measure_label,(fl_Progress progress, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Progress_window,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Progress_top_window,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Progress_top_window_offset,(fl_Progress progress, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Progress_as_group,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Progress_as_gl_window,(fl_Progress progress));
 
-  FL_EXPORT_C(fl_Progress, Fl_Progress_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(fl_Progress, Fl_Progress_New_WithLabel)(int x, int y, int w, int h,const char *l);
+  FL_EXPORT_C_HEADER(fl_Progress,Fl_Progress_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(fl_Progress,Fl_Progress_New_WithLabel,(int x, int y, int w, int h,const char *l));
 
-  FL_EXPORT_C(void, Fl_Progress_Destroy)(fl_Progress progress);
-  FL_EXPORT_C(void ,     Fl_Progress_set_maximum)(fl_Progress progress,float v);
-  FL_EXPORT_C(float,     Fl_Progress_maximum)(fl_Progress progress);
-  FL_EXPORT_C(void ,     Fl_Progress_set_minimum)(fl_Progress progress,float v);
-  FL_EXPORT_C(float,     Fl_Progress_minimum)(fl_Progress progress);
-  FL_EXPORT_C(void ,     Fl_Progress_set_value  )(fl_Progress progress,float v);
-  FL_EXPORT_C(float,     Fl_Progress_value  )(fl_Progress progress);
-  FL_EXPORT_C(fl_Progress,    Fl_OverriddenProgress_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Progress,    Fl_OverriddenProgress_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Progress_draw)(fl_Progress o);
-  FL_EXPORT_C(void, Fl_Progress_draw_super)(fl_Progress o);
-  FL_EXPORT_C(int, Fl_Progress_handle)(fl_Progress o, int event);
-  FL_EXPORT_C(int, Fl_Progress_handle_super)(fl_Progress o, int event);
-  FL_EXPORT_C(void, Fl_Progress_resize)(fl_Progress o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Progress_resize_super)(fl_Progress o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Progress_show)(fl_Progress o);
-  FL_EXPORT_C(void, Fl_Progress_show_super)(fl_Progress o);
-  FL_EXPORT_C(void, Fl_Progress_hide)(fl_Progress o);
-  FL_EXPORT_C(void, Fl_Progress_hide_super)(fl_Progress o);
+  FL_EXPORT_C_HEADER(void,Fl_Progress_Destroy,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void ,Fl_Progress_set_maximum,(fl_Progress progress,float v));
+  FL_EXPORT_C_HEADER(float,Fl_Progress_maximum,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void ,Fl_Progress_set_minimum,(fl_Progress progress,float v));
+  FL_EXPORT_C_HEADER(float,Fl_Progress_minimum,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(void ,Fl_Progress_set_value  ,(fl_Progress progress,float v));
+  FL_EXPORT_C_HEADER(float,Fl_Progress_value  ,(fl_Progress progress));
+  FL_EXPORT_C_HEADER(fl_Progress,Fl_OverriddenProgress_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Progress,Fl_OverriddenProgress_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_draw,(fl_Progress o));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_draw_super,(fl_Progress o));
+  FL_EXPORT_C_HEADER(int,Fl_Progress_handle,(fl_Progress o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Progress_handle_super,(fl_Progress o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_resize,(fl_Progress o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_resize_super,(fl_Progress o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_show,(fl_Progress o));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_show_super,(fl_Progress o));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_hide,(fl_Progress o));
+  FL_EXPORT_C_HEADER(void,Fl_Progress_hide_super,(fl_Progress o));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_RGB_ImageC.h b/c-src/Fl_RGB_ImageC.h
--- a/c-src/Fl_RGB_ImageC.h
+++ b/c-src/Fl_RGB_ImageC.h
@@ -10,31 +10,31 @@
 EXPORT {
 #endif
   #include <stdlib.h>
-  FL_EXPORT_C(fl_RGB_Image, Fl_RGB_Image_New)(uchar* bits, int W, int H);
-  FL_EXPORT_C(fl_RGB_Image, Fl_RGB_Image_New_With_D)(uchar* bits, int W, int H, int D);
-  FL_EXPORT_C(fl_RGB_Image, Fl_RGB_Image_New_With_LD)(uchar* bits, int W, int H, int LD);
-  FL_EXPORT_C(fl_RGB_Image, Fl_RGB_Image_New_With_D_LD)(uchar* bits, int W, int H, int D, int LD);
-  FL_EXPORT_C(void, Fl_RGB_Image_Destroy)(fl_RGB_Image rgb_image);
-  FL_EXPORT_C(int, Fl_RGB_Image_w)(fl_RGB_Image rgb_image);
-  FL_EXPORT_C(int, Fl_RGB_Image_h)(fl_RGB_Image rgb_image);
-  FL_EXPORT_C(int, Fl_RGB_Image_d)(fl_RGB_Image rgb_image);
-  FL_EXPORT_C(int, Fl_RGB_Image_ld)(fl_RGB_Image rgb_image);
-  FL_EXPORT_C(int, Fl_RGB_Image_count)(fl_RGB_Image rgb_image);
-  FL_EXPORT_C(fl_Image, Fl_RGB_Image_copy_with_w_h)(fl_RGB_Image rgb_image,int W, int H);
-  FL_EXPORT_C(fl_Image, Fl_RGB_Image_copy)(fl_RGB_Image rgb_image);
-  FL_EXPORT_C(void, Fl_RGB_Image_color_average)(fl_RGB_Image rgb_image,Fl_Color c, float i);
-  FL_EXPORT_C(void, Fl_RGB_Image_inactive)(fl_RGB_Image rgb_image);
-  FL_EXPORT_C(void, Fl_RGB_Image_desaturate)(fl_RGB_Image rgb_image);
-  FL_EXPORT_C(void, Fl_RGB_Image_label)(fl_RGB_Image rgb_image,fl_Widget w);
-  FL_EXPORT_C(void, Fl_RGB_Image_label_with_menu_item)(fl_RGB_Image rgb_image,fl_Menu_Item m);
-  FL_EXPORT_C(void, Fl_RGB_Image_draw_with_cx_cy)(fl_RGB_Image rgb_image,int X, int Y, int W, int H, int cx, int cy);
-  FL_EXPORT_C(void, Fl_RGB_Image_draw_with_cx)(fl_RGB_Image rgb_image,int X, int Y, int W, int H, int cx);
-  FL_EXPORT_C(void, Fl_RGB_Image_draw_with_cy)(fl_RGB_Image rgb_image,int X, int Y, int W, int H, int cy);
-  FL_EXPORT_C(void, Fl_RGB_Image_draw_with)(fl_RGB_Image rgb_image,int X, int Y, int W, int H);
-  FL_EXPORT_C(void, Fl_RGB_Image_draw)(fl_RGB_Image rgb_image,int X, int Y);
-  FL_EXPORT_C(void, Fl_RGB_Image_uncache)(fl_RGB_Image rgb_image);
-  FL_EXPORT_C(void, Fl_RGB_Image_set_max_size)(size_t size);
-  FL_EXPORT_C(size_t, Fl_RGB_Image_max_size)();
+  FL_EXPORT_C_HEADER(fl_RGB_Image,Fl_RGB_Image_New,(uchar* bits, int W, int H));
+  FL_EXPORT_C_HEADER(fl_RGB_Image,Fl_RGB_Image_New_With_D,(uchar* bits, int W, int H, int D));
+  FL_EXPORT_C_HEADER(fl_RGB_Image,Fl_RGB_Image_New_With_LD,(uchar* bits, int W, int H, int LD));
+  FL_EXPORT_C_HEADER(fl_RGB_Image,Fl_RGB_Image_New_With_D_LD,(uchar* bits, int W, int H, int D, int LD));
+  FL_EXPORT_C_HEADER(void,Fl_RGB_Image_Destroy,(fl_RGB_Image rgb_image));
+  FL_EXPORT_C_HEADER(int,Fl_RGB_Image_w,(fl_RGB_Image rgb_image));
+  FL_EXPORT_C_HEADER(int,Fl_RGB_Image_h,(fl_RGB_Image rgb_image));
+  FL_EXPORT_C_HEADER(int,Fl_RGB_Image_d,(fl_RGB_Image rgb_image));
+  FL_EXPORT_C_HEADER(int,Fl_RGB_Image_ld,(fl_RGB_Image rgb_image));
+  FL_EXPORT_C_HEADER(int,Fl_RGB_Image_count,(fl_RGB_Image rgb_image));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_RGB_Image_copy_with_w_h,(fl_RGB_Image rgb_image,int W, int H));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_RGB_Image_copy,(fl_RGB_Image rgb_image));
+  FL_EXPORT_C_HEADER(void,Fl_RGB_Image_color_average,(fl_RGB_Image rgb_image,Fl_Color c, float i));
+  FL_EXPORT_C_HEADER(void,Fl_RGB_Image_inactive,(fl_RGB_Image rgb_image));
+  FL_EXPORT_C_HEADER(void,Fl_RGB_Image_desaturate,(fl_RGB_Image rgb_image));
+  FL_EXPORT_C_HEADER(void,Fl_RGB_Image_label,(fl_RGB_Image rgb_image,fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_RGB_Image_label_with_menu_item,(fl_RGB_Image rgb_image,fl_Menu_Item m));
+  FL_EXPORT_C_HEADER(void,Fl_RGB_Image_draw_with_cx_cy,(fl_RGB_Image rgb_image,int X, int Y, int W, int H, int cx, int cy));
+  FL_EXPORT_C_HEADER(void,Fl_RGB_Image_draw_with_cx,(fl_RGB_Image rgb_image,int X, int Y, int W, int H, int cx));
+  FL_EXPORT_C_HEADER(void,Fl_RGB_Image_draw_with_cy,(fl_RGB_Image rgb_image,int X, int Y, int W, int H, int cy));
+  FL_EXPORT_C_HEADER(void,Fl_RGB_Image_draw_with,(fl_RGB_Image rgb_image,int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(void,Fl_RGB_Image_draw,(fl_RGB_Image rgb_image,int X, int Y));
+  FL_EXPORT_C_HEADER(void,Fl_RGB_Image_uncache,(fl_RGB_Image rgb_image));
+  FL_EXPORT_C_HEADER(void,Fl_RGB_Image_set_max_size,(size_t size));
+  FL_EXPORT_C_HEADER(size_t,Fl_RGB_Image_max_size,());
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Radio_ButtonC.h b/c-src/Fl_Radio_ButtonC.h
--- a/c-src/Fl_Radio_ButtonC.h
+++ b/c-src/Fl_Radio_ButtonC.h
@@ -10,105 +10,105 @@
 EXPORT {
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,Fl_Radio_Button_handle)(fl_Radio_Button self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Radio_Button_parent)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_set_parent)(fl_Radio_Button win, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Radio_Button_type)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_set_type)(fl_Radio_Button win, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Radio_Button_handle,(fl_Radio_Button self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Radio_Button_parent,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_set_parent,(fl_Radio_Button win, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Radio_Button_type,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_set_type,(fl_Radio_Button win, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Radio_Button_x)(fl_Radio_Button win);
-  FL_EXPORT_C(int,          Fl_Radio_Button_y)(fl_Radio_Button win);
-  FL_EXPORT_C(int,          Fl_Radio_Button_w)(fl_Radio_Button win);
-  FL_EXPORT_C(int,          Fl_Radio_Button_h)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_set_align)(fl_Radio_Button radio_button, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Radio_Button_align)(fl_Radio_Button win);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Radio_Button_box)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_set_box)(fl_Radio_Button win, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Radio_Button_color)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_set_color)(fl_Radio_Button win, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Radio_Button_set_color_with_bg_sel)(fl_Radio_Button win,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Radio_Button_selection_color)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_set_selection_color)(fl_Radio_Button win, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Radio_Button_label)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_copy_label)(fl_Radio_Button win, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Radio_Button_set_label)(fl_Radio_Button win, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Radio_Button_labeltype)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_set_labeltype)(fl_Radio_Button win, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Radio_Button_labelcolor)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_set_labelcolor)(fl_Radio_Button win, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Radio_Button_labelfont)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_set_labelfont)(fl_Radio_Button win, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Radio_Button_labelsize)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_set_labelsize)(fl_Radio_Button win, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Radio_Button_image)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_set_image)(fl_Radio_Button win, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Radio_Button_deimage)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_set_deimage)(fl_Radio_Button win, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Radio_Button_tooltip)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_copy_tooltip)(fl_Radio_Button win, const char* text);
-  FL_EXPORT_C(void,         Fl_Radio_Button_set_tooltip)(fl_Radio_Button win, const char* text);
-  FL_EXPORT_C(void,         Fl_Radio_Button_set_callback_with_user_data)(fl_Radio_Button win, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Radio_Button_set_callback)(fl_Radio_Button win, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Radio_Button_user_data)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_set_user_data)(fl_Radio_Button win, void* v);
-  FL_EXPORT_C(long,         Fl_Radio_Button_argument)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_set_argument)(fl_Radio_Button win, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Radio_Button_when)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_set_when)(fl_Radio_Button win, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Radio_Button_visible)(fl_Radio_Button win);
-  FL_EXPORT_C(int,          Fl_Radio_Button_visible_r)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_set_visible)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_clear_visible)(fl_Radio_Button win);
-  FL_EXPORT_C(unsigned int, Fl_Radio_Button_active)(fl_Radio_Button win);
-  FL_EXPORT_C(int,          Fl_Radio_Button_active_r)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_activate)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_deactivate)(fl_Radio_Button win);
-  FL_EXPORT_C(unsigned int, Fl_Radio_Button_output)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_set_output)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_clear_output)(fl_Radio_Button win);
-  FL_EXPORT_C(unsigned int, Fl_Radio_Button_takesevents)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_set_changed)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_clear_changed)(fl_Radio_Button win);
-  FL_EXPORT_C(int,          Fl_Radio_Button_take_focus)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_set_visible_focus)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_clear_visible_focus)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_modify_visible_focus)(fl_Radio_Button win, int v);
-  FL_EXPORT_C(unsigned int, Fl_Radio_Button_visible_focus)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_do_callback)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_do_callback_with_widget_and_user_data)(fl_Radio_Button win, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Radio_Button_do_callback_with_widget_and_default_user_data)(fl_Radio_Button win, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Radio_Button_contains)(fl_Radio_Button win, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Radio_Button_inside)(fl_Radio_Button win, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Radio_Button_redraw)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_redraw_label)(fl_Radio_Button win);
-  FL_EXPORT_C(uchar,        Fl_Radio_Button_damage)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_clear_damage_with_bitmask)(fl_Radio_Button win, uchar c);
-  FL_EXPORT_C(void,         Fl_Radio_Button_clear_damage)(fl_Radio_Button win);
-  FL_EXPORT_C(void,         Fl_Radio_Button_damage_with_text)(fl_Radio_Button win, uchar c);
-  FL_EXPORT_C(void,         Fl_Radio_Button_damage_inside_widget)(fl_Radio_Button win, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Radio_Button_draw_label_with_xywh_alignment)(fl_Radio_Button win, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Radio_Button_measure_label)(fl_Radio_Button win, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Radio_Button_window)(fl_Radio_Button radio_button);
-  FL_EXPORT_C(fl_Window,    Fl_Radio_Button_top_window)(fl_Radio_Button radio_button);
-  FL_EXPORT_C(fl_Window ,   Fl_Radio_Button_top_window_offset)(fl_Radio_Button radio_button, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Radio_Button_as_group)(fl_Radio_Button radio_button);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Radio_Button_as_gl_window)(fl_Radio_Button radio_button);
+  FL_EXPORT_C_HEADER(int,Fl_Radio_Button_x,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(int,Fl_Radio_Button_y,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(int,Fl_Radio_Button_w,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(int,Fl_Radio_Button_h,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_set_align,(fl_Radio_Button radio_button, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Radio_Button_align,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Radio_Button_box,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_set_box,(fl_Radio_Button win, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Radio_Button_color,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_set_color,(fl_Radio_Button win, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_set_color_with_bg_sel,(fl_Radio_Button win,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Radio_Button_selection_color,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_set_selection_color,(fl_Radio_Button win, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Radio_Button_label,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_copy_label,(fl_Radio_Button win, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_set_label,(fl_Radio_Button win, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Radio_Button_labeltype,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_set_labeltype,(fl_Radio_Button win, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Radio_Button_labelcolor,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_set_labelcolor,(fl_Radio_Button win, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Radio_Button_labelfont,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_set_labelfont,(fl_Radio_Button win, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Radio_Button_labelsize,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_set_labelsize,(fl_Radio_Button win, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Radio_Button_image,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_set_image,(fl_Radio_Button win, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Radio_Button_deimage,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_set_deimage,(fl_Radio_Button win, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Radio_Button_tooltip,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_copy_tooltip,(fl_Radio_Button win, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_set_tooltip,(fl_Radio_Button win, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_set_callback_with_user_data,(fl_Radio_Button win, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_set_callback,(fl_Radio_Button win, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Radio_Button_user_data,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_set_user_data,(fl_Radio_Button win, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Radio_Button_argument,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_set_argument,(fl_Radio_Button win, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Radio_Button_when,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_set_when,(fl_Radio_Button win, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Radio_Button_visible,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(int,Fl_Radio_Button_visible_r,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_set_visible,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_clear_visible,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Radio_Button_active,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(int,Fl_Radio_Button_active_r,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_activate,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_deactivate,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Radio_Button_output,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_set_output,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_clear_output,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Radio_Button_takesevents,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_set_changed,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_clear_changed,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(int,Fl_Radio_Button_take_focus,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_set_visible_focus,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_clear_visible_focus,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_modify_visible_focus,(fl_Radio_Button win, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Radio_Button_visible_focus,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_do_callback,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_do_callback_with_widget_and_user_data,(fl_Radio_Button win, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_do_callback_with_widget_and_default_user_data,(fl_Radio_Button win, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Radio_Button_contains,(fl_Radio_Button win, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Radio_Button_inside,(fl_Radio_Button win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_redraw,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_redraw_label,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(uchar,Fl_Radio_Button_damage,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_clear_damage_with_bitmask,(fl_Radio_Button win, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_clear_damage,(fl_Radio_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_damage_with_text,(fl_Radio_Button win, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_damage_inside_widget,(fl_Radio_Button win, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_draw_label_with_xywh_alignment,(fl_Radio_Button win, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_measure_label,(fl_Radio_Button win, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Radio_Button_window,(fl_Radio_Button radio_button));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Radio_Button_top_window,(fl_Radio_Button radio_button));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Radio_Button_top_window_offset,(fl_Radio_Button radio_button, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Radio_Button_as_group,(fl_Radio_Button radio_button));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Radio_Button_as_gl_window,(fl_Radio_Button radio_button));
   /* Fl_Radio_Button specific functions */
-  FL_EXPORT_C(fl_Radio_Button,    Fl_Radio_Button_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Radio_Button,    Fl_Radio_Button_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(void,               Fl_Radio_Button_Destroy)(fl_Button button);
+  FL_EXPORT_C_HEADER(fl_Radio_Button,Fl_Radio_Button_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Radio_Button,Fl_Radio_Button_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Button_Destroy,(fl_Button button));
 
-  FL_EXPORT_C(char        , Fl_Radio_Button_value)(fl_Radio_Button b);
-  FL_EXPORT_C(int         , Fl_Radio_Button_set_value)(fl_Radio_Button b, int v);
-  FL_EXPORT_C(int         , Fl_Radio_Button_set)(fl_Radio_Button b);
-  FL_EXPORT_C(int         , Fl_Radio_Button_clear)(fl_Radio_Button b);
-  FL_EXPORT_C(void        , Fl_Radio_Button_setonly)(fl_Radio_Button b);
-  FL_EXPORT_C(int         , Fl_Radio_Button_get_shortcut )(fl_Radio_Button b);
-  FL_EXPORT_C(void        , Fl_Radio_Button_set_shortcut )(fl_Radio_Button b, int s);
-  FL_EXPORT_C(Fl_Boxtype  , Fl_Radio_Button_down_box)(fl_Radio_Button b);
-  FL_EXPORT_C(void        , Fl_Radio_Button_set_down_box)(fl_Radio_Button b,Fl_Boxtype boxtype);
-  FL_EXPORT_C(Fl_Color    , Fl_Radio_Button_down_color )(fl_Radio_Button b);
-  FL_EXPORT_C(void        , Fl_Radio_Button_set_down_color)(fl_Radio_Button b, Fl_Color c);
+  FL_EXPORT_C_HEADER(char        ,Fl_Radio_Button_value,(fl_Radio_Button b));
+  FL_EXPORT_C_HEADER(int         ,Fl_Radio_Button_set_value,(fl_Radio_Button b, int v));
+  FL_EXPORT_C_HEADER(int         ,Fl_Radio_Button_set,(fl_Radio_Button b));
+  FL_EXPORT_C_HEADER(int         ,Fl_Radio_Button_clear,(fl_Radio_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Radio_Button_setonly,(fl_Radio_Button b));
+  FL_EXPORT_C_HEADER(int         ,Fl_Radio_Button_get_shortcut ,(fl_Radio_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Radio_Button_set_shortcut ,(fl_Radio_Button b, int s));
+  FL_EXPORT_C_HEADER(Fl_Boxtype  ,Fl_Radio_Button_down_box,(fl_Radio_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Radio_Button_set_down_box,(fl_Radio_Button b,Fl_Boxtype boxtype));
+  FL_EXPORT_C_HEADER(Fl_Color    ,Fl_Radio_Button_down_color ,(fl_Radio_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Radio_Button_set_down_color,(fl_Radio_Button b, Fl_Color c));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Radio_Light_ButtonC.h b/c-src/Fl_Radio_Light_ButtonC.h
--- a/c-src/Fl_Radio_Light_ButtonC.h
+++ b/c-src/Fl_Radio_Light_ButtonC.h
@@ -10,105 +10,105 @@
 EXPORT {
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,Fl_Radio_Light_Button_handle)(fl_Radio_Light_Button self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Radio_Light_Button_parent)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_set_parent)(fl_Radio_Light_Button radio_light_button, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Radio_Light_Button_type)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_set_type)(fl_Radio_Light_Button radio_light_button, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Radio_Light_Button_handle,(fl_Radio_Light_Button self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Radio_Light_Button_parent,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_set_parent,(fl_Radio_Light_Button radio_light_button, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Radio_Light_Button_type,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_set_type,(fl_Radio_Light_Button radio_light_button, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Radio_Light_Button_x)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(int,          Fl_Radio_Light_Button_y)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(int,          Fl_Radio_Light_Button_w)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(int,          Fl_Radio_Light_Button_h)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_set_align)(fl_Radio_Light_Button radio_light_button, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Radio_Light_Button_align)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Radio_Light_Button_box)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_set_box)(fl_Radio_Light_Button radio_light_button, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Radio_Light_Button_color)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_set_color)(fl_Radio_Light_Button radio_light_button, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_set_color_with_bg_sel)(fl_Radio_Light_Button radio_light_button,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Radio_Light_Button_selection_color)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_set_selection_color)(fl_Radio_Light_Button radio_light_button, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Radio_Light_Button_label)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_copy_label)(fl_Radio_Light_Button radio_light_button, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_set_label)(fl_Radio_Light_Button radio_light_button, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Radio_Light_Button_labeltype)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_set_labeltype)(fl_Radio_Light_Button radio_light_button, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Radio_Light_Button_labelcolor)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_set_labelcolor)(fl_Radio_Light_Button radio_light_button, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Radio_Light_Button_labelfont)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_set_labelfont)(fl_Radio_Light_Button radio_light_button, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Radio_Light_Button_labelsize)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_set_labelsize)(fl_Radio_Light_Button radio_light_button, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Radio_Light_Button_image)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_set_image)(fl_Radio_Light_Button radio_light_button, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Radio_Light_Button_deimage)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_set_deimage)(fl_Radio_Light_Button radio_light_button, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Radio_Light_Button_tooltip)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_copy_tooltip)(fl_Radio_Light_Button radio_light_button, const char* text);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_set_tooltip)(fl_Radio_Light_Button radio_light_button, const char* text);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_set_callback_with_user_data)(fl_Radio_Light_Button radio_light_button, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_set_callback)(fl_Radio_Light_Button radio_light_button, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Radio_Light_Button_user_data)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_set_user_data)(fl_Radio_Light_Button radio_light_button, void* v);
-  FL_EXPORT_C(long,         Fl_Radio_Light_Button_argument)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_set_argument)(fl_Radio_Light_Button radio_light_button, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Radio_Light_Button_when)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_set_when)(fl_Radio_Light_Button radio_light_button, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Radio_Light_Button_visible)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(int,          Fl_Radio_Light_Button_visible_r)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_set_visible)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_clear_visible)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(unsigned int, Fl_Radio_Light_Button_active)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(int,          Fl_Radio_Light_Button_active_r)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_activate)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_deactivate)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(unsigned int, Fl_Radio_Light_Button_output)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_set_output)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_clear_output)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(unsigned int, Fl_Radio_Light_Button_takesevents)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_set_changed)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_clear_changed)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(int,          Fl_Radio_Light_Button_take_focus)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_set_visible_focus)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_clear_visible_focus)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_modify_visible_focus)(fl_Radio_Light_Button radio_light_button, int v);
-  FL_EXPORT_C(unsigned int, Fl_Radio_Light_Button_visible_focus)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_do_callback)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_do_callback_with_widget_and_user_data)(fl_Radio_Light_Button radio_light_button, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_do_callback_with_widget_and_default_user_data)(fl_Radio_Light_Button radio_light_button, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Radio_Light_Button_contains)(fl_Radio_Light_Button radio_light_button, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Radio_Light_Button_inside)(fl_Radio_Light_Button radio_light_button, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_redraw)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_redraw_label)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(uchar,        Fl_Radio_Light_Button_damage)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_clear_damage_with_bitmask)(fl_Radio_Light_Button radio_light_button, uchar c);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_clear_damage)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_damage_with_text)(fl_Radio_Light_Button radio_light_button, uchar c);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_damage_inside_widget)(fl_Radio_Light_Button radio_light_button, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_draw_label_with_xywh_alignment)(fl_Radio_Light_Button radio_light_button, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Radio_Light_Button_measure_label)(fl_Radio_Light_Button radio_light_button, int* ww , int* hh);
+  FL_EXPORT_C_HEADER(int,Fl_Radio_Light_Button_x,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(int,Fl_Radio_Light_Button_y,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(int,Fl_Radio_Light_Button_w,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(int,Fl_Radio_Light_Button_h,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_set_align,(fl_Radio_Light_Button radio_light_button, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Radio_Light_Button_align,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Radio_Light_Button_box,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_set_box,(fl_Radio_Light_Button radio_light_button, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Radio_Light_Button_color,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_set_color,(fl_Radio_Light_Button radio_light_button, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_set_color_with_bg_sel,(fl_Radio_Light_Button radio_light_button,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Radio_Light_Button_selection_color,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_set_selection_color,(fl_Radio_Light_Button radio_light_button, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Radio_Light_Button_label,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_copy_label,(fl_Radio_Light_Button radio_light_button, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_set_label,(fl_Radio_Light_Button radio_light_button, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Radio_Light_Button_labeltype,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_set_labeltype,(fl_Radio_Light_Button radio_light_button, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Radio_Light_Button_labelcolor,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_set_labelcolor,(fl_Radio_Light_Button radio_light_button, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Radio_Light_Button_labelfont,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_set_labelfont,(fl_Radio_Light_Button radio_light_button, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Radio_Light_Button_labelsize,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_set_labelsize,(fl_Radio_Light_Button radio_light_button, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Radio_Light_Button_image,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_set_image,(fl_Radio_Light_Button radio_light_button, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Radio_Light_Button_deimage,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_set_deimage,(fl_Radio_Light_Button radio_light_button, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Radio_Light_Button_tooltip,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_copy_tooltip,(fl_Radio_Light_Button radio_light_button, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_set_tooltip,(fl_Radio_Light_Button radio_light_button, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_set_callback_with_user_data,(fl_Radio_Light_Button radio_light_button, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_set_callback,(fl_Radio_Light_Button radio_light_button, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Radio_Light_Button_user_data,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_set_user_data,(fl_Radio_Light_Button radio_light_button, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Radio_Light_Button_argument,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_set_argument,(fl_Radio_Light_Button radio_light_button, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Radio_Light_Button_when,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_set_when,(fl_Radio_Light_Button radio_light_button, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Radio_Light_Button_visible,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(int,Fl_Radio_Light_Button_visible_r,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_set_visible,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_clear_visible,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Radio_Light_Button_active,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(int,Fl_Radio_Light_Button_active_r,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_activate,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_deactivate,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Radio_Light_Button_output,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_set_output,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_clear_output,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Radio_Light_Button_takesevents,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_set_changed,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_clear_changed,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(int,Fl_Radio_Light_Button_take_focus,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_set_visible_focus,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_clear_visible_focus,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_modify_visible_focus,(fl_Radio_Light_Button radio_light_button, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Radio_Light_Button_visible_focus,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_do_callback,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_do_callback_with_widget_and_user_data,(fl_Radio_Light_Button radio_light_button, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_do_callback_with_widget_and_default_user_data,(fl_Radio_Light_Button radio_light_button, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Radio_Light_Button_contains,(fl_Radio_Light_Button radio_light_button, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Radio_Light_Button_inside,(fl_Radio_Light_Button radio_light_button, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_redraw,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_redraw_label,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(uchar,Fl_Radio_Light_Button_damage,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_clear_damage_with_bitmask,(fl_Radio_Light_Button radio_light_button, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_clear_damage,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_damage_with_text,(fl_Radio_Light_Button radio_light_button, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_damage_inside_widget,(fl_Radio_Light_Button radio_light_button, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_draw_label_with_xywh_alignment,(fl_Radio_Light_Button radio_light_button, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_measure_label,(fl_Radio_Light_Button radio_light_button, int* ww , int* hh));
 
-  FL_EXPORT_C(fl_Window,    Fl_Radio_Light_Button_window)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(fl_Window,    Fl_Radio_Light_Button_top_window)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(fl_Window ,   Fl_Radio_Light_Button_top_window_offset)(fl_Radio_Light_Button radio_light_button, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Radio_Light_Button_as_group)(fl_Radio_Light_Button radio_light_button);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Radio_Light_Button_as_gl_window)(fl_Radio_Light_Button radio_light_button);
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Radio_Light_Button_window,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Radio_Light_Button_top_window,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Radio_Light_Button_top_window_offset,(fl_Radio_Light_Button radio_light_button, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Radio_Light_Button_as_group,(fl_Radio_Light_Button radio_light_button));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Radio_Light_Button_as_gl_window,(fl_Radio_Light_Button radio_light_button));
   /* Fl_Radio_Light_Button specific functions */
-  FL_EXPORT_C(fl_Radio_Light_Button,    Fl_Radio_Light_Button_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Radio_Light_Button,    Fl_Radio_Light_Button_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(void,Fl_Radio_Light_Button_Destroy)(fl_Radio_Light_Button button);
-  FL_EXPORT_C(char        , Fl_Radio_Light_Button_value)(fl_Radio_Light_Button b);
-  FL_EXPORT_C(int         , Fl_Radio_Light_Button_set_value)(fl_Radio_Light_Button b, int v);
-  FL_EXPORT_C(int         , Fl_Radio_Light_Button_set)(fl_Radio_Light_Button b);
-  FL_EXPORT_C(int         , Fl_Radio_Light_Button_clear)(fl_Radio_Light_Button b);
-  FL_EXPORT_C(void        , Fl_Radio_Light_Button_setonly)(fl_Radio_Light_Button b);
-  FL_EXPORT_C(int         , Fl_Radio_Light_Button_get_shortcut )(fl_Radio_Light_Button b);
-  FL_EXPORT_C(void        , Fl_Radio_Light_Button_set_shortcut )(fl_Radio_Light_Button b, int s);
-  FL_EXPORT_C(Fl_Boxtype  , Fl_Radio_Light_Button_down_box)(fl_Radio_Light_Button b);
-  FL_EXPORT_C(void        , Fl_Radio_Light_Button_set_down_box)(fl_Radio_Light_Button b,Fl_Boxtype boxtype);
-  FL_EXPORT_C(Fl_Color    , Fl_Radio_Light_Button_down_color )(fl_Radio_Light_Button b);
-  FL_EXPORT_C(void        , Fl_Radio_Light_Button_set_down_color)(fl_Radio_Light_Button b, Fl_Color c);
+  FL_EXPORT_C_HEADER(fl_Radio_Light_Button,Fl_Radio_Light_Button_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Radio_Light_Button,Fl_Radio_Light_Button_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Radio_Light_Button_Destroy,(fl_Radio_Light_Button button));
+  FL_EXPORT_C_HEADER(char        ,Fl_Radio_Light_Button_value,(fl_Radio_Light_Button b));
+  FL_EXPORT_C_HEADER(int         ,Fl_Radio_Light_Button_set_value,(fl_Radio_Light_Button b, int v));
+  FL_EXPORT_C_HEADER(int         ,Fl_Radio_Light_Button_set,(fl_Radio_Light_Button b));
+  FL_EXPORT_C_HEADER(int         ,Fl_Radio_Light_Button_clear,(fl_Radio_Light_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Radio_Light_Button_setonly,(fl_Radio_Light_Button b));
+  FL_EXPORT_C_HEADER(int         ,Fl_Radio_Light_Button_get_shortcut ,(fl_Radio_Light_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Radio_Light_Button_set_shortcut ,(fl_Radio_Light_Button b, int s));
+  FL_EXPORT_C_HEADER(Fl_Boxtype  ,Fl_Radio_Light_Button_down_box,(fl_Radio_Light_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Radio_Light_Button_set_down_box,(fl_Radio_Light_Button b,Fl_Boxtype boxtype));
+  FL_EXPORT_C_HEADER(Fl_Color    ,Fl_Radio_Light_Button_down_color ,(fl_Radio_Light_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Radio_Light_Button_set_down_color,(fl_Radio_Light_Button b, Fl_Color c));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Repeat_ButtonC.h b/c-src/Fl_Repeat_ButtonC.h
--- a/c-src/Fl_Repeat_ButtonC.h
+++ b/c-src/Fl_Repeat_ButtonC.h
@@ -29,117 +29,117 @@
   };
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,Fl_Repeat_Button_handle)(fl_Repeat_Button self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Repeat_Button_parent)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_set_parent)(fl_Repeat_Button repeat_button, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Repeat_Button_type)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_set_type)(fl_Repeat_Button repeat_button, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Repeat_Button_handle,(fl_Repeat_Button self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Repeat_Button_parent,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_set_parent,(fl_Repeat_Button repeat_button, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Repeat_Button_type,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_set_type,(fl_Repeat_Button repeat_button, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Repeat_Button_x)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(int,          Fl_Repeat_Button_y)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(int,          Fl_Repeat_Button_w)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(int,          Fl_Repeat_Button_h)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_set_align)(fl_Repeat_Button repeat_button, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Repeat_Button_align)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Repeat_Button_box)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_set_box)(fl_Repeat_Button repeat_button, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Repeat_Button_color)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_set_color)(fl_Repeat_Button repeat_button, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_set_color_with_bg_sel)(fl_Repeat_Button repeat_button,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Repeat_Button_selection_color)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_set_selection_color)(fl_Repeat_Button repeat_button, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Repeat_Button_label)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_copy_label)(fl_Repeat_Button repeat_button, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_set_label)(fl_Repeat_Button repeat_button, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Repeat_Button_labeltype)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_set_labeltype)(fl_Repeat_Button repeat_button, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Repeat_Button_labelcolor)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_set_labelcolor)(fl_Repeat_Button repeat_button, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Repeat_Button_labelfont)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_set_labelfont)(fl_Repeat_Button repeat_button, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Repeat_Button_labelsize)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_set_labelsize)(fl_Repeat_Button repeat_button, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Repeat_Button_image)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_set_image)(fl_Repeat_Button repeat_button, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Repeat_Button_deimage)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_set_deimage)(fl_Repeat_Button repeat_button, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Repeat_Button_tooltip)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_copy_tooltip)(fl_Repeat_Button repeat_button, const char* text);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_set_tooltip)(fl_Repeat_Button repeat_button, const char* text);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_set_callback_with_user_data)(fl_Repeat_Button repeat_button, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_set_callback)(fl_Repeat_Button repeat_button, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Repeat_Button_user_data)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_set_user_data)(fl_Repeat_Button repeat_button, void* v);
-  FL_EXPORT_C(long,         Fl_Repeat_Button_argument)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_set_argument)(fl_Repeat_Button repeat_button, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Repeat_Button_when)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_set_when)(fl_Repeat_Button repeat_button, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Repeat_Button_visible)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(int,          Fl_Repeat_Button_visible_r)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_set_visible)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_clear_visible)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(unsigned int, Fl_Repeat_Button_active)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(int,          Fl_Repeat_Button_active_r)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_activate)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_deactivate)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(unsigned int, Fl_Repeat_Button_output)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_set_output)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_clear_output)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(unsigned int, Fl_Repeat_Button_takesevents)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_set_changed)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_clear_changed)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(int,          Fl_Repeat_Button_take_focus)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_set_visible_focus)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_clear_visible_focus)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_modify_visible_focus)(fl_Repeat_Button repeat_button, int v);
-  FL_EXPORT_C(unsigned int, Fl_Repeat_Button_visible_focus)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_do_callback)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_do_callback_with_widget_and_user_data)(fl_Repeat_Button repeat_button, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_do_callback_with_widget_and_default_user_data)(fl_Repeat_Button repeat_button, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Repeat_Button_contains)(fl_Repeat_Button repeat_button, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Repeat_Button_inside)(fl_Repeat_Button repeat_button, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_redraw)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_redraw_label)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(uchar,        Fl_Repeat_Button_damage)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_clear_damage_with_bitmask)(fl_Repeat_Button repeat_button, uchar c);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_clear_damage)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_damage_with_text)(fl_Repeat_Button repeat_button, uchar c);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_damage_inside_widget)(fl_Repeat_Button repeat_button, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_draw_label_with_xywh_alignment)(fl_Repeat_Button repeat_button, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Repeat_Button_measure_label)(fl_Repeat_Button repeat_button, int* ww , int* hh);
+  FL_EXPORT_C_HEADER(int,Fl_Repeat_Button_x,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(int,Fl_Repeat_Button_y,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(int,Fl_Repeat_Button_w,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(int,Fl_Repeat_Button_h,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_set_align,(fl_Repeat_Button repeat_button, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Repeat_Button_align,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Repeat_Button_box,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_set_box,(fl_Repeat_Button repeat_button, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Repeat_Button_color,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_set_color,(fl_Repeat_Button repeat_button, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_set_color_with_bg_sel,(fl_Repeat_Button repeat_button,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Repeat_Button_selection_color,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_set_selection_color,(fl_Repeat_Button repeat_button, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Repeat_Button_label,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_copy_label,(fl_Repeat_Button repeat_button, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_set_label,(fl_Repeat_Button repeat_button, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Repeat_Button_labeltype,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_set_labeltype,(fl_Repeat_Button repeat_button, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Repeat_Button_labelcolor,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_set_labelcolor,(fl_Repeat_Button repeat_button, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Repeat_Button_labelfont,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_set_labelfont,(fl_Repeat_Button repeat_button, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Repeat_Button_labelsize,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_set_labelsize,(fl_Repeat_Button repeat_button, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Repeat_Button_image,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_set_image,(fl_Repeat_Button repeat_button, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Repeat_Button_deimage,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_set_deimage,(fl_Repeat_Button repeat_button, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Repeat_Button_tooltip,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_copy_tooltip,(fl_Repeat_Button repeat_button, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_set_tooltip,(fl_Repeat_Button repeat_button, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_set_callback_with_user_data,(fl_Repeat_Button repeat_button, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_set_callback,(fl_Repeat_Button repeat_button, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Repeat_Button_user_data,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_set_user_data,(fl_Repeat_Button repeat_button, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Repeat_Button_argument,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_set_argument,(fl_Repeat_Button repeat_button, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Repeat_Button_when,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_set_when,(fl_Repeat_Button repeat_button, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Repeat_Button_visible,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(int,Fl_Repeat_Button_visible_r,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_set_visible,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_clear_visible,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Repeat_Button_active,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(int,Fl_Repeat_Button_active_r,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_activate,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_deactivate,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Repeat_Button_output,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_set_output,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_clear_output,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Repeat_Button_takesevents,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_set_changed,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_clear_changed,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(int,Fl_Repeat_Button_take_focus,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_set_visible_focus,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_clear_visible_focus,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_modify_visible_focus,(fl_Repeat_Button repeat_button, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Repeat_Button_visible_focus,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_do_callback,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_do_callback_with_widget_and_user_data,(fl_Repeat_Button repeat_button, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_do_callback_with_widget_and_default_user_data,(fl_Repeat_Button repeat_button, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Repeat_Button_contains,(fl_Repeat_Button repeat_button, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Repeat_Button_inside,(fl_Repeat_Button repeat_button, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_redraw,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_redraw_label,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(uchar,Fl_Repeat_Button_damage,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_clear_damage_with_bitmask,(fl_Repeat_Button repeat_button, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_clear_damage,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_damage_with_text,(fl_Repeat_Button repeat_button, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_damage_inside_widget,(fl_Repeat_Button repeat_button, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_draw_label_with_xywh_alignment,(fl_Repeat_Button repeat_button, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_measure_label,(fl_Repeat_Button repeat_button, int* ww , int* hh));
 
-  FL_EXPORT_C(fl_Window,    Fl_Repeat_Button_window)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(fl_Window,    Fl_Repeat_Button_top_window)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(fl_Window ,   Fl_Repeat_Button_top_window_offset)(fl_Repeat_Button repeat_button, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Repeat_Button_as_group)(fl_Repeat_Button repeat_button);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Repeat_Button_as_gl_window)(fl_Repeat_Button repeat_button);
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Repeat_Button_window,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Repeat_Button_top_window,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Repeat_Button_top_window_offset,(fl_Repeat_Button repeat_button, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Repeat_Button_as_group,(fl_Repeat_Button repeat_button));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Repeat_Button_as_gl_window,(fl_Repeat_Button repeat_button));
   /* Fl_Repeat_Button specific functions */
-  FL_EXPORT_C(fl_Repeat_Button,    Fl_Repeat_Button_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Repeat_Button,    Fl_Repeat_Button_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(void,Fl_Repeat_Button_Destroy)(fl_Repeat_Button button);
-  FL_EXPORT_C(char        , Fl_Repeat_Button_value)(fl_Repeat_Button b);
-  FL_EXPORT_C(int         , Fl_Repeat_Button_set_value)(fl_Repeat_Button b, int v);
-  FL_EXPORT_C(int         , Fl_Repeat_Button_set)(fl_Repeat_Button b);
-  FL_EXPORT_C(int         , Fl_Repeat_Button_clear)(fl_Repeat_Button b);
-  FL_EXPORT_C(void        , Fl_Repeat_Button_setonly)(fl_Repeat_Button b);
-  FL_EXPORT_C(int         , Fl_Repeat_Button_get_shortcut )(fl_Repeat_Button b);
-  FL_EXPORT_C(void        , Fl_Repeat_Button_set_shortcut )(fl_Repeat_Button b, int s);
-  FL_EXPORT_C(Fl_Boxtype  , Fl_Repeat_Button_down_box)(fl_Repeat_Button b);
-  FL_EXPORT_C(void        , Fl_Repeat_Button_set_down_box)(fl_Repeat_Button b,Fl_Boxtype boxtype);
-  FL_EXPORT_C(Fl_Color    , Fl_Repeat_Button_down_color )(fl_Repeat_Button b);
-  FL_EXPORT_C(void        , Fl_Repeat_Button_set_down_color)(fl_Repeat_Button b, Fl_Color c);
-  FL_EXPORT_C(fl_Repeat_Button,    Fl_OverriddenRepeat_Button_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Repeat_Button,    Fl_OverriddenRepeat_Button_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Repeat_Button_draw)(fl_Repeat_Button o);
-  FL_EXPORT_C(void, Fl_Repeat_Button_draw_super)(fl_Repeat_Button o);
-  FL_EXPORT_C(int, Fl_Repeat_Button_handle)(fl_Repeat_Button o, int event);
-  FL_EXPORT_C(int, Fl_Repeat_Button_handle_super)(fl_Repeat_Button o, int event);
-  FL_EXPORT_C(void, Fl_Repeat_Button_resize)(fl_Repeat_Button o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Repeat_Button_resize_super)(fl_Repeat_Button o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Repeat_Button_show)(fl_Repeat_Button o);
-  FL_EXPORT_C(void, Fl_Repeat_Button_show_super)(fl_Repeat_Button o);
-  FL_EXPORT_C(void, Fl_Repeat_Button_hide)(fl_Repeat_Button o);
-  FL_EXPORT_C(void, Fl_Repeat_Button_hide_super)(fl_Repeat_Button o);
+  FL_EXPORT_C_HEADER(fl_Repeat_Button,Fl_Repeat_Button_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Repeat_Button,Fl_Repeat_Button_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_Destroy,(fl_Repeat_Button button));
+  FL_EXPORT_C_HEADER(char        ,Fl_Repeat_Button_value,(fl_Repeat_Button b));
+  FL_EXPORT_C_HEADER(int         ,Fl_Repeat_Button_set_value,(fl_Repeat_Button b, int v));
+  FL_EXPORT_C_HEADER(int         ,Fl_Repeat_Button_set,(fl_Repeat_Button b));
+  FL_EXPORT_C_HEADER(int         ,Fl_Repeat_Button_clear,(fl_Repeat_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Repeat_Button_setonly,(fl_Repeat_Button b));
+  FL_EXPORT_C_HEADER(int         ,Fl_Repeat_Button_get_shortcut ,(fl_Repeat_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Repeat_Button_set_shortcut ,(fl_Repeat_Button b, int s));
+  FL_EXPORT_C_HEADER(Fl_Boxtype  ,Fl_Repeat_Button_down_box,(fl_Repeat_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Repeat_Button_set_down_box,(fl_Repeat_Button b,Fl_Boxtype boxtype));
+  FL_EXPORT_C_HEADER(Fl_Color    ,Fl_Repeat_Button_down_color ,(fl_Repeat_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Repeat_Button_set_down_color,(fl_Repeat_Button b, Fl_Color c));
+  FL_EXPORT_C_HEADER(fl_Repeat_Button,Fl_OverriddenRepeat_Button_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Repeat_Button,Fl_OverriddenRepeat_Button_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_draw,(fl_Repeat_Button o));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_draw_super,(fl_Repeat_Button o));
+  FL_EXPORT_C_HEADER(int,Fl_Repeat_Button_handle,(fl_Repeat_Button o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Repeat_Button_handle_super,(fl_Repeat_Button o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_resize,(fl_Repeat_Button o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_resize_super,(fl_Repeat_Button o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_show,(fl_Repeat_Button o));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_show_super,(fl_Repeat_Button o));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_hide,(fl_Repeat_Button o));
+  FL_EXPORT_C_HEADER(void,Fl_Repeat_Button_hide_super,(fl_Repeat_Button o));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Return_ButtonC.h b/c-src/Fl_Return_ButtonC.h
--- a/c-src/Fl_Return_ButtonC.h
+++ b/c-src/Fl_Return_ButtonC.h
@@ -29,117 +29,117 @@
   };
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,Fl_Return_Button_handle)(fl_Return_Button self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Return_Button_parent)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_set_parent)(fl_Return_Button return_button, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Return_Button_type)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_set_type)(fl_Return_Button return_button, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Return_Button_handle,(fl_Return_Button self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Return_Button_parent,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_set_parent,(fl_Return_Button return_button, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Return_Button_type,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_set_type,(fl_Return_Button return_button, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Return_Button_x)(fl_Return_Button return_button);
-  FL_EXPORT_C(int,          Fl_Return_Button_y)(fl_Return_Button return_button);
-  FL_EXPORT_C(int,          Fl_Return_Button_w)(fl_Return_Button return_button);
-  FL_EXPORT_C(int,          Fl_Return_Button_h)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_set_align)(fl_Return_Button return_button, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Return_Button_align)(fl_Return_Button return_button);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Return_Button_box)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_set_box)(fl_Return_Button return_button, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Return_Button_color)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_set_color)(fl_Return_Button return_button, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Return_Button_set_color_with_bg_sel)(fl_Return_Button return_button,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Return_Button_selection_color)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_set_selection_color)(fl_Return_Button return_button, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Return_Button_label)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_copy_label)(fl_Return_Button return_button, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Return_Button_set_label)(fl_Return_Button return_button, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Return_Button_labeltype)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_set_labeltype)(fl_Return_Button return_button, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Return_Button_labelcolor)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_set_labelcolor)(fl_Return_Button return_button, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Return_Button_labelfont)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_set_labelfont)(fl_Return_Button return_button, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Return_Button_labelsize)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_set_labelsize)(fl_Return_Button return_button, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Return_Button_image)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_set_image)(fl_Return_Button return_button, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Return_Button_deimage)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_set_deimage)(fl_Return_Button return_button, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Return_Button_tooltip)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_copy_tooltip)(fl_Return_Button return_button, const char* text);
-  FL_EXPORT_C(void,         Fl_Return_Button_set_tooltip)(fl_Return_Button return_button, const char* text);
-  FL_EXPORT_C(void,         Fl_Return_Button_set_callback_with_user_data)(fl_Return_Button return_button, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Return_Button_set_callback)(fl_Return_Button return_button, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Return_Button_user_data)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_set_user_data)(fl_Return_Button return_button, void* v);
-  FL_EXPORT_C(long,         Fl_Return_Button_argument)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_set_argument)(fl_Return_Button return_button, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Return_Button_when)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_set_when)(fl_Return_Button return_button, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Return_Button_visible)(fl_Return_Button return_button);
-  FL_EXPORT_C(int,          Fl_Return_Button_visible_r)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_set_visible)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_clear_visible)(fl_Return_Button return_button);
-  FL_EXPORT_C(unsigned int, Fl_Return_Button_active)(fl_Return_Button return_button);
-  FL_EXPORT_C(int,          Fl_Return_Button_active_r)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_activate)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_deactivate)(fl_Return_Button return_button);
-  FL_EXPORT_C(unsigned int, Fl_Return_Button_output)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_set_output)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_clear_output)(fl_Return_Button return_button);
-  FL_EXPORT_C(unsigned int, Fl_Return_Button_takesevents)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_set_changed)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_clear_changed)(fl_Return_Button return_button);
-  FL_EXPORT_C(int,          Fl_Return_Button_take_focus)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_set_visible_focus)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_clear_visible_focus)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_modify_visible_focus)(fl_Return_Button return_button, int v);
-  FL_EXPORT_C(unsigned int, Fl_Return_Button_visible_focus)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_do_callback)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_do_callback_with_widget_and_user_data)(fl_Return_Button return_button, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Return_Button_do_callback_with_widget_and_default_user_data)(fl_Return_Button return_button, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Return_Button_contains)(fl_Return_Button return_button, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Return_Button_inside)(fl_Return_Button return_button, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Return_Button_redraw)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_redraw_label)(fl_Return_Button return_button);
-  FL_EXPORT_C(uchar,        Fl_Return_Button_damage)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_clear_damage_with_bitmask)(fl_Return_Button return_button, uchar c);
-  FL_EXPORT_C(void,         Fl_Return_Button_clear_damage)(fl_Return_Button return_button);
-  FL_EXPORT_C(void,         Fl_Return_Button_damage_with_text)(fl_Return_Button return_button, uchar c);
-  FL_EXPORT_C(void,         Fl_Return_Button_damage_inside_widget)(fl_Return_Button return_button, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Return_Button_draw_label_with_xywh_alignment)(fl_Return_Button return_button, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Return_Button_measure_label)(fl_Return_Button return_button, int* ww , int* hh);
+  FL_EXPORT_C_HEADER(int,Fl_Return_Button_x,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(int,Fl_Return_Button_y,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(int,Fl_Return_Button_w,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(int,Fl_Return_Button_h,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_set_align,(fl_Return_Button return_button, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Return_Button_align,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Return_Button_box,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_set_box,(fl_Return_Button return_button, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Return_Button_color,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_set_color,(fl_Return_Button return_button, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_set_color_with_bg_sel,(fl_Return_Button return_button,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Return_Button_selection_color,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_set_selection_color,(fl_Return_Button return_button, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Return_Button_label,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_copy_label,(fl_Return_Button return_button, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_set_label,(fl_Return_Button return_button, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Return_Button_labeltype,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_set_labeltype,(fl_Return_Button return_button, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Return_Button_labelcolor,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_set_labelcolor,(fl_Return_Button return_button, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Return_Button_labelfont,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_set_labelfont,(fl_Return_Button return_button, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Return_Button_labelsize,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_set_labelsize,(fl_Return_Button return_button, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Return_Button_image,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_set_image,(fl_Return_Button return_button, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Return_Button_deimage,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_set_deimage,(fl_Return_Button return_button, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Return_Button_tooltip,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_copy_tooltip,(fl_Return_Button return_button, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_set_tooltip,(fl_Return_Button return_button, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_set_callback_with_user_data,(fl_Return_Button return_button, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_set_callback,(fl_Return_Button return_button, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Return_Button_user_data,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_set_user_data,(fl_Return_Button return_button, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Return_Button_argument,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_set_argument,(fl_Return_Button return_button, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Return_Button_when,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_set_when,(fl_Return_Button return_button, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Return_Button_visible,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(int,Fl_Return_Button_visible_r,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_set_visible,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_clear_visible,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Return_Button_active,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(int,Fl_Return_Button_active_r,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_activate,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_deactivate,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Return_Button_output,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_set_output,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_clear_output,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Return_Button_takesevents,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_set_changed,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_clear_changed,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(int,Fl_Return_Button_take_focus,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_set_visible_focus,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_clear_visible_focus,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_modify_visible_focus,(fl_Return_Button return_button, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Return_Button_visible_focus,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_do_callback,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_do_callback_with_widget_and_user_data,(fl_Return_Button return_button, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_do_callback_with_widget_and_default_user_data,(fl_Return_Button return_button, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Return_Button_contains,(fl_Return_Button return_button, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Return_Button_inside,(fl_Return_Button return_button, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_redraw,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_redraw_label,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(uchar,Fl_Return_Button_damage,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_clear_damage_with_bitmask,(fl_Return_Button return_button, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_clear_damage,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_damage_with_text,(fl_Return_Button return_button, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_damage_inside_widget,(fl_Return_Button return_button, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_draw_label_with_xywh_alignment,(fl_Return_Button return_button, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_measure_label,(fl_Return_Button return_button, int* ww , int* hh));
 
-  FL_EXPORT_C(fl_Window,    Fl_Return_Button_window)(fl_Return_Button return_button);
-  FL_EXPORT_C(fl_Window,    Fl_Return_Button_top_window)(fl_Return_Button return_button);
-  FL_EXPORT_C(fl_Window ,   Fl_Return_Button_top_window_offset)(fl_Return_Button return_button, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Return_Button_as_group)(fl_Return_Button return_button);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Return_Button_as_gl_window)(fl_Return_Button return_button);
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Return_Button_window,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Return_Button_top_window,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Return_Button_top_window_offset,(fl_Return_Button return_button, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Return_Button_as_group,(fl_Return_Button return_button));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Return_Button_as_gl_window,(fl_Return_Button return_button));
   /* Fl_Return_Button specific functions */
-  FL_EXPORT_C(fl_Return_Button,    Fl_Return_Button_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Return_Button,    Fl_Return_Button_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(void,Fl_Return_Button_Destroy)(fl_Return_Button button);
-  FL_EXPORT_C(char        , Fl_Return_Button_value)(fl_Return_Button b);
-  FL_EXPORT_C(int         , Fl_Return_Button_set_value)(fl_Return_Button b, int v);
-  FL_EXPORT_C(int         , Fl_Return_Button_set)(fl_Return_Button b);
-  FL_EXPORT_C(int         , Fl_Return_Button_clear)(fl_Return_Button b);
-  FL_EXPORT_C(void        , Fl_Return_Button_setonly)(fl_Return_Button b);
-  FL_EXPORT_C(int         , Fl_Return_Button_get_shortcut )(fl_Return_Button b);
-  FL_EXPORT_C(void        , Fl_Return_Button_set_shortcut )(fl_Return_Button b, int s);
-  FL_EXPORT_C(Fl_Boxtype  , Fl_Return_Button_down_box)(fl_Return_Button b);
-  FL_EXPORT_C(void        , Fl_Return_Button_set_down_box)(fl_Return_Button b,Fl_Boxtype boxtype);
-  FL_EXPORT_C(Fl_Color    , Fl_Return_Button_down_color )(fl_Return_Button b);
-  FL_EXPORT_C(void        , Fl_Return_Button_set_down_color)(fl_Return_Button b, Fl_Color c);
-  FL_EXPORT_C(fl_Return_Button,    Fl_OverriddenReturn_Button_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Return_Button,    Fl_OverriddenReturn_Button_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Return_Button_draw)(fl_Return_Button o);
-  FL_EXPORT_C(void, Fl_Return_Button_draw_super)(fl_Return_Button o);
-  FL_EXPORT_C(int, Fl_Return_Button_handle)(fl_Return_Button o, int event);
-  FL_EXPORT_C(int, Fl_Return_Button_handle_super)(fl_Return_Button o, int event);
-  FL_EXPORT_C(void, Fl_Return_Button_resize)(fl_Return_Button o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Return_Button_resize_super)(fl_Return_Button o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Return_Button_show)(fl_Return_Button o);
-  FL_EXPORT_C(void, Fl_Return_Button_show_super)(fl_Return_Button o);
-  FL_EXPORT_C(void, Fl_Return_Button_hide)(fl_Return_Button o);
-  FL_EXPORT_C(void, Fl_Return_Button_hide_super)(fl_Return_Button o);
+  FL_EXPORT_C_HEADER(fl_Return_Button,Fl_Return_Button_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Return_Button,Fl_Return_Button_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_Destroy,(fl_Return_Button button));
+  FL_EXPORT_C_HEADER(char        ,Fl_Return_Button_value,(fl_Return_Button b));
+  FL_EXPORT_C_HEADER(int         ,Fl_Return_Button_set_value,(fl_Return_Button b, int v));
+  FL_EXPORT_C_HEADER(int         ,Fl_Return_Button_set,(fl_Return_Button b));
+  FL_EXPORT_C_HEADER(int         ,Fl_Return_Button_clear,(fl_Return_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Return_Button_setonly,(fl_Return_Button b));
+  FL_EXPORT_C_HEADER(int         ,Fl_Return_Button_get_shortcut ,(fl_Return_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Return_Button_set_shortcut ,(fl_Return_Button b, int s));
+  FL_EXPORT_C_HEADER(Fl_Boxtype  ,Fl_Return_Button_down_box,(fl_Return_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Return_Button_set_down_box,(fl_Return_Button b,Fl_Boxtype boxtype));
+  FL_EXPORT_C_HEADER(Fl_Color    ,Fl_Return_Button_down_color ,(fl_Return_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Return_Button_set_down_color,(fl_Return_Button b, Fl_Color c));
+  FL_EXPORT_C_HEADER(fl_Return_Button,Fl_OverriddenReturn_Button_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Return_Button,Fl_OverriddenReturn_Button_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_draw,(fl_Return_Button o));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_draw_super,(fl_Return_Button o));
+  FL_EXPORT_C_HEADER(int,Fl_Return_Button_handle,(fl_Return_Button o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Return_Button_handle_super,(fl_Return_Button o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_resize,(fl_Return_Button o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_resize_super,(fl_Return_Button o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_show,(fl_Return_Button o));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_show_super,(fl_Return_Button o));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_hide,(fl_Return_Button o));
+  FL_EXPORT_C_HEADER(void,Fl_Return_Button_hide_super,(fl_Return_Button o));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_RollerC.h b/c-src/Fl_RollerC.h
--- a/c-src/Fl_RollerC.h
+++ b/c-src/Fl_RollerC.h
@@ -29,126 +29,126 @@
   };
 
 #endif
-  FL_EXPORT_C(fl_Group,     Fl_Roller_parent)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_set_parent)(fl_Roller roller, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Roller_type)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_set_type)(fl_Roller roller, uchar t);
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Roller_parent,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_set_parent,(fl_Roller roller, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Roller_type,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_set_type,(fl_Roller roller, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Roller_x)(fl_Roller roller);
-  FL_EXPORT_C(int,          Fl_Roller_y)(fl_Roller roller);
-  FL_EXPORT_C(int,          Fl_Roller_w)(fl_Roller roller);
-  FL_EXPORT_C(int,          Fl_Roller_h)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_set_align)(fl_Roller roller, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Roller_align)(fl_Roller roller);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Roller_box)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_set_box)(fl_Roller roller, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Roller_color)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_set_color)(fl_Roller roller, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Roller_set_color_with_bg_sel)(fl_Roller roller,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Roller_selection_color)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_set_selection_color)(fl_Roller roller, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Roller_label)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_copy_label)(fl_Roller roller, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Roller_set_label)(fl_Roller roller, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Roller_labeltype)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_set_labeltype)(fl_Roller roller, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Roller_labelcolor)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_set_labelcolor)(fl_Roller roller, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Roller_labelfont)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_set_labelfont)(fl_Roller roller, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Roller_labelsize)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_set_labelsize)(fl_Roller roller, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Roller_image)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_set_image)(fl_Roller roller, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Roller_deimage)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_set_deimage)(fl_Roller roller, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Roller_tooltip)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_copy_tooltip)(fl_Roller roller, const char* text);
-  FL_EXPORT_C(void,         Fl_Roller_set_tooltip)(fl_Roller roller, const char* text);
-  FL_EXPORT_C(void,         Fl_Roller_set_callback_with_user_data)(fl_Roller roller, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Roller_set_callback)(fl_Roller roller, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Roller_other_data)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_set_other_data)(fl_Roller roller, void* v);
-  FL_EXPORT_C(void*,        Fl_Roller_user_data)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_set_user_data)(fl_Roller roller, void* v);
-  FL_EXPORT_C(long,         Fl_Roller_argument)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_set_argument)(fl_Roller roller, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Roller_when)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_set_when)(fl_Roller roller, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Roller_visible)(fl_Roller roller);
-  FL_EXPORT_C(int,          Fl_Roller_visible_r)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_show)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_hide)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_set_visible)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_clear_visible)(fl_Roller roller);
-  FL_EXPORT_C(unsigned int, Fl_Roller_active)(fl_Roller roller);
-  FL_EXPORT_C(int,          Fl_Roller_active_r)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_activate)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_deactivate)(fl_Roller roller);
-  FL_EXPORT_C(unsigned int, Fl_Roller_output)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_set_output)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_clear_output)(fl_Roller roller);
-  FL_EXPORT_C(unsigned int, Fl_Roller_takesevents)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_set_changed)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_clear_changed)(fl_Roller roller);
-  FL_EXPORT_C(int,          Fl_Roller_take_focus)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_set_visible_focus)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_clear_visible_focus)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_modify_visible_focus)(fl_Roller roller, int v);
-  FL_EXPORT_C(unsigned int, Fl_Roller_visible_focus)(fl_Roller roller);
-  FL_EXPORT_C(int,          Fl_Roller_contains)(fl_Roller roller, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Roller_inside)(fl_Roller roller, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Roller_redraw)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_redraw_label)(fl_Roller roller);
-  FL_EXPORT_C(uchar,        Fl_Roller_damage)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_clear_damage_with_bitmask)(fl_Roller roller, uchar c);
-  FL_EXPORT_C(void,         Fl_Roller_clear_damage)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_damage_with_text)(fl_Roller roller, uchar c);
-  FL_EXPORT_C(void,         Fl_Roller_damage_inside_widget)(fl_Roller roller, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Roller_draw_label_with_xywh_alignment)(fl_Roller roller, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Roller_measure_label)(fl_Roller roller, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Roller_window)(fl_Roller roller);
-  FL_EXPORT_C(fl_Window,    Fl_Roller_top_window)(fl_Roller roller);
-  FL_EXPORT_C(fl_Window ,   Fl_Roller_top_window_offset)(fl_Roller roller, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Roller_as_gl_window)(fl_Roller roller);
-  FL_EXPORT_C(void,         Fl_Roller_resize)(fl_Table table,int X, int Y, int W, int H);
+  FL_EXPORT_C_HEADER(int,Fl_Roller_x,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(int,Fl_Roller_y,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(int,Fl_Roller_w,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(int,Fl_Roller_h,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_set_align,(fl_Roller roller, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Roller_align,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Roller_box,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_set_box,(fl_Roller roller, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Roller_color,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_set_color,(fl_Roller roller, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_set_color_with_bg_sel,(fl_Roller roller,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Roller_selection_color,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_set_selection_color,(fl_Roller roller, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Roller_label,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_copy_label,(fl_Roller roller, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_set_label,(fl_Roller roller, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Roller_labeltype,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_set_labeltype,(fl_Roller roller, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Roller_labelcolor,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_set_labelcolor,(fl_Roller roller, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Roller_labelfont,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_set_labelfont,(fl_Roller roller, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Roller_labelsize,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_set_labelsize,(fl_Roller roller, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Roller_image,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_set_image,(fl_Roller roller, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Roller_deimage,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_set_deimage,(fl_Roller roller, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Roller_tooltip,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_copy_tooltip,(fl_Roller roller, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_set_tooltip,(fl_Roller roller, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_set_callback_with_user_data,(fl_Roller roller, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_set_callback,(fl_Roller roller, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Roller_other_data,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_set_other_data,(fl_Roller roller, void* v));
+  FL_EXPORT_C_HEADER(void*,Fl_Roller_user_data,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_set_user_data,(fl_Roller roller, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Roller_argument,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_set_argument,(fl_Roller roller, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Roller_when,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_set_when,(fl_Roller roller, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Roller_visible,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(int,Fl_Roller_visible_r,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_show,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_hide,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_set_visible,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_clear_visible,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Roller_active,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(int,Fl_Roller_active_r,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_activate,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_deactivate,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Roller_output,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_set_output,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_clear_output,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Roller_takesevents,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_set_changed,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_clear_changed,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(int,Fl_Roller_take_focus,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_set_visible_focus,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_clear_visible_focus,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_modify_visible_focus,(fl_Roller roller, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Roller_visible_focus,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(int,Fl_Roller_contains,(fl_Roller roller, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Roller_inside,(fl_Roller roller, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_redraw,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_redraw_label,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(uchar,Fl_Roller_damage,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_clear_damage_with_bitmask,(fl_Roller roller, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_clear_damage,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_damage_with_text,(fl_Roller roller, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_damage_inside_widget,(fl_Roller roller, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_draw_label_with_xywh_alignment,(fl_Roller roller, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_measure_label,(fl_Roller roller, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Roller_window,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Roller_top_window,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Roller_top_window_offset,(fl_Roller roller, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Roller_as_gl_window,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_resize,(fl_Table table,int X, int Y, int W, int H));
 
   /* Inherited from Fl_Valuator */
-  FL_EXPORT_C(void, Fl_Roller_bounds)(fl_Roller roller, double a, double b);
-  FL_EXPORT_C(double, Fl_Roller_minimum)(fl_Roller roller);
-  FL_EXPORT_C(void, Fl_Roller_set_minimum)(fl_Roller roller, double a);
-  FL_EXPORT_C(double, Fl_Roller_maximum)(fl_Roller roller);
-  FL_EXPORT_C(void, Fl_Roller_set_maximum)(fl_Roller roller, double a);
-  FL_EXPORT_C(void, Fl_Roller_range)(fl_Roller roller, double a, double b);
-  FL_EXPORT_C(void, Fl_Roller_set_step)(fl_Roller roller, int a);
-  FL_EXPORT_C(void, Fl_Roller_set_step_with_a_b)(fl_Roller roller, double a, int b);
-  FL_EXPORT_C(void, Fl_Roller_step_with_s)(fl_Roller roller, double s);
-  FL_EXPORT_C(double, Fl_Roller_step)(fl_Roller roller);
-  FL_EXPORT_C(void, Fl_Roller_precision)(fl_Roller roller, int precision);
-  FL_EXPORT_C(double, Fl_Roller_value)(fl_Roller roller);
-  FL_EXPORT_C(int, Fl_Roller_set_value)(fl_Roller roller, double v);
-  FL_EXPORT_C(int, Fl_Roller_format)(fl_Roller roller, char* format);
-  FL_EXPORT_C(double, Fl_Roller_round)(fl_Roller roller, double v);
-  FL_EXPORT_C(double, Fl_Roller_clamp)(fl_Roller roller, double v);
-  FL_EXPORT_C(double, Fl_Roller_increment)(fl_Roller roller, double v, int n);
+  FL_EXPORT_C_HEADER(void,Fl_Roller_bounds,(fl_Roller roller, double a, double b));
+  FL_EXPORT_C_HEADER(double,Fl_Roller_minimum,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_set_minimum,(fl_Roller roller, double a));
+  FL_EXPORT_C_HEADER(double,Fl_Roller_maximum,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_set_maximum,(fl_Roller roller, double a));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_range,(fl_Roller roller, double a, double b));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_set_step,(fl_Roller roller, int a));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_set_step_with_a_b,(fl_Roller roller, double a, int b));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_step_with_s,(fl_Roller roller, double s));
+  FL_EXPORT_C_HEADER(double,Fl_Roller_step,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_precision,(fl_Roller roller, int precision));
+  FL_EXPORT_C_HEADER(double,Fl_Roller_value,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(int,Fl_Roller_set_value,(fl_Roller roller, double v));
+  FL_EXPORT_C_HEADER(int,Fl_Roller_format,(fl_Roller roller, char* format));
+  FL_EXPORT_C_HEADER(double,Fl_Roller_round,(fl_Roller roller, double v));
+  FL_EXPORT_C_HEADER(double,Fl_Roller_clamp,(fl_Roller roller, double v));
+  FL_EXPORT_C_HEADER(double,Fl_Roller_increment,(fl_Roller roller, double v, int n));
 
   /* Fl_Roller specific */
-  FL_EXPORT_C(fl_Roller,    Fl_Roller_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Roller   , Fl_Roller_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(void,      Fl_Roller_Destroy)(fl_Roller roller);
-  FL_EXPORT_C(int,       Fl_Roller_handle)(fl_Roller roller, int event);
-  FL_EXPORT_C(fl_Roller,    Fl_OverriddenRoller_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Roller,    Fl_OverriddenRoller_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Roller_draw)(fl_Roller o);
-  FL_EXPORT_C(void, Fl_Roller_draw_super)(fl_Roller o);
-  FL_EXPORT_C(int, Fl_Roller_handle)(fl_Roller o, int event);
-  FL_EXPORT_C(int, Fl_Roller_handle_super)(fl_Roller o, int event);
-  FL_EXPORT_C(void, Fl_Roller_resize)(fl_Roller o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Roller_resize_super)(fl_Roller o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Roller_show)(fl_Roller o);
-  FL_EXPORT_C(void, Fl_Roller_show_super)(fl_Roller o);
-  FL_EXPORT_C(void, Fl_Roller_hide)(fl_Roller o);
-  FL_EXPORT_C(void, Fl_Roller_hide_super)(fl_Roller o);
+  FL_EXPORT_C_HEADER(fl_Roller,Fl_Roller_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Roller   ,Fl_Roller_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_Destroy,(fl_Roller roller));
+  FL_EXPORT_C_HEADER(int,Fl_Roller_handle,(fl_Roller roller, int event));
+  FL_EXPORT_C_HEADER(fl_Roller,Fl_OverriddenRoller_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Roller,Fl_OverriddenRoller_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_draw,(fl_Roller o));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_draw_super,(fl_Roller o));
+  FL_EXPORT_C_HEADER(int,Fl_Roller_handle,(fl_Roller o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Roller_handle_super,(fl_Roller o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_resize,(fl_Roller o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_resize_super,(fl_Roller o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_show,(fl_Roller o));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_show_super,(fl_Roller o));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_hide,(fl_Roller o));
+  FL_EXPORT_C_HEADER(void,Fl_Roller_hide_super,(fl_Roller o));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Round_ButtonC.h b/c-src/Fl_Round_ButtonC.h
--- a/c-src/Fl_Round_ButtonC.h
+++ b/c-src/Fl_Round_ButtonC.h
@@ -29,117 +29,117 @@
   };
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,Fl_Round_Button_handle)(fl_Round_Button self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Round_Button_parent)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_set_parent)(fl_Round_Button round_button, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Round_Button_type)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_set_type)(fl_Round_Button round_button, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Round_Button_handle,(fl_Round_Button self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Round_Button_parent,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_set_parent,(fl_Round_Button round_button, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Round_Button_type,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_set_type,(fl_Round_Button round_button, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Round_Button_x)(fl_Round_Button round_button);
-  FL_EXPORT_C(int,          Fl_Round_Button_y)(fl_Round_Button round_button);
-  FL_EXPORT_C(int,          Fl_Round_Button_w)(fl_Round_Button round_button);
-  FL_EXPORT_C(int,          Fl_Round_Button_h)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_set_align)(fl_Round_Button round_button, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Round_Button_align)(fl_Round_Button round_button);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Round_Button_box)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_set_box)(fl_Round_Button round_button, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Round_Button_color)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_set_color)(fl_Round_Button round_button, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Round_Button_set_color_with_bg_sel)(fl_Round_Button round_button,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Round_Button_selection_color)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_set_selection_color)(fl_Round_Button round_button, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Round_Button_label)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_copy_label)(fl_Round_Button round_button, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Round_Button_set_label)(fl_Round_Button round_button, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Round_Button_labeltype)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_set_labeltype)(fl_Round_Button round_button, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Round_Button_labelcolor)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_set_labelcolor)(fl_Round_Button round_button, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Round_Button_labelfont)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_set_labelfont)(fl_Round_Button round_button, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Round_Button_labelsize)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_set_labelsize)(fl_Round_Button round_button, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Round_Button_image)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_set_image)(fl_Round_Button round_button, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Round_Button_deimage)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_set_deimage)(fl_Round_Button round_button, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Round_Button_tooltip)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_copy_tooltip)(fl_Round_Button round_button, const char* text);
-  FL_EXPORT_C(void,         Fl_Round_Button_set_tooltip)(fl_Round_Button round_button, const char* text);
-  FL_EXPORT_C(void,         Fl_Round_Button_set_callback_with_user_data)(fl_Round_Button round_button, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Round_Button_set_callback)(fl_Round_Button round_button, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Round_Button_user_data)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_set_user_data)(fl_Round_Button round_button, void* v);
-  FL_EXPORT_C(long,         Fl_Round_Button_argument)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_set_argument)(fl_Round_Button round_button, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Round_Button_when)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_set_when)(fl_Round_Button round_button, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Round_Button_visible)(fl_Round_Button round_button);
-  FL_EXPORT_C(int,          Fl_Round_Button_visible_r)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_set_visible)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_clear_visible)(fl_Round_Button round_button);
-  FL_EXPORT_C(unsigned int, Fl_Round_Button_active)(fl_Round_Button round_button);
-  FL_EXPORT_C(int,          Fl_Round_Button_active_r)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_activate)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_deactivate)(fl_Round_Button round_button);
-  FL_EXPORT_C(unsigned int, Fl_Round_Button_output)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_set_output)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_clear_output)(fl_Round_Button round_button);
-  FL_EXPORT_C(unsigned int, Fl_Round_Button_takesevents)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_set_changed)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_clear_changed)(fl_Round_Button round_button);
-  FL_EXPORT_C(int,          Fl_Round_Button_take_focus)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_set_visible_focus)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_clear_visible_focus)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_modify_visible_focus)(fl_Round_Button round_button, int v);
-  FL_EXPORT_C(unsigned int, Fl_Round_Button_visible_focus)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_do_callback)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_do_callback_with_widget_and_user_data)(fl_Round_Button round_button, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Round_Button_do_callback_with_widget_and_default_user_data)(fl_Round_Button round_button, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Round_Button_contains)(fl_Round_Button round_button, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Round_Button_inside)(fl_Round_Button round_button, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Round_Button_redraw)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_redraw_label)(fl_Round_Button round_button);
-  FL_EXPORT_C(uchar,        Fl_Round_Button_damage)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_clear_damage_with_bitmask)(fl_Round_Button round_button, uchar c);
-  FL_EXPORT_C(void,         Fl_Round_Button_clear_damage)(fl_Round_Button round_button);
-  FL_EXPORT_C(void,         Fl_Round_Button_damage_with_text)(fl_Round_Button round_button, uchar c);
-  FL_EXPORT_C(void,         Fl_Round_Button_damage_inside_widget)(fl_Round_Button round_button, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Round_Button_draw_label_with_xywh_alignment)(fl_Round_Button round_button, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Round_Button_measure_label)(fl_Round_Button round_button, int* ww , int* hh);
+  FL_EXPORT_C_HEADER(int,Fl_Round_Button_x,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(int,Fl_Round_Button_y,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(int,Fl_Round_Button_w,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(int,Fl_Round_Button_h,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_set_align,(fl_Round_Button round_button, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Round_Button_align,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Round_Button_box,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_set_box,(fl_Round_Button round_button, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Round_Button_color,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_set_color,(fl_Round_Button round_button, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_set_color_with_bg_sel,(fl_Round_Button round_button,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Round_Button_selection_color,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_set_selection_color,(fl_Round_Button round_button, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Round_Button_label,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_copy_label,(fl_Round_Button round_button, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_set_label,(fl_Round_Button round_button, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Round_Button_labeltype,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_set_labeltype,(fl_Round_Button round_button, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Round_Button_labelcolor,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_set_labelcolor,(fl_Round_Button round_button, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Round_Button_labelfont,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_set_labelfont,(fl_Round_Button round_button, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Round_Button_labelsize,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_set_labelsize,(fl_Round_Button round_button, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Round_Button_image,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_set_image,(fl_Round_Button round_button, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Round_Button_deimage,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_set_deimage,(fl_Round_Button round_button, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Round_Button_tooltip,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_copy_tooltip,(fl_Round_Button round_button, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_set_tooltip,(fl_Round_Button round_button, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_set_callback_with_user_data,(fl_Round_Button round_button, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_set_callback,(fl_Round_Button round_button, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Round_Button_user_data,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_set_user_data,(fl_Round_Button round_button, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Round_Button_argument,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_set_argument,(fl_Round_Button round_button, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Round_Button_when,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_set_when,(fl_Round_Button round_button, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Round_Button_visible,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(int,Fl_Round_Button_visible_r,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_set_visible,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_clear_visible,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Round_Button_active,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(int,Fl_Round_Button_active_r,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_activate,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_deactivate,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Round_Button_output,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_set_output,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_clear_output,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Round_Button_takesevents,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_set_changed,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_clear_changed,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(int,Fl_Round_Button_take_focus,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_set_visible_focus,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_clear_visible_focus,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_modify_visible_focus,(fl_Round_Button round_button, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Round_Button_visible_focus,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_do_callback,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_do_callback_with_widget_and_user_data,(fl_Round_Button round_button, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_do_callback_with_widget_and_default_user_data,(fl_Round_Button round_button, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Round_Button_contains,(fl_Round_Button round_button, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Round_Button_inside,(fl_Round_Button round_button, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_redraw,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_redraw_label,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(uchar,Fl_Round_Button_damage,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_clear_damage_with_bitmask,(fl_Round_Button round_button, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_clear_damage,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_damage_with_text,(fl_Round_Button round_button, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_damage_inside_widget,(fl_Round_Button round_button, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_draw_label_with_xywh_alignment,(fl_Round_Button round_button, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_measure_label,(fl_Round_Button round_button, int* ww , int* hh));
 
-  FL_EXPORT_C(fl_Window,    Fl_Round_Button_window)(fl_Round_Button round_button);
-  FL_EXPORT_C(fl_Window,    Fl_Round_Button_top_window)(fl_Round_Button round_button);
-  FL_EXPORT_C(fl_Window ,   Fl_Round_Button_top_window_offset)(fl_Round_Button round_button, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Round_Button_as_group)(fl_Round_Button round_button);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Round_Button_as_gl_window)(fl_Round_Button round_button);
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Round_Button_window,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Round_Button_top_window,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Round_Button_top_window_offset,(fl_Round_Button round_button, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Round_Button_as_group,(fl_Round_Button round_button));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Round_Button_as_gl_window,(fl_Round_Button round_button));
   /* Fl_Round_Button specific functions */
-  FL_EXPORT_C(fl_Round_Button,    Fl_Round_Button_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Round_Button,    Fl_Round_Button_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(void,Fl_Round_Button_Destroy)(fl_Round_Button button);
-  FL_EXPORT_C(char        , Fl_Round_Button_value)(fl_Round_Button b);
-  FL_EXPORT_C(int         , Fl_Round_Button_set_value)(fl_Round_Button b, int v);
-  FL_EXPORT_C(int         , Fl_Round_Button_set)(fl_Round_Button b);
-  FL_EXPORT_C(int         , Fl_Round_Button_clear)(fl_Round_Button b);
-  FL_EXPORT_C(void        , Fl_Round_Button_setonly)(fl_Round_Button b);
-  FL_EXPORT_C(int         , Fl_Round_Button_get_shortcut )(fl_Round_Button b);
-  FL_EXPORT_C(void        , Fl_Round_Button_set_shortcut )(fl_Round_Button b, int s);
-  FL_EXPORT_C(Fl_Boxtype  , Fl_Round_Button_down_box)(fl_Round_Button b);
-  FL_EXPORT_C(void        , Fl_Round_Button_set_down_box)(fl_Round_Button b,Fl_Boxtype boxtype);
-  FL_EXPORT_C(Fl_Color    , Fl_Round_Button_down_color )(fl_Round_Button b);
-  FL_EXPORT_C(void        , Fl_Round_Button_set_down_color)(fl_Round_Button b, Fl_Color c);
-  FL_EXPORT_C(fl_Round_Button,    Fl_OverriddenRound_Button_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Round_Button,    Fl_OverriddenRound_Button_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Round_Button_draw)(fl_Round_Button o);
-  FL_EXPORT_C(void, Fl_Round_Button_draw_super)(fl_Round_Button o);
-  FL_EXPORT_C(int, Fl_Round_Button_handle)(fl_Round_Button o, int event);
-  FL_EXPORT_C(int, Fl_Round_Button_handle_super)(fl_Round_Button o, int event);
-  FL_EXPORT_C(void, Fl_Round_Button_resize)(fl_Round_Button o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Round_Button_resize_super)(fl_Round_Button o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Round_Button_show)(fl_Round_Button o);
-  FL_EXPORT_C(void, Fl_Round_Button_show_super)(fl_Round_Button o);
-  FL_EXPORT_C(void, Fl_Round_Button_hide)(fl_Round_Button o);
-  FL_EXPORT_C(void, Fl_Round_Button_hide_super)(fl_Round_Button o);
+  FL_EXPORT_C_HEADER(fl_Round_Button,Fl_Round_Button_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Round_Button,Fl_Round_Button_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_Destroy,(fl_Round_Button button));
+  FL_EXPORT_C_HEADER(char        ,Fl_Round_Button_value,(fl_Round_Button b));
+  FL_EXPORT_C_HEADER(int         ,Fl_Round_Button_set_value,(fl_Round_Button b, int v));
+  FL_EXPORT_C_HEADER(int         ,Fl_Round_Button_set,(fl_Round_Button b));
+  FL_EXPORT_C_HEADER(int         ,Fl_Round_Button_clear,(fl_Round_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Round_Button_setonly,(fl_Round_Button b));
+  FL_EXPORT_C_HEADER(int         ,Fl_Round_Button_get_shortcut ,(fl_Round_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Round_Button_set_shortcut ,(fl_Round_Button b, int s));
+  FL_EXPORT_C_HEADER(Fl_Boxtype  ,Fl_Round_Button_down_box,(fl_Round_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Round_Button_set_down_box,(fl_Round_Button b,Fl_Boxtype boxtype));
+  FL_EXPORT_C_HEADER(Fl_Color    ,Fl_Round_Button_down_color ,(fl_Round_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Round_Button_set_down_color,(fl_Round_Button b, Fl_Color c));
+  FL_EXPORT_C_HEADER(fl_Round_Button,Fl_OverriddenRound_Button_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Round_Button,Fl_OverriddenRound_Button_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_draw,(fl_Round_Button o));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_draw_super,(fl_Round_Button o));
+  FL_EXPORT_C_HEADER(int,Fl_Round_Button_handle,(fl_Round_Button o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Round_Button_handle_super,(fl_Round_Button o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_resize,(fl_Round_Button o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_resize_super,(fl_Round_Button o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_show,(fl_Round_Button o));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_show_super,(fl_Round_Button o));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_hide,(fl_Round_Button o));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Button_hide_super,(fl_Round_Button o));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Round_ClockC.h b/c-src/Fl_Round_ClockC.h
--- a/c-src/Fl_Round_ClockC.h
+++ b/c-src/Fl_Round_ClockC.h
@@ -10,99 +10,99 @@
 EXPORT {
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,Fl_Round_Clock_handle)(fl_Round_Clock self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Round_Clock_parent)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_set_parent)(fl_Round_Clock round_clock, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Round_Clock_type)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_set_type)(fl_Round_Clock round_clock, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Round_Clock_handle,(fl_Round_Clock self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Round_Clock_parent,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_set_parent,(fl_Round_Clock round_clock, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Round_Clock_type,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_set_type,(fl_Round_Clock round_clock, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Round_Clock_x)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(int,          Fl_Round_Clock_y)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(int,          Fl_Round_Clock_w)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(int,          Fl_Round_Clock_h)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_set_align)(fl_Round_Clock round_clock, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Round_Clock_align)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Round_Clock_box)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_set_box)(fl_Round_Clock round_clock, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Round_Clock_color)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_set_color)(fl_Round_Clock round_clock, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Round_Clock_set_color_with_bg_sel)(fl_Round_Clock round_clock,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Round_Clock_selection_color)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_set_selection_color)(fl_Round_Clock round_clock, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Round_Clock_label)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_copy_label)(fl_Round_Clock round_clock, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Round_Clock_set_label)(fl_Round_Clock round_clock, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Round_Clock_labeltype)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_set_labeltype)(fl_Round_Clock round_clock, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Round_Clock_labelcolor)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_set_labelcolor)(fl_Round_Clock round_clock, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Round_Clock_labelfont)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_set_labelfont)(fl_Round_Clock round_clock, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Round_Clock_labelsize)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_set_labelsize)(fl_Round_Clock round_clock, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Round_Clock_image)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_set_image)(fl_Round_Clock round_clock, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Round_Clock_deimage)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_set_deimage)(fl_Round_Clock round_clock, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Round_Clock_tooltip)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_copy_tooltip)(fl_Round_Clock round_clock, const char* text);
-  FL_EXPORT_C(void,         Fl_Round_Clock_set_tooltip)(fl_Round_Clock round_clock, const char* text);
-  FL_EXPORT_C(void,         Fl_Round_Clock_set_callback_with_user_data)(fl_Round_Clock round_clock, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Round_Clock_set_callback)(fl_Round_Clock round_clock, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Round_Clock_user_data)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_set_user_data)(fl_Round_Clock round_clock, void* v);
-  FL_EXPORT_C(long,         Fl_Round_Clock_argument)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_set_argument)(fl_Round_Clock round_clock, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Round_Clock_when)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_set_when)(fl_Round_Clock round_clock, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Round_Clock_visible)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(int,          Fl_Round_Clock_visible_r)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_set_visible)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_clear_visible)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(unsigned int, Fl_Round_Clock_active)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(int,          Fl_Round_Clock_active_r)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_activate)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_deactivate)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(unsigned int, Fl_Round_Clock_output)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_set_output)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_clear_output)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(unsigned int, Fl_Round_Clock_takesevents)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_set_changed)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_clear_changed)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(int,          Fl_Round_Clock_take_focus)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_set_visible_focus)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_clear_visible_focus)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_modify_visible_focus)(fl_Round_Clock round_clock, int v);
-  FL_EXPORT_C(unsigned int, Fl_Round_Clock_visible_focus)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_do_callback)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_do_callback_with_widget_and_user_data)(fl_Round_Clock round_clock, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Round_Clock_do_callback_with_widget_and_default_user_data)(fl_Round_Clock round_clock, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Round_Clock_contains)(fl_Round_Clock round_clock, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Round_Clock_inside)(fl_Round_Clock round_clock, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Round_Clock_redraw)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_redraw_label)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(uchar,        Fl_Round_Clock_damage)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_clear_damage_with_bitmask)(fl_Round_Clock round_clock, uchar c);
-  FL_EXPORT_C(void,         Fl_Round_Clock_clear_damage)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(void,         Fl_Round_Clock_damage_with_text)(fl_Round_Clock round_clock, uchar c);
-  FL_EXPORT_C(void,         Fl_Round_Clock_damage_inside_widget)(fl_Round_Clock round_clock, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Round_Clock_draw_label_with_xywh_alignment)(fl_Round_Clock round_clock, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Round_Clock_measure_label)(fl_Round_Clock round_clock, int* ww , int* hh);
+  FL_EXPORT_C_HEADER(int,Fl_Round_Clock_x,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(int,Fl_Round_Clock_y,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(int,Fl_Round_Clock_w,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(int,Fl_Round_Clock_h,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_set_align,(fl_Round_Clock round_clock, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Round_Clock_align,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Round_Clock_box,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_set_box,(fl_Round_Clock round_clock, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Round_Clock_color,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_set_color,(fl_Round_Clock round_clock, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_set_color_with_bg_sel,(fl_Round_Clock round_clock,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Round_Clock_selection_color,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_set_selection_color,(fl_Round_Clock round_clock, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Round_Clock_label,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_copy_label,(fl_Round_Clock round_clock, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_set_label,(fl_Round_Clock round_clock, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Round_Clock_labeltype,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_set_labeltype,(fl_Round_Clock round_clock, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Round_Clock_labelcolor,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_set_labelcolor,(fl_Round_Clock round_clock, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Round_Clock_labelfont,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_set_labelfont,(fl_Round_Clock round_clock, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Round_Clock_labelsize,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_set_labelsize,(fl_Round_Clock round_clock, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Round_Clock_image,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_set_image,(fl_Round_Clock round_clock, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Round_Clock_deimage,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_set_deimage,(fl_Round_Clock round_clock, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Round_Clock_tooltip,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_copy_tooltip,(fl_Round_Clock round_clock, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_set_tooltip,(fl_Round_Clock round_clock, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_set_callback_with_user_data,(fl_Round_Clock round_clock, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_set_callback,(fl_Round_Clock round_clock, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Round_Clock_user_data,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_set_user_data,(fl_Round_Clock round_clock, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Round_Clock_argument,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_set_argument,(fl_Round_Clock round_clock, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Round_Clock_when,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_set_when,(fl_Round_Clock round_clock, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Round_Clock_visible,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(int,Fl_Round_Clock_visible_r,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_set_visible,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_clear_visible,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Round_Clock_active,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(int,Fl_Round_Clock_active_r,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_activate,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_deactivate,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Round_Clock_output,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_set_output,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_clear_output,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Round_Clock_takesevents,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_set_changed,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_clear_changed,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(int,Fl_Round_Clock_take_focus,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_set_visible_focus,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_clear_visible_focus,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_modify_visible_focus,(fl_Round_Clock round_clock, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Round_Clock_visible_focus,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_do_callback,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_do_callback_with_widget_and_user_data,(fl_Round_Clock round_clock, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_do_callback_with_widget_and_default_user_data,(fl_Round_Clock round_clock, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Round_Clock_contains,(fl_Round_Clock round_clock, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Round_Clock_inside,(fl_Round_Clock round_clock, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_redraw,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_redraw_label,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(uchar,Fl_Round_Clock_damage,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_clear_damage_with_bitmask,(fl_Round_Clock round_clock, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_clear_damage,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_damage_with_text,(fl_Round_Clock round_clock, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_damage_inside_widget,(fl_Round_Clock round_clock, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_draw_label_with_xywh_alignment,(fl_Round_Clock round_clock, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_measure_label,(fl_Round_Clock round_clock, int* ww , int* hh));
 
-  FL_EXPORT_C(fl_Window,    Fl_Round_Clock_window)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(fl_Window,    Fl_Round_Clock_top_window)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(fl_Window ,   Fl_Round_Clock_top_window_offset)(fl_Round_Clock round_clock, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Round_Clock_as_group)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Round_Clock_as_gl_window)(fl_Round_Clock round_clock);
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Round_Clock_window,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Round_Clock_top_window,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Round_Clock_top_window_offset,(fl_Round_Clock round_clock, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Round_Clock_as_group,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Round_Clock_as_gl_window,(fl_Round_Clock round_clock));
   /* Fl_Round_Clock specific functions */
-  FL_EXPORT_C(fl_Round_Clock,    Fl_Round_Clock_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Round_Clock,    Fl_Round_Clock_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Round_Clock_set_value)(fl_Round_Clock round_clock, ulong v);
-  FL_EXPORT_C(void, Fl_Round_Clock_set_value_with_hms)(fl_Round_Clock round_clock, int H, int m, int s);
-  FL_EXPORT_C(ulong, Fl_Round_Clock_value)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(int, Fl_Round_Clock_hour)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(int, Fl_Round_Clock_minute)(fl_Round_Clock round_clock);
-  FL_EXPORT_C(int, Fl_Round_Clock_second)(fl_Round_Clock round_clock);
+  FL_EXPORT_C_HEADER(fl_Round_Clock,Fl_Round_Clock_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Round_Clock,Fl_Round_Clock_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_set_value,(fl_Round_Clock round_clock, ulong v));
+  FL_EXPORT_C_HEADER(void,Fl_Round_Clock_set_value_with_hms,(fl_Round_Clock round_clock, int H, int m, int s));
+  FL_EXPORT_C_HEADER(ulong,Fl_Round_Clock_value,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(int,Fl_Round_Clock_hour,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(int,Fl_Round_Clock_minute,(fl_Round_Clock round_clock));
+  FL_EXPORT_C_HEADER(int,Fl_Round_Clock_second,(fl_Round_Clock round_clock));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_ScrollC.h b/c-src/Fl_ScrollC.h
--- a/c-src/Fl_ScrollC.h
+++ b/c-src/Fl_ScrollC.h
@@ -28,30 +28,30 @@
     ~Fl_DerivedScroll();
   };
 #endif
-  FL_EXPORT_C(void,        Fl_Scroll_set_scrollbar_size)(fl_Scroll widget, int size);
-  FL_EXPORT_C(int,         Fl_Scroll_get_scrollbar_size)(fl_Scroll widget);
-  FL_EXPORT_C(void,        Fl_Scroll_clear)(fl_Scroll widget);
-  FL_EXPORT_C(void,        Fl_Scroll_scroll_to)(fl_Scroll widget, int x, int y);
-  FL_EXPORT_C(int,         Fl_Scroll_yposition)(fl_Scroll widget);
-  FL_EXPORT_C(int,         Fl_Scroll_xposition)(fl_Scroll widget);
-  FL_EXPORT_C(uchar,        Fl_Scroll_type)(fl_Scroll widget);
-  FL_EXPORT_C(void,         Fl_Scroll_set_type)(fl_Scroll widget, uchar t);
-  FL_EXPORT_C(void,         Fl_Scroll_resize)(fl_Scroll scroll,int X, int Y, int W, int H);
-  FL_EXPORT_C(int,Fl_Scroll_handle)(fl_Scroll scroll, int event);
-  FL_EXPORT_C(fl_Scroll,    Fl_Scroll_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Scroll,    Fl_Scroll_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(fl_Scroll,    Fl_OverriddenScroll_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Scroll,    Fl_OverriddenScroll_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Scroll_draw)(fl_Scroll o);
-  FL_EXPORT_C(void, Fl_Scroll_draw_super)(fl_Scroll o);
-  FL_EXPORT_C(int, Fl_Scroll_handle)(fl_Scroll o, int event);
-  FL_EXPORT_C(int, Fl_Scroll_handle_super)(fl_Scroll o, int event);
-  FL_EXPORT_C(void, Fl_Scroll_resize)(fl_Scroll o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Scroll_resize_super)(fl_Scroll o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Scroll_show)(fl_Scroll o);
-  FL_EXPORT_C(void, Fl_Scroll_show_super)(fl_Scroll o);
-  FL_EXPORT_C(void, Fl_Scroll_hide)(fl_Scroll o);
-  FL_EXPORT_C(void, Fl_Scroll_hide_super)(fl_Scroll o);
+  FL_EXPORT_C_HEADER(void,Fl_Scroll_set_scrollbar_size,(fl_Scroll widget, int size));
+  FL_EXPORT_C_HEADER(int,Fl_Scroll_get_scrollbar_size,(fl_Scroll widget));
+  FL_EXPORT_C_HEADER(void,Fl_Scroll_clear,(fl_Scroll widget));
+  FL_EXPORT_C_HEADER(void,Fl_Scroll_scroll_to,(fl_Scroll widget, int x, int y));
+  FL_EXPORT_C_HEADER(int,Fl_Scroll_yposition,(fl_Scroll widget));
+  FL_EXPORT_C_HEADER(int,Fl_Scroll_xposition,(fl_Scroll widget));
+  FL_EXPORT_C_HEADER(uchar,Fl_Scroll_type,(fl_Scroll widget));
+  FL_EXPORT_C_HEADER(void,Fl_Scroll_set_type,(fl_Scroll widget, uchar t));
+  FL_EXPORT_C_HEADER(void,Fl_Scroll_resize,(fl_Scroll scroll,int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(int,Fl_Scroll_handle,(fl_Scroll scroll, int event));
+  FL_EXPORT_C_HEADER(fl_Scroll,Fl_Scroll_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Scroll,Fl_Scroll_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(fl_Scroll,Fl_OverriddenScroll_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Scroll,Fl_OverriddenScroll_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Scroll_draw,(fl_Scroll o));
+  FL_EXPORT_C_HEADER(void,Fl_Scroll_draw_super,(fl_Scroll o));
+  FL_EXPORT_C_HEADER(int,Fl_Scroll_handle,(fl_Scroll o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Scroll_handle_super,(fl_Scroll o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Scroll_resize,(fl_Scroll o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Scroll_resize_super,(fl_Scroll o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Scroll_show,(fl_Scroll o));
+  FL_EXPORT_C_HEADER(void,Fl_Scroll_show_super,(fl_Scroll o));
+  FL_EXPORT_C_HEADER(void,Fl_Scroll_hide,(fl_Scroll o));
+  FL_EXPORT_C_HEADER(void,Fl_Scroll_hide_super,(fl_Scroll o));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_ScrollbarC.h b/c-src/Fl_ScrollbarC.h
--- a/c-src/Fl_ScrollbarC.h
+++ b/c-src/Fl_ScrollbarC.h
@@ -28,133 +28,133 @@
     ~Fl_DerivedScrollbar();
   };
 #endif
-  FL_EXPORT_C(int,Fl_Scrollbar_handle)(fl_Widget self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Scrollbar_parent)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_set_parent)(fl_Scrollbar slider, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Scrollbar_type)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_set_type)(fl_Scrollbar slider, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Scrollbar_handle,(fl_Widget self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Scrollbar_parent,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_set_parent,(fl_Scrollbar slider, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Scrollbar_type,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_set_type,(fl_Scrollbar slider, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Scrollbar_x)(fl_Scrollbar slider);
-  FL_EXPORT_C(int,          Fl_Scrollbar_y)(fl_Scrollbar slider);
-  FL_EXPORT_C(int,          Fl_Scrollbar_w)(fl_Scrollbar slider);
-  FL_EXPORT_C(int,          Fl_Scrollbar_h)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_set_align)(fl_Scrollbar slider, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Scrollbar_align)(fl_Scrollbar slider);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Scrollbar_box)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_set_box)(fl_Scrollbar slider, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Scrollbar_color)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_set_color)(fl_Scrollbar slider, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Scrollbar_set_color_with_bg_sel)(fl_Scrollbar slider,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Scrollbar_selection_color)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_set_selection_color)(fl_Scrollbar slider, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Scrollbar_label)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_copy_label)(fl_Scrollbar slider, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Scrollbar_set_label)(fl_Scrollbar slider, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Scrollbar_labeltype)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_set_labeltype)(fl_Scrollbar slider, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Scrollbar_labelcolor)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_set_labelcolor)(fl_Scrollbar slider, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Scrollbar_labelfont)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_set_labelfont)(fl_Scrollbar slider, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Scrollbar_labelsize)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_set_labelsize)(fl_Scrollbar slider, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Scrollbar_image)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_set_image)(fl_Scrollbar slider, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Scrollbar_deimage)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_set_deimage)(fl_Scrollbar slider, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Scrollbar_tooltip)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_copy_tooltip)(fl_Scrollbar slider, const char* text);
-  FL_EXPORT_C(void,         Fl_Scrollbar_set_tooltip)(fl_Scrollbar slider, const char* text);
-  FL_EXPORT_C(void,         Fl_Scrollbar_set_callback_with_user_data)(fl_Scrollbar slider, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Scrollbar_set_callback)(fl_Scrollbar slider, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Scrollbar_other_data)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_set_other_data)(fl_Scrollbar slider, void* v);
-  FL_EXPORT_C(void*,        Fl_Scrollbar_user_data)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_set_user_data)(fl_Scrollbar slider, void* v);
-  FL_EXPORT_C(long,         Fl_Scrollbar_argument)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_set_argument)(fl_Scrollbar slider, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Scrollbar_when)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_set_when)(fl_Scrollbar slider, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Scrollbar_visible)(fl_Scrollbar slider);
-  FL_EXPORT_C(int,          Fl_Scrollbar_visible_r)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_show)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_hide)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_set_visible)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_clear_visible)(fl_Scrollbar slider);
-  FL_EXPORT_C(unsigned int, Fl_Scrollbar_active)(fl_Scrollbar slider);
-  FL_EXPORT_C(int,          Fl_Scrollbar_active_r)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_activate)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_deactivate)(fl_Scrollbar slider);
-  FL_EXPORT_C(unsigned int, Fl_Scrollbar_output)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_set_output)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_clear_output)(fl_Scrollbar slider);
-  FL_EXPORT_C(unsigned int, Fl_Scrollbar_takesevents)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_set_changed)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_clear_changed)(fl_Scrollbar slider);
-  FL_EXPORT_C(int,          Fl_Scrollbar_take_focus)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_set_visible_focus)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_clear_visible_focus)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_modify_visible_focus)(fl_Scrollbar slider, int v);
-  FL_EXPORT_C(unsigned int, Fl_Scrollbar_visible_focus)(fl_Scrollbar slider);
-  FL_EXPORT_C(int,          Fl_Scrollbar_contains)(fl_Scrollbar slider, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Scrollbar_inside)(fl_Scrollbar slider, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Scrollbar_redraw)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_redraw_label)(fl_Scrollbar slider);
-  FL_EXPORT_C(uchar,        Fl_Scrollbar_damage)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_clear_damage_with_bitmask)(fl_Scrollbar slider, uchar c);
-  FL_EXPORT_C(void,         Fl_Scrollbar_clear_damage)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_damage_with_text)(fl_Scrollbar slider, uchar c);
-  FL_EXPORT_C(void,         Fl_Scrollbar_damage_inside_widget)(fl_Scrollbar slider, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Scrollbar_draw_label_with_xywh_alignment)(fl_Scrollbar slider, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Scrollbar_measure_label)(fl_Scrollbar slider, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Scrollbar_window)(fl_Scrollbar slider);
-  FL_EXPORT_C(fl_Window,    Fl_Scrollbar_top_window)(fl_Scrollbar slider);
-  FL_EXPORT_C(fl_Window ,   Fl_Scrollbar_top_window_offset)(fl_Scrollbar slider, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Scrollbar_as_gl_window)(fl_Scrollbar slider);
-  FL_EXPORT_C(void,         Fl_Scrollbar_resize)(fl_Table table,int X, int Y, int W, int H);
+  FL_EXPORT_C_HEADER(int,Fl_Scrollbar_x,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(int,Fl_Scrollbar_y,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(int,Fl_Scrollbar_w,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(int,Fl_Scrollbar_h,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_set_align,(fl_Scrollbar slider, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Scrollbar_align,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Scrollbar_box,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_set_box,(fl_Scrollbar slider, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Scrollbar_color,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_set_color,(fl_Scrollbar slider, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_set_color_with_bg_sel,(fl_Scrollbar slider,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Scrollbar_selection_color,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_set_selection_color,(fl_Scrollbar slider, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Scrollbar_label,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_copy_label,(fl_Scrollbar slider, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_set_label,(fl_Scrollbar slider, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Scrollbar_labeltype,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_set_labeltype,(fl_Scrollbar slider, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Scrollbar_labelcolor,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_set_labelcolor,(fl_Scrollbar slider, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Scrollbar_labelfont,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_set_labelfont,(fl_Scrollbar slider, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Scrollbar_labelsize,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_set_labelsize,(fl_Scrollbar slider, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Scrollbar_image,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_set_image,(fl_Scrollbar slider, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Scrollbar_deimage,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_set_deimage,(fl_Scrollbar slider, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Scrollbar_tooltip,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_copy_tooltip,(fl_Scrollbar slider, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_set_tooltip,(fl_Scrollbar slider, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_set_callback_with_user_data,(fl_Scrollbar slider, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_set_callback,(fl_Scrollbar slider, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Scrollbar_other_data,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_set_other_data,(fl_Scrollbar slider, void* v));
+  FL_EXPORT_C_HEADER(void*,Fl_Scrollbar_user_data,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_set_user_data,(fl_Scrollbar slider, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Scrollbar_argument,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_set_argument,(fl_Scrollbar slider, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Scrollbar_when,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_set_when,(fl_Scrollbar slider, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Scrollbar_visible,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(int,Fl_Scrollbar_visible_r,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_show,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_hide,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_set_visible,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_clear_visible,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Scrollbar_active,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(int,Fl_Scrollbar_active_r,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_activate,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_deactivate,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Scrollbar_output,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_set_output,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_clear_output,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Scrollbar_takesevents,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_set_changed,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_clear_changed,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(int,Fl_Scrollbar_take_focus,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_set_visible_focus,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_clear_visible_focus,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_modify_visible_focus,(fl_Scrollbar slider, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Scrollbar_visible_focus,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(int,Fl_Scrollbar_contains,(fl_Scrollbar slider, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Scrollbar_inside,(fl_Scrollbar slider, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_redraw,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_redraw_label,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(uchar,Fl_Scrollbar_damage,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_clear_damage_with_bitmask,(fl_Scrollbar slider, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_clear_damage,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_damage_with_text,(fl_Scrollbar slider, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_damage_inside_widget,(fl_Scrollbar slider, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_draw_label_with_xywh_alignment,(fl_Scrollbar slider, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_measure_label,(fl_Scrollbar slider, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Scrollbar_window,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Scrollbar_top_window,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Scrollbar_top_window_offset,(fl_Scrollbar slider, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Scrollbar_as_gl_window,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_resize,(fl_Table table,int X, int Y, int W, int H));
 
   /* Inherited from Fl_Valuator */
-  FL_EXPORT_C(void, Fl_Scrollbar_bounds)(fl_Scrollbar slider, double a, double b);
-  FL_EXPORT_C(double, Fl_Scrollbar_minimum)(fl_Scrollbar slider);
-  FL_EXPORT_C(void, Fl_Scrollbar_set_minimum)(fl_Scrollbar slider, double a);
-  FL_EXPORT_C(double, Fl_Scrollbar_maximum)(fl_Scrollbar slider);
-  FL_EXPORT_C(void, Fl_Scrollbar_set_maximum)(fl_Scrollbar slider, double a);
-  FL_EXPORT_C(void, Fl_Scrollbar_range)(fl_Scrollbar slider, double a, double b);
-  FL_EXPORT_C(void, Fl_Scrollbar_set_step)(fl_Scrollbar slider, int a);
-  FL_EXPORT_C(void, Fl_Scrollbar_set_step_with_a_b)(fl_Scrollbar slider, double a, int b);
-  FL_EXPORT_C(void, Fl_Scrollbar_step_with_s)(fl_Scrollbar slider, double s);
-  FL_EXPORT_C(double, Fl_Scrollbar_step)(fl_Scrollbar slider);
-  FL_EXPORT_C(void, Fl_Scrollbar_precision)(fl_Scrollbar slider, int precision);
-  FL_EXPORT_C(double, Fl_Scrollbar_value)(fl_Scrollbar slider);
-  FL_EXPORT_C(int, Fl_Scrollbar_set_value)(fl_Scrollbar slider, double v);
-  FL_EXPORT_C(int, Fl_Scrollbar_format)(fl_Scrollbar slider, char* format);
-  FL_EXPORT_C(double, Fl_Scrollbar_round)(fl_Scrollbar slider, double v);
-  FL_EXPORT_C(double, Fl_Scrollbar_clamp)(fl_Scrollbar slider, double v);
-  FL_EXPORT_C(double, Fl_Scrollbar_increment)(fl_Scrollbar slider, double v, int n);
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_bounds,(fl_Scrollbar slider, double a, double b));
+  FL_EXPORT_C_HEADER(double,Fl_Scrollbar_minimum,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_set_minimum,(fl_Scrollbar slider, double a));
+  FL_EXPORT_C_HEADER(double,Fl_Scrollbar_maximum,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_set_maximum,(fl_Scrollbar slider, double a));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_range,(fl_Scrollbar slider, double a, double b));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_set_step,(fl_Scrollbar slider, int a));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_set_step_with_a_b,(fl_Scrollbar slider, double a, int b));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_step_with_s,(fl_Scrollbar slider, double s));
+  FL_EXPORT_C_HEADER(double,Fl_Scrollbar_step,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_precision,(fl_Scrollbar slider, int precision));
+  FL_EXPORT_C_HEADER(double,Fl_Scrollbar_value,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(int,Fl_Scrollbar_set_value,(fl_Scrollbar slider, double v));
+  FL_EXPORT_C_HEADER(int,Fl_Scrollbar_format,(fl_Scrollbar slider, char* format));
+  FL_EXPORT_C_HEADER(double,Fl_Scrollbar_round,(fl_Scrollbar slider, double v));
+  FL_EXPORT_C_HEADER(double,Fl_Scrollbar_clamp,(fl_Scrollbar slider, double v));
+  FL_EXPORT_C_HEADER(double,Fl_Scrollbar_increment,(fl_Scrollbar slider, double v, int n));
 
   /* Fl_Scrollbar specific */
-  FL_EXPORT_C(fl_Scrollbar,    Fl_Scrollbar_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Scrollbar   , Fl_Scrollbar_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(void,      Fl_Scrollbar_Destroy)(fl_Scrollbar slider);
-  FL_EXPORT_C(int, Fl_Scrollbar_scrollvalue)(fl_Scrollbar slider, int pos,int size,int first,int total);
-  FL_EXPORT_C(float, Fl_Scrollbar_set_slider_size)(fl_Scrollbar slider);
-  FL_EXPORT_C(void, Fl_Scrollbar_slider_size)(fl_Scrollbar slider, double v);
-  FL_EXPORT_C(Fl_Boxtype, Fl_Scrollbar_slider)(fl_Scrollbar slider);
-  FL_EXPORT_C(void, Fl_Scrollbar_set_slider)(fl_Scrollbar slider, Fl_Boxtype c);
-  FL_EXPORT_C(void, Fl_Scrollbar_set_linesize)(fl_Scrollbar slider, int i);
-  FL_EXPORT_C(int  , Fl_Scrollbar_linesize)(fl_Scrollbar slider);
-  FL_EXPORT_C(fl_Scrollbar,    Fl_OverriddenScrollbar_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Scrollbar,    Fl_OverriddenScrollbar_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Scrollbar_draw)(fl_Scrollbar o);
-  FL_EXPORT_C(void, Fl_Scrollbar_draw_super)(fl_Scrollbar o);
-  FL_EXPORT_C(int, Fl_Scrollbar_handle)(fl_Scrollbar o, int event);
-  FL_EXPORT_C(int, Fl_Scrollbar_handle_super)(fl_Scrollbar o, int event);
-  FL_EXPORT_C(void, Fl_Scrollbar_resize)(fl_Scrollbar o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Scrollbar_resize_super)(fl_Scrollbar o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Scrollbar_show)(fl_Scrollbar o);
-  FL_EXPORT_C(void, Fl_Scrollbar_show_super)(fl_Scrollbar o);
-  FL_EXPORT_C(void, Fl_Scrollbar_hide)(fl_Scrollbar o);
-  FL_EXPORT_C(void, Fl_Scrollbar_hide_super)(fl_Scrollbar o);
+  FL_EXPORT_C_HEADER(fl_Scrollbar,Fl_Scrollbar_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Scrollbar   ,Fl_Scrollbar_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_Destroy,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(int,Fl_Scrollbar_scrollvalue,(fl_Scrollbar slider, int pos,int size,int first,int total));
+  FL_EXPORT_C_HEADER(float,Fl_Scrollbar_set_slider_size,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_slider_size,(fl_Scrollbar slider, double v));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Scrollbar_slider,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_set_slider,(fl_Scrollbar slider, Fl_Boxtype c));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_set_linesize,(fl_Scrollbar slider, int i));
+  FL_EXPORT_C_HEADER(int  ,Fl_Scrollbar_linesize,(fl_Scrollbar slider));
+  FL_EXPORT_C_HEADER(fl_Scrollbar,Fl_OverriddenScrollbar_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Scrollbar,Fl_OverriddenScrollbar_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_draw,(fl_Scrollbar o));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_draw_super,(fl_Scrollbar o));
+  FL_EXPORT_C_HEADER(int,Fl_Scrollbar_handle,(fl_Scrollbar o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Scrollbar_handle_super,(fl_Scrollbar o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_resize,(fl_Scrollbar o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_resize_super,(fl_Scrollbar o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_show,(fl_Scrollbar o));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_show_super,(fl_Scrollbar o));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_hide,(fl_Scrollbar o));
+  FL_EXPORT_C_HEADER(void,Fl_Scrollbar_hide_super,(fl_Scrollbar o));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Secret_InputC.h b/c-src/Fl_Secret_InputC.h
--- a/c-src/Fl_Secret_InputC.h
+++ b/c-src/Fl_Secret_InputC.h
@@ -10,140 +10,140 @@
 EXPORT {
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,Fl_Secret_Input_handle)(fl_Secret_Input self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Secret_Input_parent)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_parent)(fl_Secret_Input secret_input, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Secret_Input_type)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_type)(fl_Secret_Input secret_input, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_handle,(fl_Secret_Input self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Secret_Input_parent,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_parent,(fl_Secret_Input secret_input, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Secret_Input_type,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_type,(fl_Secret_Input secret_input, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Secret_Input_x)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(int,          Fl_Secret_Input_y)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(int,          Fl_Secret_Input_w)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(int,          Fl_Secret_Input_h)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_align)(fl_Secret_Input secret_input, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Secret_Input_align)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Secret_Input_box)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_box)(fl_Secret_Input secret_input, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Secret_Input_color)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_color)(fl_Secret_Input secret_input, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_color_with_bg_sel)(fl_Secret_Input secret_input,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Secret_Input_selection_color)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_selection_color)(fl_Secret_Input secret_input, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Secret_Input_label)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_copy_label)(fl_Secret_Input secret_input, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_label)(fl_Secret_Input secret_input, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Secret_Input_labeltype)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_labeltype)(fl_Secret_Input secret_input, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Secret_Input_labelcolor)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_labelcolor)(fl_Secret_Input secret_input, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Secret_Input_labelfont)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_labelfont)(fl_Secret_Input secret_input, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Secret_Input_labelsize)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_labelsize)(fl_Secret_Input secret_input, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Secret_Input_image)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_image)(fl_Secret_Input secret_input, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Secret_Input_deimage)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_deimage)(fl_Secret_Input secret_input, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Secret_Input_tooltip)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_copy_tooltip)(fl_Secret_Input secret_input, const char* text);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_tooltip)(fl_Secret_Input secret_input, const char* text);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_callback_with_user_data)(fl_Secret_Input secret_input, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_callback)(fl_Secret_Input secret_input, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Secret_Input_user_data)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_user_data)(fl_Secret_Input secret_input, void* v);
-  FL_EXPORT_C(long,         Fl_Secret_Input_argument)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_argument)(fl_Secret_Input secret_input, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Secret_Input_when)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_when)(fl_Secret_Input secret_input, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Secret_Input_visible)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(int,          Fl_Secret_Input_visible_r)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_visible)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_clear_visible)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(unsigned int, Fl_Secret_Input_active)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(int,          Fl_Secret_Input_active_r)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_activate)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_deactivate)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(unsigned int, Fl_Secret_Input_output)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_output)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_clear_output)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(unsigned int, Fl_Secret_Input_takesevents)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_changed)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_clear_changed)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(int,          Fl_Secret_Input_take_focus)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_visible_focus)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_clear_visible_focus)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_modify_visible_focus)(fl_Secret_Input secret_input, int v);
-  FL_EXPORT_C(unsigned int, Fl_Secret_Input_visible_focus)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_do_callback)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_do_callback_with_widget_and_user_data)(fl_Secret_Input secret_input, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Secret_Input_do_callback_with_widget_and_default_user_data)(fl_Secret_Input secret_input, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Secret_Input_contains)(fl_Secret_Input secret_input, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Secret_Input_inside)(fl_Secret_Input secret_input, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Secret_Input_redraw)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_redraw_label)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(uchar,        Fl_Secret_Input_damage)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_clear_damage_with_bitmask)(fl_Secret_Input secret_input, uchar c);
-  FL_EXPORT_C(void,         Fl_Secret_Input_clear_damage)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_damage_with_text)(fl_Secret_Input secret_input, uchar c);
-  FL_EXPORT_C(void,         Fl_Secret_Input_damage_inside_widget)(fl_Secret_Input secret_input, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Secret_Input_draw_label_with_xywh_alignment)(fl_Secret_Input secret_input, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Secret_Input_measure_label)(fl_Secret_Input secret_input, int* ww , int* hh);
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_x,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_y,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_w,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_h,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_align,(fl_Secret_Input secret_input, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Secret_Input_align,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Secret_Input_box,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_box,(fl_Secret_Input secret_input, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Secret_Input_color,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_color,(fl_Secret_Input secret_input, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_color_with_bg_sel,(fl_Secret_Input secret_input,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Secret_Input_selection_color,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_selection_color,(fl_Secret_Input secret_input, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Secret_Input_label,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_copy_label,(fl_Secret_Input secret_input, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_label,(fl_Secret_Input secret_input, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Secret_Input_labeltype,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_labeltype,(fl_Secret_Input secret_input, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Secret_Input_labelcolor,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_labelcolor,(fl_Secret_Input secret_input, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Secret_Input_labelfont,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_labelfont,(fl_Secret_Input secret_input, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Secret_Input_labelsize,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_labelsize,(fl_Secret_Input secret_input, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Secret_Input_image,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_image,(fl_Secret_Input secret_input, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Secret_Input_deimage,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_deimage,(fl_Secret_Input secret_input, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Secret_Input_tooltip,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_copy_tooltip,(fl_Secret_Input secret_input, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_tooltip,(fl_Secret_Input secret_input, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_callback_with_user_data,(fl_Secret_Input secret_input, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_callback,(fl_Secret_Input secret_input, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Secret_Input_user_data,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_user_data,(fl_Secret_Input secret_input, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Secret_Input_argument,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_argument,(fl_Secret_Input secret_input, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Secret_Input_when,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_when,(fl_Secret_Input secret_input, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Secret_Input_visible,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_visible_r,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_visible,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_clear_visible,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Secret_Input_active,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_active_r,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_activate,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_deactivate,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Secret_Input_output,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_output,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_clear_output,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Secret_Input_takesevents,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_changed,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_clear_changed,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_take_focus,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_visible_focus,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_clear_visible_focus,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_modify_visible_focus,(fl_Secret_Input secret_input, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Secret_Input_visible_focus,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_do_callback,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_do_callback_with_widget_and_user_data,(fl_Secret_Input secret_input, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_do_callback_with_widget_and_default_user_data,(fl_Secret_Input secret_input, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_contains,(fl_Secret_Input secret_input, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_inside,(fl_Secret_Input secret_input, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_redraw,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_redraw_label,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(uchar,Fl_Secret_Input_damage,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_clear_damage_with_bitmask,(fl_Secret_Input secret_input, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_clear_damage,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_damage_with_text,(fl_Secret_Input secret_input, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_damage_inside_widget,(fl_Secret_Input secret_input, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_draw_label_with_xywh_alignment,(fl_Secret_Input secret_input, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_measure_label,(fl_Secret_Input secret_input, int* ww , int* hh));
 
-  FL_EXPORT_C(fl_Window,    Fl_Secret_Input_window)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(fl_Window,    Fl_Secret_Input_top_window)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(fl_Window ,   Fl_Secret_Input_top_window_offset)(fl_Secret_Input secret_input, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Secret_Input_as_group)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Secret_Input_as_gl_window)(fl_Secret_Input secret_input);
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Secret_Input_window,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Secret_Input_top_window,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Secret_Input_top_window_offset,(fl_Secret_Input secret_input, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Secret_Input_as_group,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Secret_Input_as_gl_window,(fl_Secret_Input secret_input));
   /* Fl_Secret_Input specific functions */
-  FL_EXPORT_C(int,      Fl_Secret_Input_handle)(fl_Secret_Input secret_input, int event);
-  FL_EXPORT_C(fl_Float_Input, Fl_Secret_Input_New_WithLabel)(int x, int y, int w, int h, const char* label); 
-  FL_EXPORT_C(fl_Float_Input, Fl_Secret_Input_New)(int x, int y, int w, int h); 
-  FL_EXPORT_C(void,     Fl_Secret_Input_Destroy)(fl_Secret_Input secret_input);
-  
-  FL_EXPORT_C(void,         Fl_Secret_Input_resize)(fl_Secret_Input secret_input, int X, int Y, int W, int H);
-  FL_EXPORT_C(int,          Fl_Secret_Input_set_value)(fl_Secret_Input secret_input, const char*);
-  FL_EXPORT_C(int,          Fl_Secret_Input_set_value_with_length)(fl_Secret_Input secret_input, const char* text, int length);
-  FL_EXPORT_C(int,          Fl_Secret_Input_static_value)(fl_Secret_Input secret_input, const char* text);
-  FL_EXPORT_C(int,          Fl_Secret_Input_static_value_with_length)(fl_Secret_Input secret_input, const char* text, int length);
-  FL_EXPORT_C(const char*,  Fl_Secret_Input_value)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(Fl_Char,      Fl_Secret_Input_index)(fl_Secret_Input secret_input, int i);
-  FL_EXPORT_C(int,          Fl_Secret_Input_size)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_size)(fl_Secret_Input secret_input, int W, int H);
-  FL_EXPORT_C(int,          Fl_Secret_Input_maximum_size)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_maximum_size)(fl_Secret_Input secret_input, int m);
-  FL_EXPORT_C(int,          Fl_Secret_Input_position)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(int,          Fl_Secret_Input_mark)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(int,          Fl_Secret_Input_set_position_with_cursor_mark)(fl_Secret_Input secret_input,int p, int m);
-  FL_EXPORT_C(int,          Fl_Secret_Input_set_position_n_n)(fl_Secret_Input secret_input,int p);
-  FL_EXPORT_C(int,          Fl_Secret_Input_set_mark)(fl_Secret_Input secret_input,int m);
-  FL_EXPORT_C(int,          Fl_Secret_Input_replace)(fl_Secret_Input secret_input,int b, int e, const char *text);
-  FL_EXPORT_C(int,          Fl_Secret_Input_replace_with_ilen)(fl_Secret_Input secret_input,int b, int e, const char *text, int ilen);
-  FL_EXPORT_C(int,          Fl_Secret_Input_cut)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(int,          Fl_Secret_Input_cut_bytes)(fl_Secret_Input secret_input,int n);
-  FL_EXPORT_C(int,          Fl_Secret_Input_cut_range)(fl_Secret_Input secret_input,int a, int b);
-  FL_EXPORT_C(int,          Fl_Secret_Input_insert)(fl_Secret_Input secret_input,const char* t);
-  FL_EXPORT_C(int,          Fl_Secret_Input_insert_with_length)(fl_Secret_Input secret_input,const char* t, int l);
-  FL_EXPORT_C(int,          Fl_Secret_Input_copy)(fl_Secret_Input secret_input,int clipboard);
-  FL_EXPORT_C(int,          Fl_Secret_Input_undo)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(int,          Fl_Secret_Input_copy_cuts)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(int,          Fl_Secret_Input_shortcut)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_shortcut)(fl_Secret_Input secret_input,int s);
-  FL_EXPORT_C(Fl_Font,      Fl_Secret_Input_textfont)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_textfont)(fl_Secret_Input secret_input,Fl_Font s);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Secret_Input_textsize)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_textsize)(fl_Secret_Input secret_input,Fl_Fontsize s);
-  FL_EXPORT_C(Fl_Color,     Fl_Secret_Input_textcolor)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_textcolor)(fl_Secret_Input secret_input,Fl_Color n);
-  FL_EXPORT_C(Fl_Color,     Fl_Secret_Input_cursor_color)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_cursor_color)(fl_Secret_Input secret_input,Fl_Color n);
-  FL_EXPORT_C(int,          Fl_Secret_Input_input_type)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_input_type)(fl_Secret_Input secret_input,int t);
-  FL_EXPORT_C(int,          Fl_Secret_Input_readonly)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_readonly)(fl_Secret_Input secret_input,int b);
-  FL_EXPORT_C(int,          Fl_Secret_Input_wrap)(fl_Secret_Input secret_input);
-  FL_EXPORT_C(void,         Fl_Secret_Input_set_wrap)(fl_Secret_Input secret_input,int b);
-  FL_EXPORT_C(void,         Fl_Secret_Input_tab_nav)(fl_Secret_Input secret_input,int val);
-  FL_EXPORT_C(int,          Fl_Secret_Input_set_tab_nav)(fl_Secret_Input secret_input);
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_handle,(fl_Secret_Input secret_input, int event));
+  FL_EXPORT_C(fl_Float_Input, Fl_Secret_Input_New_WithLabel)(int x, int y, int w, int h, const char* label);
+  FL_EXPORT_C(fl_Float_Input, Fl_Secret_Input_New)(int x, int y, int w, int h);
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_Destroy,(fl_Secret_Input secret_input));
+
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_resize,(fl_Secret_Input secret_input, int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_set_value,(fl_Secret_Input secret_input, const char*));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_set_value_with_length,(fl_Secret_Input secret_input, const char* text, int length));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_static_value,(fl_Secret_Input secret_input, const char* text));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_static_value_with_length,(fl_Secret_Input secret_input, const char* text, int length));
+  FL_EXPORT_C_HEADER(const char*,Fl_Secret_Input_value,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(Fl_Char,Fl_Secret_Input_index,(fl_Secret_Input secret_input, int i));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_size,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_size,(fl_Secret_Input secret_input, int W, int H));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_maximum_size,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_maximum_size,(fl_Secret_Input secret_input, int m));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_position,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_mark,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_set_position_with_cursor_mark,(fl_Secret_Input secret_input,int p, int m));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_set_position_n_n,(fl_Secret_Input secret_input,int p));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_set_mark,(fl_Secret_Input secret_input,int m));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_replace,(fl_Secret_Input secret_input,int b, int e, const char *text));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_replace_with_ilen,(fl_Secret_Input secret_input,int b, int e, const char *text, int ilen));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_cut,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_cut_bytes,(fl_Secret_Input secret_input,int n));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_cut_range,(fl_Secret_Input secret_input,int a, int b));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_insert,(fl_Secret_Input secret_input,const char* t));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_insert_with_length,(fl_Secret_Input secret_input,const char* t, int l));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_copy,(fl_Secret_Input secret_input,int clipboard));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_undo,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_copy_cuts,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_shortcut,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_shortcut,(fl_Secret_Input secret_input,int s));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Secret_Input_textfont,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_textfont,(fl_Secret_Input secret_input,Fl_Font s));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Secret_Input_textsize,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_textsize,(fl_Secret_Input secret_input,Fl_Fontsize s));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Secret_Input_textcolor,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_textcolor,(fl_Secret_Input secret_input,Fl_Color n));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Secret_Input_cursor_color,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_cursor_color,(fl_Secret_Input secret_input,Fl_Color n));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_input_type,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_input_type,(fl_Secret_Input secret_input,int t));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_readonly,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_readonly,(fl_Secret_Input secret_input,int b));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_wrap,(fl_Secret_Input secret_input));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_set_wrap,(fl_Secret_Input secret_input,int b));
+  FL_EXPORT_C_HEADER(void,Fl_Secret_Input_tab_nav,(fl_Secret_Input secret_input,int val));
+  FL_EXPORT_C_HEADER(int,Fl_Secret_Input_set_tab_nav,(fl_Secret_Input secret_input));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Select_BrowserC.h b/c-src/Fl_Select_BrowserC.h
--- a/c-src/Fl_Select_BrowserC.h
+++ b/c-src/Fl_Select_BrowserC.h
@@ -11,190 +11,190 @@
 #endif
 
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int ,         Fl_Select_Browser_handle_super)(fl_Select_Browser select_browser,int event);
-  FL_EXPORT_C(int ,         Fl_Select_Browser_handle )(fl_Select_Browser select_browser,int event);
-  FL_EXPORT_C(void,         Fl_Select_Browser_resize_super)(fl_Select_Browser select_browser,int x, int y, int w, int h);
-  FL_EXPORT_C(void,         Fl_Select_Browser_resize )(fl_Select_Browser select_browser,int x, int y, int w, int h);
-  FL_EXPORT_C(void,         Fl_Select_Browser_show_super)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_show )(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_hide_super)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_hide )(fl_Select_Browser select_browser);
-  FL_EXPORT_C(fl_Window,    Fl_Select_Browser_as_window_super)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(fl_Window,    Fl_Select_Browser_as_window )(fl_Select_Browser select_browser);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Select_Browser_as_gl_window_super)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Select_Browser_as_gl_window)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(fl_Group,     Fl_Select_Browser_parent)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_set_parent)(fl_Select_Browser select_browser, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Select_Browser_type)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_set_type)(fl_Select_Browser select_browser, uchar t);
+  FL_EXPORT_C_HEADER(int ,Fl_Select_Browser_handle_super,(fl_Select_Browser select_browser,int event));
+  FL_EXPORT_C_HEADER(int ,Fl_Select_Browser_handle ,(fl_Select_Browser select_browser,int event));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_resize_super,(fl_Select_Browser select_browser,int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_resize ,(fl_Select_Browser select_browser,int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_show_super,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_show ,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_hide_super,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_hide ,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Select_Browser_as_window_super,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Select_Browser_as_window ,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Select_Browser_as_gl_window_super,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Select_Browser_as_gl_window,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Select_Browser_parent,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_parent,(fl_Select_Browser select_browser, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Select_Browser_type,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_type,(fl_Select_Browser select_browser, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Select_Browser_x)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(int,          Fl_Select_Browser_y)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(int,          Fl_Select_Browser_w)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(int,          Fl_Select_Browser_h)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_set_align)(fl_Select_Browser select_browser, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Select_Browser_align)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Select_Browser_box)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_set_box)(fl_Select_Browser select_browser, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Select_Browser_color)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_set_color)(fl_Select_Browser select_browser, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Select_Browser_set_color_with_bg_sel)(fl_Select_Browser select_browser,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Select_Browser_selection_color)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_set_selection_color)(fl_Select_Browser select_browser, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Select_Browser_label)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_copy_label)(fl_Select_Browser select_browser, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Select_Browser_set_label)(fl_Select_Browser select_browser, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Select_Browser_labeltype)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_set_labeltype)(fl_Select_Browser select_browser, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Select_Browser_labelcolor)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_set_labelcolor)(fl_Select_Browser select_browser, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Select_Browser_labelfont)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_set_labelfont)(fl_Select_Browser select_browser, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Select_Browser_labelsize)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_set_labelsize)(fl_Select_Browser select_browser, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Select_Browser_image)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_set_image)(fl_Select_Browser select_browser, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Select_Browser_deimage)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_set_deimage)(fl_Select_Browser select_browser, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Select_Browser_tooltip)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_copy_tooltip)(fl_Select_Browser select_browser, const char* text);
-  FL_EXPORT_C(void,         Fl_Select_Browser_set_tooltip)(fl_Select_Browser select_browser, const char* text);
-  FL_EXPORT_C(void,         Fl_Select_Browser_set_callback_with_user_data)(fl_Select_Browser select_browser, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Select_Browser_set_callback)(fl_Select_Browser select_browser, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Select_Browser_user_data)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_set_user_data)(fl_Select_Browser select_browser, void* v);
-  FL_EXPORT_C(long,         Fl_Select_Browser_argument)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_set_argument)(fl_Select_Browser select_browser, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Select_Browser_when)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_set_when)(fl_Select_Browser select_browser, uchar i);
-  FL_EXPORT_C(int,          Fl_Select_Browser_visible_r)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_set_visible)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_clear_visible)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(unsigned int, Fl_Select_Browser_active)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(int,          Fl_Select_Browser_active_r)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_activate)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_deactivate)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(unsigned int, Fl_Select_Browser_output)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_set_output)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_clear_output)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(unsigned int, Fl_Select_Browser_takesevents)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_set_changed)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_clear_changed)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(int,          Fl_Select_Browser_take_focus)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_set_visible_focus)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_clear_visible_focus)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_modify_visible_focus)(fl_Select_Browser select_browser, int v);
-  FL_EXPORT_C(unsigned int, Fl_Select_Browser_visible_focus)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_do_callback)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_do_callback_with_widget_and_user_data)(fl_Select_Browser select_browser, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Select_Browser_do_callback_with_widget_and_default_user_data)(fl_Select_Browser select_browser, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Select_Browser_contains)(fl_Select_Browser select_browser, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Select_Browser_inside)(fl_Select_Browser select_browser, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Select_Browser_redraw)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_redraw_label)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(uchar,        Fl_Select_Browser_damage)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_clear_damage_with_bitmask)(fl_Select_Browser select_browser, uchar c);
-  FL_EXPORT_C(void,         Fl_Select_Browser_clear_damage)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,         Fl_Select_Browser_damage_with_text)(fl_Select_Browser select_browser, uchar c);
-  FL_EXPORT_C(void,         Fl_Select_Browser_damage_inside_widget)(fl_Select_Browser select_browser, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Select_Browser_draw_label_with_xywh_alignment)(fl_Select_Browser select_browser, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Select_Browser_measure_label)(fl_Select_Browser select_browser, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Select_Browser_window)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(fl_Window,    Fl_Select_Browser_top_window)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(fl_Window ,   Fl_Select_Browser_top_window_offset)(fl_Select_Browser select_browser, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Select_Browser_as_group)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Select_Browser_as_gl_window)(fl_Select_Browser select_browser);
+  FL_EXPORT_C_HEADER(int,Fl_Select_Browser_x,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(int,Fl_Select_Browser_y,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(int,Fl_Select_Browser_w,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(int,Fl_Select_Browser_h,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_align,(fl_Select_Browser select_browser, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Select_Browser_align,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Select_Browser_box,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_box,(fl_Select_Browser select_browser, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Select_Browser_color,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_color,(fl_Select_Browser select_browser, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_color_with_bg_sel,(fl_Select_Browser select_browser,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Select_Browser_selection_color,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_selection_color,(fl_Select_Browser select_browser, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Select_Browser_label,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_copy_label,(fl_Select_Browser select_browser, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_label,(fl_Select_Browser select_browser, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Select_Browser_labeltype,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_labeltype,(fl_Select_Browser select_browser, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Select_Browser_labelcolor,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_labelcolor,(fl_Select_Browser select_browser, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Select_Browser_labelfont,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_labelfont,(fl_Select_Browser select_browser, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Select_Browser_labelsize,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_labelsize,(fl_Select_Browser select_browser, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Select_Browser_image,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_image,(fl_Select_Browser select_browser, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Select_Browser_deimage,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_deimage,(fl_Select_Browser select_browser, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Select_Browser_tooltip,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_copy_tooltip,(fl_Select_Browser select_browser, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_tooltip,(fl_Select_Browser select_browser, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_callback_with_user_data,(fl_Select_Browser select_browser, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_callback,(fl_Select_Browser select_browser, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Select_Browser_user_data,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_user_data,(fl_Select_Browser select_browser, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Select_Browser_argument,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_argument,(fl_Select_Browser select_browser, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Select_Browser_when,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_when,(fl_Select_Browser select_browser, uchar i));
+  FL_EXPORT_C_HEADER(int,Fl_Select_Browser_visible_r,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_visible,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_clear_visible,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Select_Browser_active,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(int,Fl_Select_Browser_active_r,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_activate,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_deactivate,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Select_Browser_output,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_output,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_clear_output,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Select_Browser_takesevents,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_changed,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_clear_changed,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(int,Fl_Select_Browser_take_focus,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_visible_focus,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_clear_visible_focus,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_modify_visible_focus,(fl_Select_Browser select_browser, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Select_Browser_visible_focus,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_do_callback,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_do_callback_with_widget_and_user_data,(fl_Select_Browser select_browser, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_do_callback_with_widget_and_default_user_data,(fl_Select_Browser select_browser, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Select_Browser_contains,(fl_Select_Browser select_browser, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Select_Browser_inside,(fl_Select_Browser select_browser, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_redraw,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_redraw_label,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(uchar,Fl_Select_Browser_damage,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_clear_damage_with_bitmask,(fl_Select_Browser select_browser, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_clear_damage,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_damage_with_text,(fl_Select_Browser select_browser, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_damage_inside_widget,(fl_Select_Browser select_browser, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_draw_label_with_xywh_alignment,(fl_Select_Browser select_browser, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_measure_label,(fl_Select_Browser select_browser, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Select_Browser_window,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Select_Browser_top_window,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Select_Browser_top_window_offset,(fl_Select_Browser select_browser, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Select_Browser_as_group,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Select_Browser_as_gl_window,(fl_Select_Browser select_browser));
   /* Inherited from Fl_Group */
-  FL_EXPORT_C(void,         Fl_Select_Browser_begin)(fl_Select_Browser self);
-  FL_EXPORT_C(void,         Fl_Select_Browser_end)(fl_Select_Browser self);
-  FL_EXPORT_C(int,          Fl_Select_Browser_find)(fl_Select_Browser self, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Select_Browser_remove_index)(fl_Select_Browser self, int index);
-  FL_EXPORT_C(void,         Fl_Select_Browser_remove_widget)(fl_Select_Browser self, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Select_Browser_clear)(fl_Select_Browser self);
-  FL_EXPORT_C(void,         Fl_Select_Browser_set_resizable_by_reference)(fl_Select_Browser self,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Select_Browser_set_resizable)(fl_Select_Browser self,fl_Widget o);
-  FL_EXPORT_C(fl_Widget,    Fl_Select_Browser_resizable)(fl_Select_Browser self);
-  FL_EXPORT_C(void,         Fl_Select_Browser_add_resizable)(fl_Select_Browser self,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Select_Browser_init_sizes)(fl_Select_Browser self);
-  FL_EXPORT_C(int,          Fl_Select_Browser_children)(fl_Select_Browser self);
-  FL_EXPORT_C(void,         Fl_Select_Browser_set_clip_children)(fl_Select_Browser self,int c);
-  FL_EXPORT_C(unsigned int, Fl_Select_Browser_clip_children)(fl_Select_Browser self);
-  FL_EXPORT_C(void,         Fl_Select_Browser_focus)(fl_Select_Browser self,fl_Widget W);
-  FL_EXPORT_C(fl_Widget,    Fl_Select_Browser__ddfdesign_kludge)(fl_Select_Browser self);
-  FL_EXPORT_C(void,         Fl_Select_Browser_insert_with_before)(fl_Select_Browser self, fl_Widget w, fl_Widget before);
-  FL_EXPORT_C(fl_Widget*,   Fl_Select_Browser_array)(fl_Select_Browser self);
-  FL_EXPORT_C(fl_Widget,    Fl_Select_Browser_child)(fl_Select_Browser self, int n);
-  FL_EXPORT_C(void,         Fl_Select_Browser_forms_end)(fl_Select_Browser self);
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_begin,(fl_Select_Browser self));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_end,(fl_Select_Browser self));
+  FL_EXPORT_C_HEADER(int,Fl_Select_Browser_find,(fl_Select_Browser self, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_remove_index,(fl_Select_Browser self, int index));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_remove_widget,(fl_Select_Browser self, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_clear,(fl_Select_Browser self));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_resizable_by_reference,(fl_Select_Browser self,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_resizable,(fl_Select_Browser self,fl_Widget o));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Select_Browser_resizable,(fl_Select_Browser self));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_add_resizable,(fl_Select_Browser self,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_init_sizes,(fl_Select_Browser self));
+  FL_EXPORT_C_HEADER(int,Fl_Select_Browser_children,(fl_Select_Browser self));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_clip_children,(fl_Select_Browser self,int c));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Select_Browser_clip_children,(fl_Select_Browser self));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_focus,(fl_Select_Browser self,fl_Widget W));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Select_Browser__ddfdesign_kludge,(fl_Select_Browser self));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_insert_with_before,(fl_Select_Browser self, fl_Widget w, fl_Widget before));
+  FL_EXPORT_C_HEADER(fl_Widget*,Fl_Select_Browser_array,(fl_Select_Browser self));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Select_Browser_child,(fl_Select_Browser self, int n));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_forms_end,(fl_Select_Browser self));
 
   /* Fl_Select_Browser specific functions */
-  FL_EXPORT_C(fl_Select_Browser, Fl_Select_Browser_New_WithLabel)(int x, int y, int w, int h, const char* label); 
-  FL_EXPORT_C(fl_Select_Browser, Fl_Select_Browser_New)(int x, int y, int w, int h); 
-  FL_EXPORT_C(void,Fl_Select_Browser_Destroy)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void,Fl_Select_Browser_remove)(fl_Select_Browser select_browser, int line);
-  FL_EXPORT_C(void, Fl_Select_Browser_add)(fl_Select_Browser select_browser, const char* newtext);
-  FL_EXPORT_C(void, Fl_Select_Browser_add_with_d)(fl_Select_Browser select_browser, const char* newtext, void* d);
-  FL_EXPORT_C(void, Fl_Select_Browser_insert)(fl_Select_Browser select_browser, int line, const char* newtext);
-  FL_EXPORT_C(void, Fl_Select_Browser_insert_with_d)(fl_Select_Browser select_browser, int line, const char* newtext, void* d);
-  FL_EXPORT_C(void, Fl_Select_Browser_move)(fl_Select_Browser select_browser, int to, int from);
-  FL_EXPORT_C(int , Fl_Select_Browser_load)(fl_Select_Browser select_browser, const char* filename);
-  FL_EXPORT_C(void, Fl_Select_Browser_swap)(fl_Select_Browser select_browser, int a, int b);
-  FL_EXPORT_C(void, Fl_Select_Browser_clear)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(int, Fl_Select_Browser_size)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void, Fl_Select_Browser_set_size)(fl_Select_Browser select_browser, int W, int H);
-  FL_EXPORT_C(int, Fl_Select_Browser_topline)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void, Fl_Select_Browser_lineposition)(fl_Select_Browser select_browser, int line, Fl_Line_Position pos);
-  FL_EXPORT_C(void, Fl_Select_Browser_set_topline)(fl_Select_Browser select_browser, int line);
-  FL_EXPORT_C(void, Fl_Select_Browser_bottomline)(fl_Select_Browser select_browser, int line);
-  FL_EXPORT_C(void, Fl_Select_Browser_middleline)(fl_Select_Browser select_browser, int line);
-  FL_EXPORT_C(int, Fl_Select_Browser_select)(fl_Select_Browser select_browser, int line);
-  FL_EXPORT_C(int, Fl_Select_Browser_select_with_val)(fl_Select_Browser select_browser, int line, int val);
-  FL_EXPORT_C(int, Fl_Select_Browser_selected)(fl_Select_Browser select_browser, int line);
-  FL_EXPORT_C(void, Fl_Select_Browser_show_with_line)(fl_Select_Browser select_browser, int line);
-  FL_EXPORT_C(void, Fl_Select_Browser_show)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void, Fl_Select_Browser_hide_with_line)(fl_Select_Browser select_browser, int line);
-  FL_EXPORT_C(void, Fl_Select_Browser_hide)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(int, Fl_Select_Browser_visible)(fl_Select_Browser select_browser, int line);
-  FL_EXPORT_C(int, Fl_Select_Browser_value)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void, Fl_Select_Browser_set_value)(fl_Select_Browser select_browser, int line);
-  FL_EXPORT_C(const char*, Fl_Select_Browser_text)(fl_Select_Browser select_browser, int line);
-  FL_EXPORT_C(void, Fl_Select_Browser_set_text)(fl_Select_Browser select_browser, int line, const char* newtext);
-  FL_EXPORT_C(void*, Fl_Select_Browser_data)(fl_Select_Browser select_browser, int line);
-  FL_EXPORT_C(void, Fl_Select_Browser_set_data)(fl_Select_Browser select_browser, int line, void* d);
-  FL_EXPORT_C(char, Fl_Select_Browser_format_char)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void, Fl_Select_Browser_set_format_char)(fl_Select_Browser select_browser, char c);
-  FL_EXPORT_C(char, Fl_Select_Browser_column_char)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void, Fl_Select_Browser_set_column_char)(fl_Select_Browser select_browser, char c);
-  FL_EXPORT_C(const int*, Fl_Select_Browser_column_widths)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void, Fl_Select_Browser_set_column_widths)(fl_Select_Browser select_browser, const int* arr);
-  FL_EXPORT_C(int, Fl_Select_Browser_displayed)(fl_Select_Browser select_browser, int line);
-  FL_EXPORT_C(void, Fl_Select_Browser_make_visible)(fl_Select_Browser select_browser, int line);
-  FL_EXPORT_C(void, Fl_Select_Browser_set_icon)(fl_Select_Browser select_browser, int line, fl_Image icon);
-  FL_EXPORT_C(fl_Image, Fl_Select_Browser_icon)(fl_Select_Browser select_browser, int line);
-  FL_EXPORT_C(void, Fl_Select_Browser_remove_icon)(fl_Select_Browser select_browser, int line);
-  FL_EXPORT_C(int, Fl_Select_Browser_select_only)(fl_Select_Browser select_browser,void *item);
-  FL_EXPORT_C(int, Fl_Select_Browser_select_only_with_docallbacks)(fl_Select_Browser select_browser,void *item,int docallbacks);
-  FL_EXPORT_C(int, Fl_Select_Browser_deselect)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(int, Fl_Select_Browser_deselect_with_docallbacks)(fl_Select_Browser select_browser,int docallbacks);
-  FL_EXPORT_C(int, Fl_Select_Browser_position)(fl_Select_Browser select_browser); 
+  FL_EXPORT_C(fl_Select_Browser, Fl_Select_Browser_New_WithLabel)(int x, int y, int w, int h, const char* label);
+  FL_EXPORT_C(fl_Select_Browser, Fl_Select_Browser_New)(int x, int y, int w, int h);
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_Destroy,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_remove,(fl_Select_Browser select_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_add,(fl_Select_Browser select_browser, const char* newtext));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_add_with_d,(fl_Select_Browser select_browser, const char* newtext, void* d));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_insert,(fl_Select_Browser select_browser, int line, const char* newtext));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_insert_with_d,(fl_Select_Browser select_browser, int line, const char* newtext, void* d));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_move,(fl_Select_Browser select_browser, int to, int from));
+  FL_EXPORT_C_HEADER(int ,Fl_Select_Browser_load,(fl_Select_Browser select_browser, const char* filename));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_swap,(fl_Select_Browser select_browser, int a, int b));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_clear,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(int,Fl_Select_Browser_size,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_size,(fl_Select_Browser select_browser, int W, int H));
+  FL_EXPORT_C_HEADER(int,Fl_Select_Browser_topline,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_lineposition,(fl_Select_Browser select_browser, int line, Fl_Line_Position pos));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_topline,(fl_Select_Browser select_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_bottomline,(fl_Select_Browser select_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_middleline,(fl_Select_Browser select_browser, int line));
+  FL_EXPORT_C_HEADER(int,Fl_Select_Browser_select,(fl_Select_Browser select_browser, int line));
+  FL_EXPORT_C_HEADER(int,Fl_Select_Browser_select_with_val,(fl_Select_Browser select_browser, int line, int val));
+  FL_EXPORT_C_HEADER(int,Fl_Select_Browser_selected,(fl_Select_Browser select_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_show_with_line,(fl_Select_Browser select_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_show,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_hide_with_line,(fl_Select_Browser select_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_hide,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(int,Fl_Select_Browser_visible,(fl_Select_Browser select_browser, int line));
+  FL_EXPORT_C_HEADER(int,Fl_Select_Browser_value,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_value,(fl_Select_Browser select_browser, int line));
+  FL_EXPORT_C_HEADER(const char*,Fl_Select_Browser_text,(fl_Select_Browser select_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_text,(fl_Select_Browser select_browser, int line, const char* newtext));
+  FL_EXPORT_C_HEADER(void*,Fl_Select_Browser_data,(fl_Select_Browser select_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_data,(fl_Select_Browser select_browser, int line, void* d));
+  FL_EXPORT_C_HEADER(char,Fl_Select_Browser_format_char,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_format_char,(fl_Select_Browser select_browser, char c));
+  FL_EXPORT_C_HEADER(char,Fl_Select_Browser_column_char,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_column_char,(fl_Select_Browser select_browser, char c));
+  FL_EXPORT_C_HEADER(const int*,Fl_Select_Browser_column_widths,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_column_widths,(fl_Select_Browser select_browser, const int* arr));
+  FL_EXPORT_C_HEADER(int,Fl_Select_Browser_displayed,(fl_Select_Browser select_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_make_visible,(fl_Select_Browser select_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_icon,(fl_Select_Browser select_browser, int line, fl_Image icon));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Select_Browser_icon,(fl_Select_Browser select_browser, int line));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_remove_icon,(fl_Select_Browser select_browser, int line));
+  FL_EXPORT_C_HEADER(int,Fl_Select_Browser_select_only,(fl_Select_Browser select_browser,void *item));
+  FL_EXPORT_C_HEADER(int,Fl_Select_Browser_select_only_with_docallbacks,(fl_Select_Browser select_browser,void *item,int docallbacks));
+  FL_EXPORT_C_HEADER(int,Fl_Select_Browser_deselect,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(int,Fl_Select_Browser_deselect_with_docallbacks,(fl_Select_Browser select_browser,int docallbacks));
+  FL_EXPORT_C(int, Fl_Select_Browser_position)(fl_Select_Browser select_browser);
   FL_EXPORT_C(void, Fl_Select_Browser_set_position)(fl_Select_Browser select_browser,int pos); // scroll to here
-  FL_EXPORT_C(int, Fl_Select_Browser_hposition)(fl_Select_Browser select_browser); 
+  FL_EXPORT_C(int, Fl_Select_Browser_hposition)(fl_Select_Browser select_browser);
   FL_EXPORT_C(void, Fl_Select_Browser_set_hposition)(fl_Select_Browser select_browser,int); // pan to here
-  FL_EXPORT_C(uchar, Fl_Select_Browser_has_scrollbar)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void, Fl_Select_Browser_set_has_scrollbar)(fl_Select_Browser select_browser,uchar mode); 
-  FL_EXPORT_C(Fl_Font, Fl_Select_Browser_textfont)(fl_Select_Browser select_browser); 
-  FL_EXPORT_C(void, Fl_Select_Browser_set_textfont)(fl_Select_Browser select_browser,Fl_Font font); 
-  FL_EXPORT_C(Fl_Fontsize, Fl_Select_Browser_textsize)(fl_Select_Browser select_browser);  
-  FL_EXPORT_C(void, Fl_Select_Browser_set_textsize)(fl_Select_Browser select_browser,Fl_Fontsize newSize); 
-  FL_EXPORT_C(Fl_Color, Fl_Select_Browser_textcolor)(fl_Select_Browser select_browser); 
-  FL_EXPORT_C(void, Fl_Select_Browser_set_textcolor)(fl_Select_Browser select_browser,Fl_Color col); 
-  FL_EXPORT_C(int, Fl_Select_Browser_scrollbar_size)(fl_Select_Browser select_browser); 
-  FL_EXPORT_C(void, Fl_Select_Browser_set_scrollbar_size)(fl_Select_Browser select_browser,int newSize); 
-  FL_EXPORT_C(int, Fl_Select_Browser_scrollbar_width)(fl_Select_Browser select_browser); 
-  FL_EXPORT_C(void, Fl_Select_Browser_set_scrollbar_width)(fl_Select_Browser select_browser,int width); 
-  FL_EXPORT_C(void, Fl_Select_Browser_scrollbar_right)(fl_Select_Browser select_browser); 
-  FL_EXPORT_C(void, Fl_Select_Browser_set_scrollbar_left)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void, Fl_Select_Browser_sort)(fl_Select_Browser select_browser);
-  FL_EXPORT_C(void, Fl_Select_Browser_sort_with_flags)(fl_Select_Browser select_browser,int flags);
+  FL_EXPORT_C_HEADER(uchar,Fl_Select_Browser_has_scrollbar,(fl_Select_Browser select_browser));
+  FL_EXPORT_C(void, Fl_Select_Browser_set_has_scrollbar)(fl_Select_Browser select_browser,uchar mode);
+  FL_EXPORT_C(Fl_Font, Fl_Select_Browser_textfont)(fl_Select_Browser select_browser);
+  FL_EXPORT_C(void, Fl_Select_Browser_set_textfont)(fl_Select_Browser select_browser,Fl_Font font);
+  FL_EXPORT_C(Fl_Fontsize, Fl_Select_Browser_textsize)(fl_Select_Browser select_browser);
+  FL_EXPORT_C(void, Fl_Select_Browser_set_textsize)(fl_Select_Browser select_browser,Fl_Fontsize newSize);
+  FL_EXPORT_C(Fl_Color, Fl_Select_Browser_textcolor)(fl_Select_Browser select_browser);
+  FL_EXPORT_C(void, Fl_Select_Browser_set_textcolor)(fl_Select_Browser select_browser,Fl_Color col);
+  FL_EXPORT_C(int, Fl_Select_Browser_scrollbar_size)(fl_Select_Browser select_browser);
+  FL_EXPORT_C(void, Fl_Select_Browser_set_scrollbar_size)(fl_Select_Browser select_browser,int newSize);
+  FL_EXPORT_C(int, Fl_Select_Browser_scrollbar_width)(fl_Select_Browser select_browser);
+  FL_EXPORT_C(void, Fl_Select_Browser_set_scrollbar_width)(fl_Select_Browser select_browser,int width);
+  FL_EXPORT_C(void, Fl_Select_Browser_scrollbar_right)(fl_Select_Browser select_browser);
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_set_scrollbar_left,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_sort,(fl_Select_Browser select_browser));
+  FL_EXPORT_C_HEADER(void,Fl_Select_Browser_sort_with_flags,(fl_Select_Browser select_browser,int flags));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Shared_ImageC.h b/c-src/Fl_Shared_ImageC.h
--- a/c-src/Fl_Shared_ImageC.h
+++ b/c-src/Fl_Shared_ImageC.h
@@ -9,42 +9,42 @@
 #include "Fl_CallbackC.h"
 EXPORT {
 #endif
-  FL_EXPORT_C(int, Fl_Shared_Image_w)(fl_Shared_Image shared_image);
-  FL_EXPORT_C(int, Fl_Shared_Image_h)(fl_Shared_Image shared_image);
-  FL_EXPORT_C(int, Fl_Shared_Image_d)(fl_Shared_Image shared_image);
-  FL_EXPORT_C(int, Fl_Shared_Image_ld)(fl_Shared_Image shared_image);
-  FL_EXPORT_C(int, Fl_Shared_Image_count)(fl_Shared_Image shared_image);
-  FL_EXPORT_C(fl_Shared_Image, Fl_Shared_Image_copy_with_w_h)(fl_Shared_Image shared_image,int W, int H);
-  FL_EXPORT_C(fl_Shared_Image, Fl_Shared_Image_copy)(fl_Shared_Image shared_image);
-  FL_EXPORT_C(void, Fl_Shared_Image_color_average)(fl_Shared_Image shared_image,Fl_Color c, float i);
-  FL_EXPORT_C(void, Fl_Shared_Image_inactive)(fl_Shared_Image shared_image);
-  FL_EXPORT_C(void, Fl_Shared_Image_desaturate)(fl_Shared_Image shared_image);
-  FL_EXPORT_C(void, Fl_Shared_Image_label)(fl_Shared_Image shared_image,fl_Widget w);
-  FL_EXPORT_C(void, Fl_Shared_Image_label_with_menu_item)(fl_Shared_Image shared_image,fl_Menu_Item m);
-  FL_EXPORT_C(void, Fl_Shared_Image_uncache)(fl_Shared_Image shared_image);
-  FL_EXPORT_C(const char*, Fl_Shared_Image_name)(fl_Shared_Image shared_image);
-  FL_EXPORT_C(int, Fl_Shared_Image_refcount)(fl_Shared_Image shared_image);
-  FL_EXPORT_C(void, Fl_Shared_Image_release)(fl_Shared_Image shared_image);
-  FL_EXPORT_C(void, Fl_Shared_Image_reload)(fl_Shared_Image shared_image);
-  FL_EXPORT_C(fl_Image, Fl_Shared_Image_copy_with_WH)(fl_Shared_Image shared_image,int W, int H);
-  FL_EXPORT_C(fl_Image, Fl_Shared_Image_copy)(fl_Shared_Image shared_image);
-  FL_EXPORT_C(void, Fl_Shared_Image_color_average)(fl_Shared_Image shared_image,Fl_Color c, float i);
-  FL_EXPORT_C(void, Fl_Shared_Image_desaturate)(fl_Shared_Image shared_image);
-  FL_EXPORT_C(void, Fl_Shared_Image_draw_with_XYWHcxcy)(fl_Shared_Image shared_image,int X, int Y, int W, int H, int cx, int cy);
-  FL_EXPORT_C(void, Fl_Shared_Image_draw)(fl_Shared_Image shared_image,int X, int Y);
-  FL_EXPORT_C(void, Fl_Shared_Image_uncache)(fl_Shared_Image shared_image);
-  FL_EXPORT_C(fl_Shared_Image, Fl_Shared_Image_find)(const char* n);
-  FL_EXPORT_C(fl_Shared_Image, Fl_Shared_Image_find_W)(const char* n, int H);
+  FL_EXPORT_C_HEADER(int,Fl_Shared_Image_w,(fl_Shared_Image shared_image));
+  FL_EXPORT_C_HEADER(int,Fl_Shared_Image_h,(fl_Shared_Image shared_image));
+  FL_EXPORT_C_HEADER(int,Fl_Shared_Image_d,(fl_Shared_Image shared_image));
+  FL_EXPORT_C_HEADER(int,Fl_Shared_Image_ld,(fl_Shared_Image shared_image));
+  FL_EXPORT_C_HEADER(int,Fl_Shared_Image_count,(fl_Shared_Image shared_image));
+  FL_EXPORT_C_HEADER(fl_Shared_Image,Fl_Shared_Image_copy_with_w_h,(fl_Shared_Image shared_image,int W, int H));
+  FL_EXPORT_C_HEADER(fl_Shared_Image,Fl_Shared_Image_copy,(fl_Shared_Image shared_image));
+  FL_EXPORT_C_HEADER(void,Fl_Shared_Image_color_average,(fl_Shared_Image shared_image,Fl_Color c, float i));
+  FL_EXPORT_C_HEADER(void,Fl_Shared_Image_inactive,(fl_Shared_Image shared_image));
+  FL_EXPORT_C_HEADER(void,Fl_Shared_Image_desaturate,(fl_Shared_Image shared_image));
+  FL_EXPORT_C_HEADER(void,Fl_Shared_Image_label,(fl_Shared_Image shared_image,fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Shared_Image_label_with_menu_item,(fl_Shared_Image shared_image,fl_Menu_Item m));
+  FL_EXPORT_C_HEADER(void,Fl_Shared_Image_uncache,(fl_Shared_Image shared_image));
+  FL_EXPORT_C_HEADER(const char*,Fl_Shared_Image_name,(fl_Shared_Image shared_image));
+  FL_EXPORT_C_HEADER(int,Fl_Shared_Image_refcount,(fl_Shared_Image shared_image));
+  FL_EXPORT_C_HEADER(void,Fl_Shared_Image_release,(fl_Shared_Image shared_image));
+  FL_EXPORT_C_HEADER(void,Fl_Shared_Image_reload,(fl_Shared_Image shared_image));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Shared_Image_copy_with_WH,(fl_Shared_Image shared_image,int W, int H));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Shared_Image_copy,(fl_Shared_Image shared_image));
+  FL_EXPORT_C_HEADER(void,Fl_Shared_Image_color_average,(fl_Shared_Image shared_image,Fl_Color c, float i));
+  FL_EXPORT_C_HEADER(void,Fl_Shared_Image_desaturate,(fl_Shared_Image shared_image));
+  FL_EXPORT_C_HEADER(void,Fl_Shared_Image_draw_with_XYWHcxcy,(fl_Shared_Image shared_image,int X, int Y, int W, int H, int cx, int cy));
+  FL_EXPORT_C_HEADER(void,Fl_Shared_Image_draw,(fl_Shared_Image shared_image,int X, int Y));
+  FL_EXPORT_C_HEADER(void,Fl_Shared_Image_uncache,(fl_Shared_Image shared_image));
+  FL_EXPORT_C_HEADER(fl_Shared_Image,Fl_Shared_Image_find,(const char* n));
+  FL_EXPORT_C_HEADER(fl_Shared_Image,Fl_Shared_Image_find_W,(const char* n, int H));
   FL_EXPORT_C(fl_Shared_Image, Fl_Shared_Image_find_H)(const char* n, int H); /* int W = 0, */
-  FL_EXPORT_C(fl_Shared_Image, Fl_Shared_Image_find_WH)(const char* n, int W, int H);
-  FL_EXPORT_C(fl_Shared_Image, Fl_Shared_Image_get)(const char* n);
-  FL_EXPORT_C(fl_Shared_Image, Fl_Shared_Image_get_W)(const char* n, int H);
-  FL_EXPORT_C(fl_Shared_Image, Fl_Shared_Image_get_H)(const char* n, int H);
-  FL_EXPORT_C(fl_Shared_Image, Fl_Shared_Image_get_WH)(const char* n, int W, int H);
-  FL_EXPORT_C(fl_Shared_Image*, Fl_Shared_Image_images)();
-  FL_EXPORT_C(int, Fl_Shared_Image_num_images)();
-  FL_EXPORT_C(void, Fl_Shared_Image_add_handler)(fl_Shared_Image_Handler f);
-  FL_EXPORT_C(void, Fl_Shared_Image_remove_handler)(fl_Shared_Image_Handler f);
+  FL_EXPORT_C_HEADER(fl_Shared_Image,Fl_Shared_Image_find_WH,(const char* n, int W, int H));
+  FL_EXPORT_C_HEADER(fl_Shared_Image,Fl_Shared_Image_get,(const char* n));
+  FL_EXPORT_C_HEADER(fl_Shared_Image,Fl_Shared_Image_get_W,(const char* n, int H));
+  FL_EXPORT_C_HEADER(fl_Shared_Image,Fl_Shared_Image_get_H,(const char* n, int H));
+  FL_EXPORT_C_HEADER(fl_Shared_Image,Fl_Shared_Image_get_WH,(const char* n, int W, int H));
+  FL_EXPORT_C_HEADER(fl_Shared_Image*,Fl_Shared_Image_images,());
+  FL_EXPORT_C_HEADER(int,Fl_Shared_Image_num_images,());
+  FL_EXPORT_C_HEADER(void,Fl_Shared_Image_add_handler,(fl_Shared_Image_Handler f));
+  FL_EXPORT_C_HEADER(void,Fl_Shared_Image_remove_handler,(fl_Shared_Image_Handler f));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Single_WindowC.h b/c-src/Fl_Single_WindowC.h
--- a/c-src/Fl_Single_WindowC.h
+++ b/c-src/Fl_Single_WindowC.h
@@ -11,190 +11,190 @@
 EXPORT {
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,Fl_Single_Window_handle)(fl_Single_Window self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Single_Window_parent)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_set_parent)(fl_Single_Window win, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Single_Window_type)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_set_type)(fl_Single_Window win, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Single_Window_handle,(fl_Single_Window self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Single_Window_parent,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_parent,(fl_Single_Window win, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Single_Window_type,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_type,(fl_Single_Window win, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Single_Window_x)(fl_Single_Window win);
-  FL_EXPORT_C(int,          Fl_Single_Window_y)(fl_Single_Window win);
-  FL_EXPORT_C(int,          Fl_Single_Window_w)(fl_Single_Window win);
-  FL_EXPORT_C(int,          Fl_Single_Window_h)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_set_align)(fl_Single_Window double_window, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Single_Window_align)(fl_Single_Window win);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Single_Window_box)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_set_box)(fl_Single_Window win, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Single_Window_color)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_set_color)(fl_Single_Window win, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Single_Window_set_color_with_bg_sel)(fl_Single_Window win,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Single_Window_selection_color)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_set_selection_color)(fl_Single_Window win, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Single_Window_label)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_copy_label)(fl_Single_Window win, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Single_Window_set_label)(fl_Single_Window win, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Single_Window_labeltype)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_set_labeltype)(fl_Single_Window win, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Single_Window_labelcolor)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_set_labelcolor)(fl_Single_Window win, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Single_Window_labelfont)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_set_labelfont)(fl_Single_Window win, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Single_Window_labelsize)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_set_labelsize)(fl_Single_Window win, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Single_Window_image)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_set_image)(fl_Single_Window win, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Single_Window_deimage)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_set_deimage)(fl_Single_Window win, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Single_Window_tooltip)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_copy_tooltip)(fl_Single_Window win, const char* text);
-  FL_EXPORT_C(void,         Fl_Single_Window_set_tooltip)(fl_Single_Window win, const char* text);
-  FL_EXPORT_C(void,         Fl_Single_Window_set_callback_with_user_data)(fl_Single_Window win, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Single_Window_set_callback)(fl_Single_Window win, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Single_Window_user_data)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_set_user_data)(fl_Single_Window win, void* v);
-  FL_EXPORT_C(long,         Fl_Single_Window_argument)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_set_argument)(fl_Single_Window win, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Single_Window_when)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_set_when)(fl_Single_Window win, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Single_Window_visible)(fl_Single_Window win);
-  FL_EXPORT_C(int,          Fl_Single_Window_visible_r)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_set_visible)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_clear_visible)(fl_Single_Window win);
-  FL_EXPORT_C(unsigned int, Fl_Single_Window_active)(fl_Single_Window win);
-  FL_EXPORT_C(int,          Fl_Single_Window_active_r)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_activate)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_deactivate)(fl_Single_Window win);
-  FL_EXPORT_C(unsigned int, Fl_Single_Window_output)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_set_output)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_clear_output)(fl_Single_Window win);
-  FL_EXPORT_C(unsigned int, Fl_Single_Window_takesevents)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_set_changed)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_clear_changed)(fl_Single_Window win);
-  FL_EXPORT_C(int,          Fl_Single_Window_take_focus)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_set_visible_focus)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_clear_visible_focus)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_modify_visible_focus)(fl_Single_Window win, int v);
-  FL_EXPORT_C(unsigned int, Fl_Single_Window_visible_focus)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_do_callback)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_do_callback_with_widget_and_user_data)(fl_Single_Window win, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Single_Window_do_callback_with_widget_and_default_user_data)(fl_Single_Window win, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Single_Window_contains)(fl_Single_Window win, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Single_Window_inside)(fl_Single_Window win, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Single_Window_redraw)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_redraw_label)(fl_Single_Window win);
-  FL_EXPORT_C(uchar,        Fl_Single_Window_damage)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_clear_damage_with_bitmask)(fl_Single_Window win, uchar c);
-  FL_EXPORT_C(void,         Fl_Single_Window_clear_damage)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_damage_with_text)(fl_Single_Window win, uchar c);
-  FL_EXPORT_C(void,         Fl_Single_Window_damage_inside_widget)(fl_Single_Window win, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Single_Window_draw_label_with_xywh_alignment)(fl_Single_Window win, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Single_Window_measure_label)(fl_Single_Window win, int* ww , int* hh);
-  FL_EXPORT_C(fl_Group,     Fl_Single_Window_as_group)(fl_Single_Window win);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Single_Window_as_gl_window)(fl_Single_Window win);
-  FL_EXPORT_C(fl_Window,    Fl_Single_Window_window)(fl_Single_Window double_window);
-  FL_EXPORT_C(fl_Window,    Fl_Single_Window_top_window)(fl_Single_Window double_window);
-  FL_EXPORT_C(fl_Window ,   Fl_Single_Window_top_window_offset)(fl_Single_Window double_window, int* xoff, int* yoff);
+  FL_EXPORT_C_HEADER(int,Fl_Single_Window_x,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Single_Window_y,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Single_Window_w,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Single_Window_h,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_align,(fl_Single_Window double_window, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Single_Window_align,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Single_Window_box,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_box,(fl_Single_Window win, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Single_Window_color,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_color,(fl_Single_Window win, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_color_with_bg_sel,(fl_Single_Window win,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Single_Window_selection_color,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_selection_color,(fl_Single_Window win, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Single_Window_label,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_copy_label,(fl_Single_Window win, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_label,(fl_Single_Window win, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Single_Window_labeltype,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_labeltype,(fl_Single_Window win, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Single_Window_labelcolor,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_labelcolor,(fl_Single_Window win, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Single_Window_labelfont,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_labelfont,(fl_Single_Window win, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Single_Window_labelsize,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_labelsize,(fl_Single_Window win, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Single_Window_image,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_image,(fl_Single_Window win, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Single_Window_deimage,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_deimage,(fl_Single_Window win, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Single_Window_tooltip,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_copy_tooltip,(fl_Single_Window win, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_tooltip,(fl_Single_Window win, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_callback_with_user_data,(fl_Single_Window win, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_callback,(fl_Single_Window win, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Single_Window_user_data,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_user_data,(fl_Single_Window win, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Single_Window_argument,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_argument,(fl_Single_Window win, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Single_Window_when,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_when,(fl_Single_Window win, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Single_Window_visible,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Single_Window_visible_r,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_visible,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_clear_visible,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Single_Window_active,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Single_Window_active_r,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_activate,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_deactivate,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Single_Window_output,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_output,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_clear_output,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Single_Window_takesevents,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_changed,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_clear_changed,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Single_Window_take_focus,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_visible_focus,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_clear_visible_focus,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_modify_visible_focus,(fl_Single_Window win, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Single_Window_visible_focus,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_do_callback,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_do_callback_with_widget_and_user_data,(fl_Single_Window win, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_do_callback_with_widget_and_default_user_data,(fl_Single_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Single_Window_contains,(fl_Single_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Single_Window_inside,(fl_Single_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_redraw,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_redraw_label,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(uchar,Fl_Single_Window_damage,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_clear_damage_with_bitmask,(fl_Single_Window win, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_clear_damage,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_damage_with_text,(fl_Single_Window win, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_damage_inside_widget,(fl_Single_Window win, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_draw_label_with_xywh_alignment,(fl_Single_Window win, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_measure_label,(fl_Single_Window win, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Single_Window_as_group,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Single_Window_as_gl_window,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Single_Window_window,(fl_Single_Window double_window));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Single_Window_top_window,(fl_Single_Window double_window));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Single_Window_top_window_offset,(fl_Single_Window double_window, int* xoff, int* yoff));
   /* Inherited from Fl_Group */
-  FL_EXPORT_C(void, Fl_Single_Window_draw)(fl_Single_Window Single_Window);
-  FL_EXPORT_C(void, Fl_Single_Window_draw_child)(fl_Single_Window Single_Window,fl_Widget widget);
-  FL_EXPORT_C(void, Fl_Single_Window_draw_children)(fl_Single_Window Single_Window);
-  FL_EXPORT_C(void, Fl_Single_Window_draw_outside_label)(fl_Single_Window Single_Window,fl_Widget widget);
-  FL_EXPORT_C(void, Fl_Single_Window_update_child)(fl_Single_Window Single_Window,fl_Widget widget);
-  FL_EXPORT_C(int*, Fl_Single_Window_sizes)(fl_Single_Window Single_Window);
-  FL_EXPORT_C(void,         Fl_Single_Window_begin)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_end)(fl_Single_Window win);
-  FL_EXPORT_C(int,          Fl_Single_Window_find)(fl_Single_Window win, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Single_Window_add)(fl_Single_Window win, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Single_Window_insert)(fl_Single_Window win, fl_Widget w, int i);
-  FL_EXPORT_C(void,         Fl_Single_Window_remove_index)(fl_Single_Window win, int index);
-  FL_EXPORT_C(void,         Fl_Single_Window_remove_widget)(fl_Single_Window win, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Single_Window_clear)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_set_resizable_by_reference)(fl_Single_Window win,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Single_Window_set_resizable)(fl_Single_Window win,fl_Widget o);
-  FL_EXPORT_C(fl_Widget,         Fl_Single_Window_resizable)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_add_resizable)(fl_Single_Window win,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Single_Window_init_sizes)(fl_Single_Window win);
-  FL_EXPORT_C(int,          Fl_Single_Window_children)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_set_clip_children)(fl_Single_Window win,int c);
-  FL_EXPORT_C(unsigned int, Fl_Single_Window_clip_children)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_focus)(fl_Single_Window win,fl_Widget W);
-  FL_EXPORT_C(fl_Widget,    Fl_Single_Window__ddfdesign_kludge)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_insert_with_before)(fl_Single_Window self, fl_Widget w, fl_Widget before);
-  FL_EXPORT_C(fl_Widget*,   Fl_Single_Window_array)(fl_Single_Window self);
-  FL_EXPORT_C(fl_Widget,    Fl_Single_Window_child)(fl_Single_Window self, int n);
-  FL_EXPORT_C(void,         Fl_Single_Window_forms_end)(fl_Single_Window self);
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_draw,(fl_Single_Window Single_Window));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_draw_child,(fl_Single_Window Single_Window,fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_draw_children,(fl_Single_Window Single_Window));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_draw_outside_label,(fl_Single_Window Single_Window,fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_update_child,(fl_Single_Window Single_Window,fl_Widget widget));
+  FL_EXPORT_C_HEADER(int*,Fl_Single_Window_sizes,(fl_Single_Window Single_Window));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_begin,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_end,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Single_Window_find,(fl_Single_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_add,(fl_Single_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_insert,(fl_Single_Window win, fl_Widget w, int i));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_remove_index,(fl_Single_Window win, int index));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_remove_widget,(fl_Single_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_clear,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_resizable_by_reference,(fl_Single_Window win,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_resizable,(fl_Single_Window win,fl_Widget o));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Single_Window_resizable,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_add_resizable,(fl_Single_Window win,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_init_sizes,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Single_Window_children,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_clip_children,(fl_Single_Window win,int c));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Single_Window_clip_children,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_focus,(fl_Single_Window win,fl_Widget W));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Single_Window__ddfdesign_kludge,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_insert_with_before,(fl_Single_Window self, fl_Widget w, fl_Widget before));
+  FL_EXPORT_C_HEADER(fl_Widget*,Fl_Single_Window_array,(fl_Single_Window self));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Single_Window_child,(fl_Single_Window self, int n));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_forms_end,(fl_Single_Window self));
   /* FL_EXPORT_C(void,         Fl_Single_Window_forms_end)(fl_Single_Window win); */
   /* Fl_Window inherited */
-  FL_EXPORT_C(unsigned int, Fl_Single_Window_changed)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_fullscreen)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_fullscreen_off)(fl_Single_Window win);
-  FL_EXPORT_C(void,         Fl_Single_Window_fullscreen_off_with_resize)(fl_Single_Window win,int X,int Y,int W,int H);
-  FL_EXPORT_C(fl_Single_Window,    Fl_Single_Window_New_WithLabel)(int w, int h, const char* title);
-  FL_EXPORT_C(fl_Single_Window,    Fl_Single_Window_New)(int w, int h);
-  FL_EXPORT_C(fl_Single_Window,    Fl_Single_Window_NewXY_WithLabel)(int x, int y, int w, int h, const char* title);
-  FL_EXPORT_C(fl_Single_Window,    Fl_Single_Window_NewXY)(int x, int y, int w, int h);
-  FL_EXPORT_C(fl_Single_Window, Fl_OverriddenSingle_Window_New_WithLabel)(int w, int h, const char* title, fl_Single_Window_Virtual_Funcs* funcs);
-  FL_EXPORT_C(fl_Single_Window, Fl_OverriddenSingle_Window_New)(int w, int h,fl_Single_Window_Virtual_Funcs* funcs);
-  FL_EXPORT_C(fl_Single_Window, Fl_OverriddenSingle_Window_NewXY_WithLabel)(int x, int y, int w, int h, const char* title,fl_Single_Window_Virtual_Funcs* funcs);
-  FL_EXPORT_C(fl_Single_Window, Fl_OverriddenSingle_Window_NewXY)(int x, int y, int w, int h,fl_Single_Window_Virtual_Funcs* funcs);
-  FL_EXPORT_C(void,         Fl_Single_Window_iconize)(fl_Single_Window win);
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Single_Window_changed,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_fullscreen,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_fullscreen_off,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_fullscreen_off_with_resize,(fl_Single_Window win,int X,int Y,int W,int H));
+  FL_EXPORT_C_HEADER(fl_Single_Window,Fl_Single_Window_New_WithLabel,(int w, int h, const char* title));
+  FL_EXPORT_C_HEADER(fl_Single_Window,Fl_Single_Window_New,(int w, int h));
+  FL_EXPORT_C_HEADER(fl_Single_Window,Fl_Single_Window_NewXY_WithLabel,(int x, int y, int w, int h, const char* title));
+  FL_EXPORT_C_HEADER(fl_Single_Window,Fl_Single_Window_NewXY,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(fl_Single_Window,Fl_OverriddenSingle_Window_New_WithLabel,(int w, int h, const char* title, fl_Single_Window_Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(fl_Single_Window,Fl_OverriddenSingle_Window_New,(int w, int h,fl_Single_Window_Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(fl_Single_Window,Fl_OverriddenSingle_Window_NewXY_WithLabel,(int x, int y, int w, int h, const char* title,fl_Single_Window_Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(fl_Single_Window,Fl_OverriddenSingle_Window_NewXY,(int x, int y, int w, int h,fl_Single_Window_Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_iconize,(fl_Single_Window win));
 
-  FL_EXPORT_C(fl_Single_Window, Fl_OverriddenSingle_Window_New_WithLabel)(int w, int h, const char* title, fl_Single_Window_Virtual_Funcs* funcs);
-  FL_EXPORT_C(fl_Single_Window, Fl_OverriddenSingle_Window_New)(int w, int h,fl_Single_Window_Virtual_Funcs* funcs);
-  FL_EXPORT_C(fl_Single_Window, Fl_OverriddenSingle_Window_NewXY_WithLabel)(int x, int y, int w, int h, const char* title,fl_Single_Window_Virtual_Funcs* funcs);
-  FL_EXPORT_C(fl_Single_Window, Fl_OverriddenSingle_Window_NewXY)(int x, int y, int w, int h,fl_Single_Window_Virtual_Funcs* funcs);
-  FL_EXPORT_C(int ,Fl_Single_Window_handle)(fl_Single_Window win, int event);
-  FL_EXPORT_C(void ,Fl_Single_Window_set_border)(fl_Single_Window win, int b);
-  FL_EXPORT_C(void ,Fl_Single_Window_clear_border)(fl_Single_Window win);
-  FL_EXPORT_C(unsigned int ,Fl_Single_Window_border)(fl_Single_Window win);
-  FL_EXPORT_C(void ,Fl_Single_Window_set_override)(fl_Single_Window win);
-  FL_EXPORT_C(unsigned int,Fl_Single_Window_override)(fl_Single_Window win);
-  FL_EXPORT_C(void ,Fl_Single_Window_set_modal)(fl_Single_Window win);
-  FL_EXPORT_C(unsigned int,Fl_Single_Window_modal)(fl_Single_Window win);
-  FL_EXPORT_C(void ,Fl_Single_Window_set_non_modal)(fl_Single_Window win);
-  FL_EXPORT_C(unsigned int ,Fl_Single_Window_non_modal)(fl_Single_Window win);
-  FL_EXPORT_C(void ,Fl_Single_Window_set_menu_window)(fl_Single_Window win);
-  FL_EXPORT_C(unsigned int,Fl_Single_Window_menu_window)(fl_Single_Window win);
-  FL_EXPORT_C(void ,Fl_Single_Window_set_tooltip_window)(fl_Single_Window win);
-  FL_EXPORT_C(unsigned int,Fl_Single_Window_tooltip_window)(fl_Single_Window win);
-  FL_EXPORT_C(void ,Fl_Single_Window_hotspot_with_x_y)(fl_Single_Window win, int x, int y);
-  FL_EXPORT_C(void ,Fl_Single_Window_hotspot_with_x_y_with_offscreen)(fl_Single_Window win, int x, int y, int offscreen);
-  FL_EXPORT_C(void ,Fl_Single_Window_hotspot_with_widget)(fl_Single_Window win, fl_Widget w);//, int offscreen = 0);
-  FL_EXPORT_C(void ,Fl_Single_Window_hotspot_with_widget_with_offscreen)(fl_Single_Window win, fl_Widget w, int offscreen);
-  FL_EXPORT_C(void ,Fl_Single_Window_free_position)(fl_Single_Window win);
-  FL_EXPORT_C(void ,Fl_Single_Window_size_range)(fl_Single_Window win, int minw, int minh);
-  FL_EXPORT_C(void ,Fl_Single_Window_size_range_with_args)(fl_Window win, int minw, int minh, fl_Window_size_range_args* args);//int maxw=0, int maxh=0, int dw=0, int dh=0, int aspect=0);
-  FL_EXPORT_C(const char*, Fl_Single_Window_label)(fl_Single_Window win);
-  FL_EXPORT_C(const char*, Fl_Single_Window_iconlabel)(fl_Single_Window win);
-  FL_EXPORT_C(void, Fl_Single_Window_set_label)(fl_Single_Window win,const char*);
-  FL_EXPORT_C(void, Fl_Single_Window_set_iconlabel)(fl_Single_Window win,const char*);
-  FL_EXPORT_C(void, Fl_Single_Window_set_label_with_iconlabel)(fl_Single_Window win,const char* label, const char* iconlabel);
-  FL_EXPORT_C(void, Fl_Single_Window_copy_label)(fl_Single_Window win,const char* a);
-  FL_EXPORT_C(void, Fl_Single_Window_set_default_xclass)(const char* label);
-  FL_EXPORT_C(const char*, Fl_Single_Window_default_xclass)();
-  FL_EXPORT_C(const char*, Fl_Single_Window_xclass)(fl_Single_Window win);
-  FL_EXPORT_C(void, Fl_Single_Window_set_xclass)(fl_Single_Window win,const char* c);
-  FL_EXPORT_C(const void*, Fl_Single_Window_icon)(fl_Single_Window win);
-  FL_EXPORT_C(void, Fl_Single_Window_set_icon)(fl_Single_Window win,const void * ic);
-  FL_EXPORT_C(int, Fl_Single_Window_shown)(fl_Single_Window win);
-  FL_EXPORT_C(void, Fl_Single_Window_iconize)(fl_Single_Window win);
-  FL_EXPORT_C(int, Fl_Single_Window_x_root)(fl_Single_Window win);
-  FL_EXPORT_C(int, Fl_Single_Window_y_root)(fl_Single_Window win);
-  FL_EXPORT_C(fl_Single_Window, Fl_Single_Window_current)();
+  FL_EXPORT_C_HEADER(fl_Single_Window,Fl_OverriddenSingle_Window_New_WithLabel,(int w, int h, const char* title, fl_Single_Window_Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(fl_Single_Window,Fl_OverriddenSingle_Window_New,(int w, int h,fl_Single_Window_Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(fl_Single_Window,Fl_OverriddenSingle_Window_NewXY_WithLabel,(int x, int y, int w, int h, const char* title,fl_Single_Window_Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(fl_Single_Window,Fl_OverriddenSingle_Window_NewXY,(int x, int y, int w, int h,fl_Single_Window_Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(int ,Fl_Single_Window_handle,(fl_Single_Window win, int event));
+  FL_EXPORT_C_HEADER(void ,Fl_Single_Window_set_border,(fl_Single_Window win, int b));
+  FL_EXPORT_C_HEADER(void ,Fl_Single_Window_clear_border,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(unsigned int ,Fl_Single_Window_border,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Single_Window_set_override,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Single_Window_override,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Single_Window_set_modal,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Single_Window_modal,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Single_Window_set_non_modal,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(unsigned int ,Fl_Single_Window_non_modal,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Single_Window_set_menu_window,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Single_Window_menu_window,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Single_Window_set_tooltip_window,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Single_Window_tooltip_window,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Single_Window_hotspot_with_x_y,(fl_Single_Window win, int x, int y));
+  FL_EXPORT_C_HEADER(void ,Fl_Single_Window_hotspot_with_x_y_with_offscreen,(fl_Single_Window win, int x, int y, int offscreen));
+  FL_EXPORT_C_HEADER(void ,Fl_Single_Window_hotspot_with_widget,(fl_Single_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void ,Fl_Single_Window_hotspot_with_widget_with_offscreen,(fl_Single_Window win, fl_Widget w, int offscreen));
+  FL_EXPORT_C_HEADER(void ,Fl_Single_Window_free_position,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Single_Window_size_range,(fl_Single_Window win, int minw, int minh));
+  FL_EXPORT_C_HEADER(void ,Fl_Single_Window_size_range_with_args,(fl_Window win, int minw, int minh, fl_Window_size_range_args* args));
+  FL_EXPORT_C_HEADER(const char*,Fl_Single_Window_label,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(const char*,Fl_Single_Window_iconlabel,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_label,(fl_Single_Window win,const char*));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_iconlabel,(fl_Single_Window win,const char*));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_label_with_iconlabel,(fl_Single_Window win,const char* label, const char* iconlabel));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_copy_label,(fl_Single_Window win,const char* a));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_default_xclass,(const char* label));
+  FL_EXPORT_C_HEADER(const char*,Fl_Single_Window_default_xclass,());
+  FL_EXPORT_C_HEADER(const char*,Fl_Single_Window_xclass,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_xclass,(fl_Single_Window win,const char* c));
+  FL_EXPORT_C_HEADER(const void*,Fl_Single_Window_icon,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_icon,(fl_Single_Window win,const void * ic));
+  FL_EXPORT_C_HEADER(int,Fl_Single_Window_shown,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_iconize,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Single_Window_x_root,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Single_Window_y_root,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(fl_Single_Window,Fl_Single_Window_current,());
   // There is no make_current implementation on Fl_Single_Window
   // even though it is in the header file.
-  // FL_EXPORT_C(int, Fl_Single_Window_make_current)(fl_Single_Window win);
-  FL_EXPORT_C(void, Fl_Single_Window_set_cursor_with_bg)(fl_Single_Window win, Fl_Cursor cursor, Fl_Color bg);
-  FL_EXPORT_C(void, Fl_Single_Window_set_cursor_with_fg)(fl_Single_Window win,Fl_Cursor cursor, Fl_Color fg);
+  // FL_EXPORT_C_HEADER(int,Fl_Single_Window_make_current,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_cursor_with_bg,(fl_Single_Window win, Fl_Cursor cursor, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_cursor_with_fg,(fl_Single_Window win,Fl_Cursor cursor, Fl_Color fg));
   FL_EXPORT_C(void, Fl_Single_Window_set_cursor_with_fg_bg)(fl_Single_Window win,Fl_Cursor cursor, Fl_Color fg , Fl_Color bg );/* =FL_BLACK *//*=FL_WHITE*/
-  FL_EXPORT_C(void, Fl_Single_Window_set_cursor)(fl_Single_Window win,Fl_Cursor cursor);
-  FL_EXPORT_C(void, Fl_Single_Window_set_default_cursor_with_bg)(fl_Single_Window win,Fl_Cursor cursor, Fl_Color bg);
-  FL_EXPORT_C(void, Fl_Single_Window_set_default_cursor_with_fg)(fl_Single_Window win, Fl_Cursor cursor, Fl_Color fg);
-  FL_EXPORT_C(void, Fl_Single_Window_set_default_cursor_with_fg_bg)(fl_Single_Window win,Fl_Cursor cursor, Fl_Color fg , Fl_Color bg );
-  FL_EXPORT_C(void, Fl_Single_Window_set_default_cursor)(fl_Single_Window win,Fl_Cursor cursor);
-  FL_EXPORT_C(void, Fl_Single_Window_default_callback)(fl_Single_Window win, void* v);
-  FL_EXPORT_C(int, Fl_Single_Window_decorated_w)(fl_Single_Window win);
-  FL_EXPORT_C(int, Fl_Single_Window_decorated_h)(fl_Single_Window win);
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_cursor,(fl_Single_Window win,Fl_Cursor cursor));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_default_cursor_with_bg,(fl_Single_Window win,Fl_Cursor cursor, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_default_cursor_with_fg,(fl_Single_Window win, Fl_Cursor cursor, Fl_Color fg));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_default_cursor_with_fg_bg,(fl_Single_Window win,Fl_Cursor cursor, Fl_Color fg , Fl_Color bg ));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_set_default_cursor,(fl_Single_Window win,Fl_Cursor cursor));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_default_callback,(fl_Single_Window win, void* v));
+  FL_EXPORT_C_HEADER(int,Fl_Single_Window_decorated_w,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Single_Window_decorated_h,(fl_Single_Window win));
   /* Fl_Single_Window specific */
   // flush resize destructor, constructor
 #ifdef __cplusplus
@@ -244,26 +244,26 @@
     ~Fl_DerivedSingle_Window();
   };
 #endif
-  FL_EXPORT_C(fl_Single_Window_Virtual_Funcs*, Fl_Single_Window_default_virtual_funcs)();
-  FL_EXPORT_C(int ,		Fl_Single_Window_handle)(fl_Single_Window win, int event);
-  FL_EXPORT_C(int ,		Fl_Single_Window_handle_super)(fl_Single_Window win, int event);
-  FL_EXPORT_C(void,		Fl_Single_Window_draw_super)(fl_Single_Window win);
-  FL_EXPORT_C(fl_Group,		Fl_Single_Window_as_group)(fl_Single_Window window);
-  FL_EXPORT_C(fl_Window,	Fl_Single_Window_as_window)(fl_Single_Window window);
-  FL_EXPORT_C(fl_Gl_Window,	Fl_Single_Window_as_gl_window)(fl_Single_Window window);
-  FL_EXPORT_C(fl_Group,		Fl_Single_Window_as_group_super)(fl_Single_Window window);
-  FL_EXPORT_C(fl_Window,	Fl_Single_Window_as_window_super)(fl_Single_Window window);
-  FL_EXPORT_C(fl_Gl_Window,	Fl_Single_Window_as_gl_window_super)(fl_Single_Window window);
-  FL_EXPORT_C(void,		Fl_Single_Window_show_super)(fl_Single_Window win);
-  FL_EXPORT_C(void,		Fl_Single_Window_show)(fl_Single_Window win);
-  FL_EXPORT_C(void,		Fl_Single_Window_show_with_args)(fl_Single_Window win, int argc, char** argv);
-  FL_EXPORT_C(void,		Fl_Single_Window_Destroy)(fl_Single_Window win);
-  FL_EXPORT_C(void,		Fl_Single_Window_flush_super)(fl_Single_Window win);
-  FL_EXPORT_C(void,		Fl_Single_Window_flush)(fl_Single_Window win);
-  FL_EXPORT_C(void,		Fl_Single_Window_resize_super)(fl_Single_Window win, int X, int Y, int W, int H);
-  FL_EXPORT_C(void,		Fl_Single_Window_resize)(fl_Single_Window win, int X, int Y, int W, int H);
-  FL_EXPORT_C(void,		Fl_Single_Window_hide_super)(fl_Single_Window win);
-  FL_EXPORT_C(void,             Fl_Single_Window_hide)(fl_Single_Window win);
+  FL_EXPORT_C_HEADER(fl_Single_Window_Virtual_Funcs*,Fl_Single_Window_default_virtual_funcs,());
+  FL_EXPORT_C_HEADER(int ,		Fl_Single_Window_handle,(fl_Single_Window win, int event));
+  FL_EXPORT_C_HEADER(int ,		Fl_Single_Window_handle_super,(fl_Single_Window win, int event));
+  FL_EXPORT_C_HEADER(void,		Fl_Single_Window_draw_super,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(fl_Group,		Fl_Single_Window_as_group,(fl_Single_Window window));
+  FL_EXPORT_C_HEADER(fl_Window,	Fl_Single_Window_as_window,(fl_Single_Window window));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,	Fl_Single_Window_as_gl_window,(fl_Single_Window window));
+  FL_EXPORT_C_HEADER(fl_Group,		Fl_Single_Window_as_group_super,(fl_Single_Window window));
+  FL_EXPORT_C_HEADER(fl_Window,	Fl_Single_Window_as_window_super,(fl_Single_Window window));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,	Fl_Single_Window_as_gl_window_super,(fl_Single_Window window));
+  FL_EXPORT_C_HEADER(void,		Fl_Single_Window_show_super,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,		Fl_Single_Window_show,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,		Fl_Single_Window_show_with_args,(fl_Single_Window win, int argc, char** argv));
+  FL_EXPORT_C_HEADER(void,		Fl_Single_Window_Destroy,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,		Fl_Single_Window_flush_super,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,		Fl_Single_Window_flush,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,		Fl_Single_Window_resize_super,(fl_Single_Window win, int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(void,		Fl_Single_Window_resize,(fl_Single_Window win, int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(void,		Fl_Single_Window_hide_super,(fl_Single_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Single_Window_hide,(fl_Single_Window win));
 
 #ifdef __cplusplus
 }
diff --git a/c-src/Fl_SliderC.h b/c-src/Fl_SliderC.h
--- a/c-src/Fl_SliderC.h
+++ b/c-src/Fl_SliderC.h
@@ -33,147 +33,147 @@
     ~Fl_DerivedSlider();
   };
 #endif
-  FL_EXPORT_C(int,Fl_Slider_handle)(fl_Widget self, int event);
-  FL_EXPORT_C(int,Fl_Slider_handle_super)(fl_Widget self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Slider_parent)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_set_parent)(fl_Slider slider, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Slider_type)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_set_type)(fl_Slider slider, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Slider_handle,(fl_Widget self, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Slider_handle_super,(fl_Widget self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Slider_parent,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_set_parent,(fl_Slider slider, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Slider_type,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_set_type,(fl_Slider slider, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Slider_x)(fl_Slider slider);
-  FL_EXPORT_C(int,          Fl_Slider_y)(fl_Slider slider);
-  FL_EXPORT_C(int,          Fl_Slider_w)(fl_Slider slider);
-  FL_EXPORT_C(int,          Fl_Slider_h)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_set_align)(fl_Slider slider, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Slider_align)(fl_Slider slider);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Slider_box)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_set_box)(fl_Slider slider, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Slider_color)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_set_color)(fl_Slider slider, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Slider_set_color_with_bg_sel)(fl_Slider slider,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Slider_selection_color)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_set_selection_color)(fl_Slider slider, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Slider_label)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_copy_label)(fl_Slider slider, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Slider_set_label)(fl_Slider slider, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Slider_labeltype)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_set_labeltype)(fl_Slider slider, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Slider_labelcolor)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_set_labelcolor)(fl_Slider slider, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Slider_labelfont)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_set_labelfont)(fl_Slider slider, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Slider_labelsize)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_set_labelsize)(fl_Slider slider, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Slider_image)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_set_image)(fl_Slider slider, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Slider_deimage)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_set_deimage)(fl_Slider slider, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Slider_tooltip)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_copy_tooltip)(fl_Slider slider, const char* text);
-  FL_EXPORT_C(void,         Fl_Slider_set_tooltip)(fl_Slider slider, const char* text);
-  FL_EXPORT_C(void,         Fl_Slider_set_callback_with_user_data)(fl_Slider slider, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Slider_set_callback)(fl_Slider slider, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Slider_other_data)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_set_other_data)(fl_Slider slider, void* v);
-  FL_EXPORT_C(void*,        Fl_Slider_user_data)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_set_user_data)(fl_Slider slider, void* v);
-  FL_EXPORT_C(long,         Fl_Slider_argument)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_set_argument)(fl_Slider slider, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Slider_when)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_set_when)(fl_Slider slider, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Slider_visible)(fl_Slider slider);
-  FL_EXPORT_C(int,          Fl_Slider_visible_r)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_show_super)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_show)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_hide_super)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_hide)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_set_visible)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_clear_visible)(fl_Slider slider);
-  FL_EXPORT_C(unsigned int, Fl_Slider_active)(fl_Slider slider);
-  FL_EXPORT_C(int,          Fl_Slider_active_r)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_activate)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_deactivate)(fl_Slider slider);
-  FL_EXPORT_C(unsigned int, Fl_Slider_output)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_set_output)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_clear_output)(fl_Slider slider);
-  FL_EXPORT_C(unsigned int, Fl_Slider_takesevents)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_set_changed)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_clear_changed)(fl_Slider slider);
-  FL_EXPORT_C(int,          Fl_Slider_take_focus)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_set_visible_focus)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_clear_visible_focus)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_modify_visible_focus)(fl_Slider slider, int v);
-  FL_EXPORT_C(unsigned int, Fl_Slider_visible_focus)(fl_Slider slider);
-  FL_EXPORT_C(int,          Fl_Slider_contains)(fl_Slider slider, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Slider_inside)(fl_Slider slider, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Slider_redraw)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_redraw_label)(fl_Slider slider);
-  FL_EXPORT_C(uchar,        Fl_Slider_damage)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_clear_damage_with_bitmask)(fl_Slider slider, uchar c);
-  FL_EXPORT_C(void,         Fl_Slider_clear_damage)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_damage_with_text)(fl_Slider slider, uchar c);
-  FL_EXPORT_C(void,         Fl_Slider_damage_inside_widget)(fl_Slider slider, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Slider_draw_label_with_xywh_alignment)(fl_Slider slider, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Slider_measure_label)(fl_Slider slider, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Slider_window)(fl_Slider slider);
-  FL_EXPORT_C(fl_Window,    Fl_Slider_top_window)(fl_Slider slider);
-  FL_EXPORT_C(fl_Window ,   Fl_Slider_top_window_offset)(fl_Slider slider, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Slider_as_gl_window_super)(fl_Slider slider);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Slider_as_gl_window)(fl_Slider slider);
-  FL_EXPORT_C(void,         Fl_Slider_resize_super)(fl_Table table,int X, int Y, int W, int H);
-  FL_EXPORT_C(void,         Fl_Slider_resize)(fl_Table table,int X, int Y, int W, int H);
+  FL_EXPORT_C_HEADER(int,Fl_Slider_x,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(int,Fl_Slider_y,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(int,Fl_Slider_w,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(int,Fl_Slider_h,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_set_align,(fl_Slider slider, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Slider_align,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Slider_box,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_set_box,(fl_Slider slider, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Slider_color,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_set_color,(fl_Slider slider, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_set_color_with_bg_sel,(fl_Slider slider,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Slider_selection_color,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_set_selection_color,(fl_Slider slider, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Slider_label,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_copy_label,(fl_Slider slider, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_set_label,(fl_Slider slider, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Slider_labeltype,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_set_labeltype,(fl_Slider slider, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Slider_labelcolor,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_set_labelcolor,(fl_Slider slider, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Slider_labelfont,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_set_labelfont,(fl_Slider slider, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Slider_labelsize,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_set_labelsize,(fl_Slider slider, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Slider_image,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_set_image,(fl_Slider slider, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Slider_deimage,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_set_deimage,(fl_Slider slider, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Slider_tooltip,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_copy_tooltip,(fl_Slider slider, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_set_tooltip,(fl_Slider slider, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_set_callback_with_user_data,(fl_Slider slider, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_set_callback,(fl_Slider slider, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Slider_other_data,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_set_other_data,(fl_Slider slider, void* v));
+  FL_EXPORT_C_HEADER(void*,Fl_Slider_user_data,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_set_user_data,(fl_Slider slider, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Slider_argument,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_set_argument,(fl_Slider slider, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Slider_when,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_set_when,(fl_Slider slider, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Slider_visible,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(int,Fl_Slider_visible_r,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_show_super,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_show,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_hide_super,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_hide,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_set_visible,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_clear_visible,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Slider_active,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(int,Fl_Slider_active_r,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_activate,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_deactivate,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Slider_output,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_set_output,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_clear_output,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Slider_takesevents,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_set_changed,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_clear_changed,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(int,Fl_Slider_take_focus,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_set_visible_focus,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_clear_visible_focus,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_modify_visible_focus,(fl_Slider slider, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Slider_visible_focus,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(int,Fl_Slider_contains,(fl_Slider slider, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Slider_inside,(fl_Slider slider, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_redraw,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_redraw_label,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(uchar,Fl_Slider_damage,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_clear_damage_with_bitmask,(fl_Slider slider, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_clear_damage,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_damage_with_text,(fl_Slider slider, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_damage_inside_widget,(fl_Slider slider, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_draw_label_with_xywh_alignment,(fl_Slider slider, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_measure_label,(fl_Slider slider, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Slider_window,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Slider_top_window,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Slider_top_window_offset,(fl_Slider slider, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Slider_as_gl_window_super,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Slider_as_gl_window,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_resize_super,(fl_Table table,int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_resize,(fl_Table table,int X, int Y, int W, int H));
 
   /* Inherited from Fl_Valuator */
-  FL_EXPORT_C(void, Fl_Slider_bounds)(fl_Slider slider, double a, double b);
-  FL_EXPORT_C(double, Fl_Slider_minimum)(fl_Slider slider);
-  FL_EXPORT_C(void, Fl_Slider_set_minimum)(fl_Slider slider, double a);
-  FL_EXPORT_C(double, Fl_Slider_maximum)(fl_Slider slider);
-  FL_EXPORT_C(void, Fl_Slider_set_maximum)(fl_Slider slider, double a);
-  FL_EXPORT_C(void, Fl_Slider_range)(fl_Slider slider, double a, double b);
-  FL_EXPORT_C(void, Fl_Slider_set_step)(fl_Slider slider, int a);
-  FL_EXPORT_C(void, Fl_Slider_set_step_with_a_b)(fl_Slider slider, double a, int b);
-  FL_EXPORT_C(void, Fl_Slider_step_with_s)(fl_Slider slider, double s);
-  FL_EXPORT_C(double, Fl_Slider_step)(fl_Slider slider);
-  FL_EXPORT_C(void, Fl_Slider_precision)(fl_Slider slider, int precision);
-  FL_EXPORT_C(double, Fl_Slider_value)(fl_Slider slider);
-  FL_EXPORT_C(int, Fl_Slider_set_value)(fl_Slider slider, double v);
-  FL_EXPORT_C(int, Fl_Slider_format)(fl_Slider slider, char* format);
-  FL_EXPORT_C(double, Fl_Slider_round)(fl_Slider slider, double v);
-  FL_EXPORT_C(double, Fl_Slider_clamp)(fl_Slider slider, double v);
-  FL_EXPORT_C(double, Fl_Slider_increment)(fl_Slider slider, double v, int n);
+  FL_EXPORT_C_HEADER(void,Fl_Slider_bounds,(fl_Slider slider, double a, double b));
+  FL_EXPORT_C_HEADER(double,Fl_Slider_minimum,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_set_minimum,(fl_Slider slider, double a));
+  FL_EXPORT_C_HEADER(double,Fl_Slider_maximum,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_set_maximum,(fl_Slider slider, double a));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_range,(fl_Slider slider, double a, double b));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_set_step,(fl_Slider slider, int a));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_set_step_with_a_b,(fl_Slider slider, double a, int b));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_step_with_s,(fl_Slider slider, double s));
+  FL_EXPORT_C_HEADER(double,Fl_Slider_step,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_precision,(fl_Slider slider, int precision));
+  FL_EXPORT_C_HEADER(double,Fl_Slider_value,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(int,Fl_Slider_set_value,(fl_Slider slider, double v));
+  FL_EXPORT_C_HEADER(int,Fl_Slider_format,(fl_Slider slider, char* format));
+  FL_EXPORT_C_HEADER(double,Fl_Slider_round,(fl_Slider slider, double v));
+  FL_EXPORT_C_HEADER(double,Fl_Slider_clamp,(fl_Slider slider, double v));
+  FL_EXPORT_C_HEADER(double,Fl_Slider_increment,(fl_Slider slider, double v, int n));
 
   /* Fl_Slider specific */
-  FL_EXPORT_C(fl_Slider,    Fl_Slider_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Slider   , Fl_Slider_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(fl_Slider,    Fl_Slider_New_WithT)(uchar t, int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Fill_Slider,    Fl_Fill_Slider_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Fill_Slider   , Fl_Fill_Slider_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(fl_Hor_Slider,    Fl_Hor_Slider_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Hor_Slider   , Fl_Hor_Slider_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(fl_Hor_Fill_Slider,    Fl_Hor_Fill_Slider_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Hor_Fill_Slider   , Fl_Hor_Fill_Slider_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(fl_Hor_Nice_Slider,    Fl_Hor_Nice_Slider_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Hor_Nice_Slider   , Fl_Hor_Nice_Slider_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(fl_Nice_Slider,    Fl_Nice_Slider_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Nice_Slider   , Fl_Nice_Slider_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(void,      Fl_Slider_Destroy)(fl_Slider slider);
-  FL_EXPORT_C(int, Fl_Slider_scrollvalue)(fl_Slider slider, int pos,int size,int first,int total);
-  FL_EXPORT_C(float, Fl_Slider_set_slider_size)(fl_Slider slider);
-  FL_EXPORT_C(void, Fl_Slider_slider_size)(fl_Slider slider, double v);
-  FL_EXPORT_C(Fl_Boxtype, Fl_Slider_slider)(fl_Slider slider);
-  FL_EXPORT_C(void, Fl_Slider_set_slider)(fl_Slider slider, Fl_Boxtype c);
-  FL_EXPORT_C(fl_Slider,    Fl_OverriddenSlider_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Slider,    Fl_OverriddenSlider_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Slider_draw)(fl_Slider o);
-  FL_EXPORT_C(void, Fl_Slider_draw_super)(fl_Slider o);
-  FL_EXPORT_C(int, Fl_Slider_handle)(fl_Slider o, int event);
-  FL_EXPORT_C(int, Fl_Slider_handle_super)(fl_Slider o, int event);
-  FL_EXPORT_C(void, Fl_Slider_resize)(fl_Slider o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Slider_resize_super)(fl_Slider o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Slider_show)(fl_Slider o);
-  FL_EXPORT_C(void, Fl_Slider_show_super)(fl_Slider o);
-  FL_EXPORT_C(void, Fl_Slider_hide)(fl_Slider o);
-  FL_EXPORT_C(void, Fl_Slider_hide_super)(fl_Slider o);
+  FL_EXPORT_C_HEADER(fl_Slider,Fl_Slider_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Slider   ,Fl_Slider_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(fl_Slider,Fl_Slider_New_WithT,(uchar t, int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Fill_Slider,Fl_Fill_Slider_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Fill_Slider   ,Fl_Fill_Slider_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(fl_Hor_Slider,Fl_Hor_Slider_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Hor_Slider   ,Fl_Hor_Slider_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(fl_Hor_Fill_Slider,Fl_Hor_Fill_Slider_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Hor_Fill_Slider   ,Fl_Hor_Fill_Slider_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(fl_Hor_Nice_Slider,Fl_Hor_Nice_Slider_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Hor_Nice_Slider   ,Fl_Hor_Nice_Slider_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(fl_Nice_Slider,Fl_Nice_Slider_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Nice_Slider   ,Fl_Nice_Slider_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_Destroy,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(int,Fl_Slider_scrollvalue,(fl_Slider slider, int pos,int size,int first,int total));
+  FL_EXPORT_C_HEADER(float,Fl_Slider_set_slider_size,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_slider_size,(fl_Slider slider, double v));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Slider_slider,(fl_Slider slider));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_set_slider,(fl_Slider slider, Fl_Boxtype c));
+  FL_EXPORT_C_HEADER(fl_Slider,Fl_OverriddenSlider_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Slider,Fl_OverriddenSlider_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_draw,(fl_Slider o));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_draw_super,(fl_Slider o));
+  FL_EXPORT_C_HEADER(int,Fl_Slider_handle,(fl_Slider o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Slider_handle_super,(fl_Slider o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_resize,(fl_Slider o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_resize_super,(fl_Slider o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_show,(fl_Slider o));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_show_super,(fl_Slider o));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_hide,(fl_Slider o));
+  FL_EXPORT_C_HEADER(void,Fl_Slider_hide_super,(fl_Slider o));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_SpinnerC.h b/c-src/Fl_SpinnerC.h
--- a/c-src/Fl_SpinnerC.h
+++ b/c-src/Fl_SpinnerC.h
@@ -35,45 +35,45 @@
     FL_INT_INPUTC = 2
   } Spinner_Type;
 #endif
-  FL_EXPORT_C(int,       Fl_Spinner_handle)(fl_Spinner counter, int event);
-  FL_EXPORT_C(Fl_Color,     Fl_Spinner_color)(fl_Spinner counter);
-  FL_EXPORT_C(void,         Fl_Spinner_set_color)(fl_Spinner counter, Fl_Color bg);
-  FL_EXPORT_C(Fl_Color,     Fl_Spinner_selection_color)(fl_Spinner counter);
-  FL_EXPORT_C(void,         Fl_Spinner_set_selection_color)(fl_Spinner counter, Fl_Color a);
-  FL_EXPORT_C(uchar,        Fl_Spinner_type)(fl_Spinner counter);
-  FL_EXPORT_C(void,         Fl_Spinner_set_type)(fl_Spinner counter, uchar t);
-  FL_EXPORT_C(void,         Fl_Spinner_resize)(fl_Spinner spinner,int X, int Y, int W, int H);
-  FL_EXPORT_C(double, Fl_Spinner_minimum)(fl_Spinner spinner);
-  FL_EXPORT_C(void, Fl_Spinner_set_minimum)(fl_Spinner spinner, double a);
-  FL_EXPORT_C(double, Fl_Spinner_maximum)(fl_Spinner spinner);
-  FL_EXPORT_C(void, Fl_Spinner_set_maximum)(fl_Spinner spinner, double a);
-  FL_EXPORT_C(void, Fl_Spinner_range)(fl_Spinner spinner, double a, double b);
-  FL_EXPORT_C(void, Fl_Spinner_set_step)(fl_Spinner spinner, double a);
-  FL_EXPORT_C(double, Fl_Spinner_step)(fl_Spinner spinner);
-  FL_EXPORT_C(double, Fl_Spinner_value)(fl_Spinner spinner);
-  FL_EXPORT_C(void, Fl_Spinner_set_value)(fl_Spinner spinner, double v);
-  FL_EXPORT_C(void, Fl_Spinner_set_format)(fl_Spinner spinner, const char* format);
-  FL_EXPORT_C(const char*, Fl_Spinner_format)(fl_Spinner spinner);
-  FL_EXPORT_C(void,         Fl_Spinner_set_textfont)(fl_Spinner spinner, Fl_Font text);
-  FL_EXPORT_C(Fl_Font,     Fl_Spinner_textfont)(fl_Spinner spinner);
-  FL_EXPORT_C(void,         Fl_Spinner_set_textsize)(fl_Spinner spinner, Fl_Fontsize text);
-  FL_EXPORT_C(Fl_Fontsize,     Fl_Spinner_textsize)(fl_Spinner spinner);
-  FL_EXPORT_C(void,         Fl_Spinner_set_textcolor)(fl_Spinner spinner, Fl_Color text);
-  FL_EXPORT_C(Fl_Color,     Fl_Spinner_textcolor)(fl_Spinner spinner);
-  FL_EXPORT_C(fl_Spinner,    Fl_Spinner_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Spinner   , Fl_Spinner_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(fl_Spinner,    Fl_OverriddenSpinner_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Spinner,    Fl_OverriddenSpinner_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Spinner_draw)(fl_Spinner o);
-  FL_EXPORT_C(void, Fl_Spinner_draw_super)(fl_Spinner o);
-  FL_EXPORT_C(int, Fl_Spinner_handle)(fl_Spinner o, int event);
-  FL_EXPORT_C(int, Fl_Spinner_handle_super)(fl_Spinner o, int event);
-  FL_EXPORT_C(void, Fl_Spinner_resize)(fl_Spinner o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Spinner_resize_super)(fl_Spinner o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Spinner_show)(fl_Spinner o);
-  FL_EXPORT_C(void, Fl_Spinner_show_super)(fl_Spinner o);
-  FL_EXPORT_C(void, Fl_Spinner_hide)(fl_Spinner o);
-  FL_EXPORT_C(void, Fl_Spinner_hide_super)(fl_Spinner o);
+  FL_EXPORT_C_HEADER(int,Fl_Spinner_handle,(fl_Spinner counter, int event));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Spinner_color,(fl_Spinner counter));
+  FL_EXPORT_C_HEADER(void,Fl_Spinner_set_color,(fl_Spinner counter, Fl_Color bg));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Spinner_selection_color,(fl_Spinner counter));
+  FL_EXPORT_C_HEADER(void,Fl_Spinner_set_selection_color,(fl_Spinner counter, Fl_Color a));
+  FL_EXPORT_C_HEADER(uchar,Fl_Spinner_type,(fl_Spinner counter));
+  FL_EXPORT_C_HEADER(void,Fl_Spinner_set_type,(fl_Spinner counter, uchar t));
+  FL_EXPORT_C_HEADER(void,Fl_Spinner_resize,(fl_Spinner spinner,int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(double,Fl_Spinner_minimum,(fl_Spinner spinner));
+  FL_EXPORT_C_HEADER(void,Fl_Spinner_set_minimum,(fl_Spinner spinner, double a));
+  FL_EXPORT_C_HEADER(double,Fl_Spinner_maximum,(fl_Spinner spinner));
+  FL_EXPORT_C_HEADER(void,Fl_Spinner_set_maximum,(fl_Spinner spinner, double a));
+  FL_EXPORT_C_HEADER(void,Fl_Spinner_range,(fl_Spinner spinner, double a, double b));
+  FL_EXPORT_C_HEADER(void,Fl_Spinner_set_step,(fl_Spinner spinner, double a));
+  FL_EXPORT_C_HEADER(double,Fl_Spinner_step,(fl_Spinner spinner));
+  FL_EXPORT_C_HEADER(double,Fl_Spinner_value,(fl_Spinner spinner));
+  FL_EXPORT_C_HEADER(void,Fl_Spinner_set_value,(fl_Spinner spinner, double v));
+  FL_EXPORT_C_HEADER(void,Fl_Spinner_set_format,(fl_Spinner spinner, const char* format));
+  FL_EXPORT_C_HEADER(const char*,Fl_Spinner_format,(fl_Spinner spinner));
+  FL_EXPORT_C_HEADER(void,Fl_Spinner_set_textfont,(fl_Spinner spinner, Fl_Font text));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Spinner_textfont,(fl_Spinner spinner));
+  FL_EXPORT_C_HEADER(void,Fl_Spinner_set_textsize,(fl_Spinner spinner, Fl_Fontsize text));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Spinner_textsize,(fl_Spinner spinner));
+  FL_EXPORT_C_HEADER(void,Fl_Spinner_set_textcolor,(fl_Spinner spinner, Fl_Color text));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Spinner_textcolor,(fl_Spinner spinner));
+  FL_EXPORT_C_HEADER(fl_Spinner,Fl_Spinner_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Spinner   ,Fl_Spinner_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(fl_Spinner,Fl_OverriddenSpinner_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Spinner,Fl_OverriddenSpinner_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Spinner_draw,(fl_Spinner o));
+  FL_EXPORT_C_HEADER(void,Fl_Spinner_draw_super,(fl_Spinner o));
+  FL_EXPORT_C_HEADER(int,Fl_Spinner_handle,(fl_Spinner o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Spinner_handle_super,(fl_Spinner o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Spinner_resize,(fl_Spinner o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Spinner_resize_super,(fl_Spinner o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Spinner_show,(fl_Spinner o));
+  FL_EXPORT_C_HEADER(void,Fl_Spinner_show_super,(fl_Spinner o));
+  FL_EXPORT_C_HEADER(void,Fl_Spinner_hide,(fl_Spinner o));
+  FL_EXPORT_C_HEADER(void,Fl_Spinner_hide_super,(fl_Spinner o));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Sys_Menu_BarC.h b/c-src/Fl_Sys_Menu_BarC.h
--- a/c-src/Fl_Sys_Menu_BarC.h
+++ b/c-src/Fl_Sys_Menu_BarC.h
@@ -29,165 +29,165 @@
   };
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,          Fl_Sys_Menu_Bar_handle)(fl_Group self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Sys_Menu_Bar_parent)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_set_parent)(fl_Sys_Menu_Bar sys_menu_bar, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Sys_Menu_Bar_type)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_set_type)(fl_Sys_Menu_Bar sys_menu_bar, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_handle,(fl_Group self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Sys_Menu_Bar_parent,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_set_parent,(fl_Sys_Menu_Bar sys_menu_bar, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Sys_Menu_Bar_type,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_set_type,(fl_Sys_Menu_Bar sys_menu_bar, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Sys_Menu_Bar_x)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(int,          Fl_Sys_Menu_Bar_y)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(int,          Fl_Sys_Menu_Bar_w)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(int,          Fl_Sys_Menu_Bar_h)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_set_align)(fl_Sys_Menu_Bar sys_menu_bar, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Sys_Menu_Bar_align)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Sys_Menu_Bar_box)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_set_box)(fl_Sys_Menu_Bar sys_menu_bar, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Sys_Menu_Bar_color)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_set_color)(fl_Sys_Menu_Bar sys_menu_bar, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_set_color_with_bg_sel)(fl_Sys_Menu_Bar sys_menu_bar,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Sys_Menu_Bar_selection_color)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_set_selection_color)(fl_Sys_Menu_Bar sys_menu_bar, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Sys_Menu_Bar_label)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_copy_label)(fl_Sys_Menu_Bar sys_menu_bar, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_set_label)(fl_Sys_Menu_Bar sys_menu_bar, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Sys_Menu_Bar_labeltype)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_set_labeltype)(fl_Sys_Menu_Bar sys_menu_bar, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Sys_Menu_Bar_labelcolor)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_set_labelcolor)(fl_Sys_Menu_Bar sys_menu_bar, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Sys_Menu_Bar_item_labelfont)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_set_item_labelfont)(fl_Sys_Menu_Bar sys_menu_bar, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Sys_Menu_Bar_item_labelsize)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_set_item_labelsize)(fl_Sys_Menu_Bar sys_menu_bar, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Sys_Menu_Bar_image)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_set_image)(fl_Sys_Menu_Bar sys_menu_bar, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Sys_Menu_Bar_deimage)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_set_deimage)(fl_Sys_Menu_Bar sys_menu_bar, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Sys_Menu_Bar_tooltip)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_copy_tooltip)(fl_Sys_Menu_Bar sys_menu_bar, const char* text);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_set_tooltip)(fl_Sys_Menu_Bar sys_menu_bar, const char* text);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_set_callback_with_user_data)(fl_Sys_Menu_Bar sys_menu_bar, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_set_callback)(fl_Sys_Menu_Bar sys_menu_bar, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Sys_Menu_Bar_other_data)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_set_other_data)(fl_Sys_Menu_Bar sys_menu_bar, void* v);
-  FL_EXPORT_C(void*,        Fl_Sys_Menu_Bar_user_data)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_set_user_data)(fl_Sys_Menu_Bar sys_menu_bar, void* v);
-  FL_EXPORT_C(long,         Fl_Sys_Menu_Bar_argument)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_set_argument)(fl_Sys_Menu_Bar sys_menu_bar, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Sys_Menu_Bar_when)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_set_when)(fl_Sys_Menu_Bar sys_menu_bar, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Sys_Menu_Bar_visible)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(int,          Fl_Sys_Menu_Bar_visible_r)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_show)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_hide)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_set_visible)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_clear_visible)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(unsigned int, Fl_Sys_Menu_Bar_active)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(int,          Fl_Sys_Menu_Bar_active_r)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_activate)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_deactivate)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(unsigned int, Fl_Sys_Menu_Bar_output)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_set_output)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_clear_output)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(unsigned int, Fl_Sys_Menu_Bar_takesevents)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_set_changed)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_clear_changed)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(int,          Fl_Sys_Menu_Bar_take_focus)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_set_visible_focus)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_clear_visible_focus)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_modify_visible_focus)(fl_Sys_Menu_Bar sys_menu_bar, int v);
-  FL_EXPORT_C(unsigned int, Fl_Sys_Menu_Bar_visible_focus)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(int,          Fl_Sys_Menu_Bar_contains)(fl_Sys_Menu_Bar sys_menu_bar, fl_Group w);
-  FL_EXPORT_C(int,          Fl_Sys_Menu_Bar_inside)(fl_Sys_Menu_Bar sys_menu_bar, fl_Group w);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_redraw)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_redraw_label)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(uchar,        Fl_Sys_Menu_Bar_damage)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_clear_damage_with_bitmask)(fl_Sys_Menu_Bar sys_menu_bar, uchar c);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_clear_damage)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_damage_with_text)(fl_Sys_Menu_Bar sys_menu_bar, uchar c);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_damage_inside_group)(fl_Sys_Menu_Bar sys_menu_bar, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_draw_label_with_xywh_alignment)(fl_Sys_Menu_Bar sys_menu_bar, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_measure_label)(fl_Sys_Menu_Bar sys_menu_bar, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Sys_Menu_Bar_window)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(fl_Window,    Fl_Sys_Menu_Bar_top_window)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(fl_Window ,   Fl_Sys_Menu_Bar_top_window_offset)(fl_Sys_Menu_Bar sys_menu_bar, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Sys_Menu_Bar_as_group)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Sys_Menu_Bar_as_gl_window)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void,         Fl_Sys_Menu_Bar_resize)(fl_Sys_Menu_Bar sys_menu_bar,int X, int Y, int W, int H);
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_x,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_y,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_w,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_h,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_set_align,(fl_Sys_Menu_Bar sys_menu_bar, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Sys_Menu_Bar_align,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Sys_Menu_Bar_box,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_set_box,(fl_Sys_Menu_Bar sys_menu_bar, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Sys_Menu_Bar_color,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_set_color,(fl_Sys_Menu_Bar sys_menu_bar, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_set_color_with_bg_sel,(fl_Sys_Menu_Bar sys_menu_bar,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Sys_Menu_Bar_selection_color,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_set_selection_color,(fl_Sys_Menu_Bar sys_menu_bar, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Sys_Menu_Bar_label,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_copy_label,(fl_Sys_Menu_Bar sys_menu_bar, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_set_label,(fl_Sys_Menu_Bar sys_menu_bar, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Sys_Menu_Bar_labeltype,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_set_labeltype,(fl_Sys_Menu_Bar sys_menu_bar, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Sys_Menu_Bar_labelcolor,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_set_labelcolor,(fl_Sys_Menu_Bar sys_menu_bar, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Sys_Menu_Bar_item_labelfont,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_set_item_labelfont,(fl_Sys_Menu_Bar sys_menu_bar, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Sys_Menu_Bar_item_labelsize,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_set_item_labelsize,(fl_Sys_Menu_Bar sys_menu_bar, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Sys_Menu_Bar_image,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_set_image,(fl_Sys_Menu_Bar sys_menu_bar, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Sys_Menu_Bar_deimage,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_set_deimage,(fl_Sys_Menu_Bar sys_menu_bar, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Sys_Menu_Bar_tooltip,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_copy_tooltip,(fl_Sys_Menu_Bar sys_menu_bar, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_set_tooltip,(fl_Sys_Menu_Bar sys_menu_bar, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_set_callback_with_user_data,(fl_Sys_Menu_Bar sys_menu_bar, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_set_callback,(fl_Sys_Menu_Bar sys_menu_bar, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Sys_Menu_Bar_other_data,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_set_other_data,(fl_Sys_Menu_Bar sys_menu_bar, void* v));
+  FL_EXPORT_C_HEADER(void*,Fl_Sys_Menu_Bar_user_data,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_set_user_data,(fl_Sys_Menu_Bar sys_menu_bar, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Sys_Menu_Bar_argument,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_set_argument,(fl_Sys_Menu_Bar sys_menu_bar, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Sys_Menu_Bar_when,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_set_when,(fl_Sys_Menu_Bar sys_menu_bar, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Sys_Menu_Bar_visible,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_visible_r,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_show,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_hide,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_set_visible,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_clear_visible,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Sys_Menu_Bar_active,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_active_r,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_activate,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_deactivate,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Sys_Menu_Bar_output,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_set_output,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_clear_output,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Sys_Menu_Bar_takesevents,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_set_changed,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_clear_changed,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_take_focus,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_set_visible_focus,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_clear_visible_focus,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_modify_visible_focus,(fl_Sys_Menu_Bar sys_menu_bar, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Sys_Menu_Bar_visible_focus,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_contains,(fl_Sys_Menu_Bar sys_menu_bar, fl_Group w));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_inside,(fl_Sys_Menu_Bar sys_menu_bar, fl_Group w));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_redraw,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_redraw_label,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(uchar,Fl_Sys_Menu_Bar_damage,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_clear_damage_with_bitmask,(fl_Sys_Menu_Bar sys_menu_bar, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_clear_damage,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_damage_with_text,(fl_Sys_Menu_Bar sys_menu_bar, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_damage_inside_group,(fl_Sys_Menu_Bar sys_menu_bar, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_draw_label_with_xywh_alignment,(fl_Sys_Menu_Bar sys_menu_bar, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_measure_label,(fl_Sys_Menu_Bar sys_menu_bar, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Sys_Menu_Bar_window,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Sys_Menu_Bar_top_window,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Sys_Menu_Bar_top_window_offset,(fl_Sys_Menu_Bar sys_menu_bar, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Sys_Menu_Bar_as_group,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Sys_Menu_Bar_as_gl_window,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_resize,(fl_Sys_Menu_Bar sys_menu_bar,int X, int Y, int W, int H));
 
   /* Fl_Sys_Menu_Bar specific */
-  FL_EXPORT_C(fl_Sys_Menu_Bar,    Fl_Sys_Menu_Bar_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Sys_Menu_Bar, Fl_Sys_Menu_Bar_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_Destroy)(fl_Sys_Menu_Bar sys_menu_bar);
+  FL_EXPORT_C_HEADER(fl_Sys_Menu_Bar,Fl_Sys_Menu_Bar_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Sys_Menu_Bar,Fl_Sys_Menu_Bar_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_Destroy,(fl_Sys_Menu_Bar sys_menu_bar));
 
-  FL_EXPORT_C(int, Fl_Sys_Menu_Bar_item_pathname_with_finditem)(fl_Sys_Menu_Bar sys_menu_bar, char* name, int namelen,  fl_Menu_Item finditem);
-  FL_EXPORT_C(int, Fl_Sys_Menu_Bar_item_pathname)(fl_Sys_Menu_Bar sys_menu_bar, char* name, int namelen);
-  FL_EXPORT_C( fl_Menu_Item, Fl_Sys_Menu_Bar_picked)(fl_Sys_Menu_Bar sys_menu_bar,  const fl_Menu_Item item);
-  FL_EXPORT_C( fl_Menu_Item, Fl_Sys_Menu_Bar_find_item_with_name)(fl_Sys_Menu_Bar sys_menu_bar,  char* name);
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_item_pathname_with_finditem,(fl_Sys_Menu_Bar sys_menu_bar, char* name, int namelen,  fl_Menu_Item finditem));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_item_pathname,(fl_Sys_Menu_Bar sys_menu_bar, char* name, int namelen));
+  FL_EXPORT_C_HEADER( fl_Menu_Item,Fl_Sys_Menu_Bar_picked,(fl_Sys_Menu_Bar sys_menu_bar,  const fl_Menu_Item item));
+  FL_EXPORT_C_HEADER( fl_Menu_Item,Fl_Sys_Menu_Bar_find_item_with_name,(fl_Sys_Menu_Bar sys_menu_bar,  char* name));
   //  FL_EXPORT_C( fl_Menu_Item, Fl_Sys_Menu_Bar_find_item_with_cb)(fl_Sys_Menu_Bar sys_menu_bar, fl_Callback cb); Don't know how to do this
-  FL_EXPORT_C(int, Fl_Sys_Menu_Bar_find_index_with_name)(fl_Sys_Menu_Bar sys_menu_bar,  char* name);
-  FL_EXPORT_C(int, Fl_Sys_Menu_Bar_find_index_with_item)(fl_Sys_Menu_Bar sys_menu_bar,  fl_Menu_Item item);
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_find_index_with_name,(fl_Sys_Menu_Bar sys_menu_bar,  char* name));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_find_index_with_item,(fl_Sys_Menu_Bar sys_menu_bar,  fl_Menu_Item item));
   //  FL_EXPORT_C(int, Fl_Sys_Menu_Bar_find_index_with_cb)(fl_Sys_Menu_Bar sys_menu_bar, fl_Callback cb); Don't know how to do this
-  FL_EXPORT_C( fl_Menu_Item, Fl_Sys_Menu_Bar_test_shortcut)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_global)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C( fl_Menu_Item, Fl_Sys_Menu_Bar_menu)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_menu_with_m)(fl_Sys_Menu_Bar sys_menu_bar,  fl_Menu_Item* items, int size);
-  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_copy)(fl_Sys_Menu_Bar sys_menu_bar,  fl_Menu_Item m);
-  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_copy_with_user_data)(fl_Sys_Menu_Bar sys_menu_bar,  fl_Menu_Item m, void* user_data);
-  FL_EXPORT_C(int, Fl_Sys_Menu_Bar_insert)(fl_Sys_Menu_Bar sys_menu_bar, int index,  char* name, int shortcut, fl_Callback cb);
-  FL_EXPORT_C(int, Fl_Sys_Menu_Bar_insert_with_user_data)(fl_Sys_Menu_Bar sys_menu_bar, int index,  char*, int shortcut, fl_Callback* cb, void* user_data);
-  FL_EXPORT_C(int, Fl_Sys_Menu_Bar_insert_with_flags)(fl_Sys_Menu_Bar sys_menu_bar, int index,  char* name, int shortcut, fl_Callback* cb, int flags);
-  FL_EXPORT_C(int, Fl_Sys_Menu_Bar_insert_with_user_data_flags)(fl_Sys_Menu_Bar sys_menu_bar, int index,  char* name, int shortcut, fl_Callback* cb, void* user_data, int flags);
-  FL_EXPORT_C(int, Fl_Sys_Menu_Bar_insert_with_shortcutname)(fl_Sys_Menu_Bar sys_menu_bar, int index,  char* name, char* shortcut);
-  FL_EXPORT_C(int, Fl_Sys_Menu_Bar_insert_with_shortcutname_user_data)(fl_Sys_Menu_Bar sys_menu_bar, int index,  char* name,   char* shortcut, fl_Callback* cb, void* user_data);
-  FL_EXPORT_C(int, Fl_Sys_Menu_Bar_insert_with_shortcutname_flags)(fl_Sys_Menu_Bar sys_menu_bar, int index,  char* name,   char* shortcut, fl_Callback* cb, int flags);
-  FL_EXPORT_C(int, Fl_Sys_Menu_Bar_insert_with_shortcutname_user_data_flags)(fl_Sys_Menu_Bar sys_menu_bar, int index,  char* name,   char* shortcut, fl_Callback* cb, void* user_data, int flags);
-  FL_EXPORT_C(int, Fl_Sys_Menu_Bar_add)(fl_Sys_Menu_Bar sys_menu_bar, char* name, int shortcut, fl_Callback);
-  FL_EXPORT_C(int, Fl_Sys_Menu_Bar_add_with_user_data)(fl_Sys_Menu_Bar sys_menu_bar, char* name, int shortcut, fl_Callback* cb, void* user_data);
-  FL_EXPORT_C(int, Fl_Sys_Menu_Bar_add_with_flags)(fl_Sys_Menu_Bar sys_menu_bar, char* name, int shortcut, fl_Callback* cb, int flags);
-  FL_EXPORT_C(int, Fl_Sys_Menu_Bar_add_with_user_data_flags)(fl_Sys_Menu_Bar sys_menu_bar, char* name, int shortcut, fl_Callback* cb, void* user_data, int flags);
-  FL_EXPORT_C(int, Fl_Sys_Menu_Bar_add_with_shortcutname)(fl_Sys_Menu_Bar sys_menu_bar, char* name,   char* shortcut, fl_Callback* cb);
-  FL_EXPORT_C(int, Fl_Sys_Menu_Bar_add_with_shortcutname_user_data)(fl_Sys_Menu_Bar sys_menu_bar, char* name,   char* shortcut, fl_Callback* cb, void* user_data);
-  FL_EXPORT_C(int, Fl_Sys_Menu_Bar_add_with_shortcutname_flags)(fl_Sys_Menu_Bar sys_menu_bar, char* name,   char* shortcut, fl_Callback* cb, int flags);
-  FL_EXPORT_C(int, Fl_Sys_Menu_Bar_add_with_shortcutname_user_data_flags)(fl_Sys_Menu_Bar sys_menu_bar, char* name,  char* shortcut, fl_Callback* cb, void* user_data, int flags);
-  FL_EXPORT_C(int, Fl_Sys_Menu_Bar_add_with_name)(fl_Sys_Menu_Bar sys_menu_bar,  char* name);
-  FL_EXPORT_C(int , Fl_Sys_Menu_Bar_size)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_set_size)(fl_Sys_Menu_Bar sys_menu_bar, int W, int H);
-  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_clear)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(int, Fl_Sys_Menu_Bar_clear_submenu)(fl_Sys_Menu_Bar sys_menu_bar, int index);
-  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_replace)(fl_Sys_Menu_Bar sys_menu_bar, int, char* name);
-  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_remove)(fl_Sys_Menu_Bar sys_menu_bar, int);
-  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_shortcut)(fl_Sys_Menu_Bar sys_menu_bar, int i, int s);
-  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_set_mode)(fl_Sys_Menu_Bar sys_menu_bar, int i,int fl);
-  FL_EXPORT_C(int , Fl_Sys_Menu_Bar_mode)(fl_Sys_Menu_Bar sys_menu_bar, int i);
-  FL_EXPORT_C(fl_Menu_Item, Fl_Sys_Menu_Bar_mvalue)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(int, Fl_Sys_Menu_Bar_value)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(int, Fl_Sys_Menu_Bar_value_with_item)(fl_Sys_Menu_Bar sys_menu_bar,  fl_Menu_Item item);
-  FL_EXPORT_C(int, Fl_Sys_Menu_Bar_value_with_index)(fl_Sys_Menu_Bar sys_menu_bar, int index);
-  FL_EXPORT_C(char*, Fl_Sys_Menu_Bar_text)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(char*, Fl_Sys_Menu_Bar_text_with_index)(fl_Sys_Menu_Bar sys_menu_bar, int i);
-  FL_EXPORT_C(Fl_Font, Fl_Sys_Menu_Bar_textfont)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_set_textfont)(fl_Sys_Menu_Bar sys_menu_bar, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize, Fl_Sys_Menu_Bar_textsize)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_set_textsize)(fl_Sys_Menu_Bar sys_menu_bar, Fl_Fontsize c);
-  FL_EXPORT_C(Fl_Color, Fl_Sys_Menu_Bar_textcolor)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_set_textcolor)(fl_Sys_Menu_Bar sys_menu_bar, Fl_Color c);
-  FL_EXPORT_C(Fl_Boxtype, Fl_Sys_Menu_Bar_down_box)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_set_down_box)(fl_Sys_Menu_Bar sys_menu_bar, Fl_Boxtype b);
-  FL_EXPORT_C(Fl_Color, Fl_Sys_Menu_Bar_down_color)(fl_Sys_Menu_Bar sys_menu_bar);
-  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_set_down_color)(fl_Sys_Menu_Bar sys_menu_bar, unsigned c);
-  FL_EXPORT_C(fl_Sys_Menu_Bar,    Fl_OverriddenSys_Menu_Bar_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Sys_Menu_Bar,    Fl_OverriddenSys_Menu_Bar_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_draw)(fl_Sys_Menu_Bar o);
-  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_draw_super)(fl_Sys_Menu_Bar o);
-  FL_EXPORT_C(int, Fl_Sys_Menu_Bar_handle)(fl_Sys_Menu_Bar o, int event);
-  FL_EXPORT_C(int, Fl_Sys_Menu_Bar_handle_super)(fl_Sys_Menu_Bar o, int event);
-  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_resize)(fl_Sys_Menu_Bar o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_resize_super)(fl_Sys_Menu_Bar o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_show)(fl_Sys_Menu_Bar o);
-  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_show_super)(fl_Sys_Menu_Bar o);
-  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_hide)(fl_Sys_Menu_Bar o);
-  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_hide_super)(fl_Sys_Menu_Bar o);
+  FL_EXPORT_C_HEADER( fl_Menu_Item,Fl_Sys_Menu_Bar_test_shortcut,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_global,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER( fl_Menu_Item,Fl_Sys_Menu_Bar_menu,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_menu_with_m,(fl_Sys_Menu_Bar sys_menu_bar,  fl_Menu_Item* items, int size));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_copy,(fl_Sys_Menu_Bar sys_menu_bar,  fl_Menu_Item m));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_copy_with_user_data,(fl_Sys_Menu_Bar sys_menu_bar,  fl_Menu_Item m, void* user_data));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_insert,(fl_Sys_Menu_Bar sys_menu_bar, int index,  char* name, int shortcut, fl_Callback cb));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_insert_with_user_data,(fl_Sys_Menu_Bar sys_menu_bar, int index,  char*, int shortcut, fl_Callback* cb, void* user_data));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_insert_with_flags,(fl_Sys_Menu_Bar sys_menu_bar, int index,  char* name, int shortcut, fl_Callback* cb, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_insert_with_user_data_flags,(fl_Sys_Menu_Bar sys_menu_bar, int index,  char* name, int shortcut, fl_Callback* cb, void* user_data, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_insert_with_shortcutname,(fl_Sys_Menu_Bar sys_menu_bar, int index,  char* name, char* shortcut));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_insert_with_shortcutname_user_data,(fl_Sys_Menu_Bar sys_menu_bar, int index,  char* name,   char* shortcut, fl_Callback* cb, void* user_data));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_insert_with_shortcutname_flags,(fl_Sys_Menu_Bar sys_menu_bar, int index,  char* name,   char* shortcut, fl_Callback* cb, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_insert_with_shortcutname_user_data_flags,(fl_Sys_Menu_Bar sys_menu_bar, int index,  char* name,   char* shortcut, fl_Callback* cb, void* user_data, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_add,(fl_Sys_Menu_Bar sys_menu_bar, char* name, int shortcut, fl_Callback));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_add_with_user_data,(fl_Sys_Menu_Bar sys_menu_bar, char* name, int shortcut, fl_Callback* cb, void* user_data));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_add_with_flags,(fl_Sys_Menu_Bar sys_menu_bar, char* name, int shortcut, fl_Callback* cb, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_add_with_user_data_flags,(fl_Sys_Menu_Bar sys_menu_bar, char* name, int shortcut, fl_Callback* cb, void* user_data, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_add_with_shortcutname,(fl_Sys_Menu_Bar sys_menu_bar, char* name,   char* shortcut, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_add_with_shortcutname_user_data,(fl_Sys_Menu_Bar sys_menu_bar, char* name,   char* shortcut, fl_Callback* cb, void* user_data));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_add_with_shortcutname_flags,(fl_Sys_Menu_Bar sys_menu_bar, char* name,   char* shortcut, fl_Callback* cb, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_add_with_shortcutname_user_data_flags,(fl_Sys_Menu_Bar sys_menu_bar, char* name,  char* shortcut, fl_Callback* cb, void* user_data, int flags));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_add_with_name,(fl_Sys_Menu_Bar sys_menu_bar,  char* name));
+  FL_EXPORT_C_HEADER(int ,Fl_Sys_Menu_Bar_size,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_set_size,(fl_Sys_Menu_Bar sys_menu_bar, int W, int H));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_clear,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_clear_submenu,(fl_Sys_Menu_Bar sys_menu_bar, int index));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_replace,(fl_Sys_Menu_Bar sys_menu_bar, int, char* name));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_remove,(fl_Sys_Menu_Bar sys_menu_bar, int));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_shortcut,(fl_Sys_Menu_Bar sys_menu_bar, int i, int s));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_set_mode,(fl_Sys_Menu_Bar sys_menu_bar, int i,int fl));
+  FL_EXPORT_C_HEADER(int ,Fl_Sys_Menu_Bar_mode,(fl_Sys_Menu_Bar sys_menu_bar, int i));
+  FL_EXPORT_C_HEADER(fl_Menu_Item,Fl_Sys_Menu_Bar_mvalue,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_value,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_value_with_item,(fl_Sys_Menu_Bar sys_menu_bar,  fl_Menu_Item item));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_value_with_index,(fl_Sys_Menu_Bar sys_menu_bar, int index));
+  FL_EXPORT_C_HEADER(char*,Fl_Sys_Menu_Bar_text,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(char*,Fl_Sys_Menu_Bar_text_with_index,(fl_Sys_Menu_Bar sys_menu_bar, int i));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Sys_Menu_Bar_textfont,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_set_textfont,(fl_Sys_Menu_Bar sys_menu_bar, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Sys_Menu_Bar_textsize,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_set_textsize,(fl_Sys_Menu_Bar sys_menu_bar, Fl_Fontsize c));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Sys_Menu_Bar_textcolor,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_set_textcolor,(fl_Sys_Menu_Bar sys_menu_bar, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Sys_Menu_Bar_down_box,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_set_down_box,(fl_Sys_Menu_Bar sys_menu_bar, Fl_Boxtype b));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Sys_Menu_Bar_down_color,(fl_Sys_Menu_Bar sys_menu_bar));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_set_down_color,(fl_Sys_Menu_Bar sys_menu_bar, unsigned c));
+  FL_EXPORT_C_HEADER(fl_Sys_Menu_Bar,Fl_OverriddenSys_Menu_Bar_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Sys_Menu_Bar,Fl_OverriddenSys_Menu_Bar_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_draw,(fl_Sys_Menu_Bar o));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_draw_super,(fl_Sys_Menu_Bar o));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_handle,(fl_Sys_Menu_Bar o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Sys_Menu_Bar_handle_super,(fl_Sys_Menu_Bar o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_resize,(fl_Sys_Menu_Bar o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_resize_super,(fl_Sys_Menu_Bar o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_show,(fl_Sys_Menu_Bar o));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_show_super,(fl_Sys_Menu_Bar o));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_hide,(fl_Sys_Menu_Bar o));
+  FL_EXPORT_C_HEADER(void,Fl_Sys_Menu_Bar_hide_super,(fl_Sys_Menu_Bar o));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_TableC.h b/c-src/Fl_TableC.h
--- a/c-src/Fl_TableC.h
+++ b/c-src/Fl_TableC.h
@@ -10,126 +10,126 @@
 EXPORT {
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,Fl_Table_handle)(fl_Table self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Table_parent)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_set_parent)(fl_Table table, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Table_type)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_set_type)(fl_Table table, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Table_handle,(fl_Table self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Table_parent,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_parent,(fl_Table table, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Table_type,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_type,(fl_Table table, uchar t));
 
-FL_EXPORT_C(void, Fl_Table_draw_box)(fl_Table Table);
-FL_EXPORT_C(void, Fl_Table_draw_box_with_tc)(fl_Table Table,Fl_Boxtype t, Fl_Color c);
-FL_EXPORT_C(void, Fl_Table_draw_box_with_txywhc)(fl_Table Table,Fl_Boxtype t, int x,int y,int w,int h, Fl_Color c);
-FL_EXPORT_C(void, Fl_Table_draw_backdrop)(fl_Table Table);
-FL_EXPORT_C(void, Fl_Table_draw_focus)(fl_Table Table);
-FL_EXPORT_C(void, Fl_Table_draw_focus_with_txywh)(fl_Table Table,Fl_Boxtype t, int x,int y,int w,int h);
-FL_EXPORT_C(void, Fl_Table_draw_label)(fl_Table Table);
-  FL_EXPORT_C(int,          Fl_Table_x)(fl_Table table);
-  FL_EXPORT_C(int,          Fl_Table_y)(fl_Table table);
-  FL_EXPORT_C(int,          Fl_Table_w)(fl_Table table);
-  FL_EXPORT_C(int,          Fl_Table_h)(fl_Table table);
-  FL_EXPORT_C(void,     Fl_Table_set_align)(fl_Table table, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Table_align)(fl_Table table);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Table_box)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_set_box)(fl_Table table, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Table_color)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_set_color)(fl_Table table, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Table_set_color_with_bg_sel)(fl_Table table,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Table_selection_color)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_set_selection_color)(fl_Table table, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Table_label)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_copy_label)(fl_Table table, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Table_set_label)(fl_Table table, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Table_labeltype)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_set_labeltype)(fl_Table table, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Table_labelcolor)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_set_labelcolor)(fl_Table table, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Table_item_labelfont)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_set_item_labelfont)(fl_Table table, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Table_item_labelsize)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_set_item_labelsize)(fl_Table table, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Table_image)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_set_image)(fl_Table table, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Table_deimage)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_set_deimage)(fl_Table table, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Table_tooltip)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_copy_tooltip)(fl_Table table, const char* text);
-  FL_EXPORT_C(void,         Fl_Table_set_tooltip)(fl_Table table, const char* text);
-  FL_EXPORT_C(void,         Fl_Table_set_callback_with_user_data)(fl_Table table, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Table_set_callback)(fl_Table table, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Table_other_data)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_set_other_data)(fl_Table table, void* v);
-  FL_EXPORT_C(void*,        Fl_Table_user_data)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_set_user_data)(fl_Table table, void* v);
-  FL_EXPORT_C(long,         Fl_Table_argument)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_set_argument)(fl_Table table, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Table_when)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_set_when)(fl_Table table, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Table_visible)(fl_Table table);
-  FL_EXPORT_C(int,          Fl_Table_visible_r)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_show_super)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_show)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_hide_super)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_hide)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_set_visible)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_clear_visible)(fl_Table table);
-  FL_EXPORT_C(unsigned int, Fl_Table_active)(fl_Table table);
-  FL_EXPORT_C(int,          Fl_Table_active_r)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_activate)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_deactivate)(fl_Table table);
-  FL_EXPORT_C(unsigned int, Fl_Table_output)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_set_output)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_clear_output)(fl_Table table);
-  FL_EXPORT_C(unsigned int, Fl_Table_takesevents)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_set_changed)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_clear_changed)(fl_Table table);
-  FL_EXPORT_C(int,          Fl_Table_take_focus)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_set_visible_focus)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_clear_visible_focus)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_modify_visible_focus)(fl_Table table, int v);
-  FL_EXPORT_C(unsigned int, Fl_Table_visible_focus)(fl_Table table);
-  FL_EXPORT_C(int,          Fl_Table_contains)(fl_Table table, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Table_inside)(fl_Table table, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Table_redraw)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_redraw_label)(fl_Table table);
-  FL_EXPORT_C(uchar,        Fl_Table_damage)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_clear_damage_with_bitmask)(fl_Table table, uchar c);
-  FL_EXPORT_C(void,         Fl_Table_clear_damage)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_damage_with_text)(fl_Table table, uchar c);
-  FL_EXPORT_C(void,         Fl_Table_damage_inside_widget)(fl_Table table, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Table_draw_label_with_xywh_alignment)(fl_Table table, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Table_measure_label)(fl_Table table, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Table_window)(fl_Table table);
-  FL_EXPORT_C(fl_Window,    Fl_Table_top_window)(fl_Table table);
-  FL_EXPORT_C(fl_Window ,   Fl_Table_top_window_offset)(fl_Table table, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Window,    Fl_Table_as_window_super)(fl_Table table);
-  FL_EXPORT_C(fl_Window,    Fl_Table_as_window)(fl_Table table);
-  FL_EXPORT_C(fl_Group,     Fl_Table_as_group_super)(fl_Table table);
-  FL_EXPORT_C(fl_Group,     Fl_Table_as_group)(fl_Table table);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Table_as_gl_window_super)(fl_Table table);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Table_as_gl_window)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_draw_super)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_draw)(fl_Table table);
-  FL_EXPORT_C(int,          Fl_Table_handle_super)(fl_Table table, int event);
-  FL_EXPORT_C(int,          Fl_Table_handle)(fl_Table table, int event);
-  FL_EXPORT_C(void,         Fl_Table_resize_super)(fl_Table table, int x, int y, int w, int h);
-  FL_EXPORT_C(void,         Fl_Table_resize)(fl_Table table, int x, int y, int w, int h);
+FL_EXPORT_C_HEADER(void,Fl_Table_draw_box,(fl_Table Table));
+FL_EXPORT_C_HEADER(void,Fl_Table_draw_box_with_tc,(fl_Table Table,Fl_Boxtype t, Fl_Color c));
+FL_EXPORT_C_HEADER(void,Fl_Table_draw_box_with_txywhc,(fl_Table Table,Fl_Boxtype t, int x,int y,int w,int h, Fl_Color c));
+FL_EXPORT_C_HEADER(void,Fl_Table_draw_backdrop,(fl_Table Table));
+FL_EXPORT_C_HEADER(void,Fl_Table_draw_focus,(fl_Table Table));
+FL_EXPORT_C_HEADER(void,Fl_Table_draw_focus_with_txywh,(fl_Table Table,Fl_Boxtype t, int x,int y,int w,int h));
+FL_EXPORT_C_HEADER(void,Fl_Table_draw_label,(fl_Table Table));
+  FL_EXPORT_C_HEADER(int,Fl_Table_x,(fl_Table table));
+  FL_EXPORT_C_HEADER(int,Fl_Table_y,(fl_Table table));
+  FL_EXPORT_C_HEADER(int,Fl_Table_w,(fl_Table table));
+  FL_EXPORT_C_HEADER(int,Fl_Table_h,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_align,(fl_Table table, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Table_align,(fl_Table table));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Table_box,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_box,(fl_Table table, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Table_color,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_color,(fl_Table table, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_color_with_bg_sel,(fl_Table table,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Table_selection_color,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_selection_color,(fl_Table table, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Table_label,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_copy_label,(fl_Table table, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_label,(fl_Table table, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Table_labeltype,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_labeltype,(fl_Table table, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Table_labelcolor,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_labelcolor,(fl_Table table, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Table_item_labelfont,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_item_labelfont,(fl_Table table, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Table_item_labelsize,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_item_labelsize,(fl_Table table, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Table_image,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_image,(fl_Table table, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Table_deimage,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_deimage,(fl_Table table, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Table_tooltip,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_copy_tooltip,(fl_Table table, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_tooltip,(fl_Table table, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_callback_with_user_data,(fl_Table table, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_callback,(fl_Table table, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Table_other_data,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_other_data,(fl_Table table, void* v));
+  FL_EXPORT_C_HEADER(void*,Fl_Table_user_data,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_user_data,(fl_Table table, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Table_argument,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_argument,(fl_Table table, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Table_when,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_when,(fl_Table table, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Table_visible,(fl_Table table));
+  FL_EXPORT_C_HEADER(int,Fl_Table_visible_r,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_show_super,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_show,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_hide_super,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_hide,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_visible,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_clear_visible,(fl_Table table));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Table_active,(fl_Table table));
+  FL_EXPORT_C_HEADER(int,Fl_Table_active_r,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_activate,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_deactivate,(fl_Table table));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Table_output,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_output,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_clear_output,(fl_Table table));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Table_takesevents,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_changed,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_clear_changed,(fl_Table table));
+  FL_EXPORT_C_HEADER(int,Fl_Table_take_focus,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_visible_focus,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_clear_visible_focus,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_modify_visible_focus,(fl_Table table, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Table_visible_focus,(fl_Table table));
+  FL_EXPORT_C_HEADER(int,Fl_Table_contains,(fl_Table table, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Table_inside,(fl_Table table, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Table_redraw,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_redraw_label,(fl_Table table));
+  FL_EXPORT_C_HEADER(uchar,Fl_Table_damage,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_clear_damage_with_bitmask,(fl_Table table, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Table_clear_damage,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_damage_with_text,(fl_Table table, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Table_damage_inside_widget,(fl_Table table, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Table_draw_label_with_xywh_alignment,(fl_Table table, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Table_measure_label,(fl_Table table, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Table_window,(fl_Table table));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Table_top_window,(fl_Table table));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Table_top_window_offset,(fl_Table table, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Table_as_window_super,(fl_Table table));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Table_as_window,(fl_Table table));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Table_as_group_super,(fl_Table table));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Table_as_group,(fl_Table table));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Table_as_gl_window_super,(fl_Table table));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Table_as_gl_window,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_draw_super,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_draw,(fl_Table table));
+  FL_EXPORT_C_HEADER(int,Fl_Table_handle_super,(fl_Table table, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Table_handle,(fl_Table table, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Table_resize_super,(fl_Table table, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Table_resize,(fl_Table table, int x, int y, int w, int h));
   /* Fl_Group specific */
-  FL_EXPORT_C(void,         Fl_Table_remove_widget)(fl_Table table, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Table_clear_super)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_clear)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_set_resizable_by_reference)(fl_Table table,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Table_set_resizable)(fl_Table table,fl_Widget o);
-  FL_EXPORT_C(fl_Widget,    Fl_Table_resizable)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_add_resizable)(fl_Table table,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Table_init_sizes)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_set_clip_children)(fl_Table table,int c);
-  FL_EXPORT_C(unsigned int, Fl_Table_clip_children)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_focus)(fl_Table table,fl_Widget W);
-  FL_EXPORT_C(fl_Widget,    Fl_Table__ddfdesign_kludge)(fl_Table table);
-  FL_EXPORT_C(void,         Fl_Table_insert_with_before)(fl_Table self, fl_Widget w, fl_Widget before);
-  FL_EXPORT_C(fl_Widget*,   Fl_Table_array)(fl_Table self);
-  FL_EXPORT_C(fl_Widget,    Fl_Table_child)(fl_Table self, int n);
-  FL_EXPORT_C(void,         Fl_Table_forms_end)(fl_Table self);
+  FL_EXPORT_C_HEADER(void,Fl_Table_remove_widget,(fl_Table table, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Table_clear_super,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_clear,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_resizable_by_reference,(fl_Table table,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_resizable,(fl_Table table,fl_Widget o));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Table_resizable,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_add_resizable,(fl_Table table,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Table_init_sizes,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_clip_children,(fl_Table table,int c));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Table_clip_children,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_focus,(fl_Table table,fl_Widget W));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Table__ddfdesign_kludge,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_insert_with_before,(fl_Table self, fl_Widget w, fl_Widget before));
+  FL_EXPORT_C_HEADER(fl_Widget*,Fl_Table_array,(fl_Table self));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Table_child,(fl_Table self, int n));
+  FL_EXPORT_C_HEADER(void,Fl_Table_forms_end,(fl_Table self));
 
 
   /* Fl_Table specific functions */
@@ -169,77 +169,77 @@
     ~Fl_DerivedTable();
   };
 #endif
-  FL_EXPORT_C(fl_Table_Virtual_Funcs*, Fl_Table_default_virtual_funcs)();
-  FL_EXPORT_C(fl_Table, Fl_Table_New_WithLabel)(int X, int Y, int W, int H, const char *l, fl_Table_Virtual_Funcs* funcs);
-  FL_EXPORT_C(fl_Table, Fl_Table_New)(int X, int Y, int W, int H, fl_Table_Virtual_Funcs* funcs);
-  FL_EXPORT_C(void, Fl_Table_Destroy)(fl_Table table);
-  FL_EXPORT_C(void, Fl_Table_set_table_box)(fl_Table table,Fl_Boxtype val);
-  FL_EXPORT_C(Fl_Boxtype, Fl_Table_table_box)(fl_Table table);
-  FL_EXPORT_C(void, Fl_Table_set_rows_super)(fl_Table table,int val);
-  FL_EXPORT_C(void, Fl_Table_set_rows)(fl_Table table,int val);
-  FL_EXPORT_C(int, Fl_Table_rows)(fl_Table table);
-  FL_EXPORT_C(void, Fl_Table_set_cols_super)(fl_Table table, int val);
-  FL_EXPORT_C(void, Fl_Table_set_cols)(fl_Table table, int val);
-  FL_EXPORT_C(int, Fl_Table_cols)(fl_Table table);
-  FL_EXPORT_C(void, Fl_Table_visible_cells)(fl_Table table,int* r1, int* r2, int* c1, int* c2);
-  FL_EXPORT_C(int, Fl_Table_is_interactive_resize)(fl_Table table);
-  FL_EXPORT_C(int, Fl_Table_row_resize)(fl_Table table);
-  FL_EXPORT_C(void, Fl_Table_set_row_resize)(fl_Table table,int flag);
-  FL_EXPORT_C(int, Fl_Table_col_resize)(fl_Table table);
-  FL_EXPORT_C(void, Fl_Table_set_col_resize)(fl_Table table,int flag);
-  FL_EXPORT_C(int, Fl_Table_col_resize_min)(fl_Table table);
-  FL_EXPORT_C(void, Fl_Table_set_col_resize_min)(fl_Table table,int val);
-  FL_EXPORT_C(int, Fl_Table_row_resize_min)(fl_Table table);
-  FL_EXPORT_C(void, Fl_Table_set_row_resize_min)(fl_Table table,int val);
-  FL_EXPORT_C(int, Fl_Table_row_header)(fl_Table table);
-  FL_EXPORT_C(void, Fl_Table_set_row_header)(fl_Table table,int flag);
-  FL_EXPORT_C(int, Fl_Table_col_header)(fl_Table table);
-  FL_EXPORT_C(void, Fl_Table_set_col_header)(fl_Table table,int flag);
-  FL_EXPORT_C(void, Fl_Table_set_col_header_height)(fl_Table table,int height);
-  FL_EXPORT_C(int, Fl_Table_col_header_height)(fl_Table table);
-  FL_EXPORT_C(void, Fl_Table_set_row_header_width)(fl_Table table,int width);
-  FL_EXPORT_C(int, Fl_Table_row_header_width)(fl_Table table);
-  FL_EXPORT_C(void, Fl_Table_set_row_header_color)(fl_Table table,Fl_Color val);
-  FL_EXPORT_C(Fl_Color, Fl_Table_row_header_color)(fl_Table table);
-  FL_EXPORT_C(void, Fl_Table_set_col_header_color)(fl_Table table,Fl_Color val);
-  FL_EXPORT_C(Fl_Color, Fl_Table_col_header_color)(fl_Table table);
-  FL_EXPORT_C(void, Fl_Table_set_row_height)(fl_Table table,int row, int height);
-  FL_EXPORT_C(int, Fl_Table_row_height)(fl_Table table,int row);
-  FL_EXPORT_C(void, Fl_Table_set_col_width)(fl_Table table,int col, int width);
-  FL_EXPORT_C(int, Fl_Table_col_width)(fl_Table table,int col);
-  FL_EXPORT_C(void, Fl_Table_set_row_height_all)(fl_Table table,int height);
-  FL_EXPORT_C(void, Fl_Table_set_col_width_all)(fl_Table table,int width);
-  FL_EXPORT_C(void, Fl_Table_set_row_position)(fl_Table table,int row);
-  FL_EXPORT_C(void, Fl_Table_set_col_position)(fl_Table table,int col);
-  FL_EXPORT_C(int, Fl_Table_row_position)(fl_Table table);
-  FL_EXPORT_C(int, Fl_Table_col_position)(fl_Table table);
-  FL_EXPORT_C(void, Fl_Table_set_top_row)(fl_Table table,int row);
-  FL_EXPORT_C(int, Fl_Table_top_row)(fl_Table table);
-  FL_EXPORT_C(int, Fl_Table_is_selected)(fl_Table table,int r, int c);
-  FL_EXPORT_C(void, Fl_Table_get_selection)(fl_Table table,int* row_top, int* col_left, int* row_bot, int* col_right);
-  FL_EXPORT_C(void, Fl_Table_set_selection)(fl_Table table,int row_top, int col_left, int row_bot, int col_right);
-  FL_EXPORT_C(int, Fl_Table_move_cursor)(fl_Table table,int R, int C);
-  FL_EXPORT_C(void, Fl_Table_draw)(fl_Table table);
-  FL_EXPORT_C(void, Fl_Table_init_sizes)(fl_Table table);
-  FL_EXPORT_C(void, Fl_Table_add)(fl_Table table,fl_Widget wgt);
-  FL_EXPORT_C(void, Fl_Table_add)(fl_Table table,fl_Widget wgt);
-  FL_EXPORT_C(void, Fl_Table_insert)(fl_Table table,fl_Widget wgt, int n);
-  FL_EXPORT_C(void, Fl_Table_insert_with_widget)(fl_Table table,fl_Widget wgt, fl_Widget w2);
-  FL_EXPORT_C(void, Fl_Table_begin)(fl_Table table);
-  FL_EXPORT_C(void, Fl_Table_end)(fl_Table table);
-  FL_EXPORT_C(fl_Widget*, Fl_Table_array)(fl_Table table);
-  FL_EXPORT_C(fl_Widget, Fl_Table_child)(fl_Table table,int n);
-  FL_EXPORT_C(int, Fl_Table_children)(fl_Table table);
-  FL_EXPORT_C(int, Fl_Table_find)(fl_Table table,fl_Widget wgt);
-  FL_EXPORT_C(int, Fl_Table_callback_row)(fl_Table table);
-  FL_EXPORT_C(int, Fl_Table_callback_col)(fl_Table table);
-  FL_EXPORT_C(TableContextC, Fl_Table_callback_context)(fl_Table table);
-  FL_EXPORT_C(void, Fl_Table_do_callback)(fl_Table table, TableContextC tableContext, int row, int col);
+  FL_EXPORT_C_HEADER(fl_Table_Virtual_Funcs*,Fl_Table_default_virtual_funcs,());
+  FL_EXPORT_C_HEADER(fl_Table,Fl_Table_New_WithLabel,(int X, int Y, int W, int H, const char *l, fl_Table_Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(fl_Table,Fl_Table_New,(int X, int Y, int W, int H, fl_Table_Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Destroy,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_table_box,(fl_Table table,Fl_Boxtype val));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Table_table_box,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_rows_super,(fl_Table table,int val));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_rows,(fl_Table table,int val));
+  FL_EXPORT_C_HEADER(int,Fl_Table_rows,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_cols_super,(fl_Table table, int val));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_cols,(fl_Table table, int val));
+  FL_EXPORT_C_HEADER(int,Fl_Table_cols,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_visible_cells,(fl_Table table,int* r1, int* r2, int* c1, int* c2));
+  FL_EXPORT_C_HEADER(int,Fl_Table_is_interactive_resize,(fl_Table table));
+  FL_EXPORT_C_HEADER(int,Fl_Table_row_resize,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_row_resize,(fl_Table table,int flag));
+  FL_EXPORT_C_HEADER(int,Fl_Table_col_resize,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_col_resize,(fl_Table table,int flag));
+  FL_EXPORT_C_HEADER(int,Fl_Table_col_resize_min,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_col_resize_min,(fl_Table table,int val));
+  FL_EXPORT_C_HEADER(int,Fl_Table_row_resize_min,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_row_resize_min,(fl_Table table,int val));
+  FL_EXPORT_C_HEADER(int,Fl_Table_row_header,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_row_header,(fl_Table table,int flag));
+  FL_EXPORT_C_HEADER(int,Fl_Table_col_header,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_col_header,(fl_Table table,int flag));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_col_header_height,(fl_Table table,int height));
+  FL_EXPORT_C_HEADER(int,Fl_Table_col_header_height,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_row_header_width,(fl_Table table,int width));
+  FL_EXPORT_C_HEADER(int,Fl_Table_row_header_width,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_row_header_color,(fl_Table table,Fl_Color val));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Table_row_header_color,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_col_header_color,(fl_Table table,Fl_Color val));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Table_col_header_color,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_row_height,(fl_Table table,int row, int height));
+  FL_EXPORT_C_HEADER(int,Fl_Table_row_height,(fl_Table table,int row));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_col_width,(fl_Table table,int col, int width));
+  FL_EXPORT_C_HEADER(int,Fl_Table_col_width,(fl_Table table,int col));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_row_height_all,(fl_Table table,int height));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_col_width_all,(fl_Table table,int width));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_row_position,(fl_Table table,int row));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_col_position,(fl_Table table,int col));
+  FL_EXPORT_C_HEADER(int,Fl_Table_row_position,(fl_Table table));
+  FL_EXPORT_C_HEADER(int,Fl_Table_col_position,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_top_row,(fl_Table table,int row));
+  FL_EXPORT_C_HEADER(int,Fl_Table_top_row,(fl_Table table));
+  FL_EXPORT_C_HEADER(int,Fl_Table_is_selected,(fl_Table table,int r, int c));
+  FL_EXPORT_C_HEADER(void,Fl_Table_get_selection,(fl_Table table,int* row_top, int* col_left, int* row_bot, int* col_right));
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_selection,(fl_Table table,int row_top, int col_left, int row_bot, int col_right));
+  FL_EXPORT_C_HEADER(int,Fl_Table_move_cursor,(fl_Table table,int R, int C));
+  FL_EXPORT_C_HEADER(void,Fl_Table_draw,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_init_sizes,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_add,(fl_Table table,fl_Widget wgt));
+  FL_EXPORT_C_HEADER(void,Fl_Table_add,(fl_Table table,fl_Widget wgt));
+  FL_EXPORT_C_HEADER(void,Fl_Table_insert,(fl_Table table,fl_Widget wgt, int n));
+  FL_EXPORT_C_HEADER(void,Fl_Table_insert_with_widget,(fl_Table table,fl_Widget wgt, fl_Widget w2));
+  FL_EXPORT_C_HEADER(void,Fl_Table_begin,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_end,(fl_Table table));
+  FL_EXPORT_C_HEADER(fl_Widget*,Fl_Table_array,(fl_Table table));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Table_child,(fl_Table table,int n));
+  FL_EXPORT_C_HEADER(int,Fl_Table_children,(fl_Table table));
+  FL_EXPORT_C_HEADER(int,Fl_Table_find,(fl_Table table,fl_Widget wgt));
+  FL_EXPORT_C_HEADER(int,Fl_Table_callback_row,(fl_Table table));
+  FL_EXPORT_C_HEADER(int,Fl_Table_callback_col,(fl_Table table));
+  FL_EXPORT_C_HEADER(TableContextC,Fl_Table_callback_context,(fl_Table table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_do_callback,(fl_Table table, TableContextC tableContext, int row, int col));
 #if FLTK_ABI_VERSION >= 10303
-  FL_EXPORT_C(void, Fl_Table_set_tab_cell_nav)(fl_Table table, int val);
-  FL_EXPORT_C(int,  Fl_Table_tab_cell_nav)(fl_Table table);
+  FL_EXPORT_C_HEADER(void,Fl_Table_set_tab_cell_nav,(fl_Table table, int val));
+  FL_EXPORT_C_HEADER(int,Fl_Table_tab_cell_nav,(fl_Table table));
 #endif
-  FL_EXPORT_C(int,  Fl_Table_find_cell)(fl_Table table, TableContextC context, int R, int C, int* X, int* Y, int* W, int* H);
+  FL_EXPORT_C_HEADER(int,Fl_Table_find_cell,(fl_Table table, TableContextC context, int R, int C, int* X, int* Y, int* W, int* H));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Table_RowC.h b/c-src/Fl_Table_RowC.h
--- a/c-src/Fl_Table_RowC.h
+++ b/c-src/Fl_Table_RowC.h
@@ -10,119 +10,119 @@
 EXPORT {
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,Fl_Table_Row_handle_super)(fl_Table_Row self, int event);
-  FL_EXPORT_C(int,Fl_Table_Row_handle)(fl_Table_Row self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Table_Row_parent)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_set_parent)(fl_Table_Row table, fl_Group grp);
-  FL_EXPORT_C(void, Fl_Table_Row_draw_box)(fl_Table_Row Table_Row);
-  FL_EXPORT_C(void, Fl_Table_Row_draw_box_with_tc)(fl_Table_Row Table_Row,Fl_Boxtype t, Fl_Color c);
-  FL_EXPORT_C(void, Fl_Table_Row_draw_box_with_txywhc)(fl_Table_Row Table_Row,Fl_Boxtype t, int x,int y,int w,int h, Fl_Color c);
-  FL_EXPORT_C(void, Fl_Table_Row_draw_backdrop)(fl_Table_Row Table_Row);
-  FL_EXPORT_C(void, Fl_Table_Row_draw_focus)(fl_Table_Row Table_Row);
-  FL_EXPORT_C(void, Fl_Table_Row_draw_focus_with_txywh)(fl_Table_Row Table_Row,Fl_Boxtype t, int x,int y,int w,int h);
-  FL_EXPORT_C(void, Fl_Table_Row_draw_label)(fl_Table_Row Table_Row);
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_handle_super,(fl_Table_Row self, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_handle,(fl_Table_Row self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Table_Row_parent,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_parent,(fl_Table_Row table, fl_Group grp));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_draw_box,(fl_Table_Row Table_Row));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_draw_box_with_tc,(fl_Table_Row Table_Row,Fl_Boxtype t, Fl_Color c));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_draw_box_with_txywhc,(fl_Table_Row Table_Row,Fl_Boxtype t, int x,int y,int w,int h, Fl_Color c));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_draw_backdrop,(fl_Table_Row Table_Row));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_draw_focus,(fl_Table_Row Table_Row));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_draw_focus_with_txywh,(fl_Table_Row Table_Row,Fl_Boxtype t, int x,int y,int w,int h));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_draw_label,(fl_Table_Row Table_Row));
 
-  FL_EXPORT_C(int,          Fl_Table_Row_x)(fl_Table_Row table);
-  FL_EXPORT_C(int,          Fl_Table_Row_y)(fl_Table_Row table);
-  FL_EXPORT_C(int,          Fl_Table_Row_w)(fl_Table_Row table);
-  FL_EXPORT_C(int,          Fl_Table_Row_h)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_set_align)(fl_Table_Row table_row, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Table_Row_align)(fl_Table_Row table);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Table_Row_box)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_set_box)(fl_Table_Row table, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Table_Row_color)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_set_color)(fl_Table_Row table, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Table_Row_set_color_with_bg_sel)(fl_Table_Row table,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Table_Row_selection_color)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_set_selection_color)(fl_Table_Row table, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Table_Row_label)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_copy_label)(fl_Table_Row table, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Table_Row_set_label)(fl_Table_Row table, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Table_Row_labeltype)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_set_labeltype)(fl_Table_Row table, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Table_Row_labelcolor)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_set_labelcolor)(fl_Table_Row table, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Table_Row_item_labelfont)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_set_item_labelfont)(fl_Table_Row table, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Table_Row_item_labelsize)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_set_item_labelsize)(fl_Table_Row table, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Table_Row_image)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_set_image)(fl_Table_Row table, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Table_Row_deimage)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_set_deimage)(fl_Table_Row table, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Table_Row_tooltip)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_copy_tooltip)(fl_Table_Row table, const char* text);
-  FL_EXPORT_C(void,         Fl_Table_Row_set_tooltip)(fl_Table_Row table, const char* text);
-  FL_EXPORT_C(void,         Fl_Table_Row_set_callback_with_user_data)(fl_Table_Row table, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Table_Row_set_callback)(fl_Table_Row table, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Table_Row_other_data)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_set_other_data)(fl_Table_Row table, void* v);
-  FL_EXPORT_C(void*,        Fl_Table_Row_user_data)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_set_user_data)(fl_Table_Row table, void* v);
-  FL_EXPORT_C(long,         Fl_Table_Row_argument)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_set_argument)(fl_Table_Row table, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Table_Row_when)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_set_when)(fl_Table_Row table, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Table_Row_visible)(fl_Table_Row table);
-  FL_EXPORT_C(int,          Fl_Table_Row_visible_r)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_show_super)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_show)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_hide_super)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_hide)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_set_visible)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_clear_visible)(fl_Table_Row table);
-  FL_EXPORT_C(unsigned int, Fl_Table_Row_active)(fl_Table_Row table);
-  FL_EXPORT_C(int,          Fl_Table_Row_active_r)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_activate)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_deactivate)(fl_Table_Row table);
-  FL_EXPORT_C(unsigned int, Fl_Table_Row_output)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_set_output)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_clear_output)(fl_Table_Row table);
-  FL_EXPORT_C(unsigned int, Fl_Table_Row_takesevents)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_set_changed)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_clear_changed)(fl_Table_Row table);
-  FL_EXPORT_C(int,          Fl_Table_Row_take_focus)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_set_visible_focus)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_clear_visible_focus)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_modify_visible_focus)(fl_Table_Row table, int v);
-  FL_EXPORT_C(unsigned int, Fl_Table_Row_visible_focus)(fl_Table_Row table);
-  FL_EXPORT_C(int,          Fl_Table_Row_contains)(fl_Table_Row table, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Table_Row_inside)(fl_Table_Row table, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Table_Row_redraw)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_redraw_label)(fl_Table_Row table);
-  FL_EXPORT_C(uchar,        Fl_Table_Row_damage)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_clear_damage_with_bitmask)(fl_Table_Row table, uchar c);
-  FL_EXPORT_C(void,         Fl_Table_Row_clear_damage)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_damage_with_text)(fl_Table_Row table, uchar c);
-  FL_EXPORT_C(void,         Fl_Table_Row_damage_inside_widget)(fl_Table_Row table, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Table_Row_draw_label_with_xywh_alignment)(fl_Table_Row table, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Table_Row_measure_label)(fl_Table_Row table, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Table_Row_window)(fl_Table_Row table);
-  FL_EXPORT_C(fl_Window,    Fl_Table_Row_top_window)(fl_Table_Row table);
-  FL_EXPORT_C(fl_Window ,   Fl_Table_Row_top_window_offset)(fl_Table_Row table, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Table_Row_as_group_super)(fl_Table_Row table);
-  FL_EXPORT_C(fl_Group,     Fl_Table_Row_as_group)(fl_Table_Row table);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Table_Row_as_gl_window_super)(fl_Table_Row table);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Table_Row_as_gl_window)(fl_Table_Row table);
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_x,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_y,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_w,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_h,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_align,(fl_Table_Row table_row, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Table_Row_align,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Table_Row_box,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_box,(fl_Table_Row table, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Table_Row_color,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_color,(fl_Table_Row table, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_color_with_bg_sel,(fl_Table_Row table,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Table_Row_selection_color,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_selection_color,(fl_Table_Row table, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Table_Row_label,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_copy_label,(fl_Table_Row table, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_label,(fl_Table_Row table, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Table_Row_labeltype,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_labeltype,(fl_Table_Row table, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Table_Row_labelcolor,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_labelcolor,(fl_Table_Row table, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Table_Row_item_labelfont,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_item_labelfont,(fl_Table_Row table, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Table_Row_item_labelsize,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_item_labelsize,(fl_Table_Row table, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Table_Row_image,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_image,(fl_Table_Row table, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Table_Row_deimage,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_deimage,(fl_Table_Row table, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Table_Row_tooltip,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_copy_tooltip,(fl_Table_Row table, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_tooltip,(fl_Table_Row table, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_callback_with_user_data,(fl_Table_Row table, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_callback,(fl_Table_Row table, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Table_Row_other_data,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_other_data,(fl_Table_Row table, void* v));
+  FL_EXPORT_C_HEADER(void*,Fl_Table_Row_user_data,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_user_data,(fl_Table_Row table, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Table_Row_argument,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_argument,(fl_Table_Row table, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Table_Row_when,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_when,(fl_Table_Row table, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Table_Row_visible,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_visible_r,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_show_super,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_show,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_hide_super,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_hide,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_visible,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_clear_visible,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Table_Row_active,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_active_r,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_activate,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_deactivate,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Table_Row_output,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_output,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_clear_output,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Table_Row_takesevents,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_changed,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_clear_changed,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_take_focus,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_visible_focus,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_clear_visible_focus,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_modify_visible_focus,(fl_Table_Row table, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Table_Row_visible_focus,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_contains,(fl_Table_Row table, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_inside,(fl_Table_Row table, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_redraw,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_redraw_label,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(uchar,Fl_Table_Row_damage,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_clear_damage_with_bitmask,(fl_Table_Row table, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_clear_damage,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_damage_with_text,(fl_Table_Row table, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_damage_inside_widget,(fl_Table_Row table, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_draw_label_with_xywh_alignment,(fl_Table_Row table, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_measure_label,(fl_Table_Row table, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Table_Row_window,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Table_Row_top_window,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Table_Row_top_window_offset,(fl_Table_Row table, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Table_Row_as_group_super,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Table_Row_as_group,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Table_Row_as_gl_window_super,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Table_Row_as_gl_window,(fl_Table_Row table));
 
   /* Fl_Group specific */
-  FL_EXPORT_C(void,         Fl_Table_Row_remove_widget)(fl_Table_Row table, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Table_Row_clear_super)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_clear)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_set_resizable_by_reference)(fl_Table_Row table,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Table_Row_set_resizable)(fl_Table_Row table,fl_Widget o);
-  FL_EXPORT_C(fl_Widget,    Fl_Table_Row_resizable)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_add_resizable)(fl_Table_Row table,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Table_Row_init_sizes)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_set_clip_children)(fl_Table_Row table,int c);
-  FL_EXPORT_C(unsigned int, Fl_Table_Row_clip_children)(fl_Table_Row table);
-  FL_EXPORT_C(void,         Fl_Table_Row_focus)(fl_Table_Row table,fl_Widget W);
-  FL_EXPORT_C(fl_Widget,    Fl_Table_Row__ddfdesign_kludge)(fl_Table_Row table);
-  FL_EXPORT_C(void,Fl_Table_Row_draw_super)(fl_Table_Row table_row);
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_remove_widget,(fl_Table_Row table, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_clear_super,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_clear,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_resizable_by_reference,(fl_Table_Row table,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_resizable,(fl_Table_Row table,fl_Widget o));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Table_Row_resizable,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_add_resizable,(fl_Table_Row table,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_init_sizes,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_clip_children,(fl_Table_Row table,int c));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Table_Row_clip_children,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_focus,(fl_Table_Row table,fl_Widget W));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Table_Row__ddfdesign_kludge,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_draw_super,(fl_Table_Row table_row));
 
-  FL_EXPORT_C(void,         Fl_Table_Row_insert_with_before)(fl_Table_Row self, fl_Widget w, fl_Widget before);
-  FL_EXPORT_C(fl_Widget*, Fl_Table_Row_array)(fl_Table_Row self);
-  FL_EXPORT_C(fl_Widget, Fl_Table_Row_child)(fl_Table_Row self, int n);
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_insert_with_before,(fl_Table_Row self, fl_Widget w, fl_Widget before));
+  FL_EXPORT_C_HEADER(fl_Widget*,Fl_Table_Row_array,(fl_Table_Row self));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Table_Row_child,(fl_Table_Row self, int n));
   /* FL_EXPORT_C(void     , Fl_Table_Row_forms_end)(fl_Table_Row self); */
 
   /* Inherited from Fl_Table_Row */
@@ -164,91 +164,91 @@
     ~Fl_DerivedTable_Row();
   };
 #endif
-  FL_EXPORT_C(fl_Table_Row_Virtual_Funcs*, Fl_Table_Row_default_virtual_funcs)();
-  FL_EXPORT_C(void, Fl_Table_Row_set_table_box)(fl_Table_Row table,Fl_Boxtype val);
-  FL_EXPORT_C(Fl_Boxtype, Fl_Table_Row_table_box)(fl_Table_Row table);
-  FL_EXPORT_C(void, Fl_Table_Row_set_rows_super)(fl_Table_Row table,int val);
-  FL_EXPORT_C(void, Fl_Table_Row_set_rows)(fl_Table_Row table,int val);
-  FL_EXPORT_C(int, Fl_Table_Row_rows)(fl_Table_Row table);
-  FL_EXPORT_C(void, Fl_Table_Row_set_cols_super)(fl_Table_Row table, int val);
-  FL_EXPORT_C(void, Fl_Table_Row_set_cols)(fl_Table_Row table, int val);
-  FL_EXPORT_C(int, Fl_Table_Row_cols)(fl_Table_Row table);
-  FL_EXPORT_C(void, Fl_Table_Row_set_visible_cells)(fl_Table_Row table,int* r1, int* r2, int* c1, int* c2);
-  FL_EXPORT_C(int, Fl_Table_Row_is_interactive_resize)(fl_Table_Row table);
-  FL_EXPORT_C(int, Fl_Table_Row_row_resize)(fl_Table_Row table);
-  FL_EXPORT_C(void, Fl_Table_Row_set_row_resize)(fl_Table_Row table,int flag);
-  FL_EXPORT_C(int, Fl_Table_Row_col_resize)(fl_Table_Row table);
-  FL_EXPORT_C(void, Fl_Table_Row_set_col_resize)(fl_Table_Row table,int flag);
-  FL_EXPORT_C(int, Fl_Table_Row_col_resize_min)(fl_Table_Row table);
-  FL_EXPORT_C(void, Fl_Table_Row_set_col_resize_min)(fl_Table_Row table,int val);
-  FL_EXPORT_C(int, Fl_Table_Row_row_resize_min)(fl_Table_Row table);
-  FL_EXPORT_C(void, Fl_Table_Row_set_row_resize_min)(fl_Table_Row table,int val);
-  FL_EXPORT_C(int, Fl_Table_Row_row_header)(fl_Table_Row table);
-  FL_EXPORT_C(void, Fl_Table_Row_set_row_header)(fl_Table_Row table,int flag);
-  FL_EXPORT_C(int, Fl_Table_Row_col_header)(fl_Table_Row table);
-  FL_EXPORT_C(void, Fl_Table_Row_set_col_header)(fl_Table_Row table,int flag);
-  FL_EXPORT_C(void, Fl_Table_Row_set_col_header_height)(fl_Table_Row table,int height);
-  FL_EXPORT_C(int, Fl_Table_Row_col_header_height)(fl_Table_Row table);
-  FL_EXPORT_C(void, Fl_Table_Row_set_row_header_width)(fl_Table_Row table,int width);
-  FL_EXPORT_C(int, Fl_Table_Row_row_header_width)(fl_Table_Row table);
-  FL_EXPORT_C(void, Fl_Table_Row_set_row_header_color)(fl_Table_Row table,Fl_Color val);
-  FL_EXPORT_C(Fl_Color, Fl_Table_Row_row_header_color)(fl_Table_Row table);
-  FL_EXPORT_C(void, Fl_Table_Row_set_col_header_color)(fl_Table_Row table,Fl_Color val);
-  FL_EXPORT_C(Fl_Color, Fl_Table_Row_col_header_color)(fl_Table_Row table);
-  FL_EXPORT_C(void, Fl_Table_Row_set_row_height)(fl_Table_Row table,int row, int height);
-  FL_EXPORT_C(int, Fl_Table_Row_row_height)(fl_Table_Row table,int row);
-  FL_EXPORT_C(void, Fl_Table_Row_set_col_width)(fl_Table_Row table,int col, int width);
-  FL_EXPORT_C(int, Fl_Table_Row_col_width)(fl_Table_Row table,int col);
-  FL_EXPORT_C(void, Fl_Table_Row_set_row_height_all)(fl_Table_Row table,int height);
-  FL_EXPORT_C(void, Fl_Table_Row_set_col_width_all)(fl_Table_Row table,int width);
-  FL_EXPORT_C(void, Fl_Table_Row_set_row_position)(fl_Table_Row table,int row);
-  FL_EXPORT_C(void, Fl_Table_Row_set_col_position)(fl_Table_Row table,int col);
-  FL_EXPORT_C(int, Fl_Table_Row_row_position)(fl_Table_Row table);
-  FL_EXPORT_C(int, Fl_Table_Row_col_position)(fl_Table_Row table);
-  FL_EXPORT_C(void, Fl_Table_Row_set_top_row)(fl_Table_Row table,int row);
-  FL_EXPORT_C(int, Fl_Table_Row_top_row)(fl_Table_Row table);
-  FL_EXPORT_C(int, Fl_Table_Row_is_selected)(fl_Table_Row table,int r, int c);
-  FL_EXPORT_C(void, Fl_Table_Row_get_selection)(fl_Table_Row table,int *row_top, int *col_left, int *row_bot, int *col_right);
-  FL_EXPORT_C(void, Fl_Table_Row_set_selection)(fl_Table_Row table,int row_top, int col_left, int row_bot, int col_right);
-  FL_EXPORT_C(int, Fl_Table_Row_move_cursor)(fl_Table_Row table,int R, int C);
-  FL_EXPORT_C(void, Fl_Table_Row_resize_super)(fl_Table_Row table,int X, int Y, int W, int H);
-  FL_EXPORT_C(void, Fl_Table_Row_resize)(fl_Table_Row table,int X, int Y, int W, int H);
-  FL_EXPORT_C(void, Fl_Table_Row_draw)(fl_Table_Row table);
-  FL_EXPORT_C(void, Fl_Table_Row_init_sizes)(fl_Table_Row table);
-  FL_EXPORT_C(void, Fl_Table_Row_add)(fl_Table_Row table,fl_Widget wgt);
-  FL_EXPORT_C(void, Fl_Table_Row_add)(fl_Table_Row table,fl_Widget wgt);
-  FL_EXPORT_C(void, Fl_Table_Row_insert)(fl_Table_Row table,fl_Widget wgt, int n);
-  FL_EXPORT_C(void, Fl_Table_Row_insert_with_widget)(fl_Table_Row table,fl_Widget wgt, fl_Widget w2);
-  FL_EXPORT_C(void, Fl_Table_Row_begin)(fl_Table_Row table);
-  FL_EXPORT_C(void, Fl_Table_Row_end)(fl_Table_Row table);
-  FL_EXPORT_C(fl_Widget*, Fl_Table_Row_array)(fl_Table_Row table);
-  FL_EXPORT_C(fl_Widget, Fl_Table_Row_child)(fl_Table_Row table,int n);
-  FL_EXPORT_C(int, Fl_Table_Row_children)(fl_Table_Row table);
-  FL_EXPORT_C(int, Fl_Table_Row_find)(fl_Table_Row table,fl_Widget wgt);
-  FL_EXPORT_C(int, Fl_Table_Row_callback_row)(fl_Table_Row table);
-  FL_EXPORT_C(int, Fl_Table_Row_callback_col)(fl_Table_Row table);
-  FL_EXPORT_C(TableContextC, Fl_Table_Row_callback_context)(fl_Table_Row table);
-  FL_EXPORT_C(void, Fl_Table_Row_do_callback)(fl_Table_Row table, TableContextC tableContext, int row, int col);
+  FL_EXPORT_C_HEADER(fl_Table_Row_Virtual_Funcs*,Fl_Table_Row_default_virtual_funcs,());
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_table_box,(fl_Table_Row table,Fl_Boxtype val));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Table_Row_table_box,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_rows_super,(fl_Table_Row table,int val));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_rows,(fl_Table_Row table,int val));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_rows,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_cols_super,(fl_Table_Row table, int val));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_cols,(fl_Table_Row table, int val));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_cols,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_visible_cells,(fl_Table_Row table,int* r1, int* r2, int* c1, int* c2));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_is_interactive_resize,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_row_resize,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_row_resize,(fl_Table_Row table,int flag));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_col_resize,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_col_resize,(fl_Table_Row table,int flag));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_col_resize_min,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_col_resize_min,(fl_Table_Row table,int val));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_row_resize_min,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_row_resize_min,(fl_Table_Row table,int val));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_row_header,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_row_header,(fl_Table_Row table,int flag));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_col_header,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_col_header,(fl_Table_Row table,int flag));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_col_header_height,(fl_Table_Row table,int height));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_col_header_height,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_row_header_width,(fl_Table_Row table,int width));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_row_header_width,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_row_header_color,(fl_Table_Row table,Fl_Color val));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Table_Row_row_header_color,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_col_header_color,(fl_Table_Row table,Fl_Color val));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Table_Row_col_header_color,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_row_height,(fl_Table_Row table,int row, int height));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_row_height,(fl_Table_Row table,int row));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_col_width,(fl_Table_Row table,int col, int width));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_col_width,(fl_Table_Row table,int col));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_row_height_all,(fl_Table_Row table,int height));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_col_width_all,(fl_Table_Row table,int width));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_row_position,(fl_Table_Row table,int row));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_col_position,(fl_Table_Row table,int col));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_row_position,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_col_position,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_top_row,(fl_Table_Row table,int row));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_top_row,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_is_selected,(fl_Table_Row table,int r, int c));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_get_selection,(fl_Table_Row table,int *row_top, int *col_left, int *row_bot, int *col_right));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_selection,(fl_Table_Row table,int row_top, int col_left, int row_bot, int col_right));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_move_cursor,(fl_Table_Row table,int R, int C));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_resize_super,(fl_Table_Row table,int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_resize,(fl_Table_Row table,int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_draw,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_init_sizes,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_add,(fl_Table_Row table,fl_Widget wgt));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_add,(fl_Table_Row table,fl_Widget wgt));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_insert,(fl_Table_Row table,fl_Widget wgt, int n));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_insert_with_widget,(fl_Table_Row table,fl_Widget wgt, fl_Widget w2));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_begin,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_end,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(fl_Widget*,Fl_Table_Row_array,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Table_Row_child,(fl_Table_Row table,int n));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_children,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_find,(fl_Table_Row table,fl_Widget wgt));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_callback_row,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_callback_col,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(TableContextC,Fl_Table_Row_callback_context,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_do_callback,(fl_Table_Row table, TableContextC tableContext, int row, int col));
 #if FLTK_ABI_VERSION >= 10302
-  FL_EXPORT_C(void, Fl_Table_Row_set_tab_cell_nav)(fl_Table_Row table, int val);
-  FL_EXPORT_C(int,  Fl_Table_Row_tab_cell_nav)(fl_Table_Row table);
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_tab_cell_nav,(fl_Table_Row table, int val));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_tab_cell_nav,(fl_Table_Row table));
 #endif
-  FL_EXPORT_C(int,  Fl_Table_Row_find_cell)(fl_Table_Row table, TableContextC context, int R, int C, int *X, int *Y, int *W, int *H);
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_find_cell,(fl_Table_Row table, TableContextC context, int R, int C, int *X, int *Y, int *W, int *H));
 
   /* Fl_Table_Row specific */
-  FL_EXPORT_C(fl_Table_Row, Fl_Table_Row_New_WithLabel)(int X, int Y, int W, int H, const char *l);
-  FL_EXPORT_C(fl_Table_Row, Fl_Table_Row_New)(int X, int Y, int W, int H);
-  FL_EXPORT_C(fl_Table_Row, Fl_OverriddenTable_Row_New_WithLabel)(int X, int Y, int W, int H, const char *l, fl_Table_Row_Virtual_Funcs* funcs);
-  FL_EXPORT_C(fl_Table_Row, Fl_OverriddenTable_Row_New)(int X, int Y, int W, int H, fl_Table_Row_Virtual_Funcs* funcs);
-  FL_EXPORT_C(void, Fl_Table_Row_Destroy)(fl_Table_Row table);
-  FL_EXPORT_C(TableRowSelectModeC,Fl_Table_Row_type)(fl_Table_Row table);
-  FL_EXPORT_C(void,Fl_Table_Row_set_type)(fl_Table_Row table, TableRowSelectModeC t);
-  FL_EXPORT_C(int, Fl_Table_Row_row_selected)(fl_Table_Row row, int rowIndex);
-  FL_EXPORT_C(int, Fl_Table_Row_select_row)(fl_Table_Row row, int rowIndex);
+  FL_EXPORT_C_HEADER(fl_Table_Row,Fl_Table_Row_New_WithLabel,(int X, int Y, int W, int H, const char *l));
+  FL_EXPORT_C_HEADER(fl_Table_Row,Fl_Table_Row_New,(int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(fl_Table_Row,Fl_OverriddenTable_Row_New_WithLabel,(int X, int Y, int W, int H, const char *l, fl_Table_Row_Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(fl_Table_Row,Fl_OverriddenTable_Row_New,(int X, int Y, int W, int H, fl_Table_Row_Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_Destroy,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(TableRowSelectModeC,Fl_Table_Row_type,(fl_Table_Row table));
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_set_type,(fl_Table_Row table, TableRowSelectModeC t));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_row_selected,(fl_Table_Row row, int rowIndex));
+  FL_EXPORT_C_HEADER(int,Fl_Table_Row_select_row,(fl_Table_Row row, int rowIndex));
   FL_EXPORT_C(int, Fl_Table_Row_select_row_with_flag)(fl_Table_Row row, int rowIndex, int flag); // flag = 1
-  FL_EXPORT_C(void, Fl_Table_Row_select_all_rows)(fl_Table_Row row);
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_select_all_rows,(fl_Table_Row row));
   FL_EXPORT_C(void, Fl_Table_Row_select_all_rows_with_flag)(fl_Table_Row row, int flag); // flag = 1
-  FL_EXPORT_C(void, Fl_Table_Row_clear)(fl_Table_Row row);
+  FL_EXPORT_C_HEADER(void,Fl_Table_Row_clear,(fl_Table_Row row));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_TabsC.h b/c-src/Fl_TabsC.h
--- a/c-src/Fl_TabsC.h
+++ b/c-src/Fl_TabsC.h
@@ -30,132 +30,132 @@
 
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,Fl_Tabs_handle)(fl_Tabs self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Tabs_parent)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_set_parent)(fl_Tabs tabs, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Tabs_type)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_set_type)(fl_Tabs tabs, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Tabs_handle,(fl_Tabs self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Tabs_parent,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_set_parent,(fl_Tabs tabs, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Tabs_type,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_set_type,(fl_Tabs tabs, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Tabs_x)(fl_Tabs tabs);
-  FL_EXPORT_C(int,          Fl_Tabs_y)(fl_Tabs tabs);
-  FL_EXPORT_C(int,          Fl_Tabs_w)(fl_Tabs tabs);
-  FL_EXPORT_C(int,          Fl_Tabs_h)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_set_align)(fl_Tabs tabs, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Tabs_align)(fl_Tabs tabs);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Tabs_box)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_set_box)(fl_Tabs tabs, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Tabs_color)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_set_color)(fl_Tabs tabs, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Tabs_set_color_with_bg_sel)(fl_Tabs tabs,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Tabs_selection_color)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_set_selection_color)(fl_Tabs tabs, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Tabs_label)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_copy_label)(fl_Tabs tabs, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Tabs_set_label)(fl_Tabs tabs, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Tabs_labeltype)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_set_labeltype)(fl_Tabs tabs, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Tabs_labelcolor)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_set_labelcolor)(fl_Tabs tabs, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Tabs_item_labelfont)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_set_item_labelfont)(fl_Tabs tabs, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Tabs_item_labelsize)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_set_item_labelsize)(fl_Tabs tabs, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Tabs_image)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_set_image)(fl_Tabs tabs, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Tabs_deimage)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_set_deimage)(fl_Tabs tabs, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Tabs_tooltip)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_copy_tooltip)(fl_Tabs tabs, const char* text);
-  FL_EXPORT_C(void,         Fl_Tabs_set_tooltip)(fl_Tabs tabs, const char* text);
-  FL_EXPORT_C(void,         Fl_Tabs_set_callback_with_user_data)(fl_Tabs tabs, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Tabs_set_callback)(fl_Tabs tabs, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Tabs_user_data)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_set_user_data)(fl_Tabs tabs, void* v);
-  FL_EXPORT_C(long,         Fl_Tabs_argument)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_set_argument)(fl_Tabs tabs, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Tabs_when)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_set_when)(fl_Tabs tabs, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Tabs_visible)(fl_Tabs tabs);
-  FL_EXPORT_C(int,          Fl_Tabs_visible_r)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_set_visible)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_clear_visible)(fl_Tabs tabs);
-  FL_EXPORT_C(unsigned int, Fl_Tabs_active)(fl_Tabs tabs);
-  FL_EXPORT_C(int,          Fl_Tabs_active_r)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_activate)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_deactivate)(fl_Tabs tabs);
-  FL_EXPORT_C(unsigned int, Fl_Tabs_output)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_set_output)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_clear_output)(fl_Tabs tabs);
-  FL_EXPORT_C(unsigned int, Fl_Tabs_takesevents)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_set_changed)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_clear_changed)(fl_Tabs tabs);
-  FL_EXPORT_C(int,          Fl_Tabs_take_focus)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_set_visible_focus)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_clear_visible_focus)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_modify_visible_focus)(fl_Tabs tabs, int v);
-  FL_EXPORT_C(unsigned int, Fl_Tabs_visible_focus)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_do_callback)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_do_callback_with_widget_and_user_data)(fl_Tabs tabs, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Tabs_do_callback_with_widget_and_default_user_data)(fl_Tabs tabs, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Tabs_contains)(fl_Tabs tabs, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Tabs_inside)(fl_Tabs tabs, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Tabs_redraw)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_redraw_label)(fl_Tabs tabs);
-  FL_EXPORT_C(uchar,        Fl_Tabs_damage)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_clear_damage_with_bitmask)(fl_Tabs tabs, uchar c);
-  FL_EXPORT_C(void,         Fl_Tabs_clear_damage)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_damage_with_text)(fl_Tabs tabs, uchar c);
-  FL_EXPORT_C(void,         Fl_Tabs_damage_inside_widget)(fl_Tabs tabs, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Tabs_draw_label_with_xywh_alignment)(fl_Tabs tabs, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Tabs_measure_label)(fl_Tabs tabs, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Tabs_window)(fl_Tabs tabs);
-  FL_EXPORT_C(fl_Window,    Fl_Tabs_top_window)(fl_Tabs tabs);
-  FL_EXPORT_C(fl_Window ,   Fl_Tabs_top_window_offset)(fl_Tabs tabs, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Tabs_as_group)(fl_Tabs tabs);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Tabs_as_gl_window)(fl_Tabs tabs);
+  FL_EXPORT_C_HEADER(int,Fl_Tabs_x,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(int,Fl_Tabs_y,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(int,Fl_Tabs_w,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(int,Fl_Tabs_h,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_set_align,(fl_Tabs tabs, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Tabs_align,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Tabs_box,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_set_box,(fl_Tabs tabs, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Tabs_color,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_set_color,(fl_Tabs tabs, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_set_color_with_bg_sel,(fl_Tabs tabs,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Tabs_selection_color,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_set_selection_color,(fl_Tabs tabs, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Tabs_label,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_copy_label,(fl_Tabs tabs, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_set_label,(fl_Tabs tabs, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Tabs_labeltype,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_set_labeltype,(fl_Tabs tabs, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Tabs_labelcolor,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_set_labelcolor,(fl_Tabs tabs, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Tabs_item_labelfont,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_set_item_labelfont,(fl_Tabs tabs, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Tabs_item_labelsize,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_set_item_labelsize,(fl_Tabs tabs, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Tabs_image,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_set_image,(fl_Tabs tabs, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Tabs_deimage,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_set_deimage,(fl_Tabs tabs, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Tabs_tooltip,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_copy_tooltip,(fl_Tabs tabs, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_set_tooltip,(fl_Tabs tabs, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_set_callback_with_user_data,(fl_Tabs tabs, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_set_callback,(fl_Tabs tabs, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Tabs_user_data,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_set_user_data,(fl_Tabs tabs, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Tabs_argument,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_set_argument,(fl_Tabs tabs, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Tabs_when,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_set_when,(fl_Tabs tabs, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Tabs_visible,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(int,Fl_Tabs_visible_r,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_set_visible,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_clear_visible,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Tabs_active,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(int,Fl_Tabs_active_r,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_activate,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_deactivate,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Tabs_output,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_set_output,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_clear_output,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Tabs_takesevents,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_set_changed,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_clear_changed,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(int,Fl_Tabs_take_focus,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_set_visible_focus,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_clear_visible_focus,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_modify_visible_focus,(fl_Tabs tabs, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Tabs_visible_focus,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_do_callback,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_do_callback_with_widget_and_user_data,(fl_Tabs tabs, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_do_callback_with_widget_and_default_user_data,(fl_Tabs tabs, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Tabs_contains,(fl_Tabs tabs, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Tabs_inside,(fl_Tabs tabs, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_redraw,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_redraw_label,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(uchar,Fl_Tabs_damage,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_clear_damage_with_bitmask,(fl_Tabs tabs, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_clear_damage,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_damage_with_text,(fl_Tabs tabs, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_damage_inside_widget,(fl_Tabs tabs, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_draw_label_with_xywh_alignment,(fl_Tabs tabs, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_measure_label,(fl_Tabs tabs, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Tabs_window,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Tabs_top_window,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Tabs_top_window_offset,(fl_Tabs tabs, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Tabs_as_group,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Tabs_as_gl_window,(fl_Tabs tabs));
 
   /* Inherited from Fl_Group */
-  FL_EXPORT_C(void,         Fl_Tabs_begin)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_end)(fl_Tabs tabs);
-  FL_EXPORT_C(int,          Fl_Tabs_find)(fl_Tabs tabs, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Tabs_clear)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_set_resizable_by_reference)(fl_Tabs tabs,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Tabs_set_resizable)(fl_Tabs tabs,fl_Widget o);
-  FL_EXPORT_C(fl_Widget,    Fl_Tabs_resizable)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_add_resizable)(fl_Tabs tabs,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Tabs_init_sizes)(fl_Tabs tabs);
-  FL_EXPORT_C(int,          Fl_Tabs_children)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_set_clip_children)(fl_Tabs tabs,int c);
-  FL_EXPORT_C(unsigned int, Fl_Tabs_clip_children)(fl_Tabs tabs);
-  FL_EXPORT_C(void,         Fl_Tabs_focus)(fl_Tabs tabs,fl_Widget W);
-  FL_EXPORT_C(fl_Widget,    Fl_Tabs__ddfdesign_kludge)(fl_Tabs tabs);
-  FL_EXPORT_C(fl_Widget*,   Fl_Tabs_array)(fl_Tabs self);
-  FL_EXPORT_C(fl_Widget,    Fl_Tabs_child)(fl_Tabs self, int n);
-  FL_EXPORT_C(void,         Fl_Tabs_forms_end)(fl_Tabs self);
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_begin,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_end,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(int,Fl_Tabs_find,(fl_Tabs tabs, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_clear,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_set_resizable_by_reference,(fl_Tabs tabs,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_set_resizable,(fl_Tabs tabs,fl_Widget o));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Tabs_resizable,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_add_resizable,(fl_Tabs tabs,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_init_sizes,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(int,Fl_Tabs_children,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_set_clip_children,(fl_Tabs tabs,int c));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Tabs_clip_children,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_focus,(fl_Tabs tabs,fl_Widget W));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Tabs__ddfdesign_kludge,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(fl_Widget*,Fl_Tabs_array,(fl_Tabs self));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Tabs_child,(fl_Tabs self, int n));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_forms_end,(fl_Tabs self));
 
   /* Fl_Tabs specific */
-  FL_EXPORT_C(fl_Tabs, Fl_Tabs_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(fl_Tabs, Fl_Tabs_New_WithLabel)(int x, int y, int w, int h, const char* l);
-  FL_EXPORT_C(int, Fl_Tabs_handle)(fl_Tabs tabs, int event);
-  FL_EXPORT_C(fl_Widget, Fl_Tabs_value)(fl_Tabs tabs);
-  FL_EXPORT_C(int, Fl_Tabs_set_value)(fl_Tabs tabs, fl_Widget w);
-  FL_EXPORT_C(fl_Widget, Fl_Tabs_push)(fl_Tabs tabs);
-  FL_EXPORT_C(int, Fl_Tabs_set_push)(fl_Tabs tabs, fl_Widget w);
-  FL_EXPORT_C(fl_Widget, Fl_Tabs_which)(fl_Tabs tabs, int event_x, int event_y);
-  FL_EXPORT_C(void, Fl_Tabs_client_area)(fl_Tabs tabs, int* rx, int* ry, int* rw, int* rh);
-  FL_EXPORT_C(void, Fl_Tabs_client_area_with_tabh)(fl_Tabs tabs, int* rx, int* ry, int* rw, int* rh, int tabh);
-  FL_EXPORT_C(fl_Tabs,    Fl_OverriddenTabs_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Tabs,    Fl_OverriddenTabs_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Tabs_draw)(fl_Tabs o);
-  FL_EXPORT_C(void, Fl_Tabs_draw_super)(fl_Tabs o);
-  FL_EXPORT_C(int, Fl_Tabs_handle)(fl_Tabs o, int event);
-  FL_EXPORT_C(int, Fl_Tabs_handle_super)(fl_Tabs o, int event);
-  FL_EXPORT_C(void, Fl_Tabs_resize)(fl_Tabs o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Tabs_resize_super)(fl_Tabs o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Tabs_show)(fl_Tabs o);
-  FL_EXPORT_C(void, Fl_Tabs_show_super)(fl_Tabs o);
-  FL_EXPORT_C(void, Fl_Tabs_hide)(fl_Tabs o);
-  FL_EXPORT_C(void, Fl_Tabs_hide_super)(fl_Tabs o);
+  FL_EXPORT_C_HEADER(fl_Tabs,Fl_Tabs_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(fl_Tabs,Fl_Tabs_New_WithLabel,(int x, int y, int w, int h, const char* l));
+  FL_EXPORT_C_HEADER(int,Fl_Tabs_handle,(fl_Tabs tabs, int event));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Tabs_value,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(int,Fl_Tabs_set_value,(fl_Tabs tabs, fl_Widget w));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Tabs_push,(fl_Tabs tabs));
+  FL_EXPORT_C_HEADER(int,Fl_Tabs_set_push,(fl_Tabs tabs, fl_Widget w));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Tabs_which,(fl_Tabs tabs, int event_x, int event_y));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_client_area,(fl_Tabs tabs, int* rx, int* ry, int* rw, int* rh));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_client_area_with_tabh,(fl_Tabs tabs, int* rx, int* ry, int* rw, int* rh, int tabh));
+  FL_EXPORT_C_HEADER(fl_Tabs,Fl_OverriddenTabs_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Tabs,Fl_OverriddenTabs_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_draw,(fl_Tabs o));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_draw_super,(fl_Tabs o));
+  FL_EXPORT_C_HEADER(int,Fl_Tabs_handle,(fl_Tabs o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Tabs_handle_super,(fl_Tabs o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_resize,(fl_Tabs o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_resize_super,(fl_Tabs o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_show,(fl_Tabs o));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_show_super,(fl_Tabs o));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_hide,(fl_Tabs o));
+  FL_EXPORT_C_HEADER(void,Fl_Tabs_hide_super,(fl_Tabs o));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Text_BufferC.h b/c-src/Fl_Text_BufferC.h
--- a/c-src/Fl_Text_BufferC.h
+++ b/c-src/Fl_Text_BufferC.h
@@ -9,100 +9,100 @@
 #include "Fl_CallbackC.h"
 EXPORT {
 #endif
-  FL_EXPORT_C(fl_Text_Buffer, Fl_Text_Buffer_New)();
-  FL_EXPORT_C(fl_Text_Buffer, Fl_Text_Buffer_New_With_RequestedSize)(int requestedSize);
-  FL_EXPORT_C(fl_Text_Buffer, Fl_Text_Buffer_New_With_PreferredGapSize)(int preferredGapSize);
-  FL_EXPORT_C(fl_Text_Buffer, Fl_Text_Buffer_New_With_RequestedSize_PreferredGapSize)(int requestedSize, int preferredGapSize);
-  FL_EXPORT_C(void, Fl_Text_Buffer_Destroy)(fl_Text_Buffer text_buffer);
+  FL_EXPORT_C_HEADER(fl_Text_Buffer,Fl_Text_Buffer_New,());
+  FL_EXPORT_C_HEADER(fl_Text_Buffer,Fl_Text_Buffer_New_With_RequestedSize,(int requestedSize));
+  FL_EXPORT_C_HEADER(fl_Text_Buffer,Fl_Text_Buffer_New_With_PreferredGapSize,(int preferredGapSize));
+  FL_EXPORT_C_HEADER(fl_Text_Buffer,Fl_Text_Buffer_New_With_RequestedSize_PreferredGapSize,(int requestedSize, int preferredGapSize));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Buffer_Destroy,(fl_Text_Buffer text_buffer));
 #ifndef INTERNAL_LINKAGE
   typedef void (*Fl_Text_Modify_Cb)(int pos, int nInserted, int nDeleted,
                                   int nRestyled, const char* deletedText,
                                   void* cbArg);
   typedef void (*Fl_Text_Predelete_Cb)(int pos, int nDeleted, void* cbArg);
 #endif
-  FL_EXPORT_C(int, Fl_Text_Buffer_input_file_was_transcoded)(fl_Text_Buffer text_buffer);
-  FL_EXPORT_C(const char*, Fl_Text_Buffer_file_encoding_warning_message)(fl_Text_Buffer text_buffer);
-  FL_EXPORT_C(void, Fl_Text_Buffer_set_transcoding_warning_action)(fl_Text_Buffer text_buffer,fl_Text_Buffer_Callback cb);
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_input_file_was_transcoded,(fl_Text_Buffer text_buffer));
+  FL_EXPORT_C_HEADER(const char*,Fl_Text_Buffer_file_encoding_warning_message,(fl_Text_Buffer text_buffer));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Buffer_set_transcoding_warning_action,(fl_Text_Buffer text_buffer,fl_Text_Buffer_Callback cb));
   /* int input_file_was_transcoded; */
   /* const char* file_encoding_warning_message; */
   /* void (*transcoding_warning_action)(Fl_Text_Buffer*); */
-  FL_EXPORT_C(int, Fl_Text_Buffer_length)(fl_Text_Buffer text_buffer);
-  FL_EXPORT_C(char*, Fl_Text_Buffer_text)(fl_Text_Buffer text_buffer);
-  FL_EXPORT_C(void, Fl_Text_Buffer_set_text)(fl_Text_Buffer text_buffer,const char* text);
-  FL_EXPORT_C(char*, Fl_Text_Buffer_text_range)(fl_Text_Buffer text_buffer,int start, int end);
-  FL_EXPORT_C(unsigned int, Fl_Text_Buffer_char_at)(fl_Text_Buffer text_buffer,int pos);
-  FL_EXPORT_C(char, Fl_Text_Buffer_byte_at)(fl_Text_Buffer text_buffer,int pos);
-  FL_EXPORT_C(char*, Fl_Text_Buffer_address)(fl_Text_Buffer text_buffer,int pos);
-  FL_EXPORT_C(void, Fl_Text_Buffer_insert)(fl_Text_Buffer text_buffer,int pos, const char* text);
-  FL_EXPORT_C(void, Fl_Text_Buffer_append)(fl_Text_Buffer text_buffer,const char* t);
-  FL_EXPORT_C(void, Fl_Text_Buffer_remove)(fl_Text_Buffer text_buffer,int start, int end);
-  FL_EXPORT_C(void, Fl_Text_Buffer_replace)(fl_Text_Buffer text_buffer,int start, int end, const char* text);
-  FL_EXPORT_C(void, Fl_Text_Buffer_copy)(fl_Text_Buffer text_buffer,fl_Text_Buffer fromBuf, int fromStart, int fromEnd, int toPos);
-  FL_EXPORT_C(int, Fl_Text_Buffer_undo)(fl_Text_Buffer text_buffer);
-  FL_EXPORT_C(int, Fl_Text_Buffer_undo_with_cp)(fl_Text_Buffer text_buffer,int *cp);
-  FL_EXPORT_C(void, Fl_Text_Buffer_canUndo)(fl_Text_Buffer text_buffer);
-  FL_EXPORT_C(void, Fl_Text_Buffer_canUndo_with_flag)(fl_Text_Buffer text_buffer,char flag);
-  FL_EXPORT_C(int, Fl_Text_Buffer_insertfile)(fl_Text_Buffer text_buffer,const char* file, int pos);
-  FL_EXPORT_C(int, Fl_Text_Buffer_insertfile_with_buflen)(fl_Text_Buffer text_buffer,const char* file, int pos, int buflen);
-  FL_EXPORT_C(int, Fl_Text_Buffer_appendfile)(fl_Text_Buffer text_buffer,const char* file);
-  FL_EXPORT_C(int, Fl_Text_Buffer_appendfile_with_buflen)(fl_Text_Buffer text_buffer,const char* file, int buflen);
-  FL_EXPORT_C(int, Fl_Text_Buffer_loadfile)(fl_Text_Buffer text_buffer,const char* file);
-  FL_EXPORT_C(int, Fl_Text_Buffer_loadfile_with_buflen)(fl_Text_Buffer text_buffer,const char* file, int buflen);
-  FL_EXPORT_C(int, Fl_Text_Buffer_outputfile)(fl_Text_Buffer text_buffer,const char* file, int start, int end);
-  FL_EXPORT_C(int, Fl_Text_Buffer_outputfile_with_buflen)(fl_Text_Buffer text_buffer,const char* file, int start, int end, int buflen);
-  FL_EXPORT_C(int, Fl_Text_Buffer_savefile)(fl_Text_Buffer text_buffer,const char* file);
-  FL_EXPORT_C(int, Fl_Text_Buffer_savefile_with_buflen)(fl_Text_Buffer text_buffer,const char* file, int buflen);
-  FL_EXPORT_C(int, Fl_Text_Buffer_tab_distance)(fl_Text_Buffer text_buffer);
-  FL_EXPORT_C(void, Fl_Text_Buffer_set_tab_distance)(fl_Text_Buffer text_buffer,int tabDist);
-  FL_EXPORT_C(void, Fl_Text_Buffer_select)(fl_Text_Buffer text_buffer,int start, int end);
-  FL_EXPORT_C(int, Fl_Text_Buffer_selected)(fl_Text_Buffer text_buffer);
-  FL_EXPORT_C(void, Fl_Text_Buffer_unselect)(fl_Text_Buffer text_buffer);
-  FL_EXPORT_C(int, Fl_Text_Buffer_selection_position)(fl_Text_Buffer text_buffer,int* start, int* end);
-  FL_EXPORT_C(char*, Fl_Text_Buffer_selection_text)(fl_Text_Buffer text_buffer);
-  FL_EXPORT_C(void, Fl_Text_Buffer_remove_selection)(fl_Text_Buffer text_buffer);
-  FL_EXPORT_C(void, Fl_Text_Buffer_replace_selection)(fl_Text_Buffer text_buffer,const char* text);
-  FL_EXPORT_C(void, Fl_Text_Buffer_secondary_select)(fl_Text_Buffer text_buffer,int start, int end);
-  FL_EXPORT_C(int, Fl_Text_Buffer_secondary_selected)(fl_Text_Buffer text_buffer);
-  FL_EXPORT_C(void, Fl_Text_Buffer_set_secondary_unselect)(fl_Text_Buffer text_buffer);
-  FL_EXPORT_C(int, Fl_Text_Buffer_secondary_selection_position)(fl_Text_Buffer text_buffer,int* start, int* end);
-  FL_EXPORT_C(char*, Fl_Text_Buffer_secondary_selection_text)(fl_Text_Buffer text_buffer);
-  FL_EXPORT_C(void, Fl_Text_Buffer_remove_secondary_selection)(fl_Text_Buffer text_buffer);
-  FL_EXPORT_C(void, Fl_Text_Buffer_replace_secondary_selection)(fl_Text_Buffer text_buffer,const char* text);
-  FL_EXPORT_C(void, Fl_Text_Buffer_set_highlight)(fl_Text_Buffer text_buffer,int start, int end);
-  FL_EXPORT_C(int, Fl_Text_Buffer_highlight)(fl_Text_Buffer text_buffer);
-  FL_EXPORT_C(void, Fl_Text_Buffer_unhighlight)(fl_Text_Buffer text_buffer);
-  FL_EXPORT_C(int, Fl_Text_Buffer_highlight_position)(fl_Text_Buffer text_buffer,int* start, int* end);
-  FL_EXPORT_C(char*, Fl_Text_Buffer_highlight_text)(fl_Text_Buffer text_buffer);
-  FL_EXPORT_C(void, Fl_Text_Buffer_add_modify_callback)(fl_Text_Buffer text_buffer,Fl_Text_Modify_Cb bufModifiedCB, void* cbArg);
-  FL_EXPORT_C(void, Fl_Text_Buffer_remove_modify_callback)(fl_Text_Buffer text_buffer,Fl_Text_Modify_Cb bufModifiedCB, void* cbArg);
-  FL_EXPORT_C(void, Fl_Text_Buffer_call_modify_callbacks)(fl_Text_Buffer text_buffer);
-  FL_EXPORT_C(void, Fl_Text_Buffer_add_predelete_callback)(fl_Text_Buffer text_buffer,Fl_Text_Predelete_Cb bufPredelCB, void* cbArg);
-  FL_EXPORT_C(void, Fl_Text_Buffer_remove_predelete_callback)(fl_Text_Buffer text_buffer,Fl_Text_Predelete_Cb predelCB, void* cbArg);
-  FL_EXPORT_C(void, Fl_Text_Buffer_call_predelete_callbacks)(fl_Text_Buffer text_buffer);
-  FL_EXPORT_C(char*, Fl_Text_Buffer_line_text)(fl_Text_Buffer text_buffer,int pos);
-  FL_EXPORT_C(int, Fl_Text_Buffer_line_start)(fl_Text_Buffer text_buffer,int pos);
-  FL_EXPORT_C(int, Fl_Text_Buffer_line_end)(fl_Text_Buffer text_buffer,int pos);
-  FL_EXPORT_C(int, Fl_Text_Buffer_word_start)(fl_Text_Buffer text_buffer,int pos);
-  FL_EXPORT_C(int, Fl_Text_Buffer_word_end)(fl_Text_Buffer text_buffer,int pos);
-  FL_EXPORT_C(int, Fl_Text_Buffer_count_displayed_characters)(fl_Text_Buffer text_buffer,int lineStartPos, int targetPos);
-  FL_EXPORT_C(int, Fl_Text_Buffer_skip_displayed_characters)(fl_Text_Buffer text_buffer,int lineStartPos, int nChars);
-  FL_EXPORT_C(int, Fl_Text_Buffer_count_lines)(fl_Text_Buffer text_buffer,int startPos, int endPos);
-  FL_EXPORT_C(int, Fl_Text_Buffer_skip_lines)(fl_Text_Buffer text_buffer,int startPos, int nLines);
-  FL_EXPORT_C(int, Fl_Text_Buffer_rewind_lines)(fl_Text_Buffer text_buffer,int startPos, int nLines);
-  FL_EXPORT_C(int, Fl_Text_Buffer_findchar_forward)(fl_Text_Buffer text_buffer,int startPos, unsigned searchChar, int* foundPos);
-  FL_EXPORT_C(int, Fl_Text_Buffer_findchar_backward)(fl_Text_Buffer text_buffer,int startPos, unsigned int searchChar, int* foundPos);
-  FL_EXPORT_C(int, Fl_Text_Buffer_search_forward)(fl_Text_Buffer text_buffer,int startPos, const char* searchString, int* foundPos);
-  FL_EXPORT_C(int, Fl_Text_Buffer_search_forward_with_matchcase)(fl_Text_Buffer text_buffer,int startPos, const char* searchString, int* foundPos, int matchCase );
-  FL_EXPORT_C(int, Fl_Text_Buffer_search_backward)(fl_Text_Buffer text_buffer,int startPos, const char* searchString, int* foundPos);
-  FL_EXPORT_C(int, Fl_Text_Buffer_search_backward_with_matchcase)(fl_Text_Buffer text_buffer,int startPos, const char* searchString, int* foundPos, int matchCase );
-  FL_EXPORT_C(fl_Text_Selection, Fl_Text_Buffer_primary_selection)(fl_Text_Buffer text_buffer);
-  FL_EXPORT_C(const fl_Text_Selection, Fl_Text_Buffer_secondary_selection)(fl_Text_Buffer text_buffer);
-  FL_EXPORT_C(const fl_Text_Selection, Fl_Text_Buffer_highlight_selection)(fl_Text_Buffer text_buffer);
-  FL_EXPORT_C(int, Fl_Text_Buffer_prev_char)(fl_Text_Buffer text_buffer,int ix);
-  FL_EXPORT_C(int, Fl_Text_Buffer_prev_char_clipped)(fl_Text_Buffer text_buffer,int ix);
-  FL_EXPORT_C(int, Fl_Text_Buffer_next_char)(fl_Text_Buffer text_buffer,int ix);
-  FL_EXPORT_C(int, Fl_Text_Buffer_next_char_clipped)(fl_Text_Buffer text_buffer,int ix);
-  FL_EXPORT_C(int, Fl_Text_Buffer_utf8_align)(fl_Text_Buffer text_buffer,int align);
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_length,(fl_Text_Buffer text_buffer));
+  FL_EXPORT_C_HEADER(char*,Fl_Text_Buffer_text,(fl_Text_Buffer text_buffer));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Buffer_set_text,(fl_Text_Buffer text_buffer,const char* text));
+  FL_EXPORT_C_HEADER(char*,Fl_Text_Buffer_text_range,(fl_Text_Buffer text_buffer,int start, int end));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Text_Buffer_char_at,(fl_Text_Buffer text_buffer,int pos));
+  FL_EXPORT_C_HEADER(char,Fl_Text_Buffer_byte_at,(fl_Text_Buffer text_buffer,int pos));
+  FL_EXPORT_C_HEADER(char*,Fl_Text_Buffer_address,(fl_Text_Buffer text_buffer,int pos));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Buffer_insert,(fl_Text_Buffer text_buffer,int pos, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Buffer_append,(fl_Text_Buffer text_buffer,const char* t));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Buffer_remove,(fl_Text_Buffer text_buffer,int start, int end));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Buffer_replace,(fl_Text_Buffer text_buffer,int start, int end, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Buffer_copy,(fl_Text_Buffer text_buffer,fl_Text_Buffer fromBuf, int fromStart, int fromEnd, int toPos));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_undo,(fl_Text_Buffer text_buffer));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_undo_with_cp,(fl_Text_Buffer text_buffer,int *cp));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Buffer_canUndo,(fl_Text_Buffer text_buffer));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Buffer_canUndo_with_flag,(fl_Text_Buffer text_buffer,char flag));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_insertfile,(fl_Text_Buffer text_buffer,const char* file, int pos));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_insertfile_with_buflen,(fl_Text_Buffer text_buffer,const char* file, int pos, int buflen));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_appendfile,(fl_Text_Buffer text_buffer,const char* file));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_appendfile_with_buflen,(fl_Text_Buffer text_buffer,const char* file, int buflen));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_loadfile,(fl_Text_Buffer text_buffer,const char* file));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_loadfile_with_buflen,(fl_Text_Buffer text_buffer,const char* file, int buflen));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_outputfile,(fl_Text_Buffer text_buffer,const char* file, int start, int end));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_outputfile_with_buflen,(fl_Text_Buffer text_buffer,const char* file, int start, int end, int buflen));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_savefile,(fl_Text_Buffer text_buffer,const char* file));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_savefile_with_buflen,(fl_Text_Buffer text_buffer,const char* file, int buflen));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_tab_distance,(fl_Text_Buffer text_buffer));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Buffer_set_tab_distance,(fl_Text_Buffer text_buffer,int tabDist));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Buffer_select,(fl_Text_Buffer text_buffer,int start, int end));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_selected,(fl_Text_Buffer text_buffer));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Buffer_unselect,(fl_Text_Buffer text_buffer));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_selection_position,(fl_Text_Buffer text_buffer,int* start, int* end));
+  FL_EXPORT_C_HEADER(char*,Fl_Text_Buffer_selection_text,(fl_Text_Buffer text_buffer));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Buffer_remove_selection,(fl_Text_Buffer text_buffer));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Buffer_replace_selection,(fl_Text_Buffer text_buffer,const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Buffer_secondary_select,(fl_Text_Buffer text_buffer,int start, int end));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_secondary_selected,(fl_Text_Buffer text_buffer));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Buffer_set_secondary_unselect,(fl_Text_Buffer text_buffer));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_secondary_selection_position,(fl_Text_Buffer text_buffer,int* start, int* end));
+  FL_EXPORT_C_HEADER(char*,Fl_Text_Buffer_secondary_selection_text,(fl_Text_Buffer text_buffer));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Buffer_remove_secondary_selection,(fl_Text_Buffer text_buffer));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Buffer_replace_secondary_selection,(fl_Text_Buffer text_buffer,const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Buffer_set_highlight,(fl_Text_Buffer text_buffer,int start, int end));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_highlight,(fl_Text_Buffer text_buffer));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Buffer_unhighlight,(fl_Text_Buffer text_buffer));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_highlight_position,(fl_Text_Buffer text_buffer,int* start, int* end));
+  FL_EXPORT_C_HEADER(char*,Fl_Text_Buffer_highlight_text,(fl_Text_Buffer text_buffer));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Buffer_add_modify_callback,(fl_Text_Buffer text_buffer,Fl_Text_Modify_Cb bufModifiedCB, void* cbArg));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Buffer_remove_modify_callback,(fl_Text_Buffer text_buffer,Fl_Text_Modify_Cb bufModifiedCB, void* cbArg));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Buffer_call_modify_callbacks,(fl_Text_Buffer text_buffer));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Buffer_add_predelete_callback,(fl_Text_Buffer text_buffer,Fl_Text_Predelete_Cb bufPredelCB, void* cbArg));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Buffer_remove_predelete_callback,(fl_Text_Buffer text_buffer,Fl_Text_Predelete_Cb predelCB, void* cbArg));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Buffer_call_predelete_callbacks,(fl_Text_Buffer text_buffer));
+  FL_EXPORT_C_HEADER(char*,Fl_Text_Buffer_line_text,(fl_Text_Buffer text_buffer,int pos));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_line_start,(fl_Text_Buffer text_buffer,int pos));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_line_end,(fl_Text_Buffer text_buffer,int pos));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_word_start,(fl_Text_Buffer text_buffer,int pos));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_word_end,(fl_Text_Buffer text_buffer,int pos));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_count_displayed_characters,(fl_Text_Buffer text_buffer,int lineStartPos, int targetPos));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_skip_displayed_characters,(fl_Text_Buffer text_buffer,int lineStartPos, int nChars));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_count_lines,(fl_Text_Buffer text_buffer,int startPos, int endPos));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_skip_lines,(fl_Text_Buffer text_buffer,int startPos, int nLines));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_rewind_lines,(fl_Text_Buffer text_buffer,int startPos, int nLines));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_findchar_forward,(fl_Text_Buffer text_buffer,int startPos, unsigned searchChar, int* foundPos));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_findchar_backward,(fl_Text_Buffer text_buffer,int startPos, unsigned int searchChar, int* foundPos));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_search_forward,(fl_Text_Buffer text_buffer,int startPos, const char* searchString, int* foundPos));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_search_forward_with_matchcase,(fl_Text_Buffer text_buffer,int startPos, const char* searchString, int* foundPos, int matchCase ));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_search_backward,(fl_Text_Buffer text_buffer,int startPos, const char* searchString, int* foundPos));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_search_backward_with_matchcase,(fl_Text_Buffer text_buffer,int startPos, const char* searchString, int* foundPos, int matchCase ));
+  FL_EXPORT_C_HEADER(fl_Text_Selection,Fl_Text_Buffer_primary_selection,(fl_Text_Buffer text_buffer));
+  FL_EXPORT_C_HEADER(const fl_Text_Selection,Fl_Text_Buffer_secondary_selection,(fl_Text_Buffer text_buffer));
+  FL_EXPORT_C_HEADER(const fl_Text_Selection,Fl_Text_Buffer_highlight_selection,(fl_Text_Buffer text_buffer));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_prev_char,(fl_Text_Buffer text_buffer,int ix));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_prev_char_clipped,(fl_Text_Buffer text_buffer,int ix));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_next_char,(fl_Text_Buffer text_buffer,int ix));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_next_char_clipped,(fl_Text_Buffer text_buffer,int ix));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Buffer_utf8_align,(fl_Text_Buffer text_buffer,int align));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Text_DisplayC.h b/c-src/Fl_Text_DisplayC.h
--- a/c-src/Fl_Text_DisplayC.h
+++ b/c-src/Fl_Text_DisplayC.h
@@ -29,201 +29,201 @@
   };
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,          Fl_Text_Display_handle)(fl_Text_Display self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Text_Display_parent)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_set_parent)(fl_Text_Display text_display, fl_Text_Display grp);
-  FL_EXPORT_C(uchar,        Fl_Text_Display_type)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_set_type)(fl_Text_Display text_display, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_handle,(fl_Text_Display self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Text_Display_parent,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_parent,(fl_Text_Display text_display, fl_Text_Display grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Text_Display_type,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_type,(fl_Text_Display text_display, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Text_Display_x)(fl_Text_Display text_display);
-  FL_EXPORT_C(int,          Fl_Text_Display_y)(fl_Text_Display text_display);
-  FL_EXPORT_C(int,          Fl_Text_Display_w)(fl_Text_Display text_display);
-  FL_EXPORT_C(int,          Fl_Text_Display_h)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_set_align)(fl_Text_Display text_display, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Text_Display_align)(fl_Text_Display text_display);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Text_Display_box)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_set_box)(fl_Text_Display text_display, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Text_Display_color)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_set_color)(fl_Text_Display text_display, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Text_Display_set_color_with_bg_sel)(fl_Text_Display text_display,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Text_Display_selection_color)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_set_selection_color)(fl_Text_Display text_display, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Text_Display_label)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_copy_label)(fl_Text_Display text_display, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Text_Display_set_label)(fl_Text_Display text_display, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Text_Display_labeltype)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_set_labeltype)(fl_Text_Display text_display, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Text_Display_labelcolor)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_set_labelcolor)(fl_Text_Display text_display, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Text_Display_item_labelfont)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_set_item_labelfont)(fl_Text_Display text_display, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Text_Display_item_labelsize)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_set_item_labelsize)(fl_Text_Display text_display, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Text_Display_image)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_set_image)(fl_Text_Display text_display, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Text_Display_deimage)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_set_deimage)(fl_Text_Display text_display, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Text_Display_tooltip)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_copy_tooltip)(fl_Text_Display text_display, const char* text);
-  FL_EXPORT_C(void,         Fl_Text_Display_set_tooltip)(fl_Text_Display text_display, const char* text);
-  FL_EXPORT_C(void,         Fl_Text_Display_set_callback_with_user_data)(fl_Text_Display text_display, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Text_Display_set_callback)(fl_Text_Display text_display, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Text_Display_other_data)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_set_other_data)(fl_Text_Display text_display, void* v);
-  FL_EXPORT_C(void*,        Fl_Text_Display_user_data)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_set_user_data)(fl_Text_Display text_display, void* v);
-  FL_EXPORT_C(long,         Fl_Text_Display_argument)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_set_argument)(fl_Text_Display text_display, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Text_Display_when)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_set_when)(fl_Text_Display text_display, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Text_Display_visible)(fl_Text_Display text_display);
-  FL_EXPORT_C(int,          Fl_Text_Display_visible_r)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_show_super)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_show)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_hide_super)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_hide)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_set_visible)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_clear_visible)(fl_Text_Display text_display);
-  FL_EXPORT_C(unsigned int, Fl_Text_Display_active)(fl_Text_Display text_display);
-  FL_EXPORT_C(int,          Fl_Text_Display_active_r)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_activate)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_deactivate)(fl_Text_Display text_display);
-  FL_EXPORT_C(unsigned int, Fl_Text_Display_output)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_set_output)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_clear_output)(fl_Text_Display text_display);
-  FL_EXPORT_C(unsigned int, Fl_Text_Display_takesevents)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_set_changed)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_clear_changed)(fl_Text_Display text_display);
-  FL_EXPORT_C(int,          Fl_Text_Display_take_focus)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_set_visible_focus)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_clear_visible_focus)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_modify_visible_focus)(fl_Text_Display text_display, int v);
-  FL_EXPORT_C(unsigned int, Fl_Text_Display_visible_focus)(fl_Text_Display text_display);
-  FL_EXPORT_C(int,          Fl_Text_Display_contains)(fl_Text_Display text_display, fl_Text_Display w);
-  FL_EXPORT_C(int,          Fl_Text_Display_inside)(fl_Text_Display text_display, fl_Text_Display w);
-  FL_EXPORT_C(void,         Fl_Text_Display_redraw)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_redraw_label)(fl_Text_Display text_display);
-  FL_EXPORT_C(uchar,        Fl_Text_Display_damage)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_clear_damage_with_bitmask)(fl_Text_Display text_display, uchar c);
-  FL_EXPORT_C(void,         Fl_Text_Display_clear_damage)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_damage_with_text)(fl_Text_Display text_display, uchar c);
-  FL_EXPORT_C(void,         Fl_Text_Display_damage_inside_text_display)(fl_Text_Display text_display, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Text_Display_draw_label_with_xywh_alignment)(fl_Text_Display text_display, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Text_Display_measure_label)(fl_Text_Display text_display, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Text_Display_window)(fl_Text_Display text_display);
-  FL_EXPORT_C(fl_Window,    Fl_Text_Display_top_window)(fl_Text_Display text_display);
-  FL_EXPORT_C(fl_Window ,   Fl_Text_Display_top_window_offset)(fl_Text_Display text_display, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Text_Display,     Fl_Text_Display_as_text_display_super)(fl_Text_Display text_display);
-  FL_EXPORT_C(fl_Text_Display,     Fl_Text_Display_as_text_display)(fl_Text_Display text_display);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Text_Display_as_gl_window_super)(fl_Text_Display text_display);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Text_Display_as_gl_window)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_resize)(fl_Text_Display text_display,int X, int Y, int W, int H);
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_x,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_y,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_w,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_h,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_align,(fl_Text_Display text_display, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Text_Display_align,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Text_Display_box,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_box,(fl_Text_Display text_display, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Text_Display_color,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_color,(fl_Text_Display text_display, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_color_with_bg_sel,(fl_Text_Display text_display,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Text_Display_selection_color,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_selection_color,(fl_Text_Display text_display, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Text_Display_label,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_copy_label,(fl_Text_Display text_display, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_label,(fl_Text_Display text_display, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Text_Display_labeltype,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_labeltype,(fl_Text_Display text_display, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Text_Display_labelcolor,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_labelcolor,(fl_Text_Display text_display, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Text_Display_item_labelfont,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_item_labelfont,(fl_Text_Display text_display, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Text_Display_item_labelsize,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_item_labelsize,(fl_Text_Display text_display, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Text_Display_image,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_image,(fl_Text_Display text_display, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Text_Display_deimage,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_deimage,(fl_Text_Display text_display, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Text_Display_tooltip,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_copy_tooltip,(fl_Text_Display text_display, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_tooltip,(fl_Text_Display text_display, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_callback_with_user_data,(fl_Text_Display text_display, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_callback,(fl_Text_Display text_display, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Text_Display_other_data,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_other_data,(fl_Text_Display text_display, void* v));
+  FL_EXPORT_C_HEADER(void*,Fl_Text_Display_user_data,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_user_data,(fl_Text_Display text_display, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Text_Display_argument,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_argument,(fl_Text_Display text_display, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Text_Display_when,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_when,(fl_Text_Display text_display, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Text_Display_visible,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_visible_r,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_show_super,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_show,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_hide_super,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_hide,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_visible,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_clear_visible,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Text_Display_active,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_active_r,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_activate,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_deactivate,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Text_Display_output,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_output,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_clear_output,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Text_Display_takesevents,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_changed,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_clear_changed,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_take_focus,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_visible_focus,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_clear_visible_focus,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_modify_visible_focus,(fl_Text_Display text_display, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Text_Display_visible_focus,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_contains,(fl_Text_Display text_display, fl_Text_Display w));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_inside,(fl_Text_Display text_display, fl_Text_Display w));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_redraw,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_redraw_label,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(uchar,Fl_Text_Display_damage,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_clear_damage_with_bitmask,(fl_Text_Display text_display, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_clear_damage,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_damage_with_text,(fl_Text_Display text_display, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_damage_inside_text_display,(fl_Text_Display text_display, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_draw_label_with_xywh_alignment,(fl_Text_Display text_display, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_measure_label,(fl_Text_Display text_display, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Text_Display_window,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Text_Display_top_window,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Text_Display_top_window_offset,(fl_Text_Display text_display, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Text_Display,Fl_Text_Display_as_text_display_super,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(fl_Text_Display,Fl_Text_Display_as_text_display,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Text_Display_as_gl_window_super,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Text_Display_as_gl_window,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_resize,(fl_Text_Display text_display,int X, int Y, int W, int H));
 
   /* Fl_Group specific */
-  FL_EXPORT_C(void,         Fl_Text_Display_begin)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_end)(fl_Text_Display text_display);
-  FL_EXPORT_C(int,          Fl_Text_Display_find)(fl_Text_Display text_display, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Text_Display_add)(fl_Text_Display text_display, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Text_Display_insert)(fl_Text_Display text_display, const char* text);
-  FL_EXPORT_C(void,         Fl_Text_Display_remove_index)(fl_Text_Display text_display, int index);
-  FL_EXPORT_C(void,         Fl_Text_Display_remove_widget)(fl_Text_Display text_display, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Text_Display_clear)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_set_resizable_by_reference)(fl_Text_Display text_display,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Text_Display_set_resizable)(fl_Text_Display text_display,fl_Widget o);
-  FL_EXPORT_C(fl_Widget,         Fl_Text_Display_resizable)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_add_resizable)(fl_Text_Display text_display,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Text_Display_init_sizes)(fl_Text_Display text_display);
-  FL_EXPORT_C(int,          Fl_Text_Display_children)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_set_clip_children)(fl_Text_Display text_display,int c);
-  FL_EXPORT_C(unsigned int, Fl_Text_Display_clip_children)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_focus)(fl_Text_Display text_display,fl_Widget W);
-  FL_EXPORT_C(fl_Widget,    Fl_Text_Display__ddfdesign_kludge)(fl_Text_Display text_display);
-  FL_EXPORT_C(void,         Fl_Text_Display_insert_with_before)(fl_Text_Display self, fl_Widget w, fl_Widget before);
-  FL_EXPORT_C(fl_Widget*,   Fl_Text_Display_array)(fl_Text_Display self);
-  FL_EXPORT_C(fl_Widget,    Fl_Text_Display_child)(fl_Text_Display self, int n);
-  FL_EXPORT_C(fl_Group,     Fl_Text_Display_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(fl_Group,     Fl_Text_Display_New_WithLabel)(int x, int y, int w, int h, const char* t);
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_begin,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_end,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_find,(fl_Text_Display text_display, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_add,(fl_Text_Display text_display, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_insert,(fl_Text_Display text_display, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_remove_index,(fl_Text_Display text_display, int index));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_remove_widget,(fl_Text_Display text_display, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_clear,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_resizable_by_reference,(fl_Text_Display text_display,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_resizable,(fl_Text_Display text_display,fl_Widget o));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Text_Display_resizable,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_add_resizable,(fl_Text_Display text_display,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_init_sizes,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_children,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_clip_children,(fl_Text_Display text_display,int c));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Text_Display_clip_children,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_focus,(fl_Text_Display text_display,fl_Widget W));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Text_Display__ddfdesign_kludge,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_insert_with_before,(fl_Text_Display self, fl_Widget w, fl_Widget before));
+  FL_EXPORT_C_HEADER(fl_Widget*,Fl_Text_Display_array,(fl_Text_Display self));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Text_Display_child,(fl_Text_Display self, int n));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Text_Display_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Text_Display_New_WithLabel,(int x, int y, int w, int h, const char* t));
 
   /* Fl_Text_Display specific */
-  FL_EXPORT_C(fl_Text_Display, Fl_Text_Display_New)(int X, int Y, int W, int H);
-  FL_EXPORT_C(fl_Text_Display, Fl_Text_Display_New_WithLabel)(int X, int Y, int W, int H, const char* l);
-  FL_EXPORT_C(void, Fl_Text_Display_Destroy)(fl_Text_Display text_display);
-  FL_EXPORT_C(int, Fl_Text_Display_handle)(fl_Text_Display text_display, int e);
-  FL_EXPORT_C(void, Fl_Text_Display_set_buffer)(fl_Text_Display text_display, fl_Text_Buffer buf);
-  FL_EXPORT_C(fl_Text_Buffer, Fl_Text_Display_buffer)(fl_Text_Display text_display);
-  FL_EXPORT_C(void, Fl_Text_Display_redisplay_range)(fl_Text_Display text_display, int start, int end);
-  FL_EXPORT_C(void, Fl_Text_Display_scroll)(fl_Text_Display text_display, int topLineNum, int horizOffset);
-  FL_EXPORT_C(void, Fl_Text_Display_overstrike)(fl_Text_Display text_display, const char* text);
-  FL_EXPORT_C(void, Fl_Text_Display_set_insert_position)(fl_Text_Display text_display, int newPos);
-  FL_EXPORT_C(int, Fl_Text_Display_insert_position)(fl_Text_Display text_display);
-  FL_EXPORT_C(int, Fl_Text_Display_position_to_xy)(fl_Text_Display text_display, int pos, int* x, int* y);
-  FL_EXPORT_C(int, Fl_Text_Display_in_selection)(fl_Text_Display text_display, int x, int y);
-  FL_EXPORT_C(void, Fl_Text_Display_show_insert_position)(fl_Text_Display text_display);
-  FL_EXPORT_C(int, Fl_Text_Display_move_right)(fl_Text_Display text_display);
-  FL_EXPORT_C(int, Fl_Text_Display_move_left)(fl_Text_Display text_display);
-  FL_EXPORT_C(int, Fl_Text_Display_move_up)(fl_Text_Display text_display);
-  FL_EXPORT_C(int, Fl_Text_Display_move_down)(fl_Text_Display text_display);
-  FL_EXPORT_C(int, Fl_Text_Display_count_lines)(fl_Text_Display text_display, int start, int end, int start_pos_is_line_start);
-  FL_EXPORT_C(int, Fl_Text_Display_line_start)(fl_Text_Display text_display, int pos);
-  FL_EXPORT_C(int, Fl_Text_Display_line_end)(fl_Text_Display text_display, int startPos, int startPosIsLineStart);
-  FL_EXPORT_C(int, Fl_Text_Display_skip_lines)(fl_Text_Display text_display, int startPos, int nLines, int startPosIsLineStart);
-  FL_EXPORT_C(int, Fl_Text_Display_rewind_lines)(fl_Text_Display text_display, int startPos, int nLines);
-  FL_EXPORT_C(void, Fl_Text_Display_next_word)(fl_Text_Display text_display);
-  FL_EXPORT_C(void, Fl_Text_Display_previous_word)(fl_Text_Display text_display);
-  FL_EXPORT_C(void, Fl_Text_Display_show_cursor)(fl_Text_Display text_display);
-  FL_EXPORT_C(void, Fl_Text_Display_show_cursor_with_b)(fl_Text_Display text_display, int b);
-  FL_EXPORT_C(void, Fl_Text_Display_hide_cursor)(fl_Text_Display text_display);
-  FL_EXPORT_C(void, Fl_Text_Display_set_cursor_style)(fl_Text_Display text_display, int style);
-  // FL_EXPORT_C(int, Fl_Text_Display_cursor_style)(fl_Text_Display text_display);
-  FL_EXPORT_C(Fl_Color, Fl_Text_Display_cursor_color)(fl_Text_Display text_display);
-  FL_EXPORT_C(void, Fl_Text_Display_set_cursor_color)(fl_Text_Display text_display, Fl_Color n);
-  FL_EXPORT_C(int, Fl_Text_Display_scrollbar_width)(fl_Text_Display text_display);
-  FL_EXPORT_C(void, Fl_Text_Display_set_scrollbar_width)(fl_Text_Display text_display, int W);
-  FL_EXPORT_C(Fl_Align, Fl_Text_Display_scrollbar_align)(fl_Text_Display text_display);
-  FL_EXPORT_C(void, Fl_Text_Display_set_scrollbar_align)(fl_Text_Display text_display, Fl_Align a);
-  FL_EXPORT_C(int, Fl_Text_Display_word_start)(fl_Text_Display text_display, int pos);
-  FL_EXPORT_C(int, Fl_Text_Display_word_end)(fl_Text_Display text_display, int pos);
-  FL_EXPORT_C(void, Fl_Text_Display_highlight_data)(fl_Text_Display text_display, fl_Text_Buffer styleBuffer, Style_Table_Entry *styleTable, int nStyles, char unfinishedStyle, Unfinished_Style_Cb unfinishedHighlightCB, void *cbArg);
-  FL_EXPORT_C(int, Fl_Text_Display_position_style)(fl_Text_Display text_display, int lineStartPos, int lineLen, int lineIndex);
-  FL_EXPORT_C(int, Fl_Text_Display_shortcut)(fl_Text_Display text_display);
-  FL_EXPORT_C(void, Fl_Text_Display_set_shortcut)(fl_Text_Display text_display, int s);
-  FL_EXPORT_C(Fl_Font, Fl_Text_Display_textfont)(fl_Text_Display text_display);
-  FL_EXPORT_C(void, Fl_Text_Display_set_textfont)(fl_Text_Display text_display, Fl_Font s);
-  FL_EXPORT_C(Fl_Fontsize, Fl_Text_Display_textsize)(fl_Text_Display text_display);
-  FL_EXPORT_C(void, Fl_Text_Display_set_textsize)(fl_Text_Display text_display, Fl_Fontsize s);
-  FL_EXPORT_C(Fl_Color, Fl_Text_Display_textcolor)(fl_Text_Display text_display);
-  FL_EXPORT_C(void, Fl_Text_Display_set_textcolor)(fl_Text_Display text_display, Fl_Color n);
-  FL_EXPORT_C(int, Fl_Text_Display_wrapped_column)(fl_Text_Display text_display, int row, int column);
-  FL_EXPORT_C(int, Fl_Text_Display_wrapped_row)(fl_Text_Display text_display, int row);
-  FL_EXPORT_C(void, Fl_Text_Display_wrap_mode)(fl_Text_Display text_display, int wrap, int wrap_margin);
-  FL_EXPORT_C(double, Fl_Text_Display_x_to_col)(fl_Text_Display text_display, double x);
-  FL_EXPORT_C(double, Fl_Text_Display_col_to_x)(fl_Text_Display text_display,double col);
-  FL_EXPORT_C(void        ,set_linenumber_width)(fl_Text_Display text_display,int width);
-  FL_EXPORT_C(int         ,linenumber_width)(fl_Text_Display text_display);
-  FL_EXPORT_C(void        ,set_linenumber_font)(fl_Text_Display text_display,Fl_Font val);
-  FL_EXPORT_C(Fl_Font     ,linenumber_font)(fl_Text_Display text_display);
-  FL_EXPORT_C(void        ,set_linenumber_size)(fl_Text_Display text_display,Fl_Fontsize val);
-  FL_EXPORT_C(Fl_Fontsize ,linenumber_size)(fl_Text_Display text_display);
-  FL_EXPORT_C(void        ,set_linenumber_fgcolor)(fl_Text_Display text_display,Fl_Color val);
-  FL_EXPORT_C(Fl_Color    ,linenumber_fgcolor)(fl_Text_Display text_display);
-  FL_EXPORT_C(void        ,set_linenumber_bgcolor)(fl_Text_Display text_display,Fl_Color val);
-  FL_EXPORT_C(Fl_Color    ,linenumber_bgcolor)(fl_Text_Display text_display);
-  FL_EXPORT_C(void        ,set_linenumber_align)(fl_Text_Display text_display,Fl_Align val);
-  FL_EXPORT_C(Fl_Align    ,linenumber_align)(fl_Text_Display text_display);
-  FL_EXPORT_C(void        ,set_linenumber_format)(fl_Text_Display text_display,const char* val);
-  FL_EXPORT_C(const char* ,linenumber_format)(fl_Text_Display text_display);
-  FL_EXPORT_C(fl_Text_Display,    Fl_OverriddenText_Display_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Text_Display,    Fl_OverriddenText_Display_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Text_Display_draw)(fl_Text_Display o);
-  FL_EXPORT_C(void, Fl_Text_Display_draw_super)(fl_Text_Display o);
-  FL_EXPORT_C(int, Fl_Text_Display_handle)(fl_Text_Display o, int event);
-  FL_EXPORT_C(int, Fl_Text_Display_handle_super)(fl_Text_Display o, int event);
-  FL_EXPORT_C(void, Fl_Text_Display_resize)(fl_Text_Display o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Text_Display_resize_super)(fl_Text_Display o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Text_Display_show)(fl_Text_Display o);
-  FL_EXPORT_C(void, Fl_Text_Display_show_super)(fl_Text_Display o);
-  FL_EXPORT_C(void, Fl_Text_Display_hide)(fl_Text_Display o);
-  FL_EXPORT_C(void, Fl_Text_Display_hide_super)(fl_Text_Display o);
+  FL_EXPORT_C_HEADER(fl_Text_Display,Fl_Text_Display_New,(int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(fl_Text_Display,Fl_Text_Display_New_WithLabel,(int X, int Y, int W, int H, const char* l));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_Destroy,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_handle,(fl_Text_Display text_display, int e));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_buffer,(fl_Text_Display text_display, fl_Text_Buffer buf));
+  FL_EXPORT_C_HEADER(fl_Text_Buffer,Fl_Text_Display_buffer,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_redisplay_range,(fl_Text_Display text_display, int start, int end));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_scroll,(fl_Text_Display text_display, int topLineNum, int horizOffset));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_overstrike,(fl_Text_Display text_display, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_insert_position,(fl_Text_Display text_display, int newPos));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_insert_position,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_position_to_xy,(fl_Text_Display text_display, int pos, int* x, int* y));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_in_selection,(fl_Text_Display text_display, int x, int y));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_show_insert_position,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_move_right,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_move_left,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_move_up,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_move_down,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_count_lines,(fl_Text_Display text_display, int start, int end, int start_pos_is_line_start));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_line_start,(fl_Text_Display text_display, int pos));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_line_end,(fl_Text_Display text_display, int startPos, int startPosIsLineStart));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_skip_lines,(fl_Text_Display text_display, int startPos, int nLines, int startPosIsLineStart));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_rewind_lines,(fl_Text_Display text_display, int startPos, int nLines));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_next_word,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_previous_word,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_show_cursor,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_show_cursor_with_b,(fl_Text_Display text_display, int b));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_hide_cursor,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_cursor_style,(fl_Text_Display text_display, int style));
+  // FL_EXPORT_C_HEADER(int,Fl_Text_Display_cursor_style,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Text_Display_cursor_color,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_cursor_color,(fl_Text_Display text_display, Fl_Color n));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_scrollbar_width,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_scrollbar_width,(fl_Text_Display text_display, int W));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Text_Display_scrollbar_align,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_scrollbar_align,(fl_Text_Display text_display, Fl_Align a));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_word_start,(fl_Text_Display text_display, int pos));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_word_end,(fl_Text_Display text_display, int pos));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_highlight_data,(fl_Text_Display text_display, fl_Text_Buffer styleBuffer, Style_Table_Entry *styleTable, int nStyles, char unfinishedStyle, Unfinished_Style_Cb unfinishedHighlightCB, void *cbArg));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_position_style,(fl_Text_Display text_display, int lineStartPos, int lineLen, int lineIndex));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_shortcut,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_shortcut,(fl_Text_Display text_display, int s));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Text_Display_textfont,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_textfont,(fl_Text_Display text_display, Fl_Font s));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Text_Display_textsize,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_textsize,(fl_Text_Display text_display, Fl_Fontsize s));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Text_Display_textcolor,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_set_textcolor,(fl_Text_Display text_display, Fl_Color n));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_wrapped_column,(fl_Text_Display text_display, int row, int column));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_wrapped_row,(fl_Text_Display text_display, int row));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_wrap_mode,(fl_Text_Display text_display, int wrap, int wrap_margin));
+  FL_EXPORT_C_HEADER(double,Fl_Text_Display_x_to_col,(fl_Text_Display text_display, double x));
+  FL_EXPORT_C_HEADER(double,Fl_Text_Display_col_to_x,(fl_Text_Display text_display,double col));
+  FL_EXPORT_C_HEADER(void        ,set_linenumber_width,(fl_Text_Display text_display,int width));
+  FL_EXPORT_C_HEADER(int         ,linenumber_width,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void        ,set_linenumber_font,(fl_Text_Display text_display,Fl_Font val));
+  FL_EXPORT_C_HEADER(Fl_Font     ,linenumber_font,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void        ,set_linenumber_size,(fl_Text_Display text_display,Fl_Fontsize val));
+  FL_EXPORT_C_HEADER(Fl_Fontsize ,linenumber_size,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void        ,set_linenumber_fgcolor,(fl_Text_Display text_display,Fl_Color val));
+  FL_EXPORT_C_HEADER(Fl_Color    ,linenumber_fgcolor,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void        ,set_linenumber_bgcolor,(fl_Text_Display text_display,Fl_Color val));
+  FL_EXPORT_C_HEADER(Fl_Color    ,linenumber_bgcolor,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void        ,set_linenumber_align,(fl_Text_Display text_display,Fl_Align val));
+  FL_EXPORT_C_HEADER(Fl_Align    ,linenumber_align,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(void        ,set_linenumber_format,(fl_Text_Display text_display,const char* val));
+  FL_EXPORT_C_HEADER(const char* ,linenumber_format,(fl_Text_Display text_display));
+  FL_EXPORT_C_HEADER(fl_Text_Display,Fl_OverriddenText_Display_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Text_Display,Fl_OverriddenText_Display_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_draw,(fl_Text_Display o));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_draw_super,(fl_Text_Display o));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_handle,(fl_Text_Display o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Display_handle_super,(fl_Text_Display o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_resize,(fl_Text_Display o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_resize_super,(fl_Text_Display o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_show,(fl_Text_Display o));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_show_super,(fl_Text_Display o));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_hide,(fl_Text_Display o));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Display_hide_super,(fl_Text_Display o));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Text_EditorC.h b/c-src/Fl_Text_EditorC.h
--- a/c-src/Fl_Text_EditorC.h
+++ b/c-src/Fl_Text_EditorC.h
@@ -11,226 +11,226 @@
 EXPORT {
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,          Fl_Text_Editor_handle)(fl_Text_Editor self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Text_Editor_parent)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_set_parent)(fl_Text_Editor text_editor, fl_Text_Editor grp);
-  FL_EXPORT_C(uchar,        Fl_Text_Editor_type)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_set_type)(fl_Text_Editor text_editor, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_handle,(fl_Text_Editor self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Text_Editor_parent,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_parent,(fl_Text_Editor text_editor, fl_Text_Editor grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Text_Editor_type,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_type,(fl_Text_Editor text_editor, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Text_Editor_x)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(int,          Fl_Text_Editor_y)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(int,          Fl_Text_Editor_w)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(int,          Fl_Text_Editor_h)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_set_align)(fl_Text_Editor text_editor, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Text_Editor_align)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Text_Editor_box)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_set_box)(fl_Text_Editor text_editor, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Text_Editor_color)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_set_color)(fl_Text_Editor text_editor, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Text_Editor_set_color_with_bg_sel)(fl_Text_Editor text_editor,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Text_Editor_selection_color)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_set_selection_color)(fl_Text_Editor text_editor, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Text_Editor_label)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_copy_label)(fl_Text_Editor text_editor, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Text_Editor_set_label)(fl_Text_Editor text_editor, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Text_Editor_labeltype)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_set_labeltype)(fl_Text_Editor text_editor, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Text_Editor_labelcolor)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_set_labelcolor)(fl_Text_Editor text_editor, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Text_Editor_item_labelfont)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_set_item_labelfont)(fl_Text_Editor text_editor, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Text_Editor_item_labelsize)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_set_item_labelsize)(fl_Text_Editor text_editor, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Text_Editor_image)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_set_image)(fl_Text_Editor text_editor, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Text_Editor_deimage)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_set_deimage)(fl_Text_Editor text_editor, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Text_Editor_tooltip)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_copy_tooltip)(fl_Text_Editor text_editor, const char* text);
-  FL_EXPORT_C(void,         Fl_Text_Editor_set_tooltip)(fl_Text_Editor text_editor, const char* text);
-  FL_EXPORT_C(void,         Fl_Text_Editor_set_callback_with_user_data)(fl_Text_Editor text_editor, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Text_Editor_set_callback)(fl_Text_Editor text_editor, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Text_Editor_other_data)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_set_other_data)(fl_Text_Editor text_editor, void* v);
-  FL_EXPORT_C(void*,        Fl_Text_Editor_user_data)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_set_user_data)(fl_Text_Editor text_editor, void* v);
-  FL_EXPORT_C(long,         Fl_Text_Editor_argument)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_set_argument)(fl_Text_Editor text_editor, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Text_Editor_when)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_set_when)(fl_Text_Editor text_editor, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Text_Editor_visible)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(int,          Fl_Text_Editor_visible_r)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_show_super)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_show)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_hide_super)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_hide)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_set_visible)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_clear_visible)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(unsigned int, Fl_Text_Editor_active)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(int,          Fl_Text_Editor_active_r)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_activate)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_deactivate)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(unsigned int, Fl_Text_Editor_output)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_set_output)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_clear_output)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(unsigned int, Fl_Text_Editor_takesevents)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_set_changed)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_clear_changed)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(int,          Fl_Text_Editor_take_focus)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_set_visible_focus)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_clear_visible_focus)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_modify_visible_focus)(fl_Text_Editor text_editor, int v);
-  FL_EXPORT_C(unsigned int, Fl_Text_Editor_visible_focus)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(int,          Fl_Text_Editor_contains)(fl_Text_Editor text_editor, fl_Text_Editor w);
-  FL_EXPORT_C(int,          Fl_Text_Editor_inside)(fl_Text_Editor text_editor, fl_Text_Editor w);
-  FL_EXPORT_C(void,         Fl_Text_Editor_redraw)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_redraw_label)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(uchar,        Fl_Text_Editor_damage)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_clear_damage_with_bitmask)(fl_Text_Editor text_editor, uchar c);
-  FL_EXPORT_C(void,         Fl_Text_Editor_clear_damage)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_damage_with_text)(fl_Text_Editor text_editor, uchar c);
-  FL_EXPORT_C(void,         Fl_Text_Editor_damage_inside_text_editor)(fl_Text_Editor text_editor, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Text_Editor_draw_label_with_xywh_alignment)(fl_Text_Editor text_editor, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Text_Editor_measure_label)(fl_Text_Editor text_editor, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Text_Editor_window)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(fl_Window,    Fl_Text_Editor_top_window)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(fl_Window ,   Fl_Text_Editor_top_window_offset)(fl_Text_Editor text_editor, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Text_Editor,     Fl_Text_Editor_as_text_editor_super)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(fl_Text_Editor,     Fl_Text_Editor_as_text_editor)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Text_Editor_as_gl_window_super)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Text_Editor_as_gl_window)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_resize_super)(fl_Text_Editor text_editor,int X, int Y, int W, int H);
-  FL_EXPORT_C(void,         Fl_Text_Editor_resize)(fl_Text_Editor text_editor,int X, int Y, int W, int H);
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_x,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_y,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_w,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_h,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_align,(fl_Text_Editor text_editor, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Text_Editor_align,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Text_Editor_box,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_box,(fl_Text_Editor text_editor, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Text_Editor_color,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_color,(fl_Text_Editor text_editor, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_color_with_bg_sel,(fl_Text_Editor text_editor,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Text_Editor_selection_color,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_selection_color,(fl_Text_Editor text_editor, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Text_Editor_label,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_copy_label,(fl_Text_Editor text_editor, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_label,(fl_Text_Editor text_editor, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Text_Editor_labeltype,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_labeltype,(fl_Text_Editor text_editor, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Text_Editor_labelcolor,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_labelcolor,(fl_Text_Editor text_editor, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Text_Editor_item_labelfont,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_item_labelfont,(fl_Text_Editor text_editor, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Text_Editor_item_labelsize,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_item_labelsize,(fl_Text_Editor text_editor, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Text_Editor_image,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_image,(fl_Text_Editor text_editor, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Text_Editor_deimage,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_deimage,(fl_Text_Editor text_editor, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Text_Editor_tooltip,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_copy_tooltip,(fl_Text_Editor text_editor, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_tooltip,(fl_Text_Editor text_editor, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_callback_with_user_data,(fl_Text_Editor text_editor, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_callback,(fl_Text_Editor text_editor, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Text_Editor_other_data,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_other_data,(fl_Text_Editor text_editor, void* v));
+  FL_EXPORT_C_HEADER(void*,Fl_Text_Editor_user_data,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_user_data,(fl_Text_Editor text_editor, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Text_Editor_argument,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_argument,(fl_Text_Editor text_editor, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Text_Editor_when,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_when,(fl_Text_Editor text_editor, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Text_Editor_visible,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_visible_r,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_show_super,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_show,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_hide_super,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_hide,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_visible,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_clear_visible,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Text_Editor_active,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_active_r,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_activate,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_deactivate,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Text_Editor_output,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_output,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_clear_output,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Text_Editor_takesevents,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_changed,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_clear_changed,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_take_focus,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_visible_focus,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_clear_visible_focus,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_modify_visible_focus,(fl_Text_Editor text_editor, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Text_Editor_visible_focus,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_contains,(fl_Text_Editor text_editor, fl_Text_Editor w));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_inside,(fl_Text_Editor text_editor, fl_Text_Editor w));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_redraw,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_redraw_label,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(uchar,Fl_Text_Editor_damage,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_clear_damage_with_bitmask,(fl_Text_Editor text_editor, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_clear_damage,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_damage_with_text,(fl_Text_Editor text_editor, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_damage_inside_text_editor,(fl_Text_Editor text_editor, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_draw_label_with_xywh_alignment,(fl_Text_Editor text_editor, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_measure_label,(fl_Text_Editor text_editor, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Text_Editor_window,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Text_Editor_top_window,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Text_Editor_top_window_offset,(fl_Text_Editor text_editor, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Text_Editor,Fl_Text_Editor_as_text_editor_super,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(fl_Text_Editor,Fl_Text_Editor_as_text_editor,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Text_Editor_as_gl_window_super,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Text_Editor_as_gl_window,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_resize_super,(fl_Text_Editor text_editor,int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_resize,(fl_Text_Editor text_editor,int X, int Y, int W, int H));
 
   /* Fl_Group specific */
-  FL_EXPORT_C(void,         Fl_Text_Editor_begin)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_end)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(int,          Fl_Text_Editor_find)(fl_Text_Editor text_editor, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Text_Editor_add)(fl_Text_Editor text_editor, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Text_Editor_insert)(fl_Text_Editor text_editor, const char* text);
-  FL_EXPORT_C(void,         Fl_Text_Editor_remove_index)(fl_Text_Editor text_editor, int index);
-  FL_EXPORT_C(void,         Fl_Text_Editor_remove_widget)(fl_Text_Editor text_editor, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Text_Editor_clear)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_set_resizable_by_reference)(fl_Text_Editor text_editor,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Text_Editor_set_resizable)(fl_Text_Editor text_editor,fl_Widget o);
-  FL_EXPORT_C(fl_Widget,         Fl_Text_Editor_resizable)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_add_resizable)(fl_Text_Editor text_editor,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Text_Editor_init_sizes)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(int,          Fl_Text_Editor_children)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_set_clip_children)(fl_Text_Editor text_editor,int c);
-  FL_EXPORT_C(unsigned int, Fl_Text_Editor_clip_children)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_focus)(fl_Text_Editor text_editor,fl_Widget W);
-  FL_EXPORT_C(fl_Widget,    Fl_Text_Editor__ddfdesign_kludge)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void,         Fl_Text_Editor_insert_with_before)(fl_Text_Editor self, fl_Widget w, fl_Widget before);
-  FL_EXPORT_C(fl_Widget*,   Fl_Text_Editor_array)(fl_Text_Editor self);
-  FL_EXPORT_C(fl_Widget,    Fl_Text_Editor_child)(fl_Text_Editor self, int n);
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_begin,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_end,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_find,(fl_Text_Editor text_editor, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_add,(fl_Text_Editor text_editor, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_insert,(fl_Text_Editor text_editor, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_remove_index,(fl_Text_Editor text_editor, int index));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_remove_widget,(fl_Text_Editor text_editor, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_clear,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_resizable_by_reference,(fl_Text_Editor text_editor,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_resizable,(fl_Text_Editor text_editor,fl_Widget o));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Text_Editor_resizable,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_add_resizable,(fl_Text_Editor text_editor,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_init_sizes,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_children,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_clip_children,(fl_Text_Editor text_editor,int c));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Text_Editor_clip_children,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_focus,(fl_Text_Editor text_editor,fl_Widget W));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Text_Editor__ddfdesign_kludge,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_insert_with_before,(fl_Text_Editor self, fl_Widget w, fl_Widget before));
+  FL_EXPORT_C_HEADER(fl_Widget*,Fl_Text_Editor_array,(fl_Text_Editor self));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Text_Editor_child,(fl_Text_Editor self, int n));
 
   /* Inherited from Fl_Text_Display */
-  FL_EXPORT_C(fl_Text_Editor, Fl_Text_Editor_New)(int X, int Y, int W, int H);
-  FL_EXPORT_C(fl_Text_Editor, Fl_Text_Editor_New_WithLabel)(int X, int Y, int W, int H, const char* l);
-  FL_EXPORT_C(void,     Fl_Text_Editor_Destroy)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(int, Fl_Text_Editor_handle)(fl_Text_Editor text_editor, int e);
-  FL_EXPORT_C(void, Fl_Text_Editor_set_buffer)(fl_Text_Editor text_editor, fl_Text_Buffer buf);
-  FL_EXPORT_C(fl_Text_Buffer, Fl_Text_Editor_buffer)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void, Fl_Text_Editor_redisplay_range)(fl_Text_Editor text_editor, int start, int end);
-  FL_EXPORT_C(void, Fl_Text_Editor_scroll)(fl_Text_Editor text_editor, int topLineNum, int horizOffset);
-  FL_EXPORT_C(void, Fl_Text_Editor_overstrike)(fl_Text_Editor text_editor, const char* text);
-  FL_EXPORT_C(void, Fl_Text_Editor_set_insert_position)(fl_Text_Editor text_editor, int newPos);
-  FL_EXPORT_C(int, Fl_Text_Editor_insert_position)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(int, Fl_Text_Editor_position_to_xy)(fl_Text_Editor text_editor, int pos, int* x, int* y);
-  FL_EXPORT_C(int, Fl_Text_Editor_in_selection)(fl_Text_Editor text_editor, int x, int y);
-  FL_EXPORT_C(void, Fl_Text_Editor_show_insert_position)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(int, Fl_Text_Editor_move_right)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(int, Fl_Text_Editor_move_left)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(int, Fl_Text_Editor_move_up)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(int, Fl_Text_Editor_move_down)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(int, Fl_Text_Editor_count_lines)(fl_Text_Editor text_editor, int start, int end, int start_pos_is_line_start);
-  FL_EXPORT_C(int, Fl_Text_Editor_line_start)(fl_Text_Editor text_editor, int pos);
-  FL_EXPORT_C(int, Fl_Text_Editor_line_end)(fl_Text_Editor text_editor, int startPos, int startPosIsLineStart);
-  FL_EXPORT_C(int, Fl_Text_Editor_skip_lines)(fl_Text_Editor text_editor, int startPos, int nLines, int startPosIsLineStart);
-  FL_EXPORT_C(int, Fl_Text_Editor_rewind_lines)(fl_Text_Editor text_editor, int startPos, int nLines);
-  FL_EXPORT_C(void, Fl_Text_Editor_next_word)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void, Fl_Text_Editor_previous_word)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void, Fl_Text_Editor_show_cursor)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void, Fl_Text_Editor_show_cursor_with_b)(fl_Text_Editor text_editor, int b);
-  FL_EXPORT_C(void, Fl_Text_Editor_hide_cursor)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void, Fl_Text_Editor_cursor_style)(fl_Text_Editor text_editor, int style);
-  FL_EXPORT_C(Fl_Color, Fl_Text_Editor_cursor_color)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void, Fl_Text_Editor_set_cursor_color)(fl_Text_Editor text_editor, Fl_Color n);
-  FL_EXPORT_C(int, Fl_Text_Editor_scrollbar_width)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void, Fl_Text_Editor_set_scrollbar_width)(fl_Text_Editor text_editor, int W);
-  FL_EXPORT_C(Fl_Align, Fl_Text_Editor_scrollbar_align)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void, Fl_Text_Editor_set_scrollbar_align)(fl_Text_Editor text_editor, Fl_Align a);
-  FL_EXPORT_C(int, Fl_Text_Editor_word_start)(fl_Text_Editor text_editor, int pos);
-  FL_EXPORT_C(int, Fl_Text_Editor_word_end)(fl_Text_Editor text_editor, int pos);
-  FL_EXPORT_C(void, Fl_Text_Editor_highlight_data)(fl_Text_Editor text_editor, fl_Text_Buffer styleBuffer, Style_Table_Entry *styleTable, int nStyles, char unfinishedStyle, Unfinished_Style_Cb unfinishedHighlightCB, void *cbArg);
-  FL_EXPORT_C(int, Fl_Text_Editor_position_style)(fl_Text_Editor text_editor, int lineStartPos, int lineLen, int lineIndex);
-  FL_EXPORT_C(int, Fl_Text_Editor_shortcut)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void, Fl_Text_Editor_set_shortcut)(fl_Text_Editor text_editor, int s);
-  FL_EXPORT_C(Fl_Font, Fl_Text_Editor_textfont)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void, Fl_Text_Editor_set_textfont)(fl_Text_Editor text_editor, Fl_Font s);
-  FL_EXPORT_C(Fl_Fontsize, Fl_Text_Editor_textsize)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void, Fl_Text_Editor_set_textsize)(fl_Text_Editor text_editor, Fl_Fontsize s);
-  FL_EXPORT_C(Fl_Color, Fl_Text_Editor_textcolor)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(void, Fl_Text_Editor_set_textcolor)(fl_Text_Editor text_editor, Fl_Color n);
-  FL_EXPORT_C(int, Fl_Text_Editor_wrapped_column)(fl_Text_Editor text_editor, int row, int column);
-  FL_EXPORT_C(int, Fl_Text_Editor_wrapped_row)(fl_Text_Editor text_editor, int row);
-  FL_EXPORT_C(void, Fl_Text_Editor_wrap_mode)(fl_Text_Editor text_editor, int wrap, int wrap_margin);
-  FL_EXPORT_C(double, Fl_Text_Editor_x_to_col)(fl_Text_Editor text_editor, double x);
-  FL_EXPORT_C(double, Fl_Text_Editor_col_to_x)(fl_Text_Editor text_editor,double col);
+  FL_EXPORT_C_HEADER(fl_Text_Editor,Fl_Text_Editor_New,(int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(fl_Text_Editor,Fl_Text_Editor_New_WithLabel,(int X, int Y, int W, int H, const char* l));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_Destroy,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_handle,(fl_Text_Editor text_editor, int e));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_buffer,(fl_Text_Editor text_editor, fl_Text_Buffer buf));
+  FL_EXPORT_C_HEADER(fl_Text_Buffer,Fl_Text_Editor_buffer,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_redisplay_range,(fl_Text_Editor text_editor, int start, int end));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_scroll,(fl_Text_Editor text_editor, int topLineNum, int horizOffset));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_overstrike,(fl_Text_Editor text_editor, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_insert_position,(fl_Text_Editor text_editor, int newPos));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_insert_position,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_position_to_xy,(fl_Text_Editor text_editor, int pos, int* x, int* y));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_in_selection,(fl_Text_Editor text_editor, int x, int y));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_show_insert_position,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_move_right,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_move_left,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_move_up,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_move_down,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_count_lines,(fl_Text_Editor text_editor, int start, int end, int start_pos_is_line_start));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_line_start,(fl_Text_Editor text_editor, int pos));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_line_end,(fl_Text_Editor text_editor, int startPos, int startPosIsLineStart));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_skip_lines,(fl_Text_Editor text_editor, int startPos, int nLines, int startPosIsLineStart));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_rewind_lines,(fl_Text_Editor text_editor, int startPos, int nLines));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_next_word,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_previous_word,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_show_cursor,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_show_cursor_with_b,(fl_Text_Editor text_editor, int b));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_hide_cursor,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_cursor_style,(fl_Text_Editor text_editor, int style));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Text_Editor_cursor_color,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_cursor_color,(fl_Text_Editor text_editor, Fl_Color n));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_scrollbar_width,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_scrollbar_width,(fl_Text_Editor text_editor, int W));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Text_Editor_scrollbar_align,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_scrollbar_align,(fl_Text_Editor text_editor, Fl_Align a));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_word_start,(fl_Text_Editor text_editor, int pos));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_word_end,(fl_Text_Editor text_editor, int pos));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_highlight_data,(fl_Text_Editor text_editor, fl_Text_Buffer styleBuffer, Style_Table_Entry *styleTable, int nStyles, char unfinishedStyle, Unfinished_Style_Cb unfinishedHighlightCB, void *cbArg));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_position_style,(fl_Text_Editor text_editor, int lineStartPos, int lineLen, int lineIndex));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_shortcut,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_shortcut,(fl_Text_Editor text_editor, int s));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Text_Editor_textfont,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_textfont,(fl_Text_Editor text_editor, Fl_Font s));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Text_Editor_textsize,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_textsize,(fl_Text_Editor text_editor, Fl_Fontsize s));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Text_Editor_textcolor,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_textcolor,(fl_Text_Editor text_editor, Fl_Color n));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_wrapped_column,(fl_Text_Editor text_editor, int row, int column));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_wrapped_row,(fl_Text_Editor text_editor, int row));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_wrap_mode,(fl_Text_Editor text_editor, int wrap, int wrap_margin));
+  FL_EXPORT_C_HEADER(double,Fl_Text_Editor_x_to_col,(fl_Text_Editor text_editor, double x));
+  FL_EXPORT_C_HEADER(double,Fl_Text_Editor_col_to_x,(fl_Text_Editor text_editor,double col));
 
   /* Fl_Text_Editor specific */
-  FL_EXPORT_C(void, Fl_Text_Editor_set_insert_mode)(fl_Text_Editor text_editor, int b);
-  FL_EXPORT_C(int, Fl_Text_Editor_insert_mode)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(int, Fl_Text_Editor_num_key_bindings)(Key_BindingC* list);
-  FL_EXPORT_C(void, Fl_Text_Editor_add_key_binding_with_list)(fl_Text_Editor text_editor,int key, int state, fl_Key_Func f, Key_BindingC* list);
-  FL_EXPORT_C(void, Fl_Text_Editor_add_key_binding)(fl_Text_Editor text_editor, int key, int state, fl_Key_Func f);
-  FL_EXPORT_C(void, Fl_Text_Editor_remove_key_binding_with_list)(fl_Text_Editor text_editor, int key, int state, Key_BindingC* list);
-  FL_EXPORT_C(void, Fl_Text_Editor_remove_key_binding)(fl_Text_Editor text_editor, int key, int state);
-  FL_EXPORT_C(void, Fl_Text_Editor_remove_all_key_bindings_with_list)(fl_Text_Editor text_editor, Key_BindingC* list);
-  FL_EXPORT_C(void, Fl_Text_Editor_remove_all_key_bindings)(fl_Text_Editor text_editor);
-  FL_EXPORT_C(Key_BindingC*, Fl_Text_Editor_add_default_key_bindings)(fl_Text_Editor text_editor, Key_BindingC* list);
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_set_insert_mode,(fl_Text_Editor text_editor, int b));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_insert_mode,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_num_key_bindings,(Key_BindingC* list));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_add_key_binding_with_list,(fl_Text_Editor text_editor,int key, int state, fl_Key_Func f, Key_BindingC* list));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_add_key_binding,(fl_Text_Editor text_editor, int key, int state, fl_Key_Func f));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_remove_key_binding_with_list,(fl_Text_Editor text_editor, int key, int state, Key_BindingC* list));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_remove_key_binding,(fl_Text_Editor text_editor, int key, int state));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_remove_all_key_bindings_with_list,(fl_Text_Editor text_editor, Key_BindingC* list));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_remove_all_key_bindings,(fl_Text_Editor text_editor));
+  FL_EXPORT_C_HEADER(Key_BindingC*,Fl_Text_Editor_add_default_key_bindings,(fl_Text_Editor text_editor, Key_BindingC* list));
 
   // functions for the built in default bindings
-  FL_EXPORT_C(int, Fl_Text_Editor_kf_default)(int c, fl_Text_Editor e);
-  FL_EXPORT_C(int, Fl_Text_Editor_kf_ignore)(int c, fl_Text_Editor e);
-  FL_EXPORT_C(int, Fl_Text_Editor_kf_backspace)(int c, fl_Text_Editor e);
-  FL_EXPORT_C(int, Fl_Text_Editor_kf_enter)(int c, fl_Text_Editor e);
-  FL_EXPORT_C(int, Fl_Text_Editor_kf_move)(int c, fl_Text_Editor e);
-  FL_EXPORT_C(int, Fl_Text_Editor_kf_shift_move)(int c, fl_Text_Editor e);
-  FL_EXPORT_C(int, Fl_Text_Editor_kf_ctrl_move)(int c, fl_Text_Editor e);
-  FL_EXPORT_C(int, Fl_Text_Editor_kf_c_s_move)(int c, fl_Text_Editor e);
-  FL_EXPORT_C(int, Fl_Text_Editor_kf_meta_move)(int c, fl_Text_Editor e);
-  FL_EXPORT_C(int, Fl_Text_Editor_kf_m_s_move)(int c, fl_Text_Editor e);
-  FL_EXPORT_C(int, Fl_Text_Editor_kf_home)(int, fl_Text_Editor e);
-  FL_EXPORT_C(int, Fl_Text_Editor_kf_end)(int c, fl_Text_Editor e);
-  FL_EXPORT_C(int, Fl_Text_Editor_kf_left)(int c, fl_Text_Editor e);
-  FL_EXPORT_C(int, Fl_Text_Editor_kf_up)(int c, fl_Text_Editor e);
-  FL_EXPORT_C(int, Fl_Text_Editor_kf_right)(int c, fl_Text_Editor e);
-  FL_EXPORT_C(int, Fl_Text_Editor_kf_down)(int c, fl_Text_Editor e);
-  FL_EXPORT_C(int, Fl_Text_Editor_kf_page_up)(int c, fl_Text_Editor e);
-  FL_EXPORT_C(int, Fl_Text_Editor_kf_page_down)(int c, fl_Text_Editor e);
-  FL_EXPORT_C(int, Fl_Text_Editor_kf_insert)(int c, fl_Text_Editor e);
-  FL_EXPORT_C(int, Fl_Text_Editor_kf_delete)(int c, fl_Text_Editor e);
-  FL_EXPORT_C(int, Fl_Text_Editor_kf_copy)(int c, fl_Text_Editor e);
-  FL_EXPORT_C(int, Fl_Text_Editor_kf_cut)(int c, fl_Text_Editor e);
-  FL_EXPORT_C(int, Fl_Text_Editor_kf_paste)(int c, fl_Text_Editor e);
-  FL_EXPORT_C(int, Fl_Text_Editor_kf_select_all)(int c, fl_Text_Editor e);
-  FL_EXPORT_C(int, Fl_Text_Editor_kf_undo)(int c, fl_Text_Editor e);
-  FL_EXPORT_C(void,Fl_Text_Editor_replace_key_bindings)(fl_Text_Editor text_editor, Key_BindingC* list);
-  FL_EXPORT_C(void,Fl_Text_Editor_replace_key_bindings_with_list)(fl_Text_Editor text_editor, Key_BindingC* list1, Key_BindingC* list2);
-  FL_EXPORT_C(fl_Text_Editor,    Fl_OverriddenText_Editor_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Text_Editor,    Fl_OverriddenText_Editor_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Text_Editor_draw)(fl_Text_Editor o);
-  FL_EXPORT_C(void, Fl_Text_Editor_draw_super)(fl_Text_Editor o);
-  FL_EXPORT_C(int, Fl_Text_Editor_handle)(fl_Text_Editor o, int event);
-  FL_EXPORT_C(int, Fl_Text_Editor_handle_super)(fl_Text_Editor o, int event);
-  FL_EXPORT_C(void, Fl_Text_Editor_resize)(fl_Text_Editor o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Text_Editor_resize_super)(fl_Text_Editor o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Text_Editor_show)(fl_Text_Editor o);
-  FL_EXPORT_C(void, Fl_Text_Editor_show_super)(fl_Text_Editor o);
-  FL_EXPORT_C(void, Fl_Text_Editor_hide)(fl_Text_Editor o);
-  FL_EXPORT_C(void, Fl_Text_Editor_hide_super)(fl_Text_Editor o);
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_kf_default,(int c, fl_Text_Editor e));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_kf_ignore,(int c, fl_Text_Editor e));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_kf_backspace,(int c, fl_Text_Editor e));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_kf_enter,(int c, fl_Text_Editor e));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_kf_move,(int c, fl_Text_Editor e));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_kf_shift_move,(int c, fl_Text_Editor e));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_kf_ctrl_move,(int c, fl_Text_Editor e));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_kf_c_s_move,(int c, fl_Text_Editor e));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_kf_meta_move,(int c, fl_Text_Editor e));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_kf_m_s_move,(int c, fl_Text_Editor e));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_kf_home,(int, fl_Text_Editor e));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_kf_end,(int c, fl_Text_Editor e));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_kf_left,(int c, fl_Text_Editor e));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_kf_up,(int c, fl_Text_Editor e));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_kf_right,(int c, fl_Text_Editor e));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_kf_down,(int c, fl_Text_Editor e));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_kf_page_up,(int c, fl_Text_Editor e));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_kf_page_down,(int c, fl_Text_Editor e));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_kf_insert,(int c, fl_Text_Editor e));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_kf_delete,(int c, fl_Text_Editor e));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_kf_copy,(int c, fl_Text_Editor e));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_kf_cut,(int c, fl_Text_Editor e));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_kf_paste,(int c, fl_Text_Editor e));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_kf_select_all,(int c, fl_Text_Editor e));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_kf_undo,(int c, fl_Text_Editor e));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_replace_key_bindings,(fl_Text_Editor text_editor, Key_BindingC* list));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_replace_key_bindings_with_list,(fl_Text_Editor text_editor, Key_BindingC* list1, Key_BindingC* list2));
+  FL_EXPORT_C_HEADER(fl_Text_Editor,Fl_OverriddenText_Editor_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Text_Editor,Fl_OverriddenText_Editor_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_draw,(fl_Text_Editor o));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_draw_super,(fl_Text_Editor o));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_handle,(fl_Text_Editor o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Editor_handle_super,(fl_Text_Editor o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_resize,(fl_Text_Editor o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_resize_super,(fl_Text_Editor o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_show,(fl_Text_Editor o));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_show_super,(fl_Text_Editor o));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_hide,(fl_Text_Editor o));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Editor_hide_super,(fl_Text_Editor o));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Text_SelectionC.h b/c-src/Fl_Text_SelectionC.h
--- a/c-src/Fl_Text_SelectionC.h
+++ b/c-src/Fl_Text_SelectionC.h
@@ -9,14 +9,14 @@
 #include "Fl_CallbackC.h"
 EXPORT {
 #endif
-  FL_EXPORT_C(void, Fl_Text_Selection_set)(fl_Text_Selection text_selection,int start, int end);
-  FL_EXPORT_C(void, Fl_Text_Selection_update)(fl_Text_Selection text_selection, int pos, int nDeleted, int nInserted);
-  FL_EXPORT_C(int, Fl_Text_Selection_start)(fl_Text_Selection text_selection);
-  FL_EXPORT_C(int, Fl_Text_Selection_end)(fl_Text_Selection text_selection);
-  FL_EXPORT_C(int, Fl_Text_Selection_selected)(fl_Text_Selection text_selection);
-  FL_EXPORT_C(void, Fl_Text_Selection_set_selected)(fl_Text_Selection text_selection, int b);
-  FL_EXPORT_C(int, Fl_Text_Selection_includes)(fl_Text_Selection text_selection, int pos);
-  FL_EXPORT_C(int, Fl_Text_Selection_position)(fl_Text_Selection text_selection, int* start, int* end);
+  FL_EXPORT_C_HEADER(void,Fl_Text_Selection_set,(fl_Text_Selection text_selection,int start, int end));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Selection_update,(fl_Text_Selection text_selection, int pos, int nDeleted, int nInserted));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Selection_start,(fl_Text_Selection text_selection));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Selection_end,(fl_Text_Selection text_selection));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Selection_selected,(fl_Text_Selection text_selection));
+  FL_EXPORT_C_HEADER(void,Fl_Text_Selection_set_selected,(fl_Text_Selection text_selection, int b));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Selection_includes,(fl_Text_Selection text_selection, int pos));
+  FL_EXPORT_C_HEADER(int,Fl_Text_Selection_position,(fl_Text_Selection text_selection, int* start, int* end));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_TileC.h b/c-src/Fl_TileC.h
--- a/c-src/Fl_TileC.h
+++ b/c-src/Fl_TileC.h
@@ -30,134 +30,134 @@
 
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,          Fl_Tile_handle)(fl_Tile tile, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Tile_parent)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_set_parent)(fl_Tile tile, fl_Group group);
-  FL_EXPORT_C(uchar,        Fl_Tile_type)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_set_type)(fl_Tile tile, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Tile_handle,(fl_Tile tile, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Tile_parent,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_set_parent,(fl_Tile tile, fl_Group group));
+  FL_EXPORT_C_HEADER(uchar,Fl_Tile_type,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_set_type,(fl_Tile tile, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Tile_x)(fl_Tile tile);
-  FL_EXPORT_C(int,          Fl_Tile_y)(fl_Tile tile);
-  FL_EXPORT_C(int,          Fl_Tile_w)(fl_Tile tile);
-  FL_EXPORT_C(int,          Fl_Tile_h)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_set_align)(fl_Tile tile, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Tile_align)(fl_Tile tile);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Tile_box)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_set_box)(fl_Tile tile, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Tile_color)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_set_color)(fl_Tile tile, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Tile_set_color_with_bg_sel)(fl_Tile tile,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Tile_selection_color)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_set_selection_color)(fl_Tile tile, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Tile_label)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_copy_label)(fl_Tile tile, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Tile_set_label)(fl_Tile tile, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Tile_labeltype)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_set_labeltype)(fl_Tile tile, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Tile_labelcolor)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_set_labelcolor)(fl_Tile tile, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Tile_item_labelfont)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_set_item_labelfont)(fl_Tile tile, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Tile_item_labelsize)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_set_item_labelsize)(fl_Tile tile, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Tile_image)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_set_image)(fl_Tile tile, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Tile_deimage)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_set_deimage)(fl_Tile tile, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Tile_tooltip)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_copy_tooltip)(fl_Tile tile, const char* text);
-  FL_EXPORT_C(void,         Fl_Tile_set_tooltip)(fl_Tile tile, const char* text);
-  FL_EXPORT_C(void,         Fl_Tile_set_callback_with_user_data)(fl_Tile tile, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Tile_set_callback)(fl_Tile tile, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Tile_other_data)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_set_other_data)(fl_Tile tile, void* v);
-  FL_EXPORT_C(void*,        Fl_Tile_user_data)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_set_user_data)(fl_Tile tile, void* v);
-  FL_EXPORT_C(long,         Fl_Tile_argument)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_set_argument)(fl_Tile tile, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Tile_when)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_set_when)(fl_Tile tile, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Tile_visible)(fl_Tile tile);
-  FL_EXPORT_C(int,          Fl_Tile_visible_r)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_show_super)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_show)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_hide_super)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_hide)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_set_visible)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_clear_visible)(fl_Tile tile);
-  FL_EXPORT_C(unsigned int, Fl_Tile_active)(fl_Tile tile);
-  FL_EXPORT_C(int,          Fl_Tile_active_r)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_activate)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_deactivate)(fl_Tile tile);
-  FL_EXPORT_C(unsigned int, Fl_Tile_output)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_set_output)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_clear_output)(fl_Tile tile);
-  FL_EXPORT_C(unsigned int, Fl_Tile_takesevents)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_set_changed)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_clear_changed)(fl_Tile tile);
-  FL_EXPORT_C(int,          Fl_Tile_take_focus)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_set_visible_focus)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_clear_visible_focus)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_modify_visible_focus)(fl_Tile tile, int v);
-  FL_EXPORT_C(unsigned int, Fl_Tile_visible_focus)(fl_Tile tile);
-  FL_EXPORT_C(int,          Fl_Tile_contains)(fl_Tile tile, fl_Group w);
-  FL_EXPORT_C(int,          Fl_Tile_inside)(fl_Tile tile, fl_Group w);
-  FL_EXPORT_C(void,         Fl_Tile_redraw)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_redraw_label)(fl_Tile tile);
-  FL_EXPORT_C(uchar,        Fl_Tile_damage)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_clear_damage_with_bitmask)(fl_Tile tile, uchar c);
-  FL_EXPORT_C(void,         Fl_Tile_clear_damage)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_damage_with_text)(fl_Tile tile, uchar c);
-  FL_EXPORT_C(void,         Fl_Tile_damage_inside_group)(fl_Tile tile, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Tile_draw_label_with_xywh_alignment)(fl_Tile tile, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Tile_measure_label)(fl_Tile tile, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Tile_window)(fl_Tile tile);
-  FL_EXPORT_C(fl_Window,    Fl_Tile_top_window)(fl_Tile tile);
-  FL_EXPORT_C(fl_Window ,   Fl_Tile_top_window_offset)(fl_Tile tile, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Tile_as_group_super)(fl_Tile tile);
-  FL_EXPORT_C(fl_Group,     Fl_Tile_as_group)(fl_Tile tile);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Tile_as_gl_window_super)(fl_Tile tile);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Tile_as_gl_window)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_resize_super)(fl_Tile tile,int X, int Y, int W, int H);
-  FL_EXPORT_C(void,         Fl_Tile_resize)(fl_Tile tile,int X, int Y, int W, int H);
+  FL_EXPORT_C_HEADER(int,Fl_Tile_x,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(int,Fl_Tile_y,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(int,Fl_Tile_w,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(int,Fl_Tile_h,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_set_align,(fl_Tile tile, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Tile_align,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Tile_box,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_set_box,(fl_Tile tile, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Tile_color,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_set_color,(fl_Tile tile, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_set_color_with_bg_sel,(fl_Tile tile,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Tile_selection_color,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_set_selection_color,(fl_Tile tile, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Tile_label,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_copy_label,(fl_Tile tile, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_set_label,(fl_Tile tile, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Tile_labeltype,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_set_labeltype,(fl_Tile tile, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Tile_labelcolor,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_set_labelcolor,(fl_Tile tile, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Tile_item_labelfont,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_set_item_labelfont,(fl_Tile tile, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Tile_item_labelsize,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_set_item_labelsize,(fl_Tile tile, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Tile_image,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_set_image,(fl_Tile tile, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Tile_deimage,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_set_deimage,(fl_Tile tile, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Tile_tooltip,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_copy_tooltip,(fl_Tile tile, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_set_tooltip,(fl_Tile tile, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_set_callback_with_user_data,(fl_Tile tile, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_set_callback,(fl_Tile tile, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Tile_other_data,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_set_other_data,(fl_Tile tile, void* v));
+  FL_EXPORT_C_HEADER(void*,Fl_Tile_user_data,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_set_user_data,(fl_Tile tile, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Tile_argument,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_set_argument,(fl_Tile tile, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Tile_when,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_set_when,(fl_Tile tile, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Tile_visible,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(int,Fl_Tile_visible_r,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_show_super,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_show,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_hide_super,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_hide,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_set_visible,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_clear_visible,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Tile_active,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(int,Fl_Tile_active_r,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_activate,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_deactivate,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Tile_output,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_set_output,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_clear_output,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Tile_takesevents,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_set_changed,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_clear_changed,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(int,Fl_Tile_take_focus,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_set_visible_focus,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_clear_visible_focus,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_modify_visible_focus,(fl_Tile tile, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Tile_visible_focus,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(int,Fl_Tile_contains,(fl_Tile tile, fl_Group w));
+  FL_EXPORT_C_HEADER(int,Fl_Tile_inside,(fl_Tile tile, fl_Group w));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_redraw,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_redraw_label,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(uchar,Fl_Tile_damage,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_clear_damage_with_bitmask,(fl_Tile tile, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_clear_damage,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_damage_with_text,(fl_Tile tile, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_damage_inside_group,(fl_Tile tile, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_draw_label_with_xywh_alignment,(fl_Tile tile, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_measure_label,(fl_Tile tile, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Tile_window,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Tile_top_window,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Tile_top_window_offset,(fl_Tile tile, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Tile_as_group_super,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Tile_as_group,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Tile_as_gl_window_super,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Tile_as_gl_window,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_resize_super,(fl_Tile tile,int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_resize,(fl_Tile tile,int X, int Y, int W, int H));
 
   /* Fl_Tile specific */
-  FL_EXPORT_C(void,         Fl_Tile_begin)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_end)(fl_Tile tile);
-  FL_EXPORT_C(int,          Fl_Tile_find)(fl_Tile tile, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Tile_add)(fl_Tile tile, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Tile_insert)(fl_Tile tile, fl_Widget w, int i);
-  FL_EXPORT_C(void,         Fl_Tile_remove_index)(fl_Tile tile, int index);
-  FL_EXPORT_C(void,         Fl_Tile_remove_widget)(fl_Tile tile, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Tile_clear)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_set_resizable_by_reference)(fl_Tile tile,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Tile_set_resizable)(fl_Tile tile,fl_Widget o);
-  FL_EXPORT_C(fl_Widget,         Fl_Tile_resizable)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_add_resizable)(fl_Tile tile,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Tile_init_sizes)(fl_Tile tile);
-  FL_EXPORT_C(int,          Fl_Tile_children)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_set_clip_children)(fl_Tile tile,int c);
-  FL_EXPORT_C(unsigned int, Fl_Tile_clip_children)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_focus)(fl_Tile tile,fl_Widget W);
-  FL_EXPORT_C(fl_Widget,    Fl_Tile__ddfdesign_kludge)(fl_Tile tile);
-  FL_EXPORT_C(void,         Fl_Tile_insert_with_before)(fl_Tile tile, fl_Widget w, fl_Widget before);
-  FL_EXPORT_C(fl_Widget*,   Fl_Tile_array)(fl_Tile tile);
-  FL_EXPORT_C(fl_Widget,    Fl_Tile_child)(fl_Tile tile, int n);
-  FL_EXPORT_C(fl_Group,     Fl_Tile_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(fl_Group,     Fl_Tile_New_WithLabel)(int x, int y, int w, int h, const char* t);
-  FL_EXPORT_C(void,         Fl_Tile_position)(fl_Tile tile, int x, int y, int w, int h);
-  FL_EXPORT_C(fl_Tile,    Fl_OverriddenTile_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Tile,    Fl_OverriddenTile_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Tile_draw)(fl_Tile o);
-  FL_EXPORT_C(void, Fl_Tile_draw_super)(fl_Tile o);
-  FL_EXPORT_C(int, Fl_Tile_handle)(fl_Tile o, int event);
-  FL_EXPORT_C(int, Fl_Tile_handle_super)(fl_Tile o, int event);
-  FL_EXPORT_C(void, Fl_Tile_resize)(fl_Tile o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Tile_resize_super)(fl_Tile o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Tile_show)(fl_Tile o);
-  FL_EXPORT_C(void, Fl_Tile_show_super)(fl_Tile o);
-  FL_EXPORT_C(void, Fl_Tile_hide)(fl_Tile o);
-  FL_EXPORT_C(void, Fl_Tile_hide_super)(fl_Tile o);
+  FL_EXPORT_C_HEADER(void,Fl_Tile_begin,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_end,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(int,Fl_Tile_find,(fl_Tile tile, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_add,(fl_Tile tile, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_insert,(fl_Tile tile, fl_Widget w, int i));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_remove_index,(fl_Tile tile, int index));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_remove_widget,(fl_Tile tile, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_clear,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_set_resizable_by_reference,(fl_Tile tile,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_set_resizable,(fl_Tile tile,fl_Widget o));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Tile_resizable,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_add_resizable,(fl_Tile tile,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_init_sizes,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(int,Fl_Tile_children,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_set_clip_children,(fl_Tile tile,int c));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Tile_clip_children,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_focus,(fl_Tile tile,fl_Widget W));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Tile__ddfdesign_kludge,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_insert_with_before,(fl_Tile tile, fl_Widget w, fl_Widget before));
+  FL_EXPORT_C_HEADER(fl_Widget*,Fl_Tile_array,(fl_Tile tile));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Tile_child,(fl_Tile tile, int n));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Tile_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Tile_New_WithLabel,(int x, int y, int w, int h, const char* t));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_position,(fl_Tile tile, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(fl_Tile,Fl_OverriddenTile_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Tile,Fl_OverriddenTile_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_draw,(fl_Tile o));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_draw_super,(fl_Tile o));
+  FL_EXPORT_C_HEADER(int,Fl_Tile_handle,(fl_Tile o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Tile_handle_super,(fl_Tile o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_resize,(fl_Tile o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_resize_super,(fl_Tile o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_show,(fl_Tile o));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_show_super,(fl_Tile o));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_hide,(fl_Tile o));
+  FL_EXPORT_C_HEADER(void,Fl_Tile_hide_super,(fl_Tile o));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Toggle_ButtonC.h b/c-src/Fl_Toggle_ButtonC.h
--- a/c-src/Fl_Toggle_ButtonC.h
+++ b/c-src/Fl_Toggle_ButtonC.h
@@ -10,104 +10,104 @@
 EXPORT {
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,Fl_Toggle_Button_handle)(fl_Toggle_Button self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Toggle_Button_parent)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_set_parent)(fl_Toggle_Button win, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Toggle_Button_type)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_set_type)(fl_Toggle_Button win, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Toggle_Button_handle,(fl_Toggle_Button self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Toggle_Button_parent,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_set_parent,(fl_Toggle_Button win, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Toggle_Button_type,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_set_type,(fl_Toggle_Button win, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Toggle_Button_x)(fl_Toggle_Button win);
-  FL_EXPORT_C(int,          Fl_Toggle_Button_y)(fl_Toggle_Button win);
-  FL_EXPORT_C(int,          Fl_Toggle_Button_w)(fl_Toggle_Button win);
-  FL_EXPORT_C(int,          Fl_Toggle_Button_h)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_set_align)(fl_Toggle_Button toggle_button, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Toggle_Button_align)(fl_Toggle_Button win);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Toggle_Button_box)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_set_box)(fl_Toggle_Button win, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Toggle_Button_color)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_set_color)(fl_Toggle_Button win, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_set_color_with_bg_sel)(fl_Toggle_Button win,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Toggle_Button_selection_color)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_set_selection_color)(fl_Toggle_Button win, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Toggle_Button_label)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_copy_label)(fl_Toggle_Button win, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_set_label)(fl_Toggle_Button win, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Toggle_Button_labeltype)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_set_labeltype)(fl_Toggle_Button win, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Toggle_Button_labelcolor)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_set_labelcolor)(fl_Toggle_Button win, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Toggle_Button_labelfont)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_set_labelfont)(fl_Toggle_Button win, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Toggle_Button_labelsize)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_set_labelsize)(fl_Toggle_Button win, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Toggle_Button_image)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_set_image)(fl_Toggle_Button win, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Toggle_Button_deimage)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_set_deimage)(fl_Toggle_Button win, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Toggle_Button_tooltip)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_copy_tooltip)(fl_Toggle_Button win, const char* text);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_set_tooltip)(fl_Toggle_Button win, const char* text);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_set_callback_with_user_data)(fl_Toggle_Button win, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_set_callback)(fl_Toggle_Button win, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Toggle_Button_user_data)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_set_user_data)(fl_Toggle_Button win, void* v);
-  FL_EXPORT_C(long,         Fl_Toggle_Button_argument)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_set_argument)(fl_Toggle_Button win, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Toggle_Button_when)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_set_when)(fl_Toggle_Button win, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Toggle_Button_visible)(fl_Toggle_Button win);
-  FL_EXPORT_C(int,          Fl_Toggle_Button_visible_r)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_set_visible)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_clear_visible)(fl_Toggle_Button win);
-  FL_EXPORT_C(unsigned int, Fl_Toggle_Button_active)(fl_Toggle_Button win);
-  FL_EXPORT_C(int,          Fl_Toggle_Button_active_r)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_activate)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_deactivate)(fl_Toggle_Button win);
-  FL_EXPORT_C(unsigned int, Fl_Toggle_Button_output)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_set_output)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_clear_output)(fl_Toggle_Button win);
-  FL_EXPORT_C(unsigned int, Fl_Toggle_Button_takesevents)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_set_changed)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_clear_changed)(fl_Toggle_Button win);
-  FL_EXPORT_C(int,          Fl_Toggle_Button_take_focus)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_set_visible_focus)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_clear_visible_focus)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_modify_visible_focus)(fl_Toggle_Button win, int v);
-  FL_EXPORT_C(unsigned int, Fl_Toggle_Button_visible_focus)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_do_callback)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_do_callback_with_widget_and_user_data)(fl_Toggle_Button win, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_do_callback_with_widget_and_default_user_data)(fl_Toggle_Button win, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Toggle_Button_contains)(fl_Toggle_Button win, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Toggle_Button_inside)(fl_Toggle_Button win, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_redraw)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_redraw_label)(fl_Toggle_Button win);
-  FL_EXPORT_C(uchar,        Fl_Toggle_Button_damage)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_clear_damage_with_bitmask)(fl_Toggle_Button win, uchar c);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_clear_damage)(fl_Toggle_Button win);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_damage_with_text)(fl_Toggle_Button win, uchar c);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_damage_inside_widget)(fl_Toggle_Button win, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_draw_label_with_xywh_alignment)(fl_Toggle_Button win, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Toggle_Button_measure_label)(fl_Toggle_Button win, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Toggle_Button_window)(fl_Toggle_Button toggle_button);
-  FL_EXPORT_C(fl_Window,    Fl_Toggle_Button_top_window)(fl_Toggle_Button toggle_button);
-  FL_EXPORT_C(fl_Window ,   Fl_Toggle_Button_top_window_offset)(fl_Toggle_Button toggle_button, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Toggle_Button_as_group)(fl_Toggle_Button toggle_button);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Toggle_Button_as_gl_window)(fl_Toggle_Button toggle_button);
+  FL_EXPORT_C_HEADER(int,Fl_Toggle_Button_x,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(int,Fl_Toggle_Button_y,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(int,Fl_Toggle_Button_w,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(int,Fl_Toggle_Button_h,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_set_align,(fl_Toggle_Button toggle_button, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Toggle_Button_align,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Toggle_Button_box,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_set_box,(fl_Toggle_Button win, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Toggle_Button_color,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_set_color,(fl_Toggle_Button win, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_set_color_with_bg_sel,(fl_Toggle_Button win,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Toggle_Button_selection_color,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_set_selection_color,(fl_Toggle_Button win, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Toggle_Button_label,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_copy_label,(fl_Toggle_Button win, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_set_label,(fl_Toggle_Button win, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Toggle_Button_labeltype,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_set_labeltype,(fl_Toggle_Button win, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Toggle_Button_labelcolor,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_set_labelcolor,(fl_Toggle_Button win, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Toggle_Button_labelfont,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_set_labelfont,(fl_Toggle_Button win, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Toggle_Button_labelsize,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_set_labelsize,(fl_Toggle_Button win, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Toggle_Button_image,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_set_image,(fl_Toggle_Button win, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Toggle_Button_deimage,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_set_deimage,(fl_Toggle_Button win, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Toggle_Button_tooltip,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_copy_tooltip,(fl_Toggle_Button win, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_set_tooltip,(fl_Toggle_Button win, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_set_callback_with_user_data,(fl_Toggle_Button win, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_set_callback,(fl_Toggle_Button win, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Toggle_Button_user_data,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_set_user_data,(fl_Toggle_Button win, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Toggle_Button_argument,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_set_argument,(fl_Toggle_Button win, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Toggle_Button_when,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_set_when,(fl_Toggle_Button win, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Toggle_Button_visible,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(int,Fl_Toggle_Button_visible_r,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_set_visible,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_clear_visible,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Toggle_Button_active,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(int,Fl_Toggle_Button_active_r,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_activate,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_deactivate,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Toggle_Button_output,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_set_output,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_clear_output,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Toggle_Button_takesevents,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_set_changed,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_clear_changed,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(int,Fl_Toggle_Button_take_focus,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_set_visible_focus,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_clear_visible_focus,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_modify_visible_focus,(fl_Toggle_Button win, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Toggle_Button_visible_focus,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_do_callback,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_do_callback_with_widget_and_user_data,(fl_Toggle_Button win, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_do_callback_with_widget_and_default_user_data,(fl_Toggle_Button win, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Toggle_Button_contains,(fl_Toggle_Button win, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Toggle_Button_inside,(fl_Toggle_Button win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_redraw,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_redraw_label,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(uchar,Fl_Toggle_Button_damage,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_clear_damage_with_bitmask,(fl_Toggle_Button win, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_clear_damage,(fl_Toggle_Button win));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_damage_with_text,(fl_Toggle_Button win, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_damage_inside_widget,(fl_Toggle_Button win, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_draw_label_with_xywh_alignment,(fl_Toggle_Button win, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_measure_label,(fl_Toggle_Button win, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Toggle_Button_window,(fl_Toggle_Button toggle_button));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Toggle_Button_top_window,(fl_Toggle_Button toggle_button));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Toggle_Button_top_window_offset,(fl_Toggle_Button toggle_button, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Toggle_Button_as_group,(fl_Toggle_Button toggle_button));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Toggle_Button_as_gl_window,(fl_Toggle_Button toggle_button));
   /* Fl_Toggle_Button specific functions */
-  FL_EXPORT_C(fl_Toggle_Button, Fl_Toggle_Button_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Toggle_Button, Fl_Toggle_Button_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(void,             Fl_Toggle_Button_Destroy)(fl_Toggle_Button button);
-  
-  FL_EXPORT_C(char        , Fl_Toggle_Button_value)(fl_Toggle_Button b);
-  FL_EXPORT_C(int         , Fl_Toggle_Button_set_value)(fl_Toggle_Button b, int v);
-  FL_EXPORT_C(int         , Fl_Toggle_Button_clear)(fl_Toggle_Button b);
-  FL_EXPORT_C(void        , Fl_Toggle_Button_setonly)(fl_Toggle_Button b);
-  FL_EXPORT_C(int         , Fl_Toggle_Button_get_shortcut )(fl_Toggle_Button b);
-  FL_EXPORT_C(void        , Fl_Toggle_Button_set_shortcut )(fl_Toggle_Button b, int s);
-  FL_EXPORT_C(Fl_Boxtype  , Fl_Toggle_Button_down_box)(fl_Toggle_Button b);
-  FL_EXPORT_C(void        , Fl_Toggle_Button_set_down_box)(fl_Toggle_Button b,Fl_Boxtype boxtype);
-  FL_EXPORT_C(Fl_Color    , Fl_Toggle_Button_down_color )(fl_Toggle_Button b);
-  FL_EXPORT_C(void        , Fl_Toggle_Button_set_down_color)(fl_Toggle_Button b, Fl_Color c);
+  FL_EXPORT_C_HEADER(fl_Toggle_Button,Fl_Toggle_Button_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Toggle_Button,Fl_Toggle_Button_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Toggle_Button_Destroy,(fl_Toggle_Button button));
+
+  FL_EXPORT_C_HEADER(char        ,Fl_Toggle_Button_value,(fl_Toggle_Button b));
+  FL_EXPORT_C_HEADER(int         ,Fl_Toggle_Button_set_value,(fl_Toggle_Button b, int v));
+  FL_EXPORT_C_HEADER(int         ,Fl_Toggle_Button_clear,(fl_Toggle_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Toggle_Button_setonly,(fl_Toggle_Button b));
+  FL_EXPORT_C_HEADER(int         ,Fl_Toggle_Button_get_shortcut ,(fl_Toggle_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Toggle_Button_set_shortcut ,(fl_Toggle_Button b, int s));
+  FL_EXPORT_C_HEADER(Fl_Boxtype  ,Fl_Toggle_Button_down_box,(fl_Toggle_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Toggle_Button_set_down_box,(fl_Toggle_Button b,Fl_Boxtype boxtype));
+  FL_EXPORT_C_HEADER(Fl_Color    ,Fl_Toggle_Button_down_color ,(fl_Toggle_Button b));
+  FL_EXPORT_C_HEADER(void        ,Fl_Toggle_Button_set_down_color,(fl_Toggle_Button b, Fl_Color c));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_TooltipC.h b/c-src/Fl_TooltipC.h
--- a/c-src/Fl_TooltipC.h
+++ b/c-src/Fl_TooltipC.h
@@ -9,41 +9,41 @@
 #include "Fl_CallbackC.h"
 EXPORT {
 #endif
-  FL_EXPORT_C(float, Fl_Tooltip_delay)();
-  FL_EXPORT_C(void, Fl_Tooltip_set_delay)(float f);
-  FL_EXPORT_C(float, Fl_Tooltip_hoverdelay)();
-  FL_EXPORT_C(void, Fl_Tooltip_set_hoverdelay)(float f);
-  FL_EXPORT_C(int, Fl_Tooltip_enabled)();
-  FL_EXPORT_C(void, Fl_Tooltip_enable)();
-  FL_EXPORT_C(void, Fl_Tooltip_enable_with_b)(int b);
-  FL_EXPORT_C(void, Fl_Tooltip_disable)();
+  FL_EXPORT_C_HEADER(float,Fl_Tooltip_delay,());
+  FL_EXPORT_C_HEADER(void,Fl_Tooltip_set_delay,(float f));
+  FL_EXPORT_C_HEADER(float,Fl_Tooltip_hoverdelay,());
+  FL_EXPORT_C_HEADER(void,Fl_Tooltip_set_hoverdelay,(float f));
+  FL_EXPORT_C_HEADER(int,Fl_Tooltip_enabled,());
+  FL_EXPORT_C_HEADER(void,Fl_Tooltip_enable,());
+  FL_EXPORT_C_HEADER(void,Fl_Tooltip_enable_with_b,(int b));
+  FL_EXPORT_C_HEADER(void,Fl_Tooltip_disable,());
   typedef void (*fl_enter)(fl_Widget w);
-  FL_EXPORT_C(void, Fl_Tooltip_enter_area)(fl_Widget w, int X, int Y, int W, int H, const char* tip);
+  FL_EXPORT_C_HEADER(void,Fl_Tooltip_enter_area,(fl_Widget w, int X, int Y, int W, int H, const char* tip));
   typedef void (*fl_exit)(fl_Widget w);
-  FL_EXPORT_C(fl_Widget, Fl_Tooltip_current)();
-  FL_EXPORT_C(void, Fl_Tooltip_set_current)(fl_Widget w);
-  FL_EXPORT_C(Fl_Font, Fl_Tooltip_font)();
-  FL_EXPORT_C(void, Fl_Tooltip_set_font)(Fl_Font i);
-  FL_EXPORT_C(Fl_Fontsize, Fl_Tooltip_size)();
-  FL_EXPORT_C(void, Fl_Tooltip_set_size)(Fl_Fontsize s);
-  FL_EXPORT_C(Fl_Color, Fl_Tooltip_color)();
-  FL_EXPORT_C(void, Fl_Tooltip_set_color)(Fl_Color c);
-  FL_EXPORT_C(Fl_Color, Fl_Tooltip_textcolor)();
-  FL_EXPORT_C(void, Fl_Tooltip_set_textcolor)(Fl_Color c);
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Tooltip_current,());
+  FL_EXPORT_C_HEADER(void,Fl_Tooltip_set_current,(fl_Widget w));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Tooltip_font,());
+  FL_EXPORT_C_HEADER(void,Fl_Tooltip_set_font,(Fl_Font i));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Tooltip_size,());
+  FL_EXPORT_C_HEADER(void,Fl_Tooltip_set_size,(Fl_Fontsize s));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Tooltip_color,());
+  FL_EXPORT_C_HEADER(void,Fl_Tooltip_set_color,(Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Tooltip_textcolor,());
+  FL_EXPORT_C_HEADER(void,Fl_Tooltip_set_textcolor,(Fl_Color c));
 #if FLTK_ABI_VERSION >= 10301
-  FL_EXPORT_C(int, Fl_Tooltip_margin_width)();
-  FL_EXPORT_C(void, Fl_Tooltip_set_margin_width)(int v);
-  FL_EXPORT_C(int, Fl_Tooltip_margin_height)();
-  FL_EXPORT_C(void, Fl_Tooltip_set_margin_height)(int v);
-  FL_EXPORT_C(int, Fl_Tooltip_wrap_width)();
-  FL_EXPORT_C(void, Fl_Tooltip_set_wrap_width)(int v);
+  FL_EXPORT_C_HEADER(int,Fl_Tooltip_margin_width,());
+  FL_EXPORT_C_HEADER(void,Fl_Tooltip_set_margin_width,(int v));
+  FL_EXPORT_C_HEADER(int,Fl_Tooltip_margin_height,());
+  FL_EXPORT_C_HEADER(void,Fl_Tooltip_set_margin_height,(int v));
+  FL_EXPORT_C_HEADER(int,Fl_Tooltip_wrap_width,());
+  FL_EXPORT_C_HEADER(void,Fl_Tooltip_set_wrap_width,(int v));
 #else
-  FL_EXPORT_C(int, Fl_Tooltip_margin_width)();
-  FL_EXPORT_C(int, Fl_Tooltip_margin_height)();
-  FL_EXPORT_C(int, Fl_Tooltip_wrap_width)();
+  FL_EXPORT_C_HEADER(int,Fl_Tooltip_margin_width,());
+  FL_EXPORT_C_HEADER(int,Fl_Tooltip_margin_height,());
+  FL_EXPORT_C_HEADER(int,Fl_Tooltip_wrap_width,());
 #endif
 #ifdef __APPLE__
-  FL_EXPORT_C(fl_Window, Fl_Tooltip_current_window)(void);
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Tooltip_current_window,(void));
 #endif
 #ifdef __cplusplus
 }
diff --git a/c-src/Fl_TreeC.h b/c-src/Fl_TreeC.h
--- a/c-src/Fl_TreeC.h
+++ b/c-src/Fl_TreeC.h
@@ -29,261 +29,261 @@
   };
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,Fl_Tree_handle)(fl_Tree self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Tree_parent)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_set_parent)(fl_Tree tree, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Tree_type)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_set_type)(fl_Tree tree, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Tree_handle,(fl_Tree self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Tree_parent,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_parent,(fl_Tree tree, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Tree_type,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_type,(fl_Tree tree, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Tree_x)(fl_Tree tree);
-  FL_EXPORT_C(int,          Fl_Tree_y)(fl_Tree tree);
-  FL_EXPORT_C(int,          Fl_Tree_w)(fl_Tree tree);
-  FL_EXPORT_C(int,          Fl_Tree_h)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_set_align)(fl_Tree tree, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Tree_align)(fl_Tree tree);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Tree_box)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_set_box)(fl_Tree tree, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Tree_color)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_set_color)(fl_Tree tree, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Tree_set_color_with_bg_sel)(fl_Tree tree,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Tree_selection_color)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_set_selection_color)(fl_Tree tree, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Tree_label)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_copy_label)(fl_Tree tree, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Tree_set_label)(fl_Tree tree, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Tree_labeltype)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_set_labeltype)(fl_Tree tree, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Tree_labelcolor)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_set_labelcolor)(fl_Tree tree, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Tree_item_labelfont)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_set_item_labelfont)(fl_Tree tree, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Tree_item_labelsize)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_set_item_labelsize)(fl_Tree tree, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Tree_image)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_set_image)(fl_Tree tree, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Tree_deimage)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_set_deimage)(fl_Tree tree, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Tree_tooltip)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_copy_tooltip)(fl_Tree tree, const char* text);
-  FL_EXPORT_C(void,         Fl_Tree_set_tooltip)(fl_Tree tree, const char* text);
-  FL_EXPORT_C(void,         Fl_Tree_set_callback_with_user_data)(fl_Tree tree, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Tree_set_callback)(fl_Tree tree, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Tree_user_data)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_set_user_data)(fl_Tree tree, void* v);
-  FL_EXPORT_C(long,         Fl_Tree_argument)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_set_argument)(fl_Tree tree, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Tree_when)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_set_when)(fl_Tree tree, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Tree_visible)(fl_Tree tree);
-  FL_EXPORT_C(int,          Fl_Tree_visible_r)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_set_visible)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_clear_visible)(fl_Tree tree);
-  FL_EXPORT_C(unsigned int, Fl_Tree_active)(fl_Tree tree);
-  FL_EXPORT_C(int,          Fl_Tree_active_r)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_activate)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_deactivate)(fl_Tree tree);
-  FL_EXPORT_C(unsigned int, Fl_Tree_output)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_set_output)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_clear_output)(fl_Tree tree);
-  FL_EXPORT_C(unsigned int, Fl_Tree_takesevents)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_set_changed)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_clear_changed)(fl_Tree tree);
-  FL_EXPORT_C(int,          Fl_Tree_take_focus)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_set_visible_focus)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_clear_visible_focus)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_modify_visible_focus)(fl_Tree tree, int v);
-  FL_EXPORT_C(unsigned int, Fl_Tree_visible_focus)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_do_callback)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_do_callback_with_widget_and_user_data)(fl_Tree tree, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Tree_do_callback_with_widget_and_default_user_data)(fl_Tree tree, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Tree_contains)(fl_Tree tree, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Tree_inside)(fl_Tree tree, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Tree_redraw)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_redraw_label)(fl_Tree tree);
-  FL_EXPORT_C(uchar,        Fl_Tree_damage)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_clear_damage_with_bitmask)(fl_Tree tree, uchar c);
-  FL_EXPORT_C(void,         Fl_Tree_clear_damage)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_damage_with_text)(fl_Tree tree, uchar c);
-  FL_EXPORT_C(void,         Fl_Tree_damage_inside_widget)(fl_Tree tree, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Tree_draw_label_with_xywh_alignment)(fl_Tree tree, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Tree_measure_label)(fl_Tree tree, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Tree_window)(fl_Tree tree);
-  FL_EXPORT_C(fl_Window,    Fl_Tree_top_window)(fl_Tree tree);
-  FL_EXPORT_C(fl_Window ,   Fl_Tree_top_window_offset)(fl_Tree tree, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Tree_as_group)(fl_Tree tree);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Tree_as_gl_window)(fl_Tree tree);
+  FL_EXPORT_C_HEADER(int,Fl_Tree_x,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_y,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_w,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_h,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_align,(fl_Tree tree, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Tree_align,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Tree_box,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_box,(fl_Tree tree, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Tree_color,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_color,(fl_Tree tree, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_color_with_bg_sel,(fl_Tree tree,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Tree_selection_color,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_selection_color,(fl_Tree tree, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Tree_label,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_copy_label,(fl_Tree tree, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_label,(fl_Tree tree, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Tree_labeltype,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_labeltype,(fl_Tree tree, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Tree_labelcolor,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_labelcolor,(fl_Tree tree, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Tree_item_labelfont,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_item_labelfont,(fl_Tree tree, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Tree_item_labelsize,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_item_labelsize,(fl_Tree tree, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Tree_image,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_image,(fl_Tree tree, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Tree_deimage,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_deimage,(fl_Tree tree, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Tree_tooltip,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_copy_tooltip,(fl_Tree tree, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_tooltip,(fl_Tree tree, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_callback_with_user_data,(fl_Tree tree, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_callback,(fl_Tree tree, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Tree_user_data,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_user_data,(fl_Tree tree, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Tree_argument,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_argument,(fl_Tree tree, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Tree_when,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_when,(fl_Tree tree, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Tree_visible,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_visible_r,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_visible,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_clear_visible,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Tree_active,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_active_r,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_activate,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_deactivate,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Tree_output,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_output,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_clear_output,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Tree_takesevents,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_changed,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_clear_changed,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_take_focus,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_visible_focus,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_clear_visible_focus,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_modify_visible_focus,(fl_Tree tree, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Tree_visible_focus,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_do_callback,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_do_callback_with_widget_and_user_data,(fl_Tree tree, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_do_callback_with_widget_and_default_user_data,(fl_Tree tree, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_contains,(fl_Tree tree, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_inside,(fl_Tree tree, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_redraw,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_redraw_label,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(uchar,Fl_Tree_damage,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_clear_damage_with_bitmask,(fl_Tree tree, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_clear_damage,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_damage_with_text,(fl_Tree tree, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_damage_inside_widget,(fl_Tree tree, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_draw_label_with_xywh_alignment,(fl_Tree tree, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_measure_label,(fl_Tree tree, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Tree_window,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Tree_top_window,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Tree_top_window_offset,(fl_Tree tree, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Tree_as_group,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Tree_as_gl_window,(fl_Tree tree));
 
   /* Inherited from Fl_Group */
-  FL_EXPORT_C(void,         Fl_Tree_begin)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_end)(fl_Tree tree);
-  FL_EXPORT_C(int,          Fl_Tree_find)(fl_Tree tree, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Tree_clear)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_set_resizable_by_reference)(fl_Tree tree,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Tree_set_resizable)(fl_Tree tree,fl_Widget o);
-  FL_EXPORT_C(fl_Widget,    Fl_Tree_resizable)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_add_resizable)(fl_Tree tree,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Tree_init_sizes)(fl_Tree tree);
-  FL_EXPORT_C(int,          Fl_Tree_children)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_set_clip_children)(fl_Tree tree,int c);
-  FL_EXPORT_C(unsigned int, Fl_Tree_clip_children)(fl_Tree tree);
-  FL_EXPORT_C(void,         Fl_Tree_focus)(fl_Tree tree,fl_Widget W);
-  FL_EXPORT_C(fl_Widget,    Fl_Tree__ddfdesign_kludge)(fl_Tree tree);
-  FL_EXPORT_C(fl_Widget*,   Fl_Tree_array)(fl_Tree self);
-  FL_EXPORT_C(fl_Widget,    Fl_Tree_child)(fl_Tree self, int n);
-  FL_EXPORT_C(void,         Fl_Tree_forms_end)(fl_Tree self);
+  FL_EXPORT_C_HEADER(void,Fl_Tree_begin,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_end,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_find,(fl_Tree tree, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_clear,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_resizable_by_reference,(fl_Tree tree,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_resizable,(fl_Tree tree,fl_Widget o));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Tree_resizable,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_add_resizable,(fl_Tree tree,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_init_sizes,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_children,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_clip_children,(fl_Tree tree,int c));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Tree_clip_children,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_focus,(fl_Tree tree,fl_Widget W));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Tree__ddfdesign_kludge,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(fl_Widget*,Fl_Tree_array,(fl_Tree self));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Tree_child,(fl_Tree self, int n));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_forms_end,(fl_Tree self));
 
   /* Fl_Tree specific */
-  FL_EXPORT_C(fl_Tree,    Fl_Tree_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Tree   , Fl_Tree_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(void,Fl_Tree_Destroy)(fl_Tree tree);
-  FL_EXPORT_C(int, Fl_Tree_handle)(fl_Tree tree,int e);
-  FL_EXPORT_C(void, Fl_Tree_draw)(fl_Tree tree);
-  FL_EXPORT_C(void, Fl_Tree_show_self)(fl_Tree tree);
-  FL_EXPORT_C(void, Fl_Tree_root_label)(fl_Tree tree,const char *new_label);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_root)(fl_Tree tree);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_add)(fl_Tree tree,const char *path);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_add_with_item_name)(fl_Tree tree,fl_Tree_Item item, const char *name);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_insert_above)(fl_Tree tree,fl_Tree_Item above, const char *name);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_insert)(fl_Tree tree,fl_Tree_Item item, const char *name, int pos);
-  FL_EXPORT_C(int, Fl_Tree_remove)(fl_Tree tree,fl_Tree_Item item);
-  FL_EXPORT_C(void, Fl_Tree_clear)(fl_Tree tree);
-  FL_EXPORT_C(void, Fl_Tree_clear_children)(fl_Tree tree,fl_Tree_Item item);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_find_item)(fl_Tree tree,const char *path);
-  FL_EXPORT_C(int, Fl_Tree_item_pathname)(fl_Tree tree,char *pathname, int pathnamelen, const fl_Tree_Item item);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_item_clicked)(fl_Tree tree);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_first)(fl_Tree tree);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_first_visible)(fl_Tree tree);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_next)(fl_Tree tree);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_next_with_item)(fl_Tree tree,fl_Tree_Item item);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_prev)(fl_Tree tree);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_prev_with_item)(fl_Tree tree,fl_Tree_Item item);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_last)(fl_Tree tree);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_last_visible)(fl_Tree tree);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_first_selected_item)(fl_Tree tree);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_last_selected_item)(fl_Tree tree);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_next_selected_item)(fl_Tree tree);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_next_selected_item_with_item)(fl_Tree tree,fl_Tree_Item item);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_next_selected_item_with_item_direction)(fl_Tree tree,fl_Tree_Item item, int dir);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_next_item)(fl_Tree tree,fl_Tree_Item item, int dir, int visible);
-  FL_EXPORT_C(int, Fl_Tree_open_with_item)(fl_Tree tree,fl_Tree_Item item);
-  FL_EXPORT_C(int, Fl_Tree_open_with_item_docallback)(fl_Tree tree,fl_Tree_Item item, int docallback);
-  FL_EXPORT_C(int, Fl_Tree_open_with_path)(fl_Tree tree,const char *path);
-  FL_EXPORT_C(int, Fl_Tree_open_with_path_docallback)(fl_Tree tree,const char* path, int docallback);
-  FL_EXPORT_C(void, Fl_Tree_open_toggle)(fl_Tree tree,fl_Tree_Item item);
-  FL_EXPORT_C(void, Fl_Tree_open_toggle_with_docallback)(fl_Tree tree,fl_Tree_Item item, int docallback);
-  FL_EXPORT_C(int, Fl_Tree_close_with_item)(fl_Tree tree,fl_Tree_Item item);
-  FL_EXPORT_C(int, Fl_Tree_close_with_item_docallback)(fl_Tree tree,fl_Tree_Item item, int docallback);
-  FL_EXPORT_C(int, Fl_Tree_close_with_path)(fl_Tree tree,const char *path);
-  FL_EXPORT_C(int, Fl_Tree_close_with_path_docallback)(fl_Tree tree,const char* path, int docallback);
-  FL_EXPORT_C(int, Fl_Tree_is_open_with_item)(fl_Tree tree,fl_Tree_Item item);
-  FL_EXPORT_C(int, Fl_Tree_is_open_with_path)(fl_Tree tree,const char *path);
-  FL_EXPORT_C(int, Fl_Tree_is_close_with_item)(fl_Tree tree,fl_Tree_Item item);
-  FL_EXPORT_C(int, Fl_Tree_is_close_with_path)(fl_Tree tree,const char *path);
-  FL_EXPORT_C(int, Fl_Tree_select_with_item)(fl_Tree tree,fl_Tree_Item item);
-  FL_EXPORT_C(int, Fl_Tree_select_with_item_docallback)(fl_Tree tree,fl_Tree_Item item, int docallback);
-  FL_EXPORT_C(int, Fl_Tree_select_with_path)(fl_Tree tree,const char *path);
-  FL_EXPORT_C(int, Fl_Tree_select_with_path_docallback)(fl_Tree tree,const char* path, int docallback);
-  FL_EXPORT_C(void, Fl_Tree_select_toggle)(fl_Tree tree,fl_Tree_Item item);
-  FL_EXPORT_C(void, Fl_Tree_select_toggle_with_docallback)(fl_Tree tree,fl_Tree_Item item, int docallback);
-  FL_EXPORT_C(int, Fl_Tree_deselect_with_item)(fl_Tree tree,fl_Tree_Item item);
-  FL_EXPORT_C(int, Fl_Tree_deselect_with_item_docallback)(fl_Tree tree,fl_Tree_Item item, int docallback);
-  FL_EXPORT_C(int, Fl_Tree_deselect_with_path)(fl_Tree tree,const char *path);
-  FL_EXPORT_C(int, Fl_Tree_deselect_with_path_docallback)(fl_Tree tree,const char* path, int docallback);
-  FL_EXPORT_C(int, Fl_Tree_deselect_all_with_item)(fl_Tree tree,fl_Tree_Item item);
-  FL_EXPORT_C(int, Fl_Tree_deselect_all_with_docallback)(fl_Tree tree,int docallback);
-  FL_EXPORT_C(int, Fl_Tree_deselect_all_with_item_docallback)(fl_Tree tree,fl_Tree_Item item, int docallback);
-  FL_EXPORT_C(void, Fl_Tree_select_only)(fl_Tree tree,fl_Tree_Item item);
-  FL_EXPORT_C(void, Fl_Tree_select_only_with_docallback)(fl_Tree tree,fl_Tree_Item item, int docallback);
-  FL_EXPORT_C(void, Fl_Tree_select_all)(fl_Tree tree,fl_Tree_Item item);
-  FL_EXPORT_C(void, Fl_Tree_select_all_with_docallback)(fl_Tree tree,fl_Tree_Item item, int docallback);
-  FL_EXPORT_C(void, Fl_Tree_set_item_focus)(fl_Tree tree,fl_Tree_Item item);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_get_item_focus)(fl_Tree tree);
-  FL_EXPORT_C(int, Fl_Tree_is_selected_with_item)(fl_Tree tree,fl_Tree_Item item);
-  FL_EXPORT_C(int, Fl_Tree_is_selected_with_path)(fl_Tree tree,const char *path);
-  FL_EXPORT_C(Fl_Color   , Fl_Tree_item_labelfgcolor)(fl_Tree tree);
-  FL_EXPORT_C(void       , Fl_Tree_set_item_labelfgcolor)(fl_Tree tree,Fl_Color val);
-  FL_EXPORT_C(Fl_Color   , Fl_Tree_item_labelbgcolor)(fl_Tree tree);
-  FL_EXPORT_C(void       , Fl_Tree_set_item_labelbgcolor)(fl_Tree tree,Fl_Color val);
-  FL_EXPORT_C(Fl_Color, Fl_Tree_connectorcolor)(fl_Tree tree);
-  FL_EXPORT_C(void, Fl_Tree_set_connectorcolor)(fl_Tree tree,Fl_Color val);
-  FL_EXPORT_C(int, Fl_Tree_marginleft)(fl_Tree tree);
-  FL_EXPORT_C(void, Fl_Tree_set_marginleft)(fl_Tree tree,int val);
-  FL_EXPORT_C(int, Fl_Tree_margintop)(fl_Tree tree);
-  FL_EXPORT_C(void, Fl_Tree_set_margintop)(fl_Tree tree,int val);
+  FL_EXPORT_C_HEADER(fl_Tree,Fl_Tree_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Tree   ,Fl_Tree_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Destroy,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_handle,(fl_Tree tree,int e));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_draw,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_show_self,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_root_label,(fl_Tree tree,const char *new_label));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_root,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_add,(fl_Tree tree,const char *path));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_add_with_item_name,(fl_Tree tree,fl_Tree_Item item, const char *name));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_insert_above,(fl_Tree tree,fl_Tree_Item above, const char *name));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_insert,(fl_Tree tree,fl_Tree_Item item, const char *name, int pos));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_remove,(fl_Tree tree,fl_Tree_Item item));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_clear,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_clear_children,(fl_Tree tree,fl_Tree_Item item));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_find_item,(fl_Tree tree,const char *path));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_item_pathname,(fl_Tree tree,char *pathname, int pathnamelen, const fl_Tree_Item item));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_item_clicked,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_first,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_first_visible,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_next,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_next_with_item,(fl_Tree tree,fl_Tree_Item item));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_prev,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_prev_with_item,(fl_Tree tree,fl_Tree_Item item));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_last,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_last_visible,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_first_selected_item,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_last_selected_item,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_next_selected_item,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_next_selected_item_with_item,(fl_Tree tree,fl_Tree_Item item));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_next_selected_item_with_item_direction,(fl_Tree tree,fl_Tree_Item item, int dir));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_next_item,(fl_Tree tree,fl_Tree_Item item, int dir, int visible));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_open_with_item,(fl_Tree tree,fl_Tree_Item item));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_open_with_item_docallback,(fl_Tree tree,fl_Tree_Item item, int docallback));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_open_with_path,(fl_Tree tree,const char *path));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_open_with_path_docallback,(fl_Tree tree,const char* path, int docallback));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_open_toggle,(fl_Tree tree,fl_Tree_Item item));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_open_toggle_with_docallback,(fl_Tree tree,fl_Tree_Item item, int docallback));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_close_with_item,(fl_Tree tree,fl_Tree_Item item));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_close_with_item_docallback,(fl_Tree tree,fl_Tree_Item item, int docallback));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_close_with_path,(fl_Tree tree,const char *path));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_close_with_path_docallback,(fl_Tree tree,const char* path, int docallback));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_is_open_with_item,(fl_Tree tree,fl_Tree_Item item));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_is_open_with_path,(fl_Tree tree,const char *path));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_is_close_with_item,(fl_Tree tree,fl_Tree_Item item));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_is_close_with_path,(fl_Tree tree,const char *path));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_select_with_item,(fl_Tree tree,fl_Tree_Item item));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_select_with_item_docallback,(fl_Tree tree,fl_Tree_Item item, int docallback));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_select_with_path,(fl_Tree tree,const char *path));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_select_with_path_docallback,(fl_Tree tree,const char* path, int docallback));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_select_toggle,(fl_Tree tree,fl_Tree_Item item));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_select_toggle_with_docallback,(fl_Tree tree,fl_Tree_Item item, int docallback));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_deselect_with_item,(fl_Tree tree,fl_Tree_Item item));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_deselect_with_item_docallback,(fl_Tree tree,fl_Tree_Item item, int docallback));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_deselect_with_path,(fl_Tree tree,const char *path));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_deselect_with_path_docallback,(fl_Tree tree,const char* path, int docallback));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_deselect_all_with_item,(fl_Tree tree,fl_Tree_Item item));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_deselect_all_with_docallback,(fl_Tree tree,int docallback));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_deselect_all_with_item_docallback,(fl_Tree tree,fl_Tree_Item item, int docallback));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_select_only,(fl_Tree tree,fl_Tree_Item item));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_select_only_with_docallback,(fl_Tree tree,fl_Tree_Item item, int docallback));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_select_all,(fl_Tree tree,fl_Tree_Item item));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_select_all_with_docallback,(fl_Tree tree,fl_Tree_Item item, int docallback));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_item_focus,(fl_Tree tree,fl_Tree_Item item));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_get_item_focus,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_is_selected_with_item,(fl_Tree tree,fl_Tree_Item item));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_is_selected_with_path,(fl_Tree tree,const char *path));
+  FL_EXPORT_C_HEADER(Fl_Color   ,Fl_Tree_item_labelfgcolor,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void       ,Fl_Tree_set_item_labelfgcolor,(fl_Tree tree,Fl_Color val));
+  FL_EXPORT_C_HEADER(Fl_Color   ,Fl_Tree_item_labelbgcolor,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void       ,Fl_Tree_set_item_labelbgcolor,(fl_Tree tree,Fl_Color val));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Tree_connectorcolor,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_connectorcolor,(fl_Tree tree,Fl_Color val));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_marginleft,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_marginleft,(fl_Tree tree,int val));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_margintop,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_margintop,(fl_Tree tree,int val));
 #if FLTK_ABI_VERSION >= 10302
-  FL_EXPORT_C(int, Fl_Tree_marginbottom)(fl_Tree tree);
-  FL_EXPORT_C(void, Fl_Tree_set_marginbottom)(fl_Tree tree,int val);
+  FL_EXPORT_C_HEADER(int,Fl_Tree_marginbottom,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_marginbottom,(fl_Tree tree,int val));
 #endif /*FLTK_ABI_VERSION*/
-  FL_EXPORT_C(int, Fl_Tree_linespacing)(fl_Tree tree);
-  FL_EXPORT_C(void, Fl_Tree_set_linespacing)(fl_Tree tree,int val);
-  FL_EXPORT_C(int, Fl_Tree_openchild_marginbottom)(fl_Tree tree);
-  FL_EXPORT_C(void, Fl_Tree_set_openchild_marginbottom)(fl_Tree tree,int val);
-  FL_EXPORT_C(int, Fl_Tree_usericonmarginleft)(fl_Tree tree);
-  FL_EXPORT_C(void, Fl_Tree_set_usericonmarginleft)(fl_Tree tree,int val);
-  FL_EXPORT_C(int, Fl_Tree_labelmarginleft)(fl_Tree tree);
-  FL_EXPORT_C(void, Fl_Tree_set_labelmarginleft)(fl_Tree tree,int val);
+  FL_EXPORT_C_HEADER(int,Fl_Tree_linespacing,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_linespacing,(fl_Tree tree,int val));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_openchild_marginbottom,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_openchild_marginbottom,(fl_Tree tree,int val));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_usericonmarginleft,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_usericonmarginleft,(fl_Tree tree,int val));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_labelmarginleft,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_labelmarginleft,(fl_Tree tree,int val));
 #if FLTK_ABI_VERSION >= 10302
-  FL_EXPORT_C(int, Fl_Tree_widgetmarginleft)(fl_Tree tree);
-  FL_EXPORT_C(void, Fl_Tree_set_widgetmarginleft)(fl_Tree tree,int val);
+  FL_EXPORT_C_HEADER(int,Fl_Tree_widgetmarginleft,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_widgetmarginleft,(fl_Tree tree,int val));
 #endif /*FLTK_ABI_VERSION*/
-  FL_EXPORT_C(int, Fl_Tree_connectorwidth)(fl_Tree tree);
-  FL_EXPORT_C(void, Fl_Tree_set_connectorwidth)(fl_Tree tree,int val);
-  FL_EXPORT_C(fl_Image, Fl_Tree_usericon)(fl_Tree tree);
-  FL_EXPORT_C(void, Fl_Tree_set_usericon)(fl_Tree tree,fl_Image val);
-  FL_EXPORT_C(fl_Image, Fl_Tree_openicon)(fl_Tree tree);
-  FL_EXPORT_C(void, Fl_Tree_set_openicon)(fl_Tree tree,fl_Image val);
-  FL_EXPORT_C(fl_Image, Fl_Tree_closeicon)(fl_Tree tree);
-  FL_EXPORT_C(void, Fl_Tree_set_closeicon)(fl_Tree tree,fl_Image val);
-  FL_EXPORT_C(int, Fl_Tree_showcollapse)(fl_Tree tree);
-  FL_EXPORT_C(void, Fl_Tree_set_showcollapse)(fl_Tree tree,int val);
-  FL_EXPORT_C(int, Fl_Tree_showroot)(fl_Tree tree);
-  FL_EXPORT_C(void, Fl_Tree_set_showroot)(fl_Tree tree,int val);
-  FL_EXPORT_C(Fl_Tree_Connector, Fl_Tree_connectorstyle)(fl_Tree tree);
-  FL_EXPORT_C(void, Fl_Tree_set_connectorstyle)(fl_Tree tree,Fl_Tree_Connector val);
-  FL_EXPORT_C(Fl_Tree_Sort, Fl_Tree_sortorder)(fl_Tree tree);
-  FL_EXPORT_C(void, Fl_Tree_set_sortorder)(fl_Tree tree,Fl_Tree_Sort val);
-  FL_EXPORT_C(Fl_Boxtype, Fl_Tree_selectbox)(fl_Tree tree);
-  FL_EXPORT_C(void, Fl_Tree_set_selectbox)(fl_Tree tree,Fl_Boxtype val);
-  FL_EXPORT_C(Fl_Tree_Select, Fl_Tree_selectmode)(fl_Tree tree);
-  FL_EXPORT_C(void, Fl_Tree_set_selectmode)(fl_Tree tree,Fl_Tree_Select val);
+  FL_EXPORT_C_HEADER(int,Fl_Tree_connectorwidth,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_connectorwidth,(fl_Tree tree,int val));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Tree_usericon,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_usericon,(fl_Tree tree,fl_Image val));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Tree_openicon,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_openicon,(fl_Tree tree,fl_Image val));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Tree_closeicon,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_closeicon,(fl_Tree tree,fl_Image val));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_showcollapse,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_showcollapse,(fl_Tree tree,int val));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_showroot,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_showroot,(fl_Tree tree,int val));
+  FL_EXPORT_C_HEADER(Fl_Tree_Connector,Fl_Tree_connectorstyle,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_connectorstyle,(fl_Tree tree,Fl_Tree_Connector val));
+  FL_EXPORT_C_HEADER(Fl_Tree_Sort,Fl_Tree_sortorder,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_sortorder,(fl_Tree tree,Fl_Tree_Sort val));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Tree_selectbox,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_selectbox,(fl_Tree tree,Fl_Boxtype val));
+  FL_EXPORT_C_HEADER(Fl_Tree_Select,Fl_Tree_selectmode,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_selectmode,(fl_Tree tree,Fl_Tree_Select val));
 #if FLTK_ABI_VERSION >= 10302
-  FL_EXPORT_C(Fl_Tree_Item_Reselect_Mode, Fl_Tree_item_reselect_mode)(fl_Tree tree);
-  FL_EXPORT_C(void, Fl_Tree_set_item_reselect_mode)(fl_Tree tree,Fl_Tree_Item_Reselect_Mode mode);
-  FL_EXPORT_C(Fl_Tree_Item_Draw_Mode, Fl_Tree_item_draw_mode)(fl_Tree tree);
-  FL_EXPORT_C(void, Fl_Tree_set_item_draw_mode)(fl_Tree tree,Fl_Tree_Item_Draw_Mode mode);
-  FL_EXPORT_C(void, Fl_Tree_set_item_draw_mode_with_int)(fl_Tree tree,int mode);
+  FL_EXPORT_C_HEADER(Fl_Tree_Item_Reselect_Mode,Fl_Tree_item_reselect_mode,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_item_reselect_mode,(fl_Tree tree,Fl_Tree_Item_Reselect_Mode mode));
+  FL_EXPORT_C_HEADER(Fl_Tree_Item_Draw_Mode,Fl_Tree_item_draw_mode,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_item_draw_mode,(fl_Tree tree,Fl_Tree_Item_Draw_Mode mode));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_item_draw_mode_with_int,(fl_Tree tree,int mode));
 #endif /*FLTK_ABI_VERSION*/
-  FL_EXPORT_C(int, Fl_Tree_displayed)(fl_Tree tree,fl_Tree_Item item);
-  FL_EXPORT_C(void, Fl_Tree_show_item_with_yoff)(fl_Tree tree,fl_Tree_Item item, int yoff);
-  FL_EXPORT_C(void, Fl_Tree_show_item)(fl_Tree tree,fl_Tree_Item item);
-  FL_EXPORT_C(void, Fl_Tree_show_item_top)(fl_Tree tree,fl_Tree_Item item);
-  FL_EXPORT_C(void, Fl_Tree_show_item_middle)(fl_Tree tree,fl_Tree_Item item);
-  FL_EXPORT_C(void, Fl_Tree_show_item_bottom)(fl_Tree tree,fl_Tree_Item item);
-  FL_EXPORT_C(void, Fl_Tree_display)(fl_Tree tree,fl_Tree_Item item);
-  FL_EXPORT_C(int , Fl_Tree_vposition)(fl_Tree tree);
-  FL_EXPORT_C(void, Fl_Tree_set_vposition)(fl_Tree tree,int pos);
+  FL_EXPORT_C_HEADER(int,Fl_Tree_displayed,(fl_Tree tree,fl_Tree_Item item));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_show_item_with_yoff,(fl_Tree tree,fl_Tree_Item item, int yoff));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_show_item,(fl_Tree tree,fl_Tree_Item item));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_show_item_top,(fl_Tree tree,fl_Tree_Item item));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_show_item_middle,(fl_Tree tree,fl_Tree_Item item));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_show_item_bottom,(fl_Tree tree,fl_Tree_Item item));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_display,(fl_Tree tree,fl_Tree_Item item));
+  FL_EXPORT_C_HEADER(int ,Fl_Tree_vposition,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_vposition,(fl_Tree tree,int pos));
 
-  FL_EXPORT_C(int, Fl_Tree_is_scrollbar)(fl_Tree tree,fl_Widget w);
-  FL_EXPORT_C(int, Fl_Tree_scrollbar_size)(fl_Tree tree);
-  FL_EXPORT_C(void, Fl_Tree_set_scrollbar_size)(fl_Tree tree,int size);
-  FL_EXPORT_C(int, Fl_Tree_is_vscroll_visible)(fl_Tree tree);
-  FL_EXPORT_C(void, Fl_Tree_set_callback_item)(fl_Tree tree,fl_Tree_Item item);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_callback_item)(fl_Tree tree);
-  FL_EXPORT_C(void, Fl_Tree_set_callback_reason)(fl_Tree tree,Fl_Tree_Reason reason);
-  FL_EXPORT_C(Fl_Tree_Reason, Fl_Tree_callback_reason)(fl_Tree tree);
-  FL_EXPORT_C(void, Fl_Tree_load)(fl_Tree tree,fl_Preferences preferences);
-  FL_EXPORT_C(fl_Tree,    Fl_OverriddenTree_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Tree,    Fl_OverriddenTree_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Tree_draw)(fl_Tree o);
-  FL_EXPORT_C(void, Fl_Tree_draw_super)(fl_Tree o);
-  FL_EXPORT_C(int, Fl_Tree_handle)(fl_Tree o, int event);
-  FL_EXPORT_C(int, Fl_Tree_handle_super)(fl_Tree o, int event);
-  FL_EXPORT_C(void, Fl_Tree_resize)(fl_Tree o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Tree_resize_super)(fl_Tree o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Tree_show)(fl_Tree o);
-  FL_EXPORT_C(void, Fl_Tree_show_super)(fl_Tree o);
-  FL_EXPORT_C(void, Fl_Tree_hide)(fl_Tree o);
-  FL_EXPORT_C(void, Fl_Tree_hide_super)(fl_Tree o);
+  FL_EXPORT_C_HEADER(int,Fl_Tree_is_scrollbar,(fl_Tree tree,fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_scrollbar_size,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_scrollbar_size,(fl_Tree tree,int size));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_is_vscroll_visible,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_callback_item,(fl_Tree tree,fl_Tree_Item item));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_callback_item,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_set_callback_reason,(fl_Tree tree,Fl_Tree_Reason reason));
+  FL_EXPORT_C_HEADER(Fl_Tree_Reason,Fl_Tree_callback_reason,(fl_Tree tree));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_load,(fl_Tree tree,fl_Preferences preferences));
+  FL_EXPORT_C_HEADER(fl_Tree,Fl_OverriddenTree_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Tree,Fl_OverriddenTree_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_draw,(fl_Tree o));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_draw_super,(fl_Tree o));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_handle,(fl_Tree o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_handle_super,(fl_Tree o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_resize,(fl_Tree o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_resize_super,(fl_Tree o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_show,(fl_Tree o));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_show_super,(fl_Tree o));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_hide,(fl_Tree o));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_hide_super,(fl_Tree o));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Tree_ItemC.h b/c-src/Fl_Tree_ItemC.h
--- a/c-src/Fl_Tree_ItemC.h
+++ b/c-src/Fl_Tree_ItemC.h
@@ -9,102 +9,102 @@
 #include "Fl_CallbackC.h"
 EXPORT {
 #endif
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_Item_New_WithPrefs)(fl_Tree_Prefs tree_prefs);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_Item_New_WithItem)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(void, Fl_Tree_Item_Destroy)(fl_Tree_Item tree_item);
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_Item_New_WithPrefs,(fl_Tree_Prefs tree_prefs));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_Item_New_WithItem,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Item_Destroy,(fl_Tree_Item tree_item));
 
-  FL_EXPORT_C(int, Fl_Tree_Item_x)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(int, Fl_Tree_Item_y)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(int, Fl_Tree_Item_w)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(int, Fl_Tree_Item_h)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(void, Fl_Tree_Item_draw)(fl_Tree_Item tree_item, int X, int *Y, int W, fl_Widget tree, fl_Tree_Item itemfocus,  fl_Tree_Prefs prefs);
-  FL_EXPORT_C(void, Fl_Tree_Item_draw_with_lastchild)(fl_Tree_Item tree_item, int X, int *Y, int W, fl_Widget tree, fl_Tree_Item itemfocus,  fl_Tree_Prefs prefs);
-  FL_EXPORT_C(void, Fl_Tree_Item_show_self_with_indent)(fl_Tree_Item tree_item,  char* indent);
-  FL_EXPORT_C(void, Fl_Tree_Item_show_self)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(void, Fl_Tree_Item_set_label)(fl_Tree_Item tree_item,  char* val);
-  FL_EXPORT_C(const char*, Fl_Tree_Item_label)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(void, Fl_Tree_Item_set_user_data)(fl_Tree_Item tree_item,  void* data );
-  FL_EXPORT_C(void*, Fl_Tree_Item_user_data)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(void, Fl_Tree_Item_set_labelfont)(fl_Tree_Item tree_item, Fl_Font val);
-  FL_EXPORT_C(Fl_Font, Fl_Tree_Item_labelfont)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(void, Fl_Tree_Item_set_labelsize)(fl_Tree_Item tree_item, Fl_Fontsize val);
-  FL_EXPORT_C(Fl_Fontsize, Fl_Tree_Item_labelsize)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(void, Fl_Tree_Item_set_labelcolor)(fl_Tree_Item tree_item, Fl_Color val);
-  FL_EXPORT_C(Fl_Color, Fl_Tree_Item_labelcolor)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(Fl_Color, Fl_Tree_Item_labelfgcolor)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(void, Fl_Tree_Item_set_labelfgcolor)(fl_Tree_Item tree_item, Fl_Color val);
-  FL_EXPORT_C(void, Fl_Tree_Item_set_labelbgcolor)(fl_Tree_Item tree_item, Fl_Color val);
-  FL_EXPORT_C(Fl_Color, Fl_Tree_Item_labelbgcolor)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(void, Fl_Tree_Item_set_widget)(fl_Tree_Item tree_item, fl_Widget val);
-  FL_EXPORT_C(fl_Widget, Fl_Tree_Item_widget)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(int, Fl_Tree_Item_children)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_Item_child_by_index)(fl_Tree_Item tree_item, int index);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_Item_child_by_t)(fl_Tree_Item tree_item, int t);
-  FL_EXPORT_C(int, Fl_Tree_Item_has_children)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(int, Fl_Tree_Item_find_child)(fl_Tree_Item tree_item,  char* name);
-  FL_EXPORT_C(int, Fl_Tree_Item_find_child_by_item)(fl_Tree_Item tree_item, fl_Tree_Item item);
-  FL_EXPORT_C(int, Fl_Tree_Item_remove_child_by_item)(fl_Tree_Item tree_item, fl_Tree_Item item);
-  FL_EXPORT_C(int, Fl_Tree_Item_remove_child)(fl_Tree_Item tree_item,  char* new_label);
-  FL_EXPORT_C(void, Fl_Tree_Item_clear_children)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(void, Fl_Tree_Item_swap_children)(fl_Tree_Item tree_item, int ax, int bx);
-  FL_EXPORT_C(int, Fl_Tree_Item_swap_children_by_tree_item)(fl_Tree_Item tree_item, fl_Tree_Item a, fl_Tree_Item b);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_Item_find_child_item_by_children)(fl_Tree_Item tree_item, char** arr);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_Item_find_child_item_by_name)(fl_Tree_Item tree_item, const char* name);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_Item_find_child_item)(fl_Tree_Item tree_item, char** arr);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_Item_find_item)(fl_Tree_Item tree_item, char** arr);
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Item_x,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Item_y,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Item_w,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Item_h,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Item_draw,(fl_Tree_Item tree_item, int X, int *Y, int W, fl_Widget tree, fl_Tree_Item itemfocus,  fl_Tree_Prefs prefs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Item_draw_with_lastchild,(fl_Tree_Item tree_item, int X, int *Y, int W, fl_Widget tree, fl_Tree_Item itemfocus,  fl_Tree_Prefs prefs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Item_show_self_with_indent,(fl_Tree_Item tree_item,  char* indent));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Item_show_self,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Item_set_label,(fl_Tree_Item tree_item,  char* val));
+  FL_EXPORT_C_HEADER(const char*,Fl_Tree_Item_label,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Item_set_user_data,(fl_Tree_Item tree_item,  void* data ));
+  FL_EXPORT_C_HEADER(void*,Fl_Tree_Item_user_data,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Item_set_labelfont,(fl_Tree_Item tree_item, Fl_Font val));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Tree_Item_labelfont,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Item_set_labelsize,(fl_Tree_Item tree_item, Fl_Fontsize val));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Tree_Item_labelsize,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Item_set_labelcolor,(fl_Tree_Item tree_item, Fl_Color val));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Tree_Item_labelcolor,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Tree_Item_labelfgcolor,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Item_set_labelfgcolor,(fl_Tree_Item tree_item, Fl_Color val));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Item_set_labelbgcolor,(fl_Tree_Item tree_item, Fl_Color val));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Tree_Item_labelbgcolor,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Item_set_widget,(fl_Tree_Item tree_item, fl_Widget val));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Tree_Item_widget,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Item_children,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_Item_child_by_index,(fl_Tree_Item tree_item, int index));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_Item_child_by_t,(fl_Tree_Item tree_item, int t));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Item_has_children,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Item_find_child,(fl_Tree_Item tree_item,  char* name));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Item_find_child_by_item,(fl_Tree_Item tree_item, fl_Tree_Item item));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Item_remove_child_by_item,(fl_Tree_Item tree_item, fl_Tree_Item item));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Item_remove_child,(fl_Tree_Item tree_item,  char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Item_clear_children,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Item_swap_children,(fl_Tree_Item tree_item, int ax, int bx));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Item_swap_children_by_tree_item,(fl_Tree_Item tree_item, fl_Tree_Item a, fl_Tree_Item b));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_Item_find_child_item_by_children,(fl_Tree_Item tree_item, char** arr));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_Item_find_child_item_by_name,(fl_Tree_Item tree_item, const char* name));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_Item_find_child_item,(fl_Tree_Item tree_item, char** arr));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_Item_find_item,(fl_Tree_Item tree_item, char** arr));
 
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_Item_add_with)(fl_Tree_Item tree_item,  fl_Tree_Prefs prefs,  const char* new_label, fl_Tree_Item new_item);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_Item_add_with_at)(fl_Tree_Item tree_item,  fl_Tree_Prefs prefs, fl_Tree_Item new_item, char** arr);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_Item_add)(fl_Tree_Item tree_item,  fl_Tree_Prefs prefs, const char* new_label);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_Item_add_at)(fl_Tree_Item tree_item,  fl_Tree_Prefs prefs, char** arr);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_Item_insert)(fl_Tree_Item tree_item,  fl_Tree_Prefs prefs,  char* new_label);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_Item_insert_with_pos)(fl_Tree_Item tree_item,  fl_Tree_Prefs prefs,  char *new_label, int pos);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_Item_insert_above)(fl_Tree_Item tree_item,  fl_Tree_Prefs prefs,  char *new_label);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_Item_deparent    )(fl_Tree_Item tree_item, int index);
-  FL_EXPORT_C(int         , Fl_Tree_Item_reparent    )(fl_Tree_Item tree_item, fl_Tree_Item new_item, int index);
-  FL_EXPORT_C(int         , Fl_Tree_Item_move        )(fl_Tree_Item tree_item, int to, int from);
-  FL_EXPORT_C(int         , Fl_Tree_Item_move_item   )(fl_Tree_Item tree_item, fl_Tree_Item child_item, int op, int pos);
-  FL_EXPORT_C(int         , Fl_Tree_Item_move_above  )(fl_Tree_Item tree_item, fl_Tree_Item child_item);
-  FL_EXPORT_C(int         , Fl_Tree_Item_move_below  )(fl_Tree_Item tree_item, fl_Tree_Item child_item);
-  FL_EXPORT_C(int         , Fl_Tree_Item_move_into   )(fl_Tree_Item tree_item, fl_Tree_Item child_item, int pos);
-  FL_EXPORT_C(int, Fl_Tree_Item_depth)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_Item_prev)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_Item_next)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_Item_next_sibling)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_Item_prev_sibling)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(void, Fl_Tree_Item_update_prev_next)(fl_Tree_Item tree_item, int index);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_Item_next_displayed)(fl_Tree_Item tree_item, fl_Tree_Prefs prefs);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_Item_prev_displayed)(fl_Tree_Item tree_item, fl_Tree_Prefs prefs);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_Item_parent)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(void, Fl_Tree_Item_set_parent)(fl_Tree_Item tree_item, fl_Tree_Item val);
-  FL_EXPORT_C(void, Fl_Tree_Item_open)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(void, Fl_Tree_Item_close)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(int, Fl_Tree_Item_is_open)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(int, Fl_Tree_Item_is_close)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(void, Fl_Tree_Item_open_toggle)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(void, Fl_Tree_Item_select)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(void, Fl_Tree_Item_select_with_val)(fl_Tree_Item tree_item, int val);
-  FL_EXPORT_C(void, Fl_Tree_Item_select_toggle)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(int, Fl_Tree_Item_select_all)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(void, Fl_Tree_Item_deselect)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(int, Fl_Tree_Item_deselect_all)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(char, Fl_Tree_Item_is_selected)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(void, Fl_Tree_Item_activate)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(void, Fl_Tree_Item_activate_with_val)(fl_Tree_Item tree_item, int val);
-  FL_EXPORT_C(char, Fl_Tree_Item_is_active)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(int, Fl_Tree_Item_visible)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(int, Fl_Tree_Item_is_visible)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(int, Fl_Tree_Item_visible_r)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(void, Fl_Tree_Item_set_usericon)(fl_Tree_Item tree_item, fl_Image val);
-  FL_EXPORT_C(fl_Image, Fl_Tree_Item_usericon)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(fl_Tree_Item, Fl_Tree_Item_find_clicked)(fl_Tree_Item tree_item,  fl_Tree_Prefs prefs);
-  FL_EXPORT_C(int, Fl_Tree_Item_event_on_collapse_icon)(fl_Tree_Item tree_item,  fl_Tree_Prefs prefs);
-  FL_EXPORT_C(int, Fl_Tree_Item_event_on_label)(fl_Tree_Item tree_item,  fl_Tree_Prefs prefs);
-  FL_EXPORT_C(int, Fl_Tree_Item_is_root)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(int, Fl_Tree_Item_label_x)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(int, Fl_Tree_Item_label_y)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(int, Fl_Tree_Item_label_w)(fl_Tree_Item tree_item);
-  FL_EXPORT_C(int, Fl_Tree_Item_label_h)(fl_Tree_Item tree_item);
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_Item_add_with,(fl_Tree_Item tree_item,  fl_Tree_Prefs prefs,  const char* new_label, fl_Tree_Item new_item));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_Item_add_with_at,(fl_Tree_Item tree_item,  fl_Tree_Prefs prefs, fl_Tree_Item new_item, char** arr));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_Item_add,(fl_Tree_Item tree_item,  fl_Tree_Prefs prefs, const char* new_label));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_Item_add_at,(fl_Tree_Item tree_item,  fl_Tree_Prefs prefs, char** arr));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_Item_insert,(fl_Tree_Item tree_item,  fl_Tree_Prefs prefs,  char* new_label));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_Item_insert_with_pos,(fl_Tree_Item tree_item,  fl_Tree_Prefs prefs,  char *new_label, int pos));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_Item_insert_above,(fl_Tree_Item tree_item,  fl_Tree_Prefs prefs,  char *new_label));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_Item_deparent    ,(fl_Tree_Item tree_item, int index));
+  FL_EXPORT_C_HEADER(int         ,Fl_Tree_Item_reparent    ,(fl_Tree_Item tree_item, fl_Tree_Item new_item, int index));
+  FL_EXPORT_C_HEADER(int         ,Fl_Tree_Item_move        ,(fl_Tree_Item tree_item, int to, int from));
+  FL_EXPORT_C_HEADER(int         ,Fl_Tree_Item_move_item   ,(fl_Tree_Item tree_item, fl_Tree_Item child_item, int op, int pos));
+  FL_EXPORT_C_HEADER(int         ,Fl_Tree_Item_move_above  ,(fl_Tree_Item tree_item, fl_Tree_Item child_item));
+  FL_EXPORT_C_HEADER(int         ,Fl_Tree_Item_move_below  ,(fl_Tree_Item tree_item, fl_Tree_Item child_item));
+  FL_EXPORT_C_HEADER(int         ,Fl_Tree_Item_move_into   ,(fl_Tree_Item tree_item, fl_Tree_Item child_item, int pos));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Item_depth,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_Item_prev,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_Item_next,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_Item_next_sibling,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_Item_prev_sibling,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Item_update_prev_next,(fl_Tree_Item tree_item, int index));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_Item_next_displayed,(fl_Tree_Item tree_item, fl_Tree_Prefs prefs));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_Item_prev_displayed,(fl_Tree_Item tree_item, fl_Tree_Prefs prefs));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_Item_parent,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Item_set_parent,(fl_Tree_Item tree_item, fl_Tree_Item val));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Item_open,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Item_close,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Item_is_open,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Item_is_close,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Item_open_toggle,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Item_select,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Item_select_with_val,(fl_Tree_Item tree_item, int val));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Item_select_toggle,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Item_select_all,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Item_deselect,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Item_deselect_all,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(char,Fl_Tree_Item_is_selected,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Item_activate,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Item_activate_with_val,(fl_Tree_Item tree_item, int val));
+  FL_EXPORT_C_HEADER(char,Fl_Tree_Item_is_active,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Item_visible,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Item_is_visible,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Item_visible_r,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Item_set_usericon,(fl_Tree_Item tree_item, fl_Image val));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Tree_Item_usericon,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(fl_Tree_Item,Fl_Tree_Item_find_clicked,(fl_Tree_Item tree_item,  fl_Tree_Prefs prefs));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Item_event_on_collapse_icon,(fl_Tree_Item tree_item,  fl_Tree_Prefs prefs));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Item_event_on_label,(fl_Tree_Item tree_item,  fl_Tree_Prefs prefs));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Item_is_root,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Item_label_x,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Item_label_y,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Item_label_w,(fl_Tree_Item tree_item));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Item_label_h,(fl_Tree_Item tree_item));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Tree_PrefsC.h b/c-src/Fl_Tree_PrefsC.h
--- a/c-src/Fl_Tree_PrefsC.h
+++ b/c-src/Fl_Tree_PrefsC.h
@@ -9,77 +9,77 @@
 #include "Fl_CallbackC.h"
 EXPORT {
 #endif
-  FL_EXPORT_C(fl_Tree_Prefs, Fl_Tree_Prefs_New)();
-  FL_EXPORT_C(void, Fl_Tree_Prefs_Destroy)(fl_Tree_Prefs prefs);
-  FL_EXPORT_C(Fl_Font, Fl_Tree_Prefs_item_labelfont)(fl_Tree_Prefs tree_prefs);
-  FL_EXPORT_C(void, Fl_Tree_Prefs_set_item_labelfont)(fl_Tree_Prefs tree_prefs, Fl_Font val);
-  FL_EXPORT_C(Fl_Fontsize, Fl_Tree_Prefs_item_labelsize)(fl_Tree_Prefs tree_prefs);
-  FL_EXPORT_C(void, Fl_Tree_Prefs_set_item_labelsize)(fl_Tree_Prefs tree_prefs, Fl_Fontsize val);
-  FL_EXPORT_C(Fl_Color, Fl_Tree_Prefs_item_labelfgcolor)(fl_Tree_Prefs tree_prefs);
-  FL_EXPORT_C(void, Fl_Tree_Prefs_set_item_labelfgcolor)(fl_Tree_Prefs tree_prefs, Fl_Color val);
+  FL_EXPORT_C_HEADER(fl_Tree_Prefs,Fl_Tree_Prefs_New,());
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Prefs_Destroy,(fl_Tree_Prefs prefs));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Tree_Prefs_item_labelfont,(fl_Tree_Prefs tree_prefs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Prefs_set_item_labelfont,(fl_Tree_Prefs tree_prefs, Fl_Font val));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Tree_Prefs_item_labelsize,(fl_Tree_Prefs tree_prefs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Prefs_set_item_labelsize,(fl_Tree_Prefs tree_prefs, Fl_Fontsize val));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Tree_Prefs_item_labelfgcolor,(fl_Tree_Prefs tree_prefs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Prefs_set_item_labelfgcolor,(fl_Tree_Prefs tree_prefs, Fl_Color val));
 #if FLTK_ABI_VERSION >= 10302
-  FL_EXPORT_C(Fl_Color, Fl_Tree_Prefs_item_labelbgcolor)(fl_Tree_Prefs tree_prefs);
-  FL_EXPORT_C(void, Fl_Tree_Prefs_set_item_labelbgcolor)(fl_Tree_Prefs tree_prefs, Fl_Color val);
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Tree_Prefs_item_labelbgcolor,(fl_Tree_Prefs tree_prefs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Prefs_set_item_labelbgcolor,(fl_Tree_Prefs tree_prefs, Fl_Color val));
 #else /*FLTK_ABI_VERSION*/
-  FL_EXPORT_C(Fl_Color, Fl_Tree_Prefs_item_labelbgcolor)(fl_Tree_Prefs tree_prefs);
-  FL_EXPORT_C(void, Fl_Tree_Prefs_set_item_labelbgcolor)(fl_Tree_Prefs tree_prefs, Fl_Color val);
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Tree_Prefs_item_labelbgcolor,(fl_Tree_Prefs tree_prefs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Prefs_set_item_labelbgcolor,(fl_Tree_Prefs tree_prefs, Fl_Color val));
 #endif /*FLTK_ABI_VERSION*/
-  FL_EXPORT_C(Fl_Font, Fl_Tree_Prefs_labelfont)(fl_Tree_Prefs tree_prefs);
-  FL_EXPORT_C(void, Fl_Tree_Prefs_set_labelfont)(fl_Tree_Prefs tree_prefs, Fl_Font val);
-  FL_EXPORT_C(Fl_Fontsize, Fl_Tree_Prefs_labelsize)(fl_Tree_Prefs tree_prefs);
-  FL_EXPORT_C(void, Fl_Tree_Prefs_set_labelsize)(fl_Tree_Prefs tree_prefs, Fl_Fontsize val);
-  FL_EXPORT_C(Fl_Color, Fl_Tree_Prefs_labelfgcolor)(fl_Tree_Prefs tree_prefs);
-  FL_EXPORT_C(void, Fl_Tree_Prefs_set_labelfgcolor)(fl_Tree_Prefs tree_prefs, Fl_Color val);
-  FL_EXPORT_C(Fl_Color, Fl_Tree_Prefs_labelbgcolor)(fl_Tree_Prefs tree_prefs);
-  FL_EXPORT_C(void, Fl_Tree_Prefs_set_labelbgcolor)(fl_Tree_Prefs tree_prefs, Fl_Color val);
-  FL_EXPORT_C(int, Fl_Tree_Prefs_marginleft)(fl_Tree_Prefs tree_prefs);
-  FL_EXPORT_C(void, Fl_Tree_Prefs_set_marginleft)(fl_Tree_Prefs tree_prefs, int val);
-  FL_EXPORT_C(int, Fl_Tree_Prefs_margintop)(fl_Tree_Prefs tree_prefs);
-  FL_EXPORT_C(void, Fl_Tree_Prefs_set_margintop)(fl_Tree_Prefs tree_prefs, int val);
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Tree_Prefs_labelfont,(fl_Tree_Prefs tree_prefs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Prefs_set_labelfont,(fl_Tree_Prefs tree_prefs, Fl_Font val));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Tree_Prefs_labelsize,(fl_Tree_Prefs tree_prefs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Prefs_set_labelsize,(fl_Tree_Prefs tree_prefs, Fl_Fontsize val));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Tree_Prefs_labelfgcolor,(fl_Tree_Prefs tree_prefs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Prefs_set_labelfgcolor,(fl_Tree_Prefs tree_prefs, Fl_Color val));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Tree_Prefs_labelbgcolor,(fl_Tree_Prefs tree_prefs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Prefs_set_labelbgcolor,(fl_Tree_Prefs tree_prefs, Fl_Color val));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Prefs_marginleft,(fl_Tree_Prefs tree_prefs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Prefs_set_marginleft,(fl_Tree_Prefs tree_prefs, int val));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Prefs_margintop,(fl_Tree_Prefs tree_prefs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Prefs_set_margintop,(fl_Tree_Prefs tree_prefs, int val));
 #if FLTK_ABI_VERSION >= 10302
-  FL_EXPORT_C(int, Fl_Tree_Prefs_marginbottom)(fl_Tree_Prefs tree_prefs);
-  FL_EXPORT_C(void, Fl_Tree_Prefs_set_marginbottom)(fl_Tree_Prefs tree_prefs, int val);
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Prefs_marginbottom,(fl_Tree_Prefs tree_prefs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Prefs_set_marginbottom,(fl_Tree_Prefs tree_prefs, int val));
 #endif /*FLTK_ABI_VERSION*/
-  FL_EXPORT_C(int, Fl_Tree_Prefs_openchild_marginbottom)(fl_Tree_Prefs tree_prefs);
-  FL_EXPORT_C(void, Fl_Tree_Prefs_set_openchild_marginbottom)(fl_Tree_Prefs tree_prefs, int val);
-  FL_EXPORT_C(int, Fl_Tree_Prefs_usericonmarginleft)(fl_Tree_Prefs tree_prefs);
-  FL_EXPORT_C(void, Fl_Tree_Prefs_set_usericonmarginleft)(fl_Tree_Prefs tree_prefs, int val);
-  FL_EXPORT_C(int, Fl_Tree_Prefs_labelmarginleft)(fl_Tree_Prefs tree_prefs);
-  FL_EXPORT_C(void,Fl_Tree_Prefs_set_labelmarginleft)(fl_Tree_Prefs tree_prefs, int val);
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Prefs_openchild_marginbottom,(fl_Tree_Prefs tree_prefs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Prefs_set_openchild_marginbottom,(fl_Tree_Prefs tree_prefs, int val));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Prefs_usericonmarginleft,(fl_Tree_Prefs tree_prefs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Prefs_set_usericonmarginleft,(fl_Tree_Prefs tree_prefs, int val));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Prefs_labelmarginleft,(fl_Tree_Prefs tree_prefs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Prefs_set_labelmarginleft,(fl_Tree_Prefs tree_prefs, int val));
 #if FLTK_ABI_VERSION >= 10302
-  FL_EXPORT_C(int, Fl_Tree_Prefs_widgetmarginleft)(fl_Tree_Prefs tree_prefs);
-  FL_EXPORT_C(void, Fl_Tree_Prefs_set_widgetmarginleft)(fl_Tree_Prefs tree_prefs, int val);
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Prefs_widgetmarginleft,(fl_Tree_Prefs tree_prefs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Prefs_set_widgetmarginleft,(fl_Tree_Prefs tree_prefs, int val));
 #endif /*FLTK_ABI_VERSION*/
-  FL_EXPORT_C(int, Fl_Tree_Prefs_linespacing)(fl_Tree_Prefs tree_prefs);
-  FL_EXPORT_C(void, Fl_Tree_Prefs_set_linespacing)(fl_Tree_Prefs tree_prefs, int val);
-  FL_EXPORT_C(Fl_Color, Fl_Tree_Prefs_connectorcolor)(fl_Tree_Prefs tree_prefs);
-  FL_EXPORT_C(void, Fl_Tree_Prefs_set_connectorcolor)(fl_Tree_Prefs tree_prefs, Fl_Color val);
-  FL_EXPORT_C(Fl_Tree_Connector, Fl_Tree_Prefs_connectorstyle)(fl_Tree_Prefs tree_prefs);
-  FL_EXPORT_C(void, Fl_Tree_Prefs_set_connectorstyle_with_tree_connector)(fl_Tree_Prefs tree_prefs, Fl_Tree_Connector val);
-  FL_EXPORT_C(void, Fl_Tree_Prefs_set_connectorstyle_with_val)(fl_Tree_Prefs tree_prefs, int val);
-  FL_EXPORT_C(int, Fl_Tree_Prefs_connectorwidth)(fl_Tree_Prefs tree_prefs);
-  FL_EXPORT_C(void, Fl_Tree_Prefs_set_connectorwidth)(fl_Tree_Prefs tree_prefs, int val);
-  FL_EXPORT_C(fl_Image, Fl_Tree_Prefs_openicon)(fl_Tree_Prefs tree_prefs);
-  FL_EXPORT_C(void, Fl_Tree_Prefs_set_openicon)(fl_Tree_Prefs tree_prefs, fl_Image val);
-  FL_EXPORT_C(fl_Image, Fl_Tree_Prefs_closeicon)(fl_Tree_Prefs tree_prefs);
-  FL_EXPORT_C(void, Fl_Tree_Prefs_set_closeicon)(fl_Tree_Prefs tree_prefs, fl_Image val);
-  FL_EXPORT_C(fl_Image, Fl_Tree_Prefs_usericon)(fl_Tree_Prefs tree_prefs);
-  FL_EXPORT_C(void, Fl_Tree_Prefs_set_usericon)(fl_Tree_Prefs tree_prefs, fl_Image val);
-  FL_EXPORT_C(char, Fl_Tree_Prefs_showcollapse)(fl_Tree_Prefs tree_prefs);
-  FL_EXPORT_C(void, Fl_Tree_Prefs_set_showcollapse)(fl_Tree_Prefs tree_prefs, int val);
-  FL_EXPORT_C(Fl_Tree_Sort, Fl_Tree_Prefs_sortorder)(fl_Tree_Prefs tree_prefs);
-  FL_EXPORT_C(void, Fl_Tree_Prefs_set_sortorder)(fl_Tree_Prefs tree_prefs, Fl_Tree_Sort val);
-  FL_EXPORT_C(Fl_Boxtype, Fl_Tree_Prefs_selectbox)(fl_Tree_Prefs tree_prefs);
-  FL_EXPORT_C(void, Fl_Tree_Prefs_set_selectbox)(fl_Tree_Prefs tree_prefs, Fl_Boxtype val);
-  FL_EXPORT_C(int, Fl_Tree_Prefs_showroot)(fl_Tree_Prefs tree_prefs);
-  FL_EXPORT_C(void, Fl_Tree_Prefs_set_showroot)(fl_Tree_Prefs tree_prefs, int val);
-  FL_EXPORT_C(Fl_Tree_Select, Fl_Tree_Prefs_selectmode)(fl_Tree_Prefs tree_prefs);
-  FL_EXPORT_C(void, Fl_Tree_Prefs_set_selectmode)(fl_Tree_Prefs tree_prefs, Fl_Tree_Select val);
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Prefs_linespacing,(fl_Tree_Prefs tree_prefs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Prefs_set_linespacing,(fl_Tree_Prefs tree_prefs, int val));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Tree_Prefs_connectorcolor,(fl_Tree_Prefs tree_prefs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Prefs_set_connectorcolor,(fl_Tree_Prefs tree_prefs, Fl_Color val));
+  FL_EXPORT_C_HEADER(Fl_Tree_Connector,Fl_Tree_Prefs_connectorstyle,(fl_Tree_Prefs tree_prefs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Prefs_set_connectorstyle_with_tree_connector,(fl_Tree_Prefs tree_prefs, Fl_Tree_Connector val));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Prefs_set_connectorstyle_with_val,(fl_Tree_Prefs tree_prefs, int val));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Prefs_connectorwidth,(fl_Tree_Prefs tree_prefs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Prefs_set_connectorwidth,(fl_Tree_Prefs tree_prefs, int val));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Tree_Prefs_openicon,(fl_Tree_Prefs tree_prefs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Prefs_set_openicon,(fl_Tree_Prefs tree_prefs, fl_Image val));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Tree_Prefs_closeicon,(fl_Tree_Prefs tree_prefs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Prefs_set_closeicon,(fl_Tree_Prefs tree_prefs, fl_Image val));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Tree_Prefs_usericon,(fl_Tree_Prefs tree_prefs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Prefs_set_usericon,(fl_Tree_Prefs tree_prefs, fl_Image val));
+  FL_EXPORT_C_HEADER(char,Fl_Tree_Prefs_showcollapse,(fl_Tree_Prefs tree_prefs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Prefs_set_showcollapse,(fl_Tree_Prefs tree_prefs, int val));
+  FL_EXPORT_C_HEADER(Fl_Tree_Sort,Fl_Tree_Prefs_sortorder,(fl_Tree_Prefs tree_prefs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Prefs_set_sortorder,(fl_Tree_Prefs tree_prefs, Fl_Tree_Sort val));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Tree_Prefs_selectbox,(fl_Tree_Prefs tree_prefs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Prefs_set_selectbox,(fl_Tree_Prefs tree_prefs, Fl_Boxtype val));
+  FL_EXPORT_C_HEADER(int,Fl_Tree_Prefs_showroot,(fl_Tree_Prefs tree_prefs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Prefs_set_showroot,(fl_Tree_Prefs tree_prefs, int val));
+  FL_EXPORT_C_HEADER(Fl_Tree_Select,Fl_Tree_Prefs_selectmode,(fl_Tree_Prefs tree_prefs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Prefs_set_selectmode,(fl_Tree_Prefs tree_prefs, Fl_Tree_Select val));
 #if FLTK_ABI_VERSION >= 10302
-  FL_EXPORT_C(Fl_Tree_Item_Reselect_Mode, Fl_Tree_Prefs_item_reselect_mode)(fl_Tree_Prefs tree_prefs);
-  FL_EXPORT_C(void, Fl_Tree_Prefs_set_item_reselect_mode)(fl_Tree_Prefs tree_prefs, Fl_Tree_Item_Reselect_Mode mode);
-  FL_EXPORT_C(Fl_Tree_Item_Draw_Mode, Fl_Tree_Prefs_item_draw_mode)(fl_Tree_Prefs tree_prefs);
-  FL_EXPORT_C(void, Fl_Tree_Prefs_set_item_draw_mode)(fl_Tree_Prefs tree_prefs, Fl_Tree_Item_Draw_Mode val);
+  FL_EXPORT_C_HEADER(Fl_Tree_Item_Reselect_Mode,Fl_Tree_Prefs_item_reselect_mode,(fl_Tree_Prefs tree_prefs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Prefs_set_item_reselect_mode,(fl_Tree_Prefs tree_prefs, Fl_Tree_Item_Reselect_Mode mode));
+  FL_EXPORT_C_HEADER(Fl_Tree_Item_Draw_Mode,Fl_Tree_Prefs_item_draw_mode,(fl_Tree_Prefs tree_prefs));
+  FL_EXPORT_C_HEADER(void,Fl_Tree_Prefs_set_item_draw_mode,(fl_Tree_Prefs tree_prefs, Fl_Tree_Item_Draw_Mode val));
 #endif /*FLTK_ABI_VERSION*/
 #ifdef __cplusplus
 }
diff --git a/c-src/Fl_Types.h b/c-src/Fl_Types.h
--- a/c-src/Fl_Types.h
+++ b/c-src/Fl_Types.h
@@ -48,6 +48,7 @@
 #define FL_SORT_ASCENDING	0	/**< sort browser items in ascending alphabetic order. */
 #define FL_SORT_DESCENDING	1	/**< sort in descending order */
 #ifndef INTERNAL_LINKAGE
+#include "../config.h"
   enum { FL_FILE_BROWSER_FILES, FL_FILE_BROWSER_DIRECTORIES };
   enum
   {
diff --git a/c-src/Fl_ValuatorC.h b/c-src/Fl_ValuatorC.h
--- a/c-src/Fl_ValuatorC.h
+++ b/c-src/Fl_ValuatorC.h
@@ -43,127 +43,127 @@
     FL_HORIZONTALC = 1
   } Valuator_Type;
 #endif
-  FL_EXPORT_C(int,Fl_Valuator_handle)(fl_Widget self, int event);
-  FL_EXPORT_C(int,Fl_Valuator_handle_super)(fl_Widget self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Valuator_parent)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_set_parent)(fl_Valuator valuator, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Valuator_type)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_set_type)(fl_Valuator valuator, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Valuator_handle,(fl_Widget self, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Valuator_handle_super,(fl_Widget self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Valuator_parent,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_set_parent,(fl_Valuator valuator, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Valuator_type,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_set_type,(fl_Valuator valuator, uchar t));
 
-FL_EXPORT_C(void, Fl_Valuator_draw_box)(fl_Valuator Valuator);
-FL_EXPORT_C(void, Fl_Valuator_draw_box_with_tc)(fl_Valuator Valuator,Fl_Boxtype t, Fl_Color c);
-FL_EXPORT_C(void, Fl_Valuator_draw_box_with_txywhc)(fl_Valuator Valuator,Fl_Boxtype t, int x,int y,int w,int h, Fl_Color c);
-FL_EXPORT_C(void, Fl_Valuator_draw_backdrop)(fl_Valuator Valuator);
-FL_EXPORT_C(void, Fl_Valuator_draw_focus)(fl_Valuator Valuator);
-FL_EXPORT_C(void, Fl_Valuator_draw_focus_with_txywh)(fl_Valuator Valuator,Fl_Boxtype t, int x,int y,int w,int h);
-FL_EXPORT_C(void, Fl_Valuator_draw_label)(fl_Valuator Valuator);
-  FL_EXPORT_C(int,          Fl_Valuator_x)(fl_Valuator valuator);
-  FL_EXPORT_C(int,          Fl_Valuator_y)(fl_Valuator valuator);
-  FL_EXPORT_C(int,          Fl_Valuator_w)(fl_Valuator valuator);
-  FL_EXPORT_C(int,          Fl_Valuator_h)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_set_align)(fl_Valuator valuator, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Valuator_align)(fl_Valuator valuator);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Valuator_box)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_set_box)(fl_Valuator valuator, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Valuator_color)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_set_color)(fl_Valuator valuator, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Valuator_set_color_with_bg_sel)(fl_Valuator valuator,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Valuator_selection_color)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_set_selection_color)(fl_Valuator valuator, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Valuator_label)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_copy_label)(fl_Valuator valuator, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Valuator_set_label)(fl_Valuator valuator, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Valuator_labeltype)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_set_labeltype)(fl_Valuator valuator, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Valuator_labelcolor)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_set_labelcolor)(fl_Valuator valuator, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Valuator_labelfont)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_set_labelfont)(fl_Valuator valuator, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Valuator_labelsize)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_set_labelsize)(fl_Valuator valuator, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Valuator_image)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_set_image)(fl_Valuator valuator, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Valuator_deimage)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_set_deimage)(fl_Valuator valuator, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Valuator_tooltip)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_copy_tooltip)(fl_Valuator valuator, const char* text);
-  FL_EXPORT_C(void,         Fl_Valuator_set_tooltip)(fl_Valuator valuator, const char* text);
-  FL_EXPORT_C(void,         Fl_Valuator_set_callback_with_user_data)(fl_Valuator valuator, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Valuator_set_callback)(fl_Valuator valuator, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Valuator_other_data)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_set_other_data)(fl_Valuator valuator, void* v);
-  FL_EXPORT_C(void*,        Fl_Valuator_user_data)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_set_user_data)(fl_Valuator valuator, void* v);
-  FL_EXPORT_C(long,         Fl_Valuator_argument)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_set_argument)(fl_Valuator valuator, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Valuator_when)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_set_when)(fl_Valuator valuator, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Valuator_visible)(fl_Valuator valuator);
-  FL_EXPORT_C(int,          Fl_Valuator_visible_r)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_show_super)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_show)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_hide_super)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_hide)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_set_visible)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_clear_visible)(fl_Valuator valuator);
-  FL_EXPORT_C(unsigned int, Fl_Valuator_active)(fl_Valuator valuator);
-  FL_EXPORT_C(int,          Fl_Valuator_active_r)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_activate)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_deactivate)(fl_Valuator valuator);
-  FL_EXPORT_C(unsigned int, Fl_Valuator_output)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_set_output)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_clear_output)(fl_Valuator valuator);
-  FL_EXPORT_C(unsigned int, Fl_Valuator_takesevents)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_set_changed)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_clear_changed)(fl_Valuator valuator);
-  FL_EXPORT_C(int,          Fl_Valuator_take_focus)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_set_visible_focus)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_clear_visible_focus)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_modify_visible_focus)(fl_Valuator valuator, int v);
-  FL_EXPORT_C(unsigned int, Fl_Valuator_visible_focus)(fl_Valuator valuator);
-  FL_EXPORT_C(int,          Fl_Valuator_contains)(fl_Valuator valuator, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Valuator_inside)(fl_Valuator valuator, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Valuator_redraw)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_redraw_label)(fl_Valuator valuator);
-  FL_EXPORT_C(uchar,        Fl_Valuator_damage)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_clear_damage_with_bitmask)(fl_Valuator valuator, uchar c);
-  FL_EXPORT_C(void,         Fl_Valuator_clear_damage)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_damage_with_text)(fl_Valuator valuator, uchar c);
-  FL_EXPORT_C(void,         Fl_Valuator_damage_inside_widget)(fl_Valuator valuator, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Valuator_draw_label_with_xywh_alignment)(fl_Valuator valuator, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Valuator_measure_label)(fl_Valuator valuator, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Valuator_window)(fl_Valuator valuator);
-  FL_EXPORT_C(fl_Window,    Fl_Valuator_top_window)(fl_Valuator valuator);
-  FL_EXPORT_C(fl_Window ,   Fl_Valuator_top_window_offset)(fl_Valuator valuator, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Valuator_as_gl_window_super)(fl_Valuator valuator);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Valuator_as_gl_window)(fl_Valuator valuator);
-  FL_EXPORT_C(void,         Fl_Valuator_resize_super)(fl_Table table,int X, int Y, int W, int H);
-  FL_EXPORT_C(void,         Fl_Valuator_resize)(fl_Table table,int X, int Y, int W, int H);
+FL_EXPORT_C_HEADER(void,Fl_Valuator_draw_box,(fl_Valuator Valuator));
+FL_EXPORT_C_HEADER(void,Fl_Valuator_draw_box_with_tc,(fl_Valuator Valuator,Fl_Boxtype t, Fl_Color c));
+FL_EXPORT_C_HEADER(void,Fl_Valuator_draw_box_with_txywhc,(fl_Valuator Valuator,Fl_Boxtype t, int x,int y,int w,int h, Fl_Color c));
+FL_EXPORT_C_HEADER(void,Fl_Valuator_draw_backdrop,(fl_Valuator Valuator));
+FL_EXPORT_C_HEADER(void,Fl_Valuator_draw_focus,(fl_Valuator Valuator));
+FL_EXPORT_C_HEADER(void,Fl_Valuator_draw_focus_with_txywh,(fl_Valuator Valuator,Fl_Boxtype t, int x,int y,int w,int h));
+FL_EXPORT_C_HEADER(void,Fl_Valuator_draw_label,(fl_Valuator Valuator));
+  FL_EXPORT_C_HEADER(int,Fl_Valuator_x,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(int,Fl_Valuator_y,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(int,Fl_Valuator_w,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(int,Fl_Valuator_h,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_set_align,(fl_Valuator valuator, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Valuator_align,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Valuator_box,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_set_box,(fl_Valuator valuator, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Valuator_color,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_set_color,(fl_Valuator valuator, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_set_color_with_bg_sel,(fl_Valuator valuator,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Valuator_selection_color,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_set_selection_color,(fl_Valuator valuator, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Valuator_label,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_copy_label,(fl_Valuator valuator, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_set_label,(fl_Valuator valuator, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Valuator_labeltype,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_set_labeltype,(fl_Valuator valuator, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Valuator_labelcolor,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_set_labelcolor,(fl_Valuator valuator, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Valuator_labelfont,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_set_labelfont,(fl_Valuator valuator, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Valuator_labelsize,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_set_labelsize,(fl_Valuator valuator, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Valuator_image,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_set_image,(fl_Valuator valuator, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Valuator_deimage,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_set_deimage,(fl_Valuator valuator, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Valuator_tooltip,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_copy_tooltip,(fl_Valuator valuator, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_set_tooltip,(fl_Valuator valuator, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_set_callback_with_user_data,(fl_Valuator valuator, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_set_callback,(fl_Valuator valuator, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Valuator_other_data,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_set_other_data,(fl_Valuator valuator, void* v));
+  FL_EXPORT_C_HEADER(void*,Fl_Valuator_user_data,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_set_user_data,(fl_Valuator valuator, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Valuator_argument,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_set_argument,(fl_Valuator valuator, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Valuator_when,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_set_when,(fl_Valuator valuator, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Valuator_visible,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(int,Fl_Valuator_visible_r,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_show_super,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_show,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_hide_super,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_hide,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_set_visible,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_clear_visible,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Valuator_active,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(int,Fl_Valuator_active_r,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_activate,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_deactivate,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Valuator_output,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_set_output,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_clear_output,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Valuator_takesevents,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_set_changed,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_clear_changed,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(int,Fl_Valuator_take_focus,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_set_visible_focus,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_clear_visible_focus,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_modify_visible_focus,(fl_Valuator valuator, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Valuator_visible_focus,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(int,Fl_Valuator_contains,(fl_Valuator valuator, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Valuator_inside,(fl_Valuator valuator, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_redraw,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_redraw_label,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(uchar,Fl_Valuator_damage,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_clear_damage_with_bitmask,(fl_Valuator valuator, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_clear_damage,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_damage_with_text,(fl_Valuator valuator, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_damage_inside_widget,(fl_Valuator valuator, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_draw_label_with_xywh_alignment,(fl_Valuator valuator, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_measure_label,(fl_Valuator valuator, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Valuator_window,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Valuator_top_window,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Valuator_top_window_offset,(fl_Valuator valuator, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Valuator_as_gl_window_super,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Valuator_as_gl_window,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_resize_super,(fl_Table table,int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_resize,(fl_Table table,int X, int Y, int W, int H));
 
-  FL_EXPORT_C(fl_Valuator_Virtual_Funcs*, Fl_Valuator_default_virtual_funcs)();
-  FL_EXPORT_C(fl_Valuator,    Fl_Valuator_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Valuator,    Fl_OverriddenValuator_New_WithLabel)(int x, int y, int w, int h, const char* label, fl_Valuator_Virtual_Funcs* funcs);
-  FL_EXPORT_C(fl_Valuator   , Fl_Valuator_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(fl_Valuator   , Fl_OverriddenValuator_New)(int x, int y, int w, int h, fl_Valuator_Virtual_Funcs* funcs);
-  FL_EXPORT_C(void,      Fl_Valuator_Destroy)(fl_Valuator valuator);
+  FL_EXPORT_C_HEADER(fl_Valuator_Virtual_Funcs*,Fl_Valuator_default_virtual_funcs,());
+  FL_EXPORT_C_HEADER(fl_Valuator,Fl_Valuator_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Valuator,Fl_OverriddenValuator_New_WithLabel,(int x, int y, int w, int h, const char* label, fl_Valuator_Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(fl_Valuator   ,Fl_Valuator_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(fl_Valuator   ,Fl_OverriddenValuator_New,(int x, int y, int w, int h, fl_Valuator_Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_Destroy,(fl_Valuator valuator));
 
-  FL_EXPORT_C(void, Fl_Valuator_bounds)(fl_Valuator valuator, double a, double b);
-  FL_EXPORT_C(double, Fl_Valuator_minimum)(fl_Valuator valuator);
-  FL_EXPORT_C(void, Fl_Valuator_set_minimum)(fl_Valuator valuator, double a);
-  FL_EXPORT_C(double, Fl_Valuator_maximum)(fl_Valuator valuator);
-  FL_EXPORT_C(void, Fl_Valuator_set_maximum)(fl_Valuator valuator, double a);
-  FL_EXPORT_C(void, Fl_Valuator_range)(fl_Valuator valuator, double a, double b);
-  FL_EXPORT_C(void, Fl_Valuator_set_step)(fl_Valuator valuator, int a);
-  FL_EXPORT_C(void, Fl_Valuator_set_step_with_a_b)(fl_Valuator valuator, double a, int b);
-  FL_EXPORT_C(void, Fl_Valuator_step_with_s)(fl_Valuator valuator, double s);
-  FL_EXPORT_C(double, Fl_Valuator_step)(fl_Valuator valuator);
-  FL_EXPORT_C(void, Fl_Valuator_precision)(fl_Valuator valuator, int precision);
-  FL_EXPORT_C(double, Fl_Valuator_value)(fl_Valuator valuator);
-  FL_EXPORT_C(int, Fl_Valuator_set_value)(fl_Valuator valuator, double v);
-  FL_EXPORT_C(int, Fl_Valuator_format)(fl_Valuator valuator, char* format);
-  FL_EXPORT_C(double, Fl_Valuator_round)(fl_Valuator valuator, double v);
-  FL_EXPORT_C(double, Fl_Valuator_clamp)(fl_Valuator valuator, double v);
-  FL_EXPORT_C(double, Fl_Valuator_increment)(fl_Valuator valuator, double v, int n);
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_bounds,(fl_Valuator valuator, double a, double b));
+  FL_EXPORT_C_HEADER(double,Fl_Valuator_minimum,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_set_minimum,(fl_Valuator valuator, double a));
+  FL_EXPORT_C_HEADER(double,Fl_Valuator_maximum,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_set_maximum,(fl_Valuator valuator, double a));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_range,(fl_Valuator valuator, double a, double b));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_set_step,(fl_Valuator valuator, int a));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_set_step_with_a_b,(fl_Valuator valuator, double a, int b));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_step_with_s,(fl_Valuator valuator, double s));
+  FL_EXPORT_C_HEADER(double,Fl_Valuator_step,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(void,Fl_Valuator_precision,(fl_Valuator valuator, int precision));
+  FL_EXPORT_C_HEADER(double,Fl_Valuator_value,(fl_Valuator valuator));
+  FL_EXPORT_C_HEADER(int,Fl_Valuator_set_value,(fl_Valuator valuator, double v));
+  FL_EXPORT_C_HEADER(int,Fl_Valuator_format,(fl_Valuator valuator, char* format));
+  FL_EXPORT_C_HEADER(double,Fl_Valuator_round,(fl_Valuator valuator, double v));
+  FL_EXPORT_C_HEADER(double,Fl_Valuator_clamp,(fl_Valuator valuator, double v));
+  FL_EXPORT_C_HEADER(double,Fl_Valuator_increment,(fl_Valuator valuator, double v, int n));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Value_InputC.h b/c-src/Fl_Value_InputC.h
--- a/c-src/Fl_Value_InputC.h
+++ b/c-src/Fl_Value_InputC.h
@@ -29,136 +29,136 @@
   };
 
 #endif
-  FL_EXPORT_C(int,Fl_Value_Input_handle)(fl_Value_Input self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Value_Input_parent)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_set_parent)(fl_Value_Input value_input, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Value_Input_type)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_set_type)(fl_Value_Input value_input, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Value_Input_handle,(fl_Value_Input self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Value_Input_parent,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_set_parent,(fl_Value_Input value_input, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Value_Input_type,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_set_type,(fl_Value_Input value_input, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Value_Input_x)(fl_Value_Input value_input);
-  FL_EXPORT_C(int,          Fl_Value_Input_y)(fl_Value_Input value_input);
-  FL_EXPORT_C(int,          Fl_Value_Input_w)(fl_Value_Input value_input);
-  FL_EXPORT_C(int,          Fl_Value_Input_h)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_set_align)(fl_Value_Input value_input, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Value_Input_align)(fl_Value_Input value_input);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Value_Input_box)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_set_box)(fl_Value_Input value_input, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Value_Input_color)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_set_color)(fl_Value_Input value_input, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Value_Input_set_color_with_bg_sel)(fl_Value_Input value_input,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Value_Input_selection_color)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_set_selection_color)(fl_Value_Input value_input, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Value_Input_label)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_copy_label)(fl_Value_Input value_input, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Value_Input_set_label)(fl_Value_Input value_input, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Value_Input_labeltype)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_set_labeltype)(fl_Value_Input value_input, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Value_Input_labelcolor)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_set_labelcolor)(fl_Value_Input value_input, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Value_Input_labelfont)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_set_labelfont)(fl_Value_Input value_input, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Value_Input_labelsize)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_set_labelsize)(fl_Value_Input value_input, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Value_Input_image)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_set_image)(fl_Value_Input value_input, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Value_Input_deimage)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_set_deimage)(fl_Value_Input value_input, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Value_Input_tooltip)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_copy_tooltip)(fl_Value_Input value_input, const char* text);
-  FL_EXPORT_C(void,         Fl_Value_Input_set_tooltip)(fl_Value_Input value_input, const char* text);
-  FL_EXPORT_C(void,         Fl_Value_Input_set_callback_with_user_data)(fl_Value_Input value_input, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Value_Input_set_callback)(fl_Value_Input value_input, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Value_Input_user_data)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_set_user_data)(fl_Value_Input value_input, void* v);
-  FL_EXPORT_C(long,         Fl_Value_Input_argument)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_set_argument)(fl_Value_Input value_input, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Value_Input_when)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_set_when)(fl_Value_Input value_input, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Value_Input_visible)(fl_Value_Input value_input);
-  FL_EXPORT_C(int,          Fl_Value_Input_visible_r)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_set_visible)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_clear_visible)(fl_Value_Input value_input);
-  FL_EXPORT_C(unsigned int, Fl_Value_Input_active)(fl_Value_Input value_input);
-  FL_EXPORT_C(int,          Fl_Value_Input_active_r)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_activate)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_deactivate)(fl_Value_Input value_input);
-  FL_EXPORT_C(unsigned int, Fl_Value_Input_output)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_set_output)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_clear_output)(fl_Value_Input value_input);
-  FL_EXPORT_C(unsigned int, Fl_Value_Input_takesevents)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_set_changed)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_clear_changed)(fl_Value_Input value_input);
-  FL_EXPORT_C(int,          Fl_Value_Input_take_focus)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_set_visible_focus)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_clear_visible_focus)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_modify_visible_focus)(fl_Value_Input value_input, int v);
-  FL_EXPORT_C(unsigned int, Fl_Value_Input_visible_focus)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_do_callback)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_do_callback_with_widget_and_user_data)(fl_Value_Input value_input, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Value_Input_do_callback_with_widget_and_default_user_data)(fl_Value_Input value_input, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Value_Input_contains)(fl_Value_Input value_input, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Value_Input_inside)(fl_Value_Input value_input, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Value_Input_redraw)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_redraw_label)(fl_Value_Input value_input);
-  FL_EXPORT_C(uchar,        Fl_Value_Input_damage)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_clear_damage_with_bitmask)(fl_Value_Input value_input, uchar c);
-  FL_EXPORT_C(void,         Fl_Value_Input_clear_damage)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,         Fl_Value_Input_damage_with_text)(fl_Value_Input value_input, uchar c);
-  FL_EXPORT_C(void,         Fl_Value_Input_damage_inside_widget)(fl_Value_Input value_input, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Value_Input_draw_label_with_xywh_alignment)(fl_Value_Input value_input, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Value_Input_measure_label)(fl_Value_Input value_input, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Value_Input_window)(fl_Value_Input value_input);
-  FL_EXPORT_C(fl_Window,    Fl_Value_Input_top_window)(fl_Value_Input value_input);
-  FL_EXPORT_C(fl_Window ,   Fl_Value_Input_top_window_offset)(fl_Value_Input value_input, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Value_Input_as_group)(fl_Value_Input value_input);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Value_Input_as_gl_window)(fl_Value_Input value_input);
+  FL_EXPORT_C_HEADER(int,Fl_Value_Input_x,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Input_y,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Input_w,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Input_h,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_set_align,(fl_Value_Input value_input, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Value_Input_align,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Value_Input_box,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_set_box,(fl_Value_Input value_input, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Value_Input_color,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_set_color,(fl_Value_Input value_input, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_set_color_with_bg_sel,(fl_Value_Input value_input,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Value_Input_selection_color,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_set_selection_color,(fl_Value_Input value_input, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Value_Input_label,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_copy_label,(fl_Value_Input value_input, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_set_label,(fl_Value_Input value_input, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Value_Input_labeltype,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_set_labeltype,(fl_Value_Input value_input, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Value_Input_labelcolor,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_set_labelcolor,(fl_Value_Input value_input, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Value_Input_labelfont,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_set_labelfont,(fl_Value_Input value_input, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Value_Input_labelsize,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_set_labelsize,(fl_Value_Input value_input, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Value_Input_image,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_set_image,(fl_Value_Input value_input, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Value_Input_deimage,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_set_deimage,(fl_Value_Input value_input, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Value_Input_tooltip,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_copy_tooltip,(fl_Value_Input value_input, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_set_tooltip,(fl_Value_Input value_input, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_set_callback_with_user_data,(fl_Value_Input value_input, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_set_callback,(fl_Value_Input value_input, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Value_Input_user_data,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_set_user_data,(fl_Value_Input value_input, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Value_Input_argument,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_set_argument,(fl_Value_Input value_input, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Value_Input_when,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_set_when,(fl_Value_Input value_input, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Value_Input_visible,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Input_visible_r,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_set_visible,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_clear_visible,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Value_Input_active,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Input_active_r,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_activate,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_deactivate,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Value_Input_output,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_set_output,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_clear_output,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Value_Input_takesevents,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_set_changed,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_clear_changed,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Input_take_focus,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_set_visible_focus,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_clear_visible_focus,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_modify_visible_focus,(fl_Value_Input value_input, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Value_Input_visible_focus,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_do_callback,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_do_callback_with_widget_and_user_data,(fl_Value_Input value_input, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_do_callback_with_widget_and_default_user_data,(fl_Value_Input value_input, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Input_contains,(fl_Value_Input value_input, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Input_inside,(fl_Value_Input value_input, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_redraw,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_redraw_label,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(uchar,Fl_Value_Input_damage,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_clear_damage_with_bitmask,(fl_Value_Input value_input, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_clear_damage,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_damage_with_text,(fl_Value_Input value_input, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_damage_inside_widget,(fl_Value_Input value_input, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_draw_label_with_xywh_alignment,(fl_Value_Input value_input, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_measure_label,(fl_Value_Input value_input, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Value_Input_window,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Value_Input_top_window,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Value_Input_top_window_offset,(fl_Value_Input value_input, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Value_Input_as_group,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Value_Input_as_gl_window,(fl_Value_Input value_input));
   /* Inherited from Fl_Valuator */
 
-  FL_EXPORT_C(void ,	Fl_Value_Input_bounds)(fl_Value_Input value_input, double a, double b);
-  FL_EXPORT_C(double ,	Fl_Value_Input_minimum)(fl_Value_Input value_input);
-  FL_EXPORT_C(void ,	Fl_Value_Input_set_minimum)(fl_Value_Input value_input, double a);
-  FL_EXPORT_C(double,	Fl_Value_Input_maximum)(fl_Value_Input value_input);
-  FL_EXPORT_C(void ,	Fl_Value_Input_set_maximum)(fl_Value_Input value_input, double a);
-  FL_EXPORT_C(void ,	Fl_Value_Input_range)(fl_Value_Input value_input, double a, double b);
-  FL_EXPORT_C(void ,	Fl_Value_Input_set_step_with_a)(fl_Value_Input value_input, int a);
-  FL_EXPORT_C(void ,	Fl_Value_Input_set_step_with_a_b)(fl_Value_Input value_input, double a, int b);
-  FL_EXPORT_C(void,	Fl_Value_Input_set_step_with_s)(fl_Value_Input value_input, double s);
-  FL_EXPORT_C(double ,	Fl_Value_Input_step)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,	Fl_Value_Input_precision)(fl_Value_Input value_input, int p);
-  FL_EXPORT_C(double ,	Fl_Value_Input_value)(fl_Value_Input value_input);
-  FL_EXPORT_C(int ,	Fl_Value_Input_set_value)(fl_Value_Input value_input, double v);
-  FL_EXPORT_C(double ,	Fl_Value_Input_round)(fl_Value_Input value_input, double v);
-  FL_EXPORT_C(double ,	Fl_Value_Input_clamp)(fl_Value_Input value_input, double v);
-  FL_EXPORT_C(double ,	Fl_Value_Input_increment)(fl_Value_Input value_input, double v, int n);
+  FL_EXPORT_C_HEADER(void ,	Fl_Value_Input_bounds,(fl_Value_Input value_input, double a, double b));
+  FL_EXPORT_C_HEADER(double ,	Fl_Value_Input_minimum,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void ,	Fl_Value_Input_set_minimum,(fl_Value_Input value_input, double a));
+  FL_EXPORT_C_HEADER(double,	Fl_Value_Input_maximum,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void ,	Fl_Value_Input_set_maximum,(fl_Value_Input value_input, double a));
+  FL_EXPORT_C_HEADER(void ,	Fl_Value_Input_range,(fl_Value_Input value_input, double a, double b));
+  FL_EXPORT_C_HEADER(void ,	Fl_Value_Input_set_step_with_a,(fl_Value_Input value_input, int a));
+  FL_EXPORT_C_HEADER(void ,	Fl_Value_Input_set_step_with_a_b,(fl_Value_Input value_input, double a, int b));
+  FL_EXPORT_C_HEADER(void,	Fl_Value_Input_set_step_with_s,(fl_Value_Input value_input, double s));
+  FL_EXPORT_C_HEADER(double ,	Fl_Value_Input_step,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,	Fl_Value_Input_precision,(fl_Value_Input value_input, int p));
+  FL_EXPORT_C_HEADER(double ,	Fl_Value_Input_value,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(int ,	Fl_Value_Input_set_value,(fl_Value_Input value_input, double v));
+  FL_EXPORT_C_HEADER(double ,	Fl_Value_Input_round,(fl_Value_Input value_input, double v));
+  FL_EXPORT_C_HEADER(double ,	Fl_Value_Input_clamp,(fl_Value_Input value_input, double v));
+  FL_EXPORT_C_HEADER(double ,	Fl_Value_Input_increment,(fl_Value_Input value_input, double v, int n));
   /* Fl_Value_Input specific functions */
 
-  FL_EXPORT_C(fl_Value_Input,  Fl_Value_Input_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Value_Input, Fl_Value_Input_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(void          , Fl_Value_Input_Destroy)(fl_Value_Input button);
+  FL_EXPORT_C_HEADER(fl_Value_Input,Fl_Value_Input_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Value_Input,Fl_Value_Input_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void          ,Fl_Value_Input_Destroy,(fl_Value_Input button));
 
-  FL_EXPORT_C(char,	Fl_Value_Input_soft)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,	Fl_Value_Input_resize)(fl_Value_Input value_input, int X, int Y, int W, int H);
-  FL_EXPORT_C(void ,	Fl_Value_Input_set_soft)(fl_Value_Input value_input, char s);
-  FL_EXPORT_C(int ,	Fl_Value_Input_shortcut)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,	Fl_Value_Input_set_shortcut)(fl_Value_Input value_input,int v);
-  FL_EXPORT_C(Fl_Font,	Fl_Value_Input_textfont)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,	Fl_Value_Input_set_textfont)(fl_Value_Input value_input,int v);
-  FL_EXPORT_C(int ,	Fl_Value_Input_textsize)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,	Fl_Value_Input_set_textsize)(fl_Value_Input value_input,int v);
-  FL_EXPORT_C(Fl_Color,	Fl_Value_Input_textcolor)(fl_Value_Input value_input);
-  FL_EXPORT_C(void,	Fl_Value_Input_set_textcolor)(fl_Value_Input value_input,int v);
-  FL_EXPORT_C(fl_Value_Input,    Fl_OverriddenValue_Input_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Value_Input,    Fl_OverriddenValue_Input_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Value_Input_draw)(fl_Value_Input o);
-  FL_EXPORT_C(void, Fl_Value_Input_draw_super)(fl_Value_Input o);
-  FL_EXPORT_C(int, Fl_Value_Input_handle)(fl_Value_Input o, int event);
-  FL_EXPORT_C(int, Fl_Value_Input_handle_super)(fl_Value_Input o, int event);
-  FL_EXPORT_C(void, Fl_Value_Input_resize)(fl_Value_Input o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Value_Input_resize_super)(fl_Value_Input o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Value_Input_show)(fl_Value_Input o);
-  FL_EXPORT_C(void, Fl_Value_Input_show_super)(fl_Value_Input o);
-  FL_EXPORT_C(void, Fl_Value_Input_hide)(fl_Value_Input o);
-  FL_EXPORT_C(void, Fl_Value_Input_hide_super)(fl_Value_Input o);
+  FL_EXPORT_C_HEADER(char,	Fl_Value_Input_soft,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,	Fl_Value_Input_resize,(fl_Value_Input value_input, int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(void ,	Fl_Value_Input_set_soft,(fl_Value_Input value_input, char s));
+  FL_EXPORT_C_HEADER(int ,	Fl_Value_Input_shortcut,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,	Fl_Value_Input_set_shortcut,(fl_Value_Input value_input,int v));
+  FL_EXPORT_C_HEADER(Fl_Font,	Fl_Value_Input_textfont,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,	Fl_Value_Input_set_textfont,(fl_Value_Input value_input,int v));
+  FL_EXPORT_C_HEADER(int ,	Fl_Value_Input_textsize,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,	Fl_Value_Input_set_textsize,(fl_Value_Input value_input,int v));
+  FL_EXPORT_C_HEADER(Fl_Color,	Fl_Value_Input_textcolor,(fl_Value_Input value_input));
+  FL_EXPORT_C_HEADER(void,	Fl_Value_Input_set_textcolor,(fl_Value_Input value_input,int v));
+  FL_EXPORT_C_HEADER(fl_Value_Input,Fl_OverriddenValue_Input_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Value_Input,Fl_OverriddenValue_Input_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_draw,(fl_Value_Input o));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_draw_super,(fl_Value_Input o));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Input_handle,(fl_Value_Input o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Input_handle_super,(fl_Value_Input o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_resize,(fl_Value_Input o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_resize_super,(fl_Value_Input o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_show,(fl_Value_Input o));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_show_super,(fl_Value_Input o));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_hide,(fl_Value_Input o));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Input_hide_super,(fl_Value_Input o));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Value_OutputC.h b/c-src/Fl_Value_OutputC.h
--- a/c-src/Fl_Value_OutputC.h
+++ b/c-src/Fl_Value_OutputC.h
@@ -29,134 +29,134 @@
   };
 
 #endif
-  FL_EXPORT_C(int,Fl_Value_Output_handle)(fl_Value_Output self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Value_Output_parent)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_set_parent)(fl_Value_Output value_output, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Value_Output_type)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_set_type)(fl_Value_Output value_output, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Value_Output_handle,(fl_Value_Output self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Value_Output_parent,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_set_parent,(fl_Value_Output value_output, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Value_Output_type,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_set_type,(fl_Value_Output value_output, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Value_Output_x)(fl_Value_Output value_output);
-  FL_EXPORT_C(int,          Fl_Value_Output_y)(fl_Value_Output value_output);
-  FL_EXPORT_C(int,          Fl_Value_Output_w)(fl_Value_Output value_output);
-  FL_EXPORT_C(int,          Fl_Value_Output_h)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_set_align)(fl_Value_Output value_output, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Value_Output_align)(fl_Value_Output value_output);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Value_Output_box)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_set_box)(fl_Value_Output value_output, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Value_Output_color)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_set_color)(fl_Value_Output value_output, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Value_Output_set_color_with_bg_sel)(fl_Value_Output value_output,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Value_Output_selection_color)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_set_selection_color)(fl_Value_Output value_output, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Value_Output_label)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_copy_label)(fl_Value_Output value_output, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Value_Output_set_label)(fl_Value_Output value_output, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Value_Output_labeltype)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_set_labeltype)(fl_Value_Output value_output, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Value_Output_labelcolor)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_set_labelcolor)(fl_Value_Output value_output, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Value_Output_labelfont)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_set_labelfont)(fl_Value_Output value_output, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Value_Output_labelsize)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_set_labelsize)(fl_Value_Output value_output, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Value_Output_image)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_set_image)(fl_Value_Output value_output, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Value_Output_deimage)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_set_deimage)(fl_Value_Output value_output, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Value_Output_tooltip)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_copy_tooltip)(fl_Value_Output value_output, const char* text);
-  FL_EXPORT_C(void,         Fl_Value_Output_set_tooltip)(fl_Value_Output value_output, const char* text);
-  FL_EXPORT_C(void,         Fl_Value_Output_set_callback_with_user_data)(fl_Value_Output value_output, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Value_Output_set_callback)(fl_Value_Output value_output, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Value_Output_user_data)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_set_user_data)(fl_Value_Output value_output, void* v);
-  FL_EXPORT_C(long,         Fl_Value_Output_argument)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_set_argument)(fl_Value_Output value_output, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Value_Output_when)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_set_when)(fl_Value_Output value_output, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Value_Output_visible)(fl_Value_Output value_output);
-  FL_EXPORT_C(int,          Fl_Value_Output_visible_r)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_set_visible)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_clear_visible)(fl_Value_Output value_output);
-  FL_EXPORT_C(unsigned int, Fl_Value_Output_active)(fl_Value_Output value_output);
-  FL_EXPORT_C(int,          Fl_Value_Output_active_r)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_activate)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_deactivate)(fl_Value_Output value_output);
-  FL_EXPORT_C(unsigned int, Fl_Value_Output_output)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_set_output)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_clear_output)(fl_Value_Output value_output);
-  FL_EXPORT_C(unsigned int, Fl_Value_Output_takesevents)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_set_changed)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_clear_changed)(fl_Value_Output value_output);
-  FL_EXPORT_C(int,          Fl_Value_Output_take_focus)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_set_visible_focus)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_clear_visible_focus)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_modify_visible_focus)(fl_Value_Output value_output, int v);
-  FL_EXPORT_C(unsigned int, Fl_Value_Output_visible_focus)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_do_callback)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_do_callback_with_widget_and_user_data)(fl_Value_Output value_output, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Value_Output_do_callback_with_widget_and_default_user_data)(fl_Value_Output value_output, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Value_Output_contains)(fl_Value_Output value_output, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Value_Output_inside)(fl_Value_Output value_output, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Value_Output_redraw)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_redraw_label)(fl_Value_Output value_output);
-  FL_EXPORT_C(uchar,        Fl_Value_Output_damage)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_clear_damage_with_bitmask)(fl_Value_Output value_output, uchar c);
-  FL_EXPORT_C(void,         Fl_Value_Output_clear_damage)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,         Fl_Value_Output_damage_with_text)(fl_Value_Output value_output, uchar c);
-  FL_EXPORT_C(void,         Fl_Value_Output_damage_inside_widget)(fl_Value_Output value_output, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Value_Output_draw_label_with_xywh_alignment)(fl_Value_Output value_output, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Value_Output_measure_label)(fl_Value_Output value_output, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Value_Output_window)(fl_Value_Output value_output);
-  FL_EXPORT_C(fl_Window,    Fl_Value_Output_top_window)(fl_Value_Output value_output);
-  FL_EXPORT_C(fl_Window ,   Fl_Value_Output_top_window_offset)(fl_Value_Output value_output, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Value_Output_as_group)(fl_Value_Output value_output);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Value_Output_as_gl_window)(fl_Value_Output value_output);
+  FL_EXPORT_C_HEADER(int,Fl_Value_Output_x,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Output_y,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Output_w,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Output_h,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_set_align,(fl_Value_Output value_output, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Value_Output_align,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Value_Output_box,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_set_box,(fl_Value_Output value_output, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Value_Output_color,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_set_color,(fl_Value_Output value_output, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_set_color_with_bg_sel,(fl_Value_Output value_output,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Value_Output_selection_color,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_set_selection_color,(fl_Value_Output value_output, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Value_Output_label,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_copy_label,(fl_Value_Output value_output, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_set_label,(fl_Value_Output value_output, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Value_Output_labeltype,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_set_labeltype,(fl_Value_Output value_output, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Value_Output_labelcolor,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_set_labelcolor,(fl_Value_Output value_output, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Value_Output_labelfont,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_set_labelfont,(fl_Value_Output value_output, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Value_Output_labelsize,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_set_labelsize,(fl_Value_Output value_output, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Value_Output_image,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_set_image,(fl_Value_Output value_output, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Value_Output_deimage,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_set_deimage,(fl_Value_Output value_output, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Value_Output_tooltip,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_copy_tooltip,(fl_Value_Output value_output, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_set_tooltip,(fl_Value_Output value_output, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_set_callback_with_user_data,(fl_Value_Output value_output, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_set_callback,(fl_Value_Output value_output, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Value_Output_user_data,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_set_user_data,(fl_Value_Output value_output, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Value_Output_argument,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_set_argument,(fl_Value_Output value_output, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Value_Output_when,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_set_when,(fl_Value_Output value_output, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Value_Output_visible,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Output_visible_r,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_set_visible,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_clear_visible,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Value_Output_active,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Output_active_r,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_activate,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_deactivate,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Value_Output_output,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_set_output,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_clear_output,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Value_Output_takesevents,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_set_changed,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_clear_changed,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Output_take_focus,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_set_visible_focus,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_clear_visible_focus,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_modify_visible_focus,(fl_Value_Output value_output, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Value_Output_visible_focus,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_do_callback,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_do_callback_with_widget_and_user_data,(fl_Value_Output value_output, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_do_callback_with_widget_and_default_user_data,(fl_Value_Output value_output, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Output_contains,(fl_Value_Output value_output, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Output_inside,(fl_Value_Output value_output, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_redraw,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_redraw_label,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(uchar,Fl_Value_Output_damage,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_clear_damage_with_bitmask,(fl_Value_Output value_output, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_clear_damage,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_damage_with_text,(fl_Value_Output value_output, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_damage_inside_widget,(fl_Value_Output value_output, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_draw_label_with_xywh_alignment,(fl_Value_Output value_output, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_measure_label,(fl_Value_Output value_output, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Value_Output_window,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Value_Output_top_window,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Value_Output_top_window_offset,(fl_Value_Output value_output, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Value_Output_as_group,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Value_Output_as_gl_window,(fl_Value_Output value_output));
   /* Inherited from Fl_Valuator */
 
-  FL_EXPORT_C(void ,	Fl_Value_Output_bounds)(fl_Value_Output value_output, double a, double b);
-  FL_EXPORT_C(double ,	Fl_Value_Output_minimum)(fl_Value_Output value_output);
-  FL_EXPORT_C(void ,	Fl_Value_Output_set_minimum)(fl_Value_Output value_output, double a);
-  FL_EXPORT_C(double,	Fl_Value_Output_maximum)(fl_Value_Output value_output);
-  FL_EXPORT_C(void ,	Fl_Value_Output_set_maximum)(fl_Value_Output value_output, double a);
-  FL_EXPORT_C(void ,	Fl_Value_Output_range)(fl_Value_Output value_output, double a, double b);
-  FL_EXPORT_C(void ,	Fl_Value_Output_set_step_with_a)(fl_Value_Output value_output, int a);
-  FL_EXPORT_C(void ,	Fl_Value_Output_set_step_with_a_b)(fl_Value_Output value_output, double a, int b);
-  FL_EXPORT_C(void,	Fl_Value_Output_set_step_with_s)(fl_Value_Output value_output, double s);
-  FL_EXPORT_C(double ,	Fl_Value_Output_step)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,	Fl_Value_Output_precision)(fl_Value_Output value_output, int p);
-  FL_EXPORT_C(double ,	Fl_Value_Output_value)(fl_Value_Output value_output);
-  FL_EXPORT_C(int ,	Fl_Value_Output_set_value)(fl_Value_Output value_output, double v);
-  FL_EXPORT_C(double ,	Fl_Value_Output_round)(fl_Value_Output value_output, double v);
-  FL_EXPORT_C(double ,	Fl_Value_Output_clamp)(fl_Value_Output value_output, double v);
-  FL_EXPORT_C(double ,	Fl_Value_Output_increment)(fl_Value_Output value_output, double v, int n);
+  FL_EXPORT_C_HEADER(void ,	Fl_Value_Output_bounds,(fl_Value_Output value_output, double a, double b));
+  FL_EXPORT_C_HEADER(double ,	Fl_Value_Output_minimum,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void ,	Fl_Value_Output_set_minimum,(fl_Value_Output value_output, double a));
+  FL_EXPORT_C_HEADER(double,	Fl_Value_Output_maximum,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void ,	Fl_Value_Output_set_maximum,(fl_Value_Output value_output, double a));
+  FL_EXPORT_C_HEADER(void ,	Fl_Value_Output_range,(fl_Value_Output value_output, double a, double b));
+  FL_EXPORT_C_HEADER(void ,	Fl_Value_Output_set_step_with_a,(fl_Value_Output value_output, int a));
+  FL_EXPORT_C_HEADER(void ,	Fl_Value_Output_set_step_with_a_b,(fl_Value_Output value_output, double a, int b));
+  FL_EXPORT_C_HEADER(void,	Fl_Value_Output_set_step_with_s,(fl_Value_Output value_output, double s));
+  FL_EXPORT_C_HEADER(double ,	Fl_Value_Output_step,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,	Fl_Value_Output_precision,(fl_Value_Output value_output, int p));
+  FL_EXPORT_C_HEADER(double ,	Fl_Value_Output_value,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(int ,	Fl_Value_Output_set_value,(fl_Value_Output value_output, double v));
+  FL_EXPORT_C_HEADER(double ,	Fl_Value_Output_round,(fl_Value_Output value_output, double v));
+  FL_EXPORT_C_HEADER(double ,	Fl_Value_Output_clamp,(fl_Value_Output value_output, double v));
+  FL_EXPORT_C_HEADER(double ,	Fl_Value_Output_increment,(fl_Value_Output value_output, double v, int n));
   /* Fl_Value_Output specific functions */
 
-  FL_EXPORT_C(fl_Value_Output,  Fl_Value_Output_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Value_Output, Fl_Value_Output_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(void          , Fl_Value_Output_Destroy)(fl_Value_Output button);
+  FL_EXPORT_C_HEADER(fl_Value_Output,Fl_Value_Output_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Value_Output,Fl_Value_Output_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void          ,Fl_Value_Output_Destroy,(fl_Value_Output button));
 
-  FL_EXPORT_C(void,Fl_Value_Output_resize)(fl_Value_Output value_output,int X,int Y,int W,int H);
-  FL_EXPORT_C(char,	Fl_Value_Output_soft)(fl_Value_Output value_output);
-  FL_EXPORT_C(void ,	Fl_Value_Output_set_soft)(fl_Value_Output value_output, char s);
-  FL_EXPORT_C(Fl_Font,	Fl_Value_Output_textfont)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,	Fl_Value_Output_set_textfont)(fl_Value_Output value_output,int v);
-  FL_EXPORT_C(int ,	Fl_Value_Output_textsize)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,	Fl_Value_Output_set_textsize)(fl_Value_Output value_output,int v);
-  FL_EXPORT_C(Fl_Color,	Fl_Value_Output_textcolor)(fl_Value_Output value_output);
-  FL_EXPORT_C(void,	Fl_Value_Output_set_textcolor)(fl_Value_Output value_output,int v);
-  FL_EXPORT_C(fl_Value_Output,    Fl_OverriddenValue_Output_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Value_Output,    Fl_OverriddenValue_Output_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Value_Output_draw)(fl_Value_Output o);
-  FL_EXPORT_C(void, Fl_Value_Output_draw_super)(fl_Value_Output o);
-  FL_EXPORT_C(int, Fl_Value_Output_handle)(fl_Value_Output o, int event);
-  FL_EXPORT_C(int, Fl_Value_Output_handle_super)(fl_Value_Output o, int event);
-  FL_EXPORT_C(void, Fl_Value_Output_resize)(fl_Value_Output o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Value_Output_resize_super)(fl_Value_Output o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Value_Output_show)(fl_Value_Output o);
-  FL_EXPORT_C(void, Fl_Value_Output_show_super)(fl_Value_Output o);
-  FL_EXPORT_C(void, Fl_Value_Output_hide)(fl_Value_Output o);
-  FL_EXPORT_C(void, Fl_Value_Output_hide_super)(fl_Value_Output o);
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_resize,(fl_Value_Output value_output,int X,int Y,int W,int H));
+  FL_EXPORT_C_HEADER(char,	Fl_Value_Output_soft,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void ,	Fl_Value_Output_set_soft,(fl_Value_Output value_output, char s));
+  FL_EXPORT_C_HEADER(Fl_Font,	Fl_Value_Output_textfont,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,	Fl_Value_Output_set_textfont,(fl_Value_Output value_output,int v));
+  FL_EXPORT_C_HEADER(int ,	Fl_Value_Output_textsize,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,	Fl_Value_Output_set_textsize,(fl_Value_Output value_output,int v));
+  FL_EXPORT_C_HEADER(Fl_Color,	Fl_Value_Output_textcolor,(fl_Value_Output value_output));
+  FL_EXPORT_C_HEADER(void,	Fl_Value_Output_set_textcolor,(fl_Value_Output value_output,int v));
+  FL_EXPORT_C_HEADER(fl_Value_Output,Fl_OverriddenValue_Output_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Value_Output,Fl_OverriddenValue_Output_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_draw,(fl_Value_Output o));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_draw_super,(fl_Value_Output o));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Output_handle,(fl_Value_Output o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Output_handle_super,(fl_Value_Output o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_resize,(fl_Value_Output o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_resize_super,(fl_Value_Output o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_show,(fl_Value_Output o));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_show_super,(fl_Value_Output o));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_hide,(fl_Value_Output o));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Output_hide_super,(fl_Value_Output o));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_Value_SliderC.h b/c-src/Fl_Value_SliderC.h
--- a/c-src/Fl_Value_SliderC.h
+++ b/c-src/Fl_Value_SliderC.h
@@ -30,142 +30,142 @@
   };
 
 #endif
-  FL_EXPORT_C(fl_Group,     Fl_Value_Slider_parent)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_set_parent)(fl_Value_Slider value_slider, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Value_Slider_type)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_set_type)(fl_Value_Slider value_slider, uchar t);
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Value_Slider_parent,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_parent,(fl_Value_Slider value_slider, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Value_Slider_type,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_type,(fl_Value_Slider value_slider, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Value_Slider_x)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(int,          Fl_Value_Slider_y)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(int,          Fl_Value_Slider_w)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(int,          Fl_Value_Slider_h)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_set_align)(fl_Value_Slider value_slider, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Value_Slider_align)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Value_Slider_box)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_set_box)(fl_Value_Slider value_slider, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Value_Slider_color)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_set_color)(fl_Value_Slider value_slider, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Value_Slider_set_color_with_bg_sel)(fl_Value_Slider value_slider,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Value_Slider_selection_color)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_set_selection_color)(fl_Value_Slider value_slider, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Value_Slider_label)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_copy_label)(fl_Value_Slider value_slider, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Value_Slider_set_label)(fl_Value_Slider value_slider, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Value_Slider_labeltype)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_set_labeltype)(fl_Value_Slider value_slider, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Value_Slider_labelcolor)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_set_labelcolor)(fl_Value_Slider value_slider, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Value_Slider_labelfont)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_set_labelfont)(fl_Value_Slider value_slider, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Value_Slider_labelsize)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_set_labelsize)(fl_Value_Slider value_slider, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Value_Slider_image)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_set_image)(fl_Value_Slider value_slider, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Value_Slider_deimage)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_set_deimage)(fl_Value_Slider value_slider, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Value_Slider_tooltip)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_copy_tooltip)(fl_Value_Slider value_slider, const char* text);
-  FL_EXPORT_C(void,         Fl_Value_Slider_set_tooltip)(fl_Value_Slider value_slider, const char* text);
-  FL_EXPORT_C(void,         Fl_Value_Slider_set_callback_with_user_data)(fl_Value_Slider value_slider, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Value_Slider_set_callback)(fl_Value_Slider value_slider, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Value_Slider_other_data)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_set_other_data)(fl_Value_Slider value_slider, void* v);
-  FL_EXPORT_C(void*,        Fl_Value_Slider_user_data)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_set_user_data)(fl_Value_Slider value_slider, void* v);
-  FL_EXPORT_C(long,         Fl_Value_Slider_argument)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_set_argument)(fl_Value_Slider value_slider, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Value_Slider_when)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_set_when)(fl_Value_Slider value_slider, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Value_Slider_visible)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(int,          Fl_Value_Slider_visible_r)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_show)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_hide)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_set_visible)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_clear_visible)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(unsigned int, Fl_Value_Slider_active)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(int,          Fl_Value_Slider_active_r)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_activate)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_deactivate)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(unsigned int, Fl_Value_Slider_output)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_set_output)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_clear_output)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(unsigned int, Fl_Value_Slider_takesevents)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_set_changed)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_clear_changed)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(int,          Fl_Value_Slider_take_focus)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_set_visible_focus)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_clear_visible_focus)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_modify_visible_focus)(fl_Value_Slider value_slider, int v);
-  FL_EXPORT_C(unsigned int, Fl_Value_Slider_visible_focus)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(int,          Fl_Value_Slider_contains)(fl_Value_Slider value_slider, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Value_Slider_inside)(fl_Value_Slider value_slider, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Value_Slider_redraw)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_redraw_label)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(uchar,        Fl_Value_Slider_damage)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_clear_damage_with_bitmask)(fl_Value_Slider value_slider, uchar c);
-  FL_EXPORT_C(void,         Fl_Value_Slider_clear_damage)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_damage_with_text)(fl_Value_Slider value_slider, uchar c);
-  FL_EXPORT_C(void,         Fl_Value_Slider_damage_inside_widget)(fl_Value_Slider value_slider, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Value_Slider_draw_label_with_xywh_alignment)(fl_Value_Slider value_slider, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Value_Slider_measure_label)(fl_Value_Slider value_slider, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Value_Slider_window)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(fl_Window,    Fl_Value_Slider_top_window)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(fl_Window ,   Fl_Value_Slider_top_window_offset)(fl_Value_Slider value_slider, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Value_Slider_as_gl_window)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void,         Fl_Value_Slider_resize)(fl_Table table,int X, int Y, int W, int H);
+  FL_EXPORT_C_HEADER(int,Fl_Value_Slider_x,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Slider_y,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Slider_w,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Slider_h,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_align,(fl_Value_Slider value_slider, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Value_Slider_align,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Value_Slider_box,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_box,(fl_Value_Slider value_slider, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Value_Slider_color,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_color,(fl_Value_Slider value_slider, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_color_with_bg_sel,(fl_Value_Slider value_slider,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Value_Slider_selection_color,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_selection_color,(fl_Value_Slider value_slider, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Value_Slider_label,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_copy_label,(fl_Value_Slider value_slider, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_label,(fl_Value_Slider value_slider, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Value_Slider_labeltype,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_labeltype,(fl_Value_Slider value_slider, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Value_Slider_labelcolor,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_labelcolor,(fl_Value_Slider value_slider, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Value_Slider_labelfont,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_labelfont,(fl_Value_Slider value_slider, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Value_Slider_labelsize,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_labelsize,(fl_Value_Slider value_slider, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Value_Slider_image,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_image,(fl_Value_Slider value_slider, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Value_Slider_deimage,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_deimage,(fl_Value_Slider value_slider, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Value_Slider_tooltip,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_copy_tooltip,(fl_Value_Slider value_slider, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_tooltip,(fl_Value_Slider value_slider, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_callback_with_user_data,(fl_Value_Slider value_slider, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_callback,(fl_Value_Slider value_slider, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Value_Slider_other_data,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_other_data,(fl_Value_Slider value_slider, void* v));
+  FL_EXPORT_C_HEADER(void*,Fl_Value_Slider_user_data,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_user_data,(fl_Value_Slider value_slider, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Value_Slider_argument,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_argument,(fl_Value_Slider value_slider, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Value_Slider_when,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_when,(fl_Value_Slider value_slider, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Value_Slider_visible,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Slider_visible_r,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_show,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_hide,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_visible,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_clear_visible,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Value_Slider_active,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Slider_active_r,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_activate,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_deactivate,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Value_Slider_output,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_output,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_clear_output,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Value_Slider_takesevents,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_changed,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_clear_changed,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Slider_take_focus,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_visible_focus,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_clear_visible_focus,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_modify_visible_focus,(fl_Value_Slider value_slider, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Value_Slider_visible_focus,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Slider_contains,(fl_Value_Slider value_slider, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Slider_inside,(fl_Value_Slider value_slider, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_redraw,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_redraw_label,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(uchar,Fl_Value_Slider_damage,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_clear_damage_with_bitmask,(fl_Value_Slider value_slider, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_clear_damage,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_damage_with_text,(fl_Value_Slider value_slider, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_damage_inside_widget,(fl_Value_Slider value_slider, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_draw_label_with_xywh_alignment,(fl_Value_Slider value_slider, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_measure_label,(fl_Value_Slider value_slider, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Value_Slider_window,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Value_Slider_top_window,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Value_Slider_top_window_offset,(fl_Value_Slider value_slider, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Value_Slider_as_gl_window,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_resize,(fl_Table table,int X, int Y, int W, int H));
 
   /* Inherited from Fl_Valuator */
-  FL_EXPORT_C(void, Fl_Value_Slider_bounds)(fl_Value_Slider value_slider, double a, double b);
-  FL_EXPORT_C(double, Fl_Value_Slider_minimum)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void, Fl_Value_Slider_set_minimum)(fl_Value_Slider value_slider, double a);
-  FL_EXPORT_C(double, Fl_Value_Slider_maximum)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void, Fl_Value_Slider_set_maximum)(fl_Value_Slider value_slider, double a);
-  FL_EXPORT_C(void, Fl_Value_Slider_range)(fl_Value_Slider value_slider, double a, double b);
-  FL_EXPORT_C(void, Fl_Value_Slider_set_step)(fl_Value_Slider value_slider, int a);
-  FL_EXPORT_C(void, Fl_Value_Slider_set_step_with_a_b)(fl_Value_Slider value_slider, double a, int b);
-  FL_EXPORT_C(void, Fl_Value_Slider_step_with_s)(fl_Value_Slider value_slider, double s);
-  FL_EXPORT_C(double, Fl_Value_Slider_step)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void, Fl_Value_Slider_precision)(fl_Value_Slider value_slider, int precision);
-  FL_EXPORT_C(double, Fl_Value_Slider_value)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(int, Fl_Value_Slider_set_value)(fl_Value_Slider value_slider, double v);
-  FL_EXPORT_C(int, Fl_Value_Slider_format)(fl_Value_Slider value_slider, char* format);
-  FL_EXPORT_C(double, Fl_Value_Slider_round)(fl_Value_Slider value_slider, double v);
-  FL_EXPORT_C(double, Fl_Value_Slider_clamp)(fl_Value_Slider value_slider, double v);
-  FL_EXPORT_C(double, Fl_Value_Slider_increment)(fl_Value_Slider value_slider, double v, int n);
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_bounds,(fl_Value_Slider value_slider, double a, double b));
+  FL_EXPORT_C_HEADER(double,Fl_Value_Slider_minimum,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_minimum,(fl_Value_Slider value_slider, double a));
+  FL_EXPORT_C_HEADER(double,Fl_Value_Slider_maximum,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_maximum,(fl_Value_Slider value_slider, double a));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_range,(fl_Value_Slider value_slider, double a, double b));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_step,(fl_Value_Slider value_slider, int a));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_step_with_a_b,(fl_Value_Slider value_slider, double a, int b));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_step_with_s,(fl_Value_Slider value_slider, double s));
+  FL_EXPORT_C_HEADER(double,Fl_Value_Slider_step,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_precision,(fl_Value_Slider value_slider, int precision));
+  FL_EXPORT_C_HEADER(double,Fl_Value_Slider_value,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Slider_set_value,(fl_Value_Slider value_slider, double v));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Slider_format,(fl_Value_Slider value_slider, char* format));
+  FL_EXPORT_C_HEADER(double,Fl_Value_Slider_round,(fl_Value_Slider value_slider, double v));
+  FL_EXPORT_C_HEADER(double,Fl_Value_Slider_clamp,(fl_Value_Slider value_slider, double v));
+  FL_EXPORT_C_HEADER(double,Fl_Value_Slider_increment,(fl_Value_Slider value_slider, double v, int n));
 
   /* Inherited from Fl_Slider specific */
-  FL_EXPORT_C(int, Fl_Value_Slider_scrollvalue)(fl_Value_Slider value_slider, int pos,int size,int first,int total);
-  FL_EXPORT_C(float, Fl_Value_Slider_set_value_slider_size)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void, Fl_Value_Slider_value_slider_size)(fl_Value_Slider value_slider, double v);
-  FL_EXPORT_C(Fl_Boxtype, Fl_Value_Slider_value_slider)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void, Fl_Value_Slider_set_value_slider)(fl_Value_Slider value_slider, Fl_Boxtype c);
+  FL_EXPORT_C_HEADER(int,Fl_Value_Slider_scrollvalue,(fl_Value_Slider value_slider, int pos,int size,int first,int total));
+  FL_EXPORT_C_HEADER(float,Fl_Value_Slider_set_value_slider_size,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_value_slider_size,(fl_Value_Slider value_slider, double v));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Value_Slider_value_slider,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_value_slider,(fl_Value_Slider value_slider, Fl_Boxtype c));
 
 
   /* Fl_Value_Slider specific */
-  FL_EXPORT_C(fl_Value_Slider,    Fl_Value_Slider_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Value_Slider   , Fl_Value_Slider_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(fl_Value_Slider,    Fl_Hor_Value_Slider_New_WithLabel)(int x, int y, int w, int h, const char* label);
-  FL_EXPORT_C(fl_Value_Slider   , Fl_Hor_Value_Slider_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(void,      Fl_Value_Slider_Destroy)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(Fl_Font, Fl_Value_Slider_textfont)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void, Fl_Value_Slider_set_textfont)(fl_Value_Slider value_slider, Fl_Font s);
-  FL_EXPORT_C(Fl_Fontsize, Fl_Value_Slider_textsize)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void, Fl_Value_Slider_set_textsize)(fl_Value_Slider value_slider, Fl_Fontsize s);
-  FL_EXPORT_C(Fl_Color, Fl_Value_Slider_textcolor)(fl_Value_Slider value_slider);
-  FL_EXPORT_C(void, Fl_Value_Slider_set_textcolor)(fl_Value_Slider value_slider, Fl_Color s);
-  FL_EXPORT_C(int,Fl_Value_Slider_handle)(fl_Widget self, int event);
-  FL_EXPORT_C(fl_Value_Slider,    Fl_OverriddenValue_Slider_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Value_Slider,    Fl_OverriddenValue_Slider_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Value_Slider_draw)(fl_Value_Slider o);
-  FL_EXPORT_C(void, Fl_Value_Slider_draw_super)(fl_Value_Slider o);
-  FL_EXPORT_C(int, Fl_Value_Slider_handle)(fl_Value_Slider o, int event);
-  FL_EXPORT_C(int, Fl_Value_Slider_handle_super)(fl_Value_Slider o, int event);
-  FL_EXPORT_C(void, Fl_Value_Slider_resize)(fl_Value_Slider o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Value_Slider_resize_super)(fl_Value_Slider o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Value_Slider_show)(fl_Value_Slider o);
-  FL_EXPORT_C(void, Fl_Value_Slider_show_super)(fl_Value_Slider o);
-  FL_EXPORT_C(void, Fl_Value_Slider_hide)(fl_Value_Slider o);
-  FL_EXPORT_C(void, Fl_Value_Slider_hide_super)(fl_Value_Slider o);
+  FL_EXPORT_C_HEADER(fl_Value_Slider,Fl_Value_Slider_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Value_Slider   ,Fl_Value_Slider_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(fl_Value_Slider,Fl_Hor_Value_Slider_New_WithLabel,(int x, int y, int w, int h, const char* label));
+  FL_EXPORT_C_HEADER(fl_Value_Slider   ,Fl_Hor_Value_Slider_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_Destroy,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Value_Slider_textfont,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_textfont,(fl_Value_Slider value_slider, Fl_Font s));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Value_Slider_textsize,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_textsize,(fl_Value_Slider value_slider, Fl_Fontsize s));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Value_Slider_textcolor,(fl_Value_Slider value_slider));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_set_textcolor,(fl_Value_Slider value_slider, Fl_Color s));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Slider_handle,(fl_Widget self, int event));
+  FL_EXPORT_C_HEADER(fl_Value_Slider,Fl_OverriddenValue_Slider_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Value_Slider,Fl_OverriddenValue_Slider_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_draw,(fl_Value_Slider o));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_draw_super,(fl_Value_Slider o));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Slider_handle,(fl_Value_Slider o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Value_Slider_handle_super,(fl_Value_Slider o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_resize,(fl_Value_Slider o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_resize_super,(fl_Value_Slider o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_show,(fl_Value_Slider o));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_show_super,(fl_Value_Slider o));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_hide,(fl_Value_Slider o));
+  FL_EXPORT_C_HEADER(void,Fl_Value_Slider_hide_super,(fl_Value_Slider o));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_WidgetC.cpp b/c-src/Fl_WidgetC.cpp
--- a/c-src/Fl_WidgetC.cpp
+++ b/c-src/Fl_WidgetC.cpp
@@ -379,7 +379,7 @@
     return (static_cast<Fl_DerivedWidget*>(widget))->take_focus();
   }
   FL_EXPORT_C(void,Fl_Widget_set_active)(fl_Widget widget){
-    (static_cast<Fl_DerivedWidget*>(widget))->active();
+    (static_cast<Fl_DerivedWidget*>(widget))->set_active();
   }
   FL_EXPORT_C(void,Fl_Widget_clear_active)(fl_Widget widget){
     (static_cast<Fl_DerivedWidget*>(widget))->clear_active();
diff --git a/c-src/Fl_WidgetC.h b/c-src/Fl_WidgetC.h
--- a/c-src/Fl_WidgetC.h
+++ b/c-src/Fl_WidgetC.h
@@ -36,113 +36,113 @@
     ~Fl_DerivedWidget();
   };
 #endif
-  FL_EXPORT_C(int,Fl_Widget_handle)(fl_Widget self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Widget_parent)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_set_parent)(fl_Widget widget, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Widget_type)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_set_type)(fl_Widget widget, uchar t);
-  FL_EXPORT_C(void, Fl_Widget_draw_box)(fl_Widget Widget);
-  FL_EXPORT_C(void, Fl_Widget_draw_box_with_tc)(fl_Widget Widget,Fl_Boxtype t, Fl_Color c);
-  FL_EXPORT_C(void, Fl_Widget_draw_box_with_txywhc)(fl_Widget Widget,Fl_Boxtype t, int x,int y,int w,int h, Fl_Color c);
-  FL_EXPORT_C(void, Fl_Widget_draw_backdrop)(fl_Widget Widget);
-  FL_EXPORT_C(void, Fl_Widget_draw_focus)(fl_Widget Widget);
-  FL_EXPORT_C(void, Fl_Widget_draw_focus_with_txywh)(fl_Widget Widget,Fl_Boxtype t, int x,int y,int w,int h);
-  FL_EXPORT_C(void, Fl_Widget_draw_label)(fl_Widget Widget);
-  FL_EXPORT_C(int,          Fl_Widget_x)(fl_Widget widget);
-  FL_EXPORT_C(int,          Fl_Widget_y)(fl_Widget widget);
-  FL_EXPORT_C(int,          Fl_Widget_w)(fl_Widget widget);
-  FL_EXPORT_C(int,          Fl_Widget_h)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_set_align)(fl_Widget widget, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Widget_align)(fl_Widget widget);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Widget_box)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_set_box)(fl_Widget widget, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Widget_color)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_set_color)(fl_Widget widget, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Widget_set_color_with_bg_sel)(fl_Widget widget,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Widget_selection_color)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_set_selection_color)(fl_Widget widget, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Widget_label)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_copy_label)(fl_Widget widget, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Widget_set_label)(fl_Widget widget, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Widget_labeltype)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_set_labeltype)(fl_Widget widget, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Widget_labelcolor)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_set_labelcolor)(fl_Widget widget, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Widget_labelfont)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_set_labelfont)(fl_Widget widget, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Widget_labelsize)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_set_labelsize)(fl_Widget widget, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Widget_image)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_set_image)(fl_Widget widget, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Widget_deimage)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_set_deimage)(fl_Widget widget, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Widget_tooltip)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_copy_tooltip)(fl_Widget widget, const char* text);
-  FL_EXPORT_C(void,         Fl_Widget_set_tooltip)(fl_Widget widget, const char* text);
-  FL_EXPORT_C(void,         Fl_Widget_do_callback)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_set_callback_with_user_data)(fl_Widget widget, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Widget_set_callback)(fl_Widget widget, fl_Callback* cb);
-  FL_EXPORT_C(int,          Fl_Widget_has_callback)(fl_Widget widget);
-  FL_EXPORT_C(void*,        Fl_Widget_other_data)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_set_other_data)(fl_Widget widget, void* v);
-  FL_EXPORT_C(void*,        Fl_Widget_user_data)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_set_user_data)(fl_Widget widget, void* v);
-  FL_EXPORT_C(long,         Fl_Widget_argument)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_set_argument)(fl_Widget widget, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Widget_when)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_set_when)(fl_Widget widget, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Widget_visible)(fl_Widget widget);
-  FL_EXPORT_C(int,          Fl_Widget_visible_r)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_show_super)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_show)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_hide_super)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_hide)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_set_visible)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_clear_visible)(fl_Widget widget);
-  FL_EXPORT_C(unsigned int, Fl_Widget_active)(fl_Widget widget);
-  FL_EXPORT_C(int,          Fl_Widget_active_r)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_activate)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_deactivate)(fl_Widget widget);
-  FL_EXPORT_C(unsigned int, Fl_Widget_output)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_set_output)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_clear_output)(fl_Widget widget);
-  FL_EXPORT_C(unsigned int, Fl_Widget_takesevents)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_set_changed)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_clear_changed)(fl_Widget widget);
-  FL_EXPORT_C(unsigned int, Fl_Widget_changed)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_set_active)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_clear_active)(fl_Widget widget);
-  FL_EXPORT_C(int,          Fl_Widget_take_focus)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_set_visible_focus)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_clear_visible_focus)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_modify_visible_focus)(fl_Widget widget, int v);
-  FL_EXPORT_C(unsigned int, Fl_Widget_visible_focus)(fl_Widget widget);
-  FL_EXPORT_C(int,          Fl_Widget_contains)(fl_Widget widget, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Widget_inside)(fl_Widget widget, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Widget_redraw)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_redraw_label)(fl_Widget widget);
-  FL_EXPORT_C(uchar,        Fl_Widget_damage)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_clear_damage_with_bitmask)(fl_Widget widget, uchar c);
-  FL_EXPORT_C(void,         Fl_Widget_clear_damage)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_damage_with_text)(fl_Widget widget, uchar c);
-  FL_EXPORT_C(void,         Fl_Widget_damage_inside_widget)(fl_Widget widget, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Widget_draw_label_with_xywh_alignment)(fl_Widget widget, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Widget_measure_label)(fl_Widget widget, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Widget_window)(fl_Widget widget);
-  FL_EXPORT_C(fl_Window,    Fl_Widget_top_window)(fl_Widget widget);
-  FL_EXPORT_C(fl_Window ,   Fl_Widget_top_window_offset)(fl_Widget widget, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Widget_as_group_super)(fl_Widget widget);
-  FL_EXPORT_C(fl_Group,     Fl_Widget_as_group)(fl_Widget widget);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Widget_as_gl_window_super)(fl_Widget widget);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Widget_as_gl_window)(fl_Widget widget);
-  FL_EXPORT_C(void,         Fl_Widget_resize_super)(fl_Widget widget,int X, int Y, int W, int H);
-  FL_EXPORT_C(void,         Fl_Widget_resize)(fl_Widget widget,int X, int Y, int W, int H);
-  FL_EXPORT_C(fl_Widget_Virtual_Funcs*, Fl_Widget_default_virtual_funcs)();
-  FL_EXPORT_C(fl_Widget,    Fl_Widget_New)(int X, int Y, int W, int H);
-  FL_EXPORT_C(fl_Widget,    Fl_Widget_New_WithLabel)(int X, int Y, int W, int H, const char* label);
-  FL_EXPORT_C(fl_Widget,    Fl_OverriddenWidget_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Widget,    Fl_OverriddenWidget_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void,         Fl_Widget_Destroy)(fl_Widget widget);
+  FL_EXPORT_C_HEADER(int,Fl_Widget_handle,(fl_Widget self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Widget_parent,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_set_parent,(fl_Widget widget, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Widget_type,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_set_type,(fl_Widget widget, uchar t));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_draw_box,(fl_Widget Widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_draw_box_with_tc,(fl_Widget Widget,Fl_Boxtype t, Fl_Color c));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_draw_box_with_txywhc,(fl_Widget Widget,Fl_Boxtype t, int x,int y,int w,int h, Fl_Color c));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_draw_backdrop,(fl_Widget Widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_draw_focus,(fl_Widget Widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_draw_focus_with_txywh,(fl_Widget Widget,Fl_Boxtype t, int x,int y,int w,int h));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_draw_label,(fl_Widget Widget));
+  FL_EXPORT_C_HEADER(int,Fl_Widget_x,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(int,Fl_Widget_y,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(int,Fl_Widget_w,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(int,Fl_Widget_h,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_set_align,(fl_Widget widget, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Widget_align,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Widget_box,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_set_box,(fl_Widget widget, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Widget_color,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_set_color,(fl_Widget widget, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_set_color_with_bg_sel,(fl_Widget widget,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Widget_selection_color,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_set_selection_color,(fl_Widget widget, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Widget_label,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_copy_label,(fl_Widget widget, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_set_label,(fl_Widget widget, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Widget_labeltype,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_set_labeltype,(fl_Widget widget, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Widget_labelcolor,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_set_labelcolor,(fl_Widget widget, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Widget_labelfont,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_set_labelfont,(fl_Widget widget, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Widget_labelsize,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_set_labelsize,(fl_Widget widget, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Widget_image,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_set_image,(fl_Widget widget, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Widget_deimage,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_set_deimage,(fl_Widget widget, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Widget_tooltip,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_copy_tooltip,(fl_Widget widget, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_set_tooltip,(fl_Widget widget, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_do_callback,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_set_callback_with_user_data,(fl_Widget widget, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_set_callback,(fl_Widget widget, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(int,Fl_Widget_has_callback,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void*,Fl_Widget_other_data,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_set_other_data,(fl_Widget widget, void* v));
+  FL_EXPORT_C_HEADER(void*,Fl_Widget_user_data,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_set_user_data,(fl_Widget widget, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Widget_argument,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_set_argument,(fl_Widget widget, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Widget_when,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_set_when,(fl_Widget widget, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Widget_visible,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(int,Fl_Widget_visible_r,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_show_super,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_show,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_hide_super,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_hide,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_set_visible,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_clear_visible,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Widget_active,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(int,Fl_Widget_active_r,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_activate,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_deactivate,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Widget_output,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_set_output,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_clear_output,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Widget_takesevents,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_set_changed,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_clear_changed,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Widget_changed,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_set_active,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_clear_active,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(int,Fl_Widget_take_focus,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_set_visible_focus,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_clear_visible_focus,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_modify_visible_focus,(fl_Widget widget, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Widget_visible_focus,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(int,Fl_Widget_contains,(fl_Widget widget, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Widget_inside,(fl_Widget widget, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_redraw,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_redraw_label,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(uchar,Fl_Widget_damage,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_clear_damage_with_bitmask,(fl_Widget widget, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_clear_damage,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_damage_with_text,(fl_Widget widget, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_damage_inside_widget,(fl_Widget widget, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_draw_label_with_xywh_alignment,(fl_Widget widget, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_measure_label,(fl_Widget widget, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Widget_window,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Widget_top_window,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Widget_top_window_offset,(fl_Widget widget, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Widget_as_group_super,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Widget_as_group,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Widget_as_gl_window_super,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Widget_as_gl_window,(fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_resize_super,(fl_Widget widget,int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_resize,(fl_Widget widget,int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(fl_Widget_Virtual_Funcs*,Fl_Widget_default_virtual_funcs,());
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Widget_New,(int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Widget_New_WithLabel,(int X, int Y, int W, int H, const char* label));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_OverriddenWidget_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_OverriddenWidget_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Widget_Destroy,(fl_Widget widget));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_WindowC.h b/c-src/Fl_WindowC.h
--- a/c-src/Fl_WindowC.h
+++ b/c-src/Fl_WindowC.h
@@ -52,212 +52,212 @@
 #define FL_DOUBLE_WINDOWC 0xF1
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,Fl_Window_handle)(fl_Window self, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Window_parent)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_set_parent)(fl_Window win, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Window_type)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_set_type)(fl_Window win, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Window_handle,(fl_Window self, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Window_parent,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_parent,(fl_Window win, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Window_type,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_type,(fl_Window win, uchar t));
 
-  FL_EXPORT_C(void, Fl_Window_draw_box)(fl_Window Window);
-  FL_EXPORT_C(void, Fl_Window_draw_box_with_tc)(fl_Window Window,Fl_Boxtype t, Fl_Color c);
-  FL_EXPORT_C(void, Fl_Window_draw_box_with_txywhc)(fl_Window Window,Fl_Boxtype t, int x,int y,int w,int h, Fl_Color c);
-  FL_EXPORT_C(void, Fl_Window_draw_backdrop)(fl_Window Window);
-  FL_EXPORT_C(void, Fl_Window_draw_focus)(fl_Window Window);
-  FL_EXPORT_C(void, Fl_Window_draw_focus_with_txywh)(fl_Window Window,Fl_Boxtype t, int x,int y,int w,int h);
-  FL_EXPORT_C(void, Fl_Window_draw_label)(fl_Window Window);
-  FL_EXPORT_C(int,          Fl_Window_x)(fl_Window win);
-  FL_EXPORT_C(int,          Fl_Window_y)(fl_Window win);
-  FL_EXPORT_C(int,          Fl_Window_w)(fl_Window win);
-  FL_EXPORT_C(int,          Fl_Window_h)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_set_align)(fl_Window window, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Window_align)(fl_Window win);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Window_box)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_set_box)(fl_Window win, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Window_color)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_set_color)(fl_Window win, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Window_set_color_with_bg_sel)(fl_Window win,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Window_selection_color)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_set_selection_color)(fl_Window win, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Window_label)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_copy_label)(fl_Window win, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Window_set_label)(fl_Window win, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Window_labeltype)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_set_labeltype)(fl_Window win, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Window_labelcolor)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_set_labelcolor)(fl_Window win, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Window_labelfont)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_set_labelfont)(fl_Window win, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Window_labelsize)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_set_labelsize)(fl_Window win, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Window_image)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_set_image)(fl_Window win, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Window_deimage)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_set_deimage)(fl_Window win, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Window_tooltip)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_copy_tooltip)(fl_Window win, const char* text);
-  FL_EXPORT_C(void,         Fl_Window_set_tooltip)(fl_Window win, const char* text);
-  FL_EXPORT_C(void,         Fl_Window_set_callback_with_user_data)(fl_Window win, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Window_set_callback)(fl_Window win, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Window_user_data)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_set_user_data)(fl_Window win, void* v);
-  FL_EXPORT_C(long,         Fl_Window_argument)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_set_argument)(fl_Window win, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Window_when)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_set_when)(fl_Window win, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Window_visible)(fl_Window win);
-  FL_EXPORT_C(int,          Fl_Window_visible_r)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_set_visible)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_clear_visible)(fl_Window win);
-  FL_EXPORT_C(unsigned int, Fl_Window_active)(fl_Window win);
-  FL_EXPORT_C(int,          Fl_Window_active_r)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_activate)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_deactivate)(fl_Window win);
-  FL_EXPORT_C(unsigned int, Fl_Window_output)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_set_output)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_clear_output)(fl_Window win);
-  FL_EXPORT_C(unsigned int, Fl_Window_takesevents)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_set_changed)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_clear_changed)(fl_Window win);
-  FL_EXPORT_C(int,          Fl_Window_take_focus)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_set_visible_focus)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_clear_visible_focus)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_modify_visible_focus)(fl_Window win, int v);
-  FL_EXPORT_C(unsigned int, Fl_Window_visible_focus)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_do_callback)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_do_callback_with_widget_and_user_data)(fl_Window win, fl_Widget w, long arg);
-  FL_EXPORT_C(void,         Fl_Window_do_callback_with_widget_and_default_user_data)(fl_Window win, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Window_contains)(fl_Window win, fl_Widget w);
-  FL_EXPORT_C(int,          Fl_Window_inside)(fl_Window win, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Window_redraw)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_redraw_label)(fl_Window win);
-  FL_EXPORT_C(uchar,        Fl_Window_damage)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_clear_damage_with_bitmask)(fl_Window win, uchar c);
-  FL_EXPORT_C(void,         Fl_Window_clear_damage)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_damage_with_text)(fl_Window win, uchar c);
-  FL_EXPORT_C(void,         Fl_Window_damage_inside_widget)(fl_Window win, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Window_draw_label_with_xywh_alignment)(fl_Window win, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(fl_Window,    Fl_Window_window)(fl_Window window);
-  FL_EXPORT_C(fl_Window,    Fl_Window_top_window)(fl_Window window);
-  FL_EXPORT_C(fl_Window ,   Fl_Window_top_window_offset)(fl_Window window, int* xoff, int* yoff);
-  FL_EXPORT_C(void,         Fl_Window_measure_label)(fl_Window win, int* ww , int* hh);
-  FL_EXPORT_C(fl_Group,     Fl_Window_as_group)(fl_Window win);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Window_as_gl_window)(fl_Window win);
+  FL_EXPORT_C_HEADER(void,Fl_Window_draw_box,(fl_Window Window));
+  FL_EXPORT_C_HEADER(void,Fl_Window_draw_box_with_tc,(fl_Window Window,Fl_Boxtype t, Fl_Color c));
+  FL_EXPORT_C_HEADER(void,Fl_Window_draw_box_with_txywhc,(fl_Window Window,Fl_Boxtype t, int x,int y,int w,int h, Fl_Color c));
+  FL_EXPORT_C_HEADER(void,Fl_Window_draw_backdrop,(fl_Window Window));
+  FL_EXPORT_C_HEADER(void,Fl_Window_draw_focus,(fl_Window Window));
+  FL_EXPORT_C_HEADER(void,Fl_Window_draw_focus_with_txywh,(fl_Window Window,Fl_Boxtype t, int x,int y,int w,int h));
+  FL_EXPORT_C_HEADER(void,Fl_Window_draw_label,(fl_Window Window));
+  FL_EXPORT_C_HEADER(int,Fl_Window_x,(fl_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Window_y,(fl_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Window_w,(fl_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Window_h,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_align,(fl_Window window, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Window_align,(fl_Window win));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Window_box,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_box,(fl_Window win, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Window_color,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_color,(fl_Window win, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_color_with_bg_sel,(fl_Window win,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Window_selection_color,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_selection_color,(fl_Window win, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Window_label,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_copy_label,(fl_Window win, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_label,(fl_Window win, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Window_labeltype,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_labeltype,(fl_Window win, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Window_labelcolor,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_labelcolor,(fl_Window win, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Window_labelfont,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_labelfont,(fl_Window win, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Window_labelsize,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_labelsize,(fl_Window win, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Window_image,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_image,(fl_Window win, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Window_deimage,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_deimage,(fl_Window win, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Window_tooltip,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_copy_tooltip,(fl_Window win, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_tooltip,(fl_Window win, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_callback_with_user_data,(fl_Window win, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_callback,(fl_Window win, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Window_user_data,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_user_data,(fl_Window win, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Window_argument,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_argument,(fl_Window win, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Window_when,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_when,(fl_Window win, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Window_visible,(fl_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Window_visible_r,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_visible,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_clear_visible,(fl_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Window_active,(fl_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Window_active_r,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_activate,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_deactivate,(fl_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Window_output,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_output,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_clear_output,(fl_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Window_takesevents,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_changed,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_clear_changed,(fl_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Window_take_focus,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_visible_focus,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_clear_visible_focus,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_modify_visible_focus,(fl_Window win, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Window_visible_focus,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_do_callback,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_do_callback_with_widget_and_user_data,(fl_Window win, fl_Widget w, long arg));
+  FL_EXPORT_C_HEADER(void,Fl_Window_do_callback_with_widget_and_default_user_data,(fl_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Window_contains,(fl_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(int,Fl_Window_inside,(fl_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Window_redraw,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_redraw_label,(fl_Window win));
+  FL_EXPORT_C_HEADER(uchar,Fl_Window_damage,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_clear_damage_with_bitmask,(fl_Window win, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Window_clear_damage,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_damage_with_text,(fl_Window win, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Window_damage_inside_widget,(fl_Window win, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Window_draw_label_with_xywh_alignment,(fl_Window win, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Window_window,(fl_Window window));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Window_top_window,(fl_Window window));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Window_top_window_offset,(fl_Window window, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(void,Fl_Window_measure_label,(fl_Window win, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Window_as_group,(fl_Window win));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Window_as_gl_window,(fl_Window win));
 
   /* Inherited from Fl_Group */
-  FL_EXPORT_C(void, Fl_Window_draw)(fl_Window Window);
-  FL_EXPORT_C(void, Fl_Window_draw_child)(fl_Window Window,fl_Widget widget);
-  FL_EXPORT_C(void, Fl_Window_draw_children)(fl_Window Window);
-  FL_EXPORT_C(void, Fl_Window_draw_outside_label)(fl_Window Window,fl_Widget widget);
-  FL_EXPORT_C(void, Fl_Window_update_child)(fl_Window Window,fl_Widget widget);
-  FL_EXPORT_C(int*, Fl_Window_sizes)(fl_Window Window);
-  FL_EXPORT_C(void,         Fl_Window_begin)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_end)(fl_Window win);
-  FL_EXPORT_C(int,          Fl_Window_find)(fl_Window win, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Window_add)(fl_Window win, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Window_insert)(fl_Window win, fl_Widget w, int i);
-  FL_EXPORT_C(void,         Fl_Window_remove_index)(fl_Window win, int index);
-  FL_EXPORT_C(void,         Fl_Window_remove_widget)(fl_Window win, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Window_clear)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_set_resizable_by_reference)(fl_Window win,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Window_set_resizable)(fl_Window win,fl_Widget o);
-  FL_EXPORT_C(fl_Widget,    Fl_Window_resizable)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_add_resizable)(fl_Window win,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Window_init_sizes)(fl_Window win);
-  FL_EXPORT_C(int,          Fl_Window_children)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_set_clip_children)(fl_Window win,int c);
-  FL_EXPORT_C(unsigned int, Fl_Window_clip_children)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_focus)(fl_Window win,fl_Widget W);
-  FL_EXPORT_C(fl_Widget,    Fl_Window__ddfdesign_kludge)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_insert_with_before)(fl_Window self, fl_Widget w, fl_Widget before);
-  FL_EXPORT_C(fl_Widget*,   Fl_Window_array)(fl_Window self);
-  FL_EXPORT_C(fl_Widget,    Fl_Window_child)(fl_Window self, int n);
-  FL_EXPORT_C(void,         Fl_Window_forms_end)(fl_Window self);
+  FL_EXPORT_C_HEADER(void,Fl_Window_draw,(fl_Window Window));
+  FL_EXPORT_C_HEADER(void,Fl_Window_draw_child,(fl_Window Window,fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Window_draw_children,(fl_Window Window));
+  FL_EXPORT_C_HEADER(void,Fl_Window_draw_outside_label,(fl_Window Window,fl_Widget widget));
+  FL_EXPORT_C_HEADER(void,Fl_Window_update_child,(fl_Window Window,fl_Widget widget));
+  FL_EXPORT_C_HEADER(int*,Fl_Window_sizes,(fl_Window Window));
+  FL_EXPORT_C_HEADER(void,Fl_Window_begin,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_end,(fl_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Window_find,(fl_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Window_add,(fl_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Window_insert,(fl_Window win, fl_Widget w, int i));
+  FL_EXPORT_C_HEADER(void,Fl_Window_remove_index,(fl_Window win, int index));
+  FL_EXPORT_C_HEADER(void,Fl_Window_remove_widget,(fl_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Window_clear,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_resizable_by_reference,(fl_Window win,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_resizable,(fl_Window win,fl_Widget o));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Window_resizable,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_add_resizable,(fl_Window win,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Window_init_sizes,(fl_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Window_children,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_clip_children,(fl_Window win,int c));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Window_clip_children,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_focus,(fl_Window win,fl_Widget W));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Window__ddfdesign_kludge,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_insert_with_before,(fl_Window self, fl_Widget w, fl_Widget before));
+  FL_EXPORT_C_HEADER(fl_Widget*,Fl_Window_array,(fl_Window self));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Window_child,(fl_Window self, int n));
+  FL_EXPORT_C_HEADER(void,Fl_Window_forms_end,(fl_Window self));
   /* FL_EXPORT_C(void,         Fl_Window_forms_end)(fl_Window win); */
   /* Fl_Window specific */
-  FL_EXPORT_C(fl_Window_Virtual_Funcs*, Fl_Window_default_virtual_funcs)();
-  FL_EXPORT_C(void, Fl_Window_draw_super)(fl_Window window);
-  FL_EXPORT_C(int,  Fl_Window_handle_super)(fl_Window window, int event);
-  FL_EXPORT_C(fl_Group, Fl_Window_as_group_super)(fl_Window window);
-  FL_EXPORT_C(void, Fl_Window_resize_super)(fl_Window window, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Window_show_super)(fl_Window window);
-  FL_EXPORT_C(void, Fl_Window_hide_super)(fl_Window window);
-  FL_EXPORT_C(void, Fl_Window_flush_super)(fl_Window window);
-  FL_EXPORT_C(fl_Window, Fl_Window_as_window_super)(fl_Window window);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Window_as_gl_window_super)(fl_Window window);
-  FL_EXPORT_C(fl_Window, Fl_Window_as_window)(fl_Window window);
-  FL_EXPORT_C(unsigned int, Fl_Window_changed)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_fullscreen)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_fullscreen_off)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_fullscreen_off_with_resize)(fl_Window win,int X,int Y,int W,int H);
-  FL_EXPORT_C(void*, Fl_Window_other_data)(fl_Window window);
-  FL_EXPORT_C(void, Fl_Window_set_other_data)(fl_Window window, void* v);
-  FL_EXPORT_C(fl_Window,    Fl_Window_New_WithLabel)(int w, int h, const char* title);
-  FL_EXPORT_C(fl_Window, Fl_OverriddenWindow_New_WithLabel)(int w, int h, const char* title, fl_Window_Virtual_Funcs* funcs);
-  FL_EXPORT_C(fl_Window,    Fl_Window_New)(int w, int h);
-  FL_EXPORT_C(fl_Window, Fl_OverriddenWindow_New)(int w, int h,fl_Window_Virtual_Funcs* funcs);
-  FL_EXPORT_C(fl_Window,    Fl_Window_NewXY_WithLabel)(int x, int y, int w, int h, const char* title);
-  FL_EXPORT_C(fl_Window, Fl_OverriddenWindow_NewXY_WithLabel)(int x, int y, int w, int h, const char* title,fl_Window_Virtual_Funcs* funcs);
-  FL_EXPORT_C(fl_Window,    Fl_Window_NewXY)(int x, int y, int w, int h);
-  FL_EXPORT_C(fl_Window, Fl_OverriddenWindow_NewXY)(int x, int y, int w, int h,fl_Window_Virtual_Funcs* funcs);
-  FL_EXPORT_C(void,         Fl_Window_hide)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_show)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_show_with_args)(fl_Window win, int argc, char** argv);
-  FL_EXPORT_C(void,         Fl_Window_Destroy)(fl_Window win);
-  FL_EXPORT_C(void,         Fl_Window_resize)(fl_Window win, int X, int Y, int W, int H);
-  FL_EXPORT_C(void,         Fl_Window_iconize)(fl_Window win);
-  FL_EXPORT_C(int ,Fl_Window_handle)(fl_Window win, int event);
-  FL_EXPORT_C(void ,Fl_Window_set_border)(fl_Window win, int b);
-  FL_EXPORT_C(void ,Fl_Window_clear_border)(fl_Window win);
-  FL_EXPORT_C(unsigned int ,Fl_Window_border)(fl_Window win);
-  FL_EXPORT_C(void ,Fl_Window_set_override)(fl_Window win);
-  FL_EXPORT_C(unsigned int,Fl_Window_override)(fl_Window win);
-  FL_EXPORT_C(void ,Fl_Window_set_modal)(fl_Window win);
-  FL_EXPORT_C(unsigned int,Fl_Window_modal)(fl_Window win);
-  FL_EXPORT_C(void ,Fl_Window_set_non_modal)(fl_Window win);
-  FL_EXPORT_C(unsigned int ,Fl_Window_non_modal)(fl_Window win);
-  FL_EXPORT_C(void ,Fl_Window_set_menu_window)(fl_Window win);
-  FL_EXPORT_C(unsigned int,Fl_Window_menu_window)(fl_Window win);
-  FL_EXPORT_C(void ,Fl_Window_set_tooltip_window)(fl_Window win);
-  FL_EXPORT_C(unsigned int,Fl_Window_tooltip_window)(fl_Window win);
-  FL_EXPORT_C(void ,Fl_Window_hotspot_with_x_y)(fl_Window win, int x, int y);
-  FL_EXPORT_C(void ,Fl_Window_hotspot_with_x_y_with_offscreen)(fl_Window win, int x, int y, int offscreen);
-  FL_EXPORT_C(void ,Fl_Window_hotspot_with_widget)(fl_Window win, fl_Widget w);//, int offscreen = 0);
-  FL_EXPORT_C(void ,Fl_Window_hotspot_with_widget_with_offscreen)(fl_Window win, fl_Widget w, int offscreen);
-  FL_EXPORT_C(fl_Window_size_range_args*,Fl_Window_default_size_range_args)();
-  FL_EXPORT_C(void ,Fl_Window_free_position)(fl_Window win);
-  FL_EXPORT_C(fl_Window_size_range_args* ,Fl_Window_size_range_default_args)();
-  FL_EXPORT_C(void ,Fl_Window_size_range)(fl_Window win, int minw, int minh);
-  FL_EXPORT_C(void ,Fl_Window_size_range_with_args)(fl_Window win, int minw, int minh, fl_Window_size_range_args* args);//int maxw=0, int maxh=0, int dw=0, int dh=0, int aspect=0);
-  FL_EXPORT_C(const char*, Fl_Window_label)(fl_Window win);
-  FL_EXPORT_C(const char*, Fl_Window_iconlabel)(fl_Window win);
-  FL_EXPORT_C(void, Fl_Window_set_label)(fl_Window win,const char*);
-  FL_EXPORT_C(void, Fl_Window_set_iconlabel)(fl_Window win,const char*);
-  FL_EXPORT_C(void, Fl_Window_set_label_with_iconlabel)(fl_Window win,const char* label, const char* iconlabel);
-  FL_EXPORT_C(void, Fl_Window_copy_label)(fl_Window win,const char* a);
-  FL_EXPORT_C(void, Fl_Window_set_default_xclass)(const char* label);
-  FL_EXPORT_C(const char*, Fl_Window_default_xclass)();
-  FL_EXPORT_C(const char*, Fl_Window_xclass)(fl_Window win);
-  FL_EXPORT_C(void, Fl_Window_set_xclass)(fl_Window win,const char* c);
-  FL_EXPORT_C(const void*, Fl_Window_icon)(fl_Window win);
-  FL_EXPORT_C(void, Fl_Window_set_icon)(fl_Window win,const void * ic);
-  FL_EXPORT_C(int, Fl_Window_shown)(fl_Window win);
-  FL_EXPORT_C(void, Fl_Window_iconize)(fl_Window win);
-  FL_EXPORT_C(int, Fl_Window_x_root)(fl_Window win);
-  FL_EXPORT_C(int, Fl_Window_y_root)(fl_Window win);
-  FL_EXPORT_C(fl_Window, Fl_Window_current)();
-  FL_EXPORT_C(void, Fl_Window_make_current)(fl_Window win);
-  FL_EXPORT_C(void, Fl_Window_set_cursor_with_bg)(fl_Window win, Fl_Cursor cursor, Fl_Color bg);
-  FL_EXPORT_C(void, Fl_Window_set_cursor_with_fg)(fl_Window win,Fl_Cursor cursor, Fl_Color fg);
-  FL_EXPORT_C(void, Fl_Window_set_cursor_with_fg_bg)(fl_Window win,Fl_Cursor cursor, Fl_Color fg , Fl_Color bg );/* =FL_BLACK *//*=FL_WHITE*/
-  FL_EXPORT_C(void, Fl_Window_set_cursor)(fl_Window win,Fl_Cursor cursor);
-  FL_EXPORT_C(void, Fl_Window_set_default_cursor_with_bg)(fl_Window win,Fl_Cursor cursor, Fl_Color bg);
-  FL_EXPORT_C(void, Fl_Window_set_default_cursor_with_fg)(fl_Window win, Fl_Cursor cursor, Fl_Color fg);
-  FL_EXPORT_C(void, Fl_Window_set_default_cursor_with_fg_bg)(fl_Window win,Fl_Cursor cursor, Fl_Color fg , Fl_Color bg );
-  FL_EXPORT_C(void, Fl_Window_set_default_cursor)(fl_Window win,Fl_Cursor cursor);
-  FL_EXPORT_C(void, Fl_Window_default_callback)(fl_Window win, void* v);
-  FL_EXPORT_C(int, Fl_Window_decorated_w)(fl_Window win);
-  FL_EXPORT_C(int, Fl_Window_decorated_h)(fl_Window win);
-  FL_EXPORT_C(void, Fl_Window_wait_for_expose)(fl_Window win);
+  FL_EXPORT_C_HEADER(fl_Window_Virtual_Funcs*,Fl_Window_default_virtual_funcs,());
+  FL_EXPORT_C_HEADER(void,Fl_Window_draw_super,(fl_Window window));
+  FL_EXPORT_C_HEADER(int,Fl_Window_handle_super,(fl_Window window, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Window_as_group_super,(fl_Window window));
+  FL_EXPORT_C_HEADER(void,Fl_Window_resize_super,(fl_Window window, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Window_show_super,(fl_Window window));
+  FL_EXPORT_C_HEADER(void,Fl_Window_hide_super,(fl_Window window));
+  FL_EXPORT_C_HEADER(void,Fl_Window_flush_super,(fl_Window window));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Window_as_window_super,(fl_Window window));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Window_as_gl_window_super,(fl_Window window));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Window_as_window,(fl_Window window));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Window_changed,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_fullscreen,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_fullscreen_off,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_fullscreen_off_with_resize,(fl_Window win,int X,int Y,int W,int H));
+  FL_EXPORT_C_HEADER(void*,Fl_Window_other_data,(fl_Window window));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_other_data,(fl_Window window, void* v));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Window_New_WithLabel,(int w, int h, const char* title));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_OverriddenWindow_New_WithLabel,(int w, int h, const char* title, fl_Window_Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Window_New,(int w, int h));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_OverriddenWindow_New,(int w, int h,fl_Window_Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Window_NewXY_WithLabel,(int x, int y, int w, int h, const char* title));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_OverriddenWindow_NewXY_WithLabel,(int x, int y, int w, int h, const char* title,fl_Window_Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Window_NewXY,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_OverriddenWindow_NewXY,(int x, int y, int w, int h,fl_Window_Virtual_Funcs* funcs));
+  FL_EXPORT_C_HEADER(void,Fl_Window_hide,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_show,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_show_with_args,(fl_Window win, int argc, char** argv));
+  FL_EXPORT_C_HEADER(void,Fl_Window_Destroy,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_resize,(fl_Window win, int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(void,Fl_Window_iconize,(fl_Window win));
+  FL_EXPORT_C_HEADER(int ,Fl_Window_handle,(fl_Window win, int event));
+  FL_EXPORT_C_HEADER(void ,Fl_Window_set_border,(fl_Window win, int b));
+  FL_EXPORT_C_HEADER(void ,Fl_Window_clear_border,(fl_Window win));
+  FL_EXPORT_C_HEADER(unsigned int ,Fl_Window_border,(fl_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Window_set_override,(fl_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Window_override,(fl_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Window_set_modal,(fl_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Window_modal,(fl_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Window_set_non_modal,(fl_Window win));
+  FL_EXPORT_C_HEADER(unsigned int ,Fl_Window_non_modal,(fl_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Window_set_menu_window,(fl_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Window_menu_window,(fl_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Window_set_tooltip_window,(fl_Window win));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Window_tooltip_window,(fl_Window win));
+  FL_EXPORT_C_HEADER(void ,Fl_Window_hotspot_with_x_y,(fl_Window win, int x, int y));
+  FL_EXPORT_C_HEADER(void ,Fl_Window_hotspot_with_x_y_with_offscreen,(fl_Window win, int x, int y, int offscreen));
+  FL_EXPORT_C_HEADER(void ,Fl_Window_hotspot_with_widget,(fl_Window win, fl_Widget w));
+  FL_EXPORT_C_HEADER(void ,Fl_Window_hotspot_with_widget_with_offscreen,(fl_Window win, fl_Widget w, int offscreen));
+  FL_EXPORT_C_HEADER(fl_Window_size_range_args*,Fl_Window_default_size_range_args,());
+  FL_EXPORT_C_HEADER(void ,Fl_Window_free_position,(fl_Window win));
+  FL_EXPORT_C_HEADER(fl_Window_size_range_args* ,Fl_Window_size_range_default_args,());
+  FL_EXPORT_C_HEADER(void ,Fl_Window_size_range,(fl_Window win, int minw, int minh));
+  FL_EXPORT_C_HEADER(void ,Fl_Window_size_range_with_args,(fl_Window win, int minw, int minh, fl_Window_size_range_args* args));
+  FL_EXPORT_C_HEADER(const char*,Fl_Window_label,(fl_Window win));
+  FL_EXPORT_C_HEADER(const char*,Fl_Window_iconlabel,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_label,(fl_Window win,const char*));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_iconlabel,(fl_Window win,const char*));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_label_with_iconlabel,(fl_Window win,const char* label, const char* iconlabel));
+  FL_EXPORT_C_HEADER(void,Fl_Window_copy_label,(fl_Window win,const char* a));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_default_xclass,(const char* label));
+  FL_EXPORT_C_HEADER(const char*,Fl_Window_default_xclass,());
+  FL_EXPORT_C_HEADER(const char*,Fl_Window_xclass,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_xclass,(fl_Window win,const char* c));
+  FL_EXPORT_C_HEADER(const void*,Fl_Window_icon,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_icon,(fl_Window win,const void * ic));
+  FL_EXPORT_C_HEADER(int,Fl_Window_shown,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_iconize,(fl_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Window_x_root,(fl_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Window_y_root,(fl_Window win));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Window_current,());
+  FL_EXPORT_C_HEADER(void,Fl_Window_make_current,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_cursor_with_bg,(fl_Window win, Fl_Cursor cursor, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_cursor_with_fg,(fl_Window win,Fl_Cursor cursor, Fl_Color fg));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_cursor_with_fg_bg,(fl_Window win,Fl_Cursor cursor, Fl_Color fg , Fl_Color bg ));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_cursor,(fl_Window win,Fl_Cursor cursor));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_default_cursor_with_bg,(fl_Window win,Fl_Cursor cursor, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_default_cursor_with_fg,(fl_Window win, Fl_Cursor cursor, Fl_Color fg));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_default_cursor_with_fg_bg,(fl_Window win,Fl_Cursor cursor, Fl_Color fg , Fl_Color bg ));
+  FL_EXPORT_C_HEADER(void,Fl_Window_set_default_cursor,(fl_Window win,Fl_Cursor cursor));
+  FL_EXPORT_C_HEADER(void,Fl_Window_default_callback,(fl_Window win, void* v));
+  FL_EXPORT_C_HEADER(int,Fl_Window_decorated_w,(fl_Window win));
+  FL_EXPORT_C_HEADER(int,Fl_Window_decorated_h,(fl_Window win));
+  FL_EXPORT_C_HEADER(void,Fl_Window_wait_for_expose,(fl_Window win));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_WizardC.h b/c-src/Fl_WizardC.h
--- a/c-src/Fl_WizardC.h
+++ b/c-src/Fl_WizardC.h
@@ -30,141 +30,141 @@
 
 #endif
   /* Inherited from Fl_Widget */
-  FL_EXPORT_C(int,          Fl_Wizard_handle)(fl_Wizard wizard, int event);
-  FL_EXPORT_C(fl_Group,     Fl_Wizard_parent)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_set_parent)(fl_Wizard wizard, fl_Group grp);
-  FL_EXPORT_C(uchar,        Fl_Wizard_type)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_set_type)(fl_Wizard wizard, uchar t);
+  FL_EXPORT_C_HEADER(int,Fl_Wizard_handle,(fl_Wizard wizard, int event));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Wizard_parent,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_set_parent,(fl_Wizard wizard, fl_Group grp));
+  FL_EXPORT_C_HEADER(uchar,Fl_Wizard_type,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_set_type,(fl_Wizard wizard, uchar t));
 
-  FL_EXPORT_C(int,          Fl_Wizard_x)(fl_Wizard wizard);
-  FL_EXPORT_C(int,          Fl_Wizard_y)(fl_Wizard wizard);
-  FL_EXPORT_C(int,          Fl_Wizard_w)(fl_Wizard wizard);
-  FL_EXPORT_C(int,          Fl_Wizard_h)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_set_align)(fl_Wizard wizard, Fl_Align alignment);
-  FL_EXPORT_C(Fl_Align,     Fl_Wizard_align)(fl_Wizard wizard);
-  FL_EXPORT_C(Fl_Boxtype,   Fl_Wizard_box)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_set_box)(fl_Wizard wizard, Fl_Boxtype new_box);
-  FL_EXPORT_C(Fl_Color,     Fl_Wizard_color)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_set_color)(fl_Wizard wizard, Fl_Color bg);
-  FL_EXPORT_C(void,         Fl_Wizard_set_color_with_bg_sel)(fl_Wizard wizard,Fl_Color bg, Fl_Color a);
-  FL_EXPORT_C(Fl_Color,     Fl_Wizard_selection_color)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_set_selection_color)(fl_Wizard wizard, Fl_Color a);
-  FL_EXPORT_C(const char*,  Fl_Wizard_label)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_copy_label)(fl_Wizard wizard, const char* new_label);
-  FL_EXPORT_C(void,         Fl_Wizard_set_label)(fl_Wizard wizard, const char* text);
-  FL_EXPORT_C(Fl_Labeltype, Fl_Wizard_labeltype)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_set_labeltype)(fl_Wizard wizard, Fl_Labeltype a);
-  FL_EXPORT_C(Fl_Color,     Fl_Wizard_labelcolor)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_set_labelcolor)(fl_Wizard wizard, Fl_Color c);
-  FL_EXPORT_C(Fl_Font,      Fl_Wizard_item_labelfont)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_set_item_labelfont)(fl_Wizard wizard, Fl_Font c);
-  FL_EXPORT_C(Fl_Fontsize,  Fl_Wizard_item_labelsize)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_set_item_labelsize)(fl_Wizard wizard, Fl_Fontsize pix);
-  FL_EXPORT_C(fl_Image,     Fl_Wizard_image)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_set_image)(fl_Wizard wizard, fl_Image pix);
-  FL_EXPORT_C(fl_Image,     Fl_Wizard_deimage)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_set_deimage)(fl_Wizard wizard, fl_Image pix);
-  FL_EXPORT_C(const char*,  Fl_Wizard_tooltip)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_copy_tooltip)(fl_Wizard wizard, const char* text);
-  FL_EXPORT_C(void,         Fl_Wizard_set_tooltip)(fl_Wizard wizard, const char* text);
-  FL_EXPORT_C(void,         Fl_Wizard_set_callback_with_user_data)(fl_Wizard wizard, fl_Callback* cb, void* p);
-  FL_EXPORT_C(void,         Fl_Wizard_set_callback)(fl_Wizard wizard, fl_Callback* cb);
-  FL_EXPORT_C(void*,        Fl_Wizard_other_data)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_set_other_data)(fl_Wizard wizard, void* v);
-  FL_EXPORT_C(void*,        Fl_Wizard_user_data)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_set_user_data)(fl_Wizard wizard, void* v);
-  FL_EXPORT_C(long,         Fl_Wizard_argument)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_set_argument)(fl_Wizard wizard, long v);
-  FL_EXPORT_C(Fl_When,      Fl_Wizard_when)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_set_when)(fl_Wizard wizard, uchar i);
-  FL_EXPORT_C(unsigned int, Fl_Wizard_visible)(fl_Wizard wizard);
-  FL_EXPORT_C(int,          Fl_Wizard_visible_r)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_show_super)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_show)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_hide_super)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_hide)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_set_visible)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_clear_visible)(fl_Wizard wizard);
-  FL_EXPORT_C(unsigned int, Fl_Wizard_active)(fl_Wizard wizard);
-  FL_EXPORT_C(int,          Fl_Wizard_active_r)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_activate)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_deactivate)(fl_Wizard wizard);
-  FL_EXPORT_C(unsigned int, Fl_Wizard_output)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_set_output)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_clear_output)(fl_Wizard wizard);
-  FL_EXPORT_C(unsigned int, Fl_Wizard_takesevents)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_set_changed)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_clear_changed)(fl_Wizard wizard);
-  FL_EXPORT_C(int,          Fl_Wizard_take_focus)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_set_visible_focus)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_clear_visible_focus)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_modify_visible_focus)(fl_Wizard wizard, int v);
-  FL_EXPORT_C(unsigned int, Fl_Wizard_visible_focus)(fl_Wizard wizard);
-  FL_EXPORT_C(int,          Fl_Wizard_contains)(fl_Wizard wizard, fl_Group w);
-  FL_EXPORT_C(int,          Fl_Wizard_inside)(fl_Wizard wizard, fl_Group w);
-  FL_EXPORT_C(void,         Fl_Wizard_redraw)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_redraw_label)(fl_Wizard wizard);
-  FL_EXPORT_C(uchar,        Fl_Wizard_damage)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_clear_damage_with_bitmask)(fl_Wizard wizard, uchar c);
-  FL_EXPORT_C(void,         Fl_Wizard_clear_damage)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_damage_with_text)(fl_Wizard wizard, uchar c);
-  FL_EXPORT_C(void,         Fl_Wizard_damage_inside_group)(fl_Wizard wizard, uchar c, int x , int y , int w, int h);
-  FL_EXPORT_C(void,         Fl_Wizard_draw_label_with_xywh_alignment)(fl_Wizard wizard, int x , int y , int w, int h, Fl_Align alignment);
-  FL_EXPORT_C(void,         Fl_Wizard_measure_label)(fl_Wizard wizard, int* ww , int* hh);
-  FL_EXPORT_C(fl_Window,    Fl_Wizard_window)(fl_Wizard wizard);
-  FL_EXPORT_C(fl_Window,    Fl_Wizard_top_window)(fl_Wizard wizard);
-  FL_EXPORT_C(fl_Window ,   Fl_Wizard_top_window_offset)(fl_Wizard wizard, int* xoff, int* yoff);
-  FL_EXPORT_C(fl_Group,     Fl_Wizard_as_group_super)(fl_Wizard wizard);
-  FL_EXPORT_C(fl_Group,     Fl_Wizard_as_group)(fl_Wizard wizard);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Wizard_as_gl_window_super)(fl_Wizard wizard);
-  FL_EXPORT_C(fl_Gl_Window, Fl_Wizard_as_gl_window)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_resize_super)(fl_Wizard wizard,int X, int Y, int W, int H);
-  FL_EXPORT_C(void,         Fl_Wizard_resize)(fl_Wizard wizard,int X, int Y, int W, int H);
+  FL_EXPORT_C_HEADER(int,Fl_Wizard_x,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(int,Fl_Wizard_y,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(int,Fl_Wizard_w,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(int,Fl_Wizard_h,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_set_align,(fl_Wizard wizard, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(Fl_Align,Fl_Wizard_align,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(Fl_Boxtype,Fl_Wizard_box,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_set_box,(fl_Wizard wizard, Fl_Boxtype new_box));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Wizard_color,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_set_color,(fl_Wizard wizard, Fl_Color bg));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_set_color_with_bg_sel,(fl_Wizard wizard,Fl_Color bg, Fl_Color a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Wizard_selection_color,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_set_selection_color,(fl_Wizard wizard, Fl_Color a));
+  FL_EXPORT_C_HEADER(const char*,Fl_Wizard_label,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_copy_label,(fl_Wizard wizard, const char* new_label));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_set_label,(fl_Wizard wizard, const char* text));
+  FL_EXPORT_C_HEADER(Fl_Labeltype,Fl_Wizard_labeltype,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_set_labeltype,(fl_Wizard wizard, Fl_Labeltype a));
+  FL_EXPORT_C_HEADER(Fl_Color,Fl_Wizard_labelcolor,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_set_labelcolor,(fl_Wizard wizard, Fl_Color c));
+  FL_EXPORT_C_HEADER(Fl_Font,Fl_Wizard_item_labelfont,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_set_item_labelfont,(fl_Wizard wizard, Fl_Font c));
+  FL_EXPORT_C_HEADER(Fl_Fontsize,Fl_Wizard_item_labelsize,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_set_item_labelsize,(fl_Wizard wizard, Fl_Fontsize pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Wizard_image,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_set_image,(fl_Wizard wizard, fl_Image pix));
+  FL_EXPORT_C_HEADER(fl_Image,Fl_Wizard_deimage,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_set_deimage,(fl_Wizard wizard, fl_Image pix));
+  FL_EXPORT_C_HEADER(const char*,Fl_Wizard_tooltip,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_copy_tooltip,(fl_Wizard wizard, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_set_tooltip,(fl_Wizard wizard, const char* text));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_set_callback_with_user_data,(fl_Wizard wizard, fl_Callback* cb, void* p));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_set_callback,(fl_Wizard wizard, fl_Callback* cb));
+  FL_EXPORT_C_HEADER(void*,Fl_Wizard_other_data,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_set_other_data,(fl_Wizard wizard, void* v));
+  FL_EXPORT_C_HEADER(void*,Fl_Wizard_user_data,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_set_user_data,(fl_Wizard wizard, void* v));
+  FL_EXPORT_C_HEADER(long,Fl_Wizard_argument,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_set_argument,(fl_Wizard wizard, long v));
+  FL_EXPORT_C_HEADER(Fl_When,Fl_Wizard_when,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_set_when,(fl_Wizard wizard, uchar i));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Wizard_visible,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(int,Fl_Wizard_visible_r,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_show_super,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_show,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_hide_super,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_hide,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_set_visible,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_clear_visible,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Wizard_active,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(int,Fl_Wizard_active_r,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_activate,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_deactivate,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Wizard_output,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_set_output,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_clear_output,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Wizard_takesevents,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_set_changed,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_clear_changed,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(int,Fl_Wizard_take_focus,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_set_visible_focus,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_clear_visible_focus,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_modify_visible_focus,(fl_Wizard wizard, int v));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Wizard_visible_focus,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(int,Fl_Wizard_contains,(fl_Wizard wizard, fl_Group w));
+  FL_EXPORT_C_HEADER(int,Fl_Wizard_inside,(fl_Wizard wizard, fl_Group w));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_redraw,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_redraw_label,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(uchar,Fl_Wizard_damage,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_clear_damage_with_bitmask,(fl_Wizard wizard, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_clear_damage,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_damage_with_text,(fl_Wizard wizard, uchar c));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_damage_inside_group,(fl_Wizard wizard, uchar c, int x , int y , int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_draw_label_with_xywh_alignment,(fl_Wizard wizard, int x , int y , int w, int h, Fl_Align alignment));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_measure_label,(fl_Wizard wizard, int* ww , int* hh));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Wizard_window,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(fl_Window,Fl_Wizard_top_window,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(fl_Window ,Fl_Wizard_top_window_offset,(fl_Wizard wizard, int* xoff, int* yoff));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Wizard_as_group_super,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(fl_Group,Fl_Wizard_as_group,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Wizard_as_gl_window_super,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(fl_Gl_Window,Fl_Wizard_as_gl_window,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_resize_super,(fl_Wizard wizard,int X, int Y, int W, int H));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_resize,(fl_Wizard wizard,int X, int Y, int W, int H));
 
   /* Inherited from Fl_Group*/
-  FL_EXPORT_C(void,         Fl_Wizard_begin)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_end)(fl_Wizard wizard);
-  FL_EXPORT_C(int,          Fl_Wizard_find)(fl_Wizard wizard, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Wizard_add)(fl_Wizard wizard, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Wizard_insert)(fl_Wizard wizard, fl_Widget w, int i);
-  FL_EXPORT_C(void,         Fl_Wizard_remove_index)(fl_Wizard wizard, int index);
-  FL_EXPORT_C(void,         Fl_Wizard_remove_widget)(fl_Wizard wizard, fl_Widget w);
-  FL_EXPORT_C(void,         Fl_Wizard_clear)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_set_resizable_by_reference)(fl_Wizard wizard,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Wizard_set_resizable)(fl_Wizard wizard,fl_Widget o);
-  FL_EXPORT_C(fl_Widget,    Fl_Wizard_resizable)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_add_resizable)(fl_Wizard wizard,fl_Widget o);
-  FL_EXPORT_C(void,         Fl_Wizard_init_sizes)(fl_Wizard wizard);
-  FL_EXPORT_C(int,          Fl_Wizard_children)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_set_clip_children)(fl_Wizard wizard,int c);
-  FL_EXPORT_C(unsigned int, Fl_Wizard_clip_children)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_focus)(fl_Wizard wizard,fl_Widget W);
-  FL_EXPORT_C(fl_Widget,    Fl_Wizard__ddfdesign_kludge)(fl_Wizard wizard);
-  FL_EXPORT_C(void,         Fl_Wizard_insert_with_before)(fl_Wizard self, fl_Widget w, fl_Widget before);
-  FL_EXPORT_C(fl_Widget*,   Fl_Wizard_array)(fl_Wizard wizard);
-  FL_EXPORT_C(fl_Widget,    Fl_Wizard_child)(fl_Wizard wizard, int n);
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_begin,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_end,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(int,Fl_Wizard_find,(fl_Wizard wizard, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_add,(fl_Wizard wizard, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_insert,(fl_Wizard wizard, fl_Widget w, int i));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_remove_index,(fl_Wizard wizard, int index));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_remove_widget,(fl_Wizard wizard, fl_Widget w));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_clear,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_set_resizable_by_reference,(fl_Wizard wizard,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_set_resizable,(fl_Wizard wizard,fl_Widget o));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Wizard_resizable,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_add_resizable,(fl_Wizard wizard,fl_Widget o));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_init_sizes,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(int,Fl_Wizard_children,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_set_clip_children,(fl_Wizard wizard,int c));
+  FL_EXPORT_C_HEADER(unsigned int,Fl_Wizard_clip_children,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_focus,(fl_Wizard wizard,fl_Widget W));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Wizard__ddfdesign_kludge,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_insert_with_before,(fl_Wizard self, fl_Widget w, fl_Widget before));
+  FL_EXPORT_C_HEADER(fl_Widget*,Fl_Wizard_array,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Wizard_child,(fl_Wizard wizard, int n));
 
 
   /* Fl_Wizard Specific */
-  FL_EXPORT_C(void, Fl_Wizard_next)(fl_Wizard wizard);
-  FL_EXPORT_C(void, Fl_Wizard_prev)(fl_Wizard wizard);
-  FL_EXPORT_C(fl_Widget,Fl_Wizard_value)(fl_Wizard wizard);
-  FL_EXPORT_C(void, Fl_Wizard_set_value)(fl_Wizard wizard, fl_Widget w);
-  FL_EXPORT_C(fl_Wizard,     Fl_Wizard_New)(int x, int y, int w, int h);
-  FL_EXPORT_C(fl_Wizard,     Fl_Wizard_New_WithLabel)(int x, int y, int w, int h, const char* t);
-  FL_EXPORT_C(void,          Fl_Wizard_Destroy)(fl_Wizard wizard);
-  FL_EXPORT_C(fl_Wizard,    Fl_OverriddenWizard_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(fl_Wizard,    Fl_OverriddenWizard_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);
-  FL_EXPORT_C(void, Fl_Wizard_draw)(fl_Wizard o);
-  FL_EXPORT_C(void, Fl_Wizard_draw_super)(fl_Wizard o);
-  FL_EXPORT_C(int, Fl_Wizard_handle)(fl_Wizard o, int event);
-  FL_EXPORT_C(int, Fl_Wizard_handle_super)(fl_Wizard o, int event);
-  FL_EXPORT_C(void, Fl_Wizard_resize)(fl_Wizard o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Wizard_resize_super)(fl_Wizard o, int x, int y, int w, int h);
-  FL_EXPORT_C(void, Fl_Wizard_show)(fl_Wizard o);
-  FL_EXPORT_C(void, Fl_Wizard_show_super)(fl_Wizard o);
-  FL_EXPORT_C(void, Fl_Wizard_hide)(fl_Wizard o);
-  FL_EXPORT_C(void, Fl_Wizard_hide_super)(fl_Wizard o);
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_next,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_prev,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(fl_Widget,Fl_Wizard_value,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_set_value,(fl_Wizard wizard, fl_Widget w));
+  FL_EXPORT_C_HEADER(fl_Wizard,Fl_Wizard_New,(int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(fl_Wizard,Fl_Wizard_New_WithLabel,(int x, int y, int w, int h, const char* t));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_Destroy,(fl_Wizard wizard));
+  FL_EXPORT_C_HEADER(fl_Wizard,Fl_OverriddenWizard_New,(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(fl_Wizard,Fl_OverriddenWizard_New_WithLabel,(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_draw,(fl_Wizard o));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_draw_super,(fl_Wizard o));
+  FL_EXPORT_C_HEADER(int,Fl_Wizard_handle,(fl_Wizard o, int event));
+  FL_EXPORT_C_HEADER(int,Fl_Wizard_handle_super,(fl_Wizard o, int event));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_resize,(fl_Wizard o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_resize_super,(fl_Wizard o, int x, int y, int w, int h));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_show,(fl_Wizard o));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_show_super,(fl_Wizard o));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_hide,(fl_Wizard o));
+  FL_EXPORT_C_HEADER(void,Fl_Wizard_hide_super,(fl_Wizard o));
 
 #ifdef __cplusplus
 }
diff --git a/c-src/Fl_XBM_ImageC.h b/c-src/Fl_XBM_ImageC.h
--- a/c-src/Fl_XBM_ImageC.h
+++ b/c-src/Fl_XBM_ImageC.h
@@ -6,7 +6,7 @@
 #include "Fl_CallbackC.h"
 EXPORT {
 #endif
-  FL_EXPORT_C(fl_XBM_Image, Fl_XBM_Image_New)(const char* filename);
+  FL_EXPORT_C_HEADER(fl_XBM_Image,Fl_XBM_Image_New,(const char* filename));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Fl_XPM_ImageC.h b/c-src/Fl_XPM_ImageC.h
--- a/c-src/Fl_XPM_ImageC.h
+++ b/c-src/Fl_XPM_ImageC.h
@@ -6,7 +6,7 @@
 #include "Fl_CallbackC.h"
 EXPORT {
 #endif
-  FL_EXPORT_C(fl_XPM_Image, Fl_XPM_Image_New)(const char* filename);
+  FL_EXPORT_C_HEADER(fl_XPM_Image,Fl_XPM_Image_New,(const char* filename));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/Makefile.in b/c-src/Makefile.in
--- a/c-src/Makefile.in
+++ b/c-src/Makefile.in
@@ -141,8 +141,8 @@
 	test -d $(STATIC_OBJECT_FILES) || mkdir $(STATIC_OBJECT_FILES)
 	test -d $(SHARED_OBJECT_FILES) || mkdir $(SHARED_OBJECT_FILES)
 	@echo "*** Compiling $<..."
-	$(CXXSTATIC) -c $(FPIC) $^ -o $(STATIC_OBJECT_FILES)/$@
-	$(CXXSHARED) -c $(FPIC) $^ -o $(SHARED_OBJECT_FILES)/$@
+	$(CXXSTATIC)  -Wno-attributes -Wall -c $(FPIC) $^ -o $(STATIC_OBJECT_FILES)/$@
+	$(CXXSHARED)  -Wno-attributes -Wall -c $(FPIC) $^ -o $(SHARED_OBJECT_FILES)/$@
 libfltkc.a : $(OBJECTS)
 	test -d $(LIBDIR) || mkdir $(LIBDIR)
 	@echo "*** Linking $@..."
@@ -152,12 +152,12 @@
 	test -d $(LIBDIR) || mkdir $(LIBDIR)
 	@echo "*** Linking $@..."
 	(cd $(SHARED_OBJECT_FILES); \
-	$(CXX) $(SONAME_FLAGS),$(LIBDIR)/$@ -o $(LIBDIR)/$@ $^ $(FLTKCONFIGCOMMAND));
+	$(CXX)  -Wno-attributes -Wall $(SONAME_FLAGS),$(LIBDIR)/$@ -o $(LIBDIR)/$@ $^ $(FLTKCONFIGCOMMAND));
 libfltkc-dyn.dylib: $(OBJECTS)
 	test -d $(LIBDIR) || mkdir $(LIBDIR)
 	@echo "*** Linking $@..."
 	(cd $(SHARED_OBJECT_FILES); \
-	$(CXX) $(SONAME_FLAGS),$(LIBDIR)/$@ -o $(LIBDIR)/$@ $^ -L/usr/local/lib $(FLTKCONFIGCOMMAND));
+	$(CXX)  -Wno-attributes -Wall $(SONAME_FLAGS),$(LIBDIR)/$@ -o $(LIBDIR)/$@ $^ -L/usr/local/lib $(FLTKCONFIGCOMMAND));
 clean:
 	test -d $(LIBDIR) && rm -rf $(LIBDIR)
 	test -d $(SHARED_OBJECT_FILES) && rm -rf $(SHARED_OBJECT_FILES)
diff --git a/c-src/filenameC.h b/c-src/filenameC.h
--- a/c-src/filenameC.h
+++ b/c-src/filenameC.h
@@ -12,27 +12,27 @@
 #include <dirent.h>
 #include "FL/filename.H"
 #endif
-  FL_EXPORT_C(int, flc_filename_list)(const char *d, struct dirent ***l);
-  FL_EXPORT_C(int, flc_filename_list_with_s)(const char *d, struct dirent ***l, Fl_File_Sort_F *s);
-  FL_EXPORT_C(void,flc_filename_free_list)(struct dirent ***l, int n);
-  FL_EXPORT_C(int, flc_open_uri_with_msg_msglen)(const char *uri,char *msg ,int msglen);
-  FL_EXPORT_C(int, flc_open_uri_with_msglen)(const char *uri,int msglen);
-  FL_EXPORT_C(int, flc_open_uri_with_msg)(const char *uri, char *msg);
-  FL_EXPORT_C(int, flc_open_uri)(const char *uri);
-  FL_EXPORT_C(void, flc_decode_uri)(char *uri);
-  FL_EXPORT_C(const char*	,flc_filename_name)(const char*  filename);
-  FL_EXPORT_C(const char*	,flc_filename_ext)(const char* buf);
-  FL_EXPORT_C(char*	,flc_filename_setext)(char* to, int tolen, const char* ext);
-  FL_EXPORT_C(int		,flc_filename_expand)(char* to, int tolen, const char* from);
-  FL_EXPORT_C(int		,flc_filename_absolute)(char* to, int tolen, const char* from);
-  FL_EXPORT_C(int		,flc_filename_relative)(char* to, int tolen, const char* from);
-  FL_EXPORT_C(int		,flc_filename_match)(const char* name, const char* pattern);
-  FL_EXPORT_C(int		,flc_filename_isdir)(const char* name);
-  FL_EXPORT_C(int		,flc_filename_relative_with_cwd)(char* to, int tolen, const char* from, const char* cwd);
-  FL_EXPORT_C(Fl_File_Sort_F* ,fl_numericsort_reference ());
-  FL_EXPORT_C(Fl_File_Sort_F* ,fl_alphasort_reference ());
-  FL_EXPORT_C(Fl_File_Sort_F* ,fl_casealphasort_reference ());
-  FL_EXPORT_C(Fl_File_Sort_F* ,fl_casenumericsort_reference ());
+  FL_EXPORT_C_HEADER(int,flc_filename_list,(const char *d, struct dirent ***l));
+  FL_EXPORT_C_HEADER(int,flc_filename_list_with_s,(const char *d, struct dirent ***l, Fl_File_Sort_F *s));
+  FL_EXPORT_C_HEADER(void,flc_filename_free_list,(struct dirent ***l, int n));
+  FL_EXPORT_C_HEADER(int,flc_open_uri_with_msg_msglen,(const char *uri,char *msg ,int msglen));
+  FL_EXPORT_C_HEADER(int,flc_open_uri_with_msglen,(const char *uri,int msglen));
+  FL_EXPORT_C_HEADER(int,flc_open_uri_with_msg,(const char *uri, char *msg));
+  FL_EXPORT_C_HEADER(int,flc_open_uri,(const char *uri));
+  FL_EXPORT_C_HEADER(void,flc_decode_uri,(char *uri));
+  FL_EXPORT_C_HEADER(const char*	,flc_filename_name,(const char*  filename));
+  FL_EXPORT_C_HEADER(const char*	,flc_filename_ext,(const char* buf));
+  FL_EXPORT_C_HEADER(char*	,flc_filename_setext,(char* to, int tolen, const char* ext));
+  FL_EXPORT_C_HEADER(int		,flc_filename_expand,(char* to, int tolen, const char* from));
+  FL_EXPORT_C_HEADER(int		,flc_filename_absolute,(char* to, int tolen, const char* from));
+  FL_EXPORT_C_HEADER(int		,flc_filename_relative,(char* to, int tolen, const char* from));
+  FL_EXPORT_C_HEADER(int		,flc_filename_match,(const char* name, const char* pattern));
+  FL_EXPORT_C_HEADER(int		,flc_filename_isdir,(const char* name));
+  FL_EXPORT_C_HEADER(int		,flc_filename_relative_with_cwd,(char* to, int tolen, const char* from, const char* cwd));
+  FL_EXPORT_C_HEADER(Fl_File_Sort_F* ,fl_numericsort_reference, ());
+  FL_EXPORT_C_HEADER(Fl_File_Sort_F* ,fl_alphasort_reference, ());
+  FL_EXPORT_C_HEADER(Fl_File_Sort_F* ,fl_casealphasort_reference, ());
+  FL_EXPORT_C_HEADER(Fl_File_Sort_F* ,fl_casenumericsort_reference, ());
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/fl_show_colormapC.h b/c-src/fl_show_colormapC.h
--- a/c-src/fl_show_colormapC.h
+++ b/c-src/fl_show_colormapC.h
@@ -9,7 +9,7 @@
 #include "Fl_CallbackC.h"
 EXPORT {
 #endif
-  FL_EXPORT_C(Fl_Color, flc_show_colormap)(Fl_Color oldcol);
+  FL_EXPORT_C_HEADER(Fl_Color,flc_show_colormap,(Fl_Color oldcol));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/glC.h b/c-src/glC.h
--- a/c-src/glC.h
+++ b/c-src/glC.h
@@ -14,32 +14,32 @@
 #  else
 #    include <GL/gl.h>
 #  endif
-  FL_EXPORT_C(void, flc_gl_start)();
-  FL_EXPORT_C(void, flc_gl_finish)();
-  FL_EXPORT_C(void, flc_gl_color)(Fl_Color i);
-  FL_EXPORT_C(void, flc_gl_color_with_i)(int c);
-  FL_EXPORT_C(void, flc_gl_rect)(int x,int y,int w,int h);
-  FL_EXPORT_C(void, flc_gl_rectf)(int x,int y,int w,int h);
-  FL_EXPORT_C(void, flc_gl_font)(int fontid, int size);
-  FL_EXPORT_C(int, flc_gl_height)();
-  FL_EXPORT_C(int, flc_gl_descent)();
-  FL_EXPORT_C(double, flc_gl_width)(const char* str);
-  FL_EXPORT_C(double, flc_gl_width_with_n)(const char* str, int n);
-  FL_EXPORT_C(double, flc_gl_width_with_uchar_str)(uchar str);
-  FL_EXPORT_C(void, flc_gl_draw)(const char* str);
-  FL_EXPORT_C(void, flc_gl_draw_with_n)(const char* str, int n);
-  FL_EXPORT_C(void, flc_gl_draw_with_xy)(const char* str, float x, float y);
-  FL_EXPORT_C(void, flc_gl_draw_with_nxy)(const char* str, int n, float x, float y);
-  FL_EXPORT_C(void, flc_gl_draw_with_xywh_align)(const char* str, int x, int y, int w, int h, Fl_Align align);
-  FL_EXPORT_C(void, flc_gl_measure)(const char* str, int x, int y);
+  FL_EXPORT_C_HEADER(void,flc_gl_start,());
+  FL_EXPORT_C_HEADER(void,flc_gl_finish,());
+  FL_EXPORT_C_HEADER(void,flc_gl_color,(Fl_Color i));
+  FL_EXPORT_C_HEADER(void,flc_gl_color_with_i,(int c));
+  FL_EXPORT_C_HEADER(void,flc_gl_rect,(int x,int y,int w,int h));
+  FL_EXPORT_C_HEADER(void,flc_gl_rectf,(int x,int y,int w,int h));
+  FL_EXPORT_C_HEADER(void,flc_gl_font,(int fontid, int size));
+  FL_EXPORT_C_HEADER(int,flc_gl_height,());
+  FL_EXPORT_C_HEADER(int,flc_gl_descent,());
+  FL_EXPORT_C_HEADER(double,flc_gl_width,(const char* str));
+  FL_EXPORT_C_HEADER(double,flc_gl_width_with_n,(const char* str, int n));
+  FL_EXPORT_C_HEADER(double,flc_gl_width_with_uchar_str,(uchar str));
+  FL_EXPORT_C_HEADER(void,flc_gl_draw,(const char* str));
+  FL_EXPORT_C_HEADER(void,flc_gl_draw_with_n,(const char* str, int n));
+  FL_EXPORT_C_HEADER(void,flc_gl_draw_with_xy,(const char* str, float x, float y));
+  FL_EXPORT_C_HEADER(void,flc_gl_draw_with_nxy,(const char* str, int n, float x, float y));
+  FL_EXPORT_C_HEADER(void,flc_gl_draw_with_xywh_align,(const char* str, int x, int y, int w, int h, Fl_Align align));
+  FL_EXPORT_C_HEADER(void,flc_gl_measure,(const char* str, int x, int y));
 #ifdef __APPLE__
-  FL_EXPORT_C(void, flc_set_gl_texture_pile_height)(int max);
-  FL_EXPORT_C(int, flc_gl_texture_pile_height)();
+  FL_EXPORT_C_HEADER(void,flc_set_gl_texture_pile_height,(int max));
+  FL_EXPORT_C_HEADER(int,flc_gl_texture_pile_height,());
 #endif
-  FL_EXPORT_C(void, flc_gl_draw_image)(const uchar* str, int x,int y,int w,int h);
-  FL_EXPORT_C(void, flc_gl_draw_image_with_d)(const uchar* str, int x,int y,int w,int h, int d);
-  FL_EXPORT_C(void, flc_gl_draw_image_with_ld)(const uchar* str, int x,int y,int w,int h, int ld);
-  FL_EXPORT_C(void, flc_gl_draw_image_with_d_ld)(const uchar* str, int x,int y,int w,int h, int d, int ld);
+  FL_EXPORT_C_HEADER(void,flc_gl_draw_image,(const uchar* str, int x,int y,int w,int h));
+  FL_EXPORT_C_HEADER(void,flc_gl_draw_image_with_d,(const uchar* str, int x,int y,int w,int h, int d));
+  FL_EXPORT_C_HEADER(void,flc_gl_draw_image_with_ld,(const uchar* str, int x,int y,int w,int h, int ld));
+  FL_EXPORT_C_HEADER(void,flc_gl_draw_image_with_d_ld,(const uchar* str, int x,int y,int w,int h, int d, int ld));
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/glutC.h b/c-src/glutC.h
--- a/c-src/glutC.h
+++ b/c-src/glutC.h
@@ -9,96 +9,96 @@
 #include "Fl_CallbackC.h"
 EXPORT {
 #endif
-  FL_EXPORT_C(void, flc_glutInit)(int* argcp, char** argv);
-  FL_EXPORT_C(void, flc_glutInitDisplayMode)(unsigned int mode);
-  FL_EXPORT_C(void, flc_glutInitWindowPosition)(int x, int y);
-  FL_EXPORT_C(void, flc_glutInitWindowSize)(int w, int h);
-  FL_EXPORT_C(void, flc_glutMainLoop)();
-  FL_EXPORT_C(int, flc_glutCreateWindow)(char* title);
-  FL_EXPORT_C(int, flc_glutCreateSubWindow)(int win, int x, int y, int width, int height);
-  FL_EXPORT_C(void, flc_glutDestroyWindow)(int win);
-  FL_EXPORT_C(void, flc_glutPostRedisplay)();
-  FL_EXPORT_C(void, flc_glutPostWindowRedisplay)(int win);
-  FL_EXPORT_C(void, flc_glutSwapBuffers)();
-  FL_EXPORT_C(int, flc_glutGetWindow)();
-  FL_EXPORT_C(void, flc_glutSetWindow)(int win);
-  FL_EXPORT_C(void, flc_glutSetWindowTitle)(char* t);
-  FL_EXPORT_C(void, flc_glutSetIconTitle)(char* t);
-  FL_EXPORT_C(void, flc_glutPositionWindow)(int x, int y);
-  FL_EXPORT_C(void, flc_glutReshapeWindow)(int w, int h);
-  FL_EXPORT_C(void, flc_glutPopWindow)();
-  FL_EXPORT_C(void, flc_glutPushWindow)();
-  FL_EXPORT_C(void, flc_glutIconifyWindow)();
-  FL_EXPORT_C(void, flc_glutShowWindow)();
-  FL_EXPORT_C(void, flc_glutHideWindow)();
-  FL_EXPORT_C(void, flc_glutFullScreen)();
-  FL_EXPORT_C(void, flc_glutSetCursor)(Fl_Cursor cursor);
-  FL_EXPORT_C(void, flc_glutWarpPointer)(int x, int y);
-  FL_EXPORT_C(void, flc_glutEstablishOverlay)();
-  FL_EXPORT_C(void, flc_glutRemoveOverlay)();
-  FL_EXPORT_C(void, flc_glutUseLayer)(GLenum layer);
-  FL_EXPORT_C(void, flc_glutPostOverlayRedisplay)();
-  FL_EXPORT_C(void, flc_glutShowOverlay)();
-  FL_EXPORT_C(void, flc_glutHideOverlay)();
-  FL_EXPORT_C(int, flc_glutCreateMenu)(void (*f)(int));
-  FL_EXPORT_C(void, flc_glutDestroyMenu)(int menu);
-  FL_EXPORT_C(int, flc_glutGetMenu)();
-  FL_EXPORT_C(void, flc_glutSetMenu)(int m);
-  FL_EXPORT_C(void, flc_glutAddMenuEntry)(char* label, int value);
-  FL_EXPORT_C(void, flc_glutAddSubMenu)(char* label, int submenu);
-  FL_EXPORT_C(void, flc_glutChangeToMenuEntry)(int item, char* labela, int value);
-  FL_EXPORT_C(void, flc_glutChangeToSubMenu)(int item, char* label, int submenu);
-  FL_EXPORT_C(void, flc_glutRemoveMenuItem)(int item);
-  FL_EXPORT_C(void, flc_glutAttachMenu)(int b);
-  FL_EXPORT_C(void, flc_glutDetachMenu)(int b);
-  FL_EXPORT_C(void, flc_glutDisplayFunc)(void (*f)());
-  FL_EXPORT_C(void, flc_glutReshapeFunc)(void (*f)(int w, int h));
-  FL_EXPORT_C(void, flc_glutKeyboardFunc)(void (*f)(uchar key, int x, int y));
-  FL_EXPORT_C(void, flc_glutMouseFunc)(void (*f)(int b, int state, int x, int y));
-  FL_EXPORT_C(void, flc_glutMotionFunc)(void (*f)(int x, int y));
-  FL_EXPORT_C(void, flc_glutPassiveMotionFunc)(void (*f)(int x, int y));
-  FL_EXPORT_C(void, flc_glutEntryFunc)(void (*f)(int s));
-  FL_EXPORT_C(void, flc_glutVisibilityFunc)(void (*f)(int s));
-  FL_EXPORT_C(void, flc_glutIdleFunc)(void (*f)());
-  FL_EXPORT_C(void, flc_glutTimerFunc)(unsigned int msec, void (*f)(int), int value);
-  FL_EXPORT_C(void, flc_glutMenuStateFunc)(void (*f)(int state));
-  FL_EXPORT_C(void, flc_glutMenuStatusFunc)(void (*f)(int status, int x, int y));
-  FL_EXPORT_C(void, flc_glutSpecialFunc)(void (*f)(int key, int x, int y));
-  FL_EXPORT_C(void, flc_glutOverlayDisplayFunc)(void (*f)());
-  FL_EXPORT_C(int, flc_glutGet)(GLenum type);
-  FL_EXPORT_C(int, flc_glutDeviceGet)(GLenum type);
-  FL_EXPORT_C(int, flc_glutGetModifiers)();
-  FL_EXPORT_C(int, flc_glutLayerGet)(GLenum type);
-  FL_EXPORT_C(GLUTproc, flc_glutGetProcAddress)(const char* procName);
-  FL_EXPORT_C(void, flc_glutBitmapCharacter)(void* font, int character);
-  FL_EXPORT_C(int, flc_glutBitmapHeight)(void* font);
-  FL_EXPORT_C(int, flc_glutBitmapLength)(void* font, const unsigned char* string);
-  FL_EXPORT_C(void, flc_glutBitmapString)(void* font, const unsigned char* string);
-  FL_EXPORT_C(int, flc_glutBitmapWidth)(void* font, int character);
-  FL_EXPORT_C(int, flc_glutExtensionSupported)(char* name);
-  FL_EXPORT_C(void, flc_glutStrokeCharacter)(void* font, int character);
-  FL_EXPORT_C(GLfloat, flc_glutStrokeHeight)(void* font);
-  FL_EXPORT_C(int, flc_glutStrokeLength)(void* font, const unsigned char* string);
-  FL_EXPORT_C(void, flc_glutStrokeString)(void* font, const unsigned char* string);
-  FL_EXPORT_C(int, flc_glutStrokeWidth)(void* font, int character);
-  FL_EXPORT_C(void, flc_glutWireSphere)(GLdouble radius, GLint slices, GLint stacks);
-  FL_EXPORT_C(void, flc_glutSolidSphere)(GLdouble radius, GLint slices, GLint stacks);
-  FL_EXPORT_C(void, flc_glutWireCone)(GLdouble base, GLdouble height, GLint slices, GLint stacks);
-  FL_EXPORT_C(void, flc_glutSolidCone)(GLdouble base, GLdouble height, GLint slices, GLint stacks);
-  FL_EXPORT_C(void, flc_glutWireCube)(GLdouble size);
-  FL_EXPORT_C(void, flc_glutSolidCube)(GLdouble size);
-  FL_EXPORT_C(void, flc_glutWireTorus)(GLdouble innerRadius, GLdouble outerRadius, GLint sides, GLint rings);
-  FL_EXPORT_C(void, flc_glutSolidTorus)(GLdouble innerRadius, GLdouble outerRadius, GLint sides, GLint rings);
-  FL_EXPORT_C(void, flc_glutWireDodecahedron)();
-  FL_EXPORT_C(void, flc_glutSolidDodecahedron)();
-  FL_EXPORT_C(void, flc_glutWireTeapot)(GLdouble size);
-  FL_EXPORT_C(void, flc_glutSolidTeapot)(GLdouble size);
-  FL_EXPORT_C(void, flc_glutWireOctahedron)();
-  FL_EXPORT_C(void, flc_glutSolidOctahedron)();
-  FL_EXPORT_C(void, flc_glutWireTetrahedron)();
-  FL_EXPORT_C(void, flc_glutSolidTetrahedron)();
-  FL_EXPORT_C(void, flc_glutWireIcosahedron)();
-  FL_EXPORT_C(void, flc_glutSolidIcosahedron)();
+  FL_EXPORT_C_HEADER(void,flc_glutInit,(int* argcp, char** argv));
+  FL_EXPORT_C_HEADER(void,flc_glutInitDisplayMode,(unsigned int mode));
+  FL_EXPORT_C_HEADER(void,flc_glutInitWindowPosition,(int x, int y));
+  FL_EXPORT_C_HEADER(void,flc_glutInitWindowSize,(int w, int h));
+  FL_EXPORT_C_HEADER(void,flc_glutMainLoop,());
+  FL_EXPORT_C_HEADER(int,flc_glutCreateWindow,(char* title));
+  FL_EXPORT_C_HEADER(int,flc_glutCreateSubWindow,(int win, int x, int y, int width, int height));
+  FL_EXPORT_C_HEADER(void,flc_glutDestroyWindow,(int win));
+  FL_EXPORT_C_HEADER(void,flc_glutPostRedisplay,());
+  FL_EXPORT_C_HEADER(void,flc_glutPostWindowRedisplay,(int win));
+  FL_EXPORT_C_HEADER(void,flc_glutSwapBuffers,());
+  FL_EXPORT_C_HEADER(int,flc_glutGetWindow,());
+  FL_EXPORT_C_HEADER(void,flc_glutSetWindow,(int win));
+  FL_EXPORT_C_HEADER(void,flc_glutSetWindowTitle,(char* t));
+  FL_EXPORT_C_HEADER(void,flc_glutSetIconTitle,(char* t));
+  FL_EXPORT_C_HEADER(void,flc_glutPositionWindow,(int x, int y));
+  FL_EXPORT_C_HEADER(void,flc_glutReshapeWindow,(int w, int h));
+  FL_EXPORT_C_HEADER(void,flc_glutPopWindow,());
+  FL_EXPORT_C_HEADER(void,flc_glutPushWindow,());
+  FL_EXPORT_C_HEADER(void,flc_glutIconifyWindow,());
+  FL_EXPORT_C_HEADER(void,flc_glutShowWindow,());
+  FL_EXPORT_C_HEADER(void,flc_glutHideWindow,());
+  FL_EXPORT_C_HEADER(void,flc_glutFullScreen,());
+  FL_EXPORT_C_HEADER(void,flc_glutSetCursor,(Fl_Cursor cursor));
+  FL_EXPORT_C_HEADER(void,flc_glutWarpPointer,(int x, int y));
+  FL_EXPORT_C_HEADER(void,flc_glutEstablishOverlay,());
+  FL_EXPORT_C_HEADER(void,flc_glutRemoveOverlay,());
+  FL_EXPORT_C_HEADER(void,flc_glutUseLayer,(GLenum layer));
+  FL_EXPORT_C_HEADER(void,flc_glutPostOverlayRedisplay,());
+  FL_EXPORT_C_HEADER(void,flc_glutShowOverlay,());
+  FL_EXPORT_C_HEADER(void,flc_glutHideOverlay,());
+  FL_EXPORT_C_HEADER(int,flc_glutCreateMenu,(void (*f)(int)));
+  FL_EXPORT_C_HEADER(void,flc_glutDestroyMenu,(int menu));
+  FL_EXPORT_C_HEADER(int,flc_glutGetMenu,());
+  FL_EXPORT_C_HEADER(void,flc_glutSetMenu,(int m));
+  FL_EXPORT_C_HEADER(void,flc_glutAddMenuEntry,(char* label, int value));
+  FL_EXPORT_C_HEADER(void,flc_glutAddSubMenu,(char* label, int submenu));
+  FL_EXPORT_C_HEADER(void,flc_glutChangeToMenuEntry,(int item, char* labela, int value));
+  FL_EXPORT_C_HEADER(void,flc_glutChangeToSubMenu,(int item, char* label, int submenu));
+  FL_EXPORT_C_HEADER(void,flc_glutRemoveMenuItem,(int item));
+  FL_EXPORT_C_HEADER(void,flc_glutAttachMenu,(int b));
+  FL_EXPORT_C_HEADER(void,flc_glutDetachMenu,(int b));
+  FL_EXPORT_C_HEADER(void,flc_glutDisplayFunc,(void (*f)()));
+  FL_EXPORT_C_HEADER(void,flc_glutReshapeFunc,(void (*f)(int w, int h)));
+  FL_EXPORT_C_HEADER(void,flc_glutKeyboardFunc,(void (*f)(uchar key, int x, int y)));
+  FL_EXPORT_C_HEADER(void,flc_glutMouseFunc,(void (*f)(int b, int state, int x, int y)));
+  FL_EXPORT_C_HEADER(void,flc_glutMotionFunc,(void (*f)(int x, int y)));
+  FL_EXPORT_C_HEADER(void,flc_glutPassiveMotionFunc,(void (*f)(int x, int y)));
+  FL_EXPORT_C_HEADER(void,flc_glutEntryFunc,(void (*f)(int s)));
+  FL_EXPORT_C_HEADER(void,flc_glutVisibilityFunc,(void (*f)(int s)));
+  FL_EXPORT_C_HEADER(void,flc_glutIdleFunc,(void (*f)()));
+  FL_EXPORT_C_HEADER(void,flc_glutTimerFunc,(unsigned int msec, void (*f)(int), int value));
+  FL_EXPORT_C_HEADER(void,flc_glutMenuStateFunc,(void (*f)(int state)));
+  FL_EXPORT_C_HEADER(void,flc_glutMenuStatusFunc,(void (*f)(int status, int x, int y)));
+  FL_EXPORT_C_HEADER(void,flc_glutSpecialFunc,(void (*f)(int key, int x, int y)));
+  FL_EXPORT_C_HEADER(void,flc_glutOverlayDisplayFunc,(void (*f)()));
+  FL_EXPORT_C_HEADER(int,flc_glutGet,(GLenum type));
+  FL_EXPORT_C_HEADER(int,flc_glutDeviceGet,(GLenum type));
+  FL_EXPORT_C_HEADER(int,flc_glutGetModifiers,());
+  FL_EXPORT_C_HEADER(int,flc_glutLayerGet,(GLenum type));
+  FL_EXPORT_C_HEADER(GLUTproc,flc_glutGetProcAddress,(const char* procName));
+  FL_EXPORT_C_HEADER(void,flc_glutBitmapCharacter,(void* font, int character));
+  FL_EXPORT_C_HEADER(int,flc_glutBitmapHeight,(void* font));
+  FL_EXPORT_C_HEADER(int,flc_glutBitmapLength,(void* font, const unsigned char* string));
+  FL_EXPORT_C_HEADER(void,flc_glutBitmapString,(void* font, const unsigned char* string));
+  FL_EXPORT_C_HEADER(int,flc_glutBitmapWidth,(void* font, int character));
+  FL_EXPORT_C_HEADER(int,flc_glutExtensionSupported,(char* name));
+  FL_EXPORT_C_HEADER(void,flc_glutStrokeCharacter,(void* font, int character));
+  FL_EXPORT_C_HEADER(GLfloat,flc_glutStrokeHeight,(void* font));
+  FL_EXPORT_C_HEADER(int,flc_glutStrokeLength,(void* font, const unsigned char* string));
+  FL_EXPORT_C_HEADER(void,flc_glutStrokeString,(void* font, const unsigned char* string));
+  FL_EXPORT_C_HEADER(int,flc_glutStrokeWidth,(void* font, int character));
+  FL_EXPORT_C_HEADER(void,flc_glutWireSphere,(GLdouble radius, GLint slices, GLint stacks));
+  FL_EXPORT_C_HEADER(void,flc_glutSolidSphere,(GLdouble radius, GLint slices, GLint stacks));
+  FL_EXPORT_C_HEADER(void,flc_glutWireCone,(GLdouble base, GLdouble height, GLint slices, GLint stacks));
+  FL_EXPORT_C_HEADER(void,flc_glutSolidCone,(GLdouble base, GLdouble height, GLint slices, GLint stacks));
+  FL_EXPORT_C_HEADER(void,flc_glutWireCube,(GLdouble size));
+  FL_EXPORT_C_HEADER(void,flc_glutSolidCube,(GLdouble size));
+  FL_EXPORT_C_HEADER(void,flc_glutWireTorus,(GLdouble innerRadius, GLdouble outerRadius, GLint sides, GLint rings));
+  FL_EXPORT_C_HEADER(void,flc_glutSolidTorus,(GLdouble innerRadius, GLdouble outerRadius, GLint sides, GLint rings));
+  FL_EXPORT_C_HEADER(void,flc_glutWireDodecahedron,());
+  FL_EXPORT_C_HEADER(void,flc_glutSolidDodecahedron,());
+  FL_EXPORT_C_HEADER(void,flc_glutWireTeapot,(GLdouble size));
+  FL_EXPORT_C_HEADER(void,flc_glutSolidTeapot,(GLdouble size));
+  FL_EXPORT_C_HEADER(void,flc_glutWireOctahedron,());
+  FL_EXPORT_C_HEADER(void,flc_glutSolidOctahedron,());
+  FL_EXPORT_C_HEADER(void,flc_glutWireTetrahedron,());
+  FL_EXPORT_C_HEADER(void,flc_glutSolidTetrahedron,());
+  FL_EXPORT_C_HEADER(void,flc_glutWireIcosahedron,());
+  FL_EXPORT_C_HEADER(void,flc_glutSolidIcosahedron,());
 #ifdef __cplusplus
 }
 #endif
diff --git a/c-src/xC.h b/c-src/xC.h
--- a/c-src/xC.h
+++ b/c-src/xC.h
@@ -16,24 +16,24 @@
 # include <X11/Xlib.h>
 # include <X11/Xutil.h>
 #endif
- FL_EXPORT_C(void, flc_open_display)();
- FL_EXPORT_C(Fl_Bitmask, flc_create_bitmask)(int w, int h, const uchar *data);
- FL_EXPORT_C(Fl_Bitmask, flc_create_alphamask)(int w, int h, int d, int ld, const uchar *data);
- FL_EXPORT_C(void, flc_delete_bitmask)(Fl_Bitmask bm);
+ FL_EXPORT_C_HEADER(void,flc_open_display,());
+ FL_EXPORT_C_HEADER(Fl_Bitmask,flc_create_bitmask,(int w, int h, const uchar *data));
+ FL_EXPORT_C_HEADER(Fl_Bitmask,flc_create_alphamask,(int w, int h, int d, int ld, const uchar *data));
+ FL_EXPORT_C_HEADER(void,flc_delete_bitmask,(Fl_Bitmask bm));
 #if !defined(WIN32) && !defined(__APPLE__)
  typedef ulong Fl_Bitmask;
- FL_EXPORT_C(void, flc_close_display)();
- FL_EXPORT_C(ulong, flc_xpixel)(Fl_Color i);
- FL_EXPORT_C(ulong, flc_xpixel_with_rgb)(uchar r, uchar g, uchar b);
- FL_EXPORT_C(void, flc_set_fl_screen)(int screen);
- FL_EXPORT_C(int, flc_fl_screen)();
- FL_EXPORT_C(Display*, flc_fl_display)();
- FL_EXPORT_C(void, flc_set_fl_display)(Display* d);
- FL_EXPORT_C(void, flc_open_display_with_d)(Display* d);
- FL_EXPORT_C(void, flc_set_fl_colormap)(Colormap c);
- FL_EXPORT_C(Colormap, flc_fl_colormap)();
- FL_EXPORT_C(void, flc_set_fl_visual)(XVisualInfo* i);
- FL_EXPORT_C(XVisualInfo*, flc_fl_visual)();
+ FL_EXPORT_C_HEADER(void,flc_close_display,());
+ FL_EXPORT_C_HEADER(ulong,flc_xpixel,(Fl_Color i));
+ FL_EXPORT_C_HEADER(ulong,flc_xpixel_with_rgb,(uchar r, uchar g, uchar b));
+ FL_EXPORT_C_HEADER(void,flc_set_fl_screen,(int screen));
+ FL_EXPORT_C_HEADER(int,flc_fl_screen,());
+ FL_EXPORT_C_HEADER(Display*,flc_fl_display,());
+ FL_EXPORT_C_HEADER(void,flc_set_fl_display,(Display* d));
+ FL_EXPORT_C_HEADER(void,flc_open_display_with_d,(Display* d));
+ FL_EXPORT_C_HEADER(void,flc_set_fl_colormap,(Colormap c));
+ FL_EXPORT_C_HEADER(Colormap,flc_fl_colormap,());
+ FL_EXPORT_C_HEADER(void,flc_set_fl_visual,(XVisualInfo* i));
+ FL_EXPORT_C_HEADER(XVisualInfo*,flc_fl_visual,());
 #endif
 #ifdef __cplusplus
 }
diff --git a/fltkhs.cabal b/fltkhs.cabal
--- a/fltkhs.cabal
+++ b/fltkhs.cabal
@@ -1,5 +1,5 @@
 name : fltkhs
-version : 0.5.2.9
+version : 0.5.3.0
 synopsis : FLTK bindings
 description: Low level bindings for the FLTK GUI toolkit. For installation and quick start instruction please scroll all the way down to the README.
 license : MIT
@@ -38,6 +38,7 @@
   if flag(opengl)
      exposed-modules:
                    Graphics.UI.FLTK.LowLevel.Gl
+                   Graphics.UI.FLTK.LowLevel.Glut
                    Graphics.UI.FLTK.LowLevel.GlWindow
      cpp-options: -DGLSUPPORT
   exposed-modules:
@@ -140,7 +141,7 @@
   include-dirs: ./c-src, ./
   default-extensions: GADTs
   default-language: Haskell2010
-  ghc-options: -Wall
+  ghc-options: -Wall -fno-warn-name-shadowing -fno-warn-orphans -fno-warn-unused-matches -fno-warn-dodgy-exports
   if impl(ghc >= 8.0.1)
      cpp-options: -DHASCALLSTACK_AVAILABLE
   else
diff --git a/src/Fluid/Generate.hs b/src/Fluid/Generate.hs
--- a/src/Fluid/Generate.hs
+++ b/src/Fluid/Generate.hs
@@ -1,4 +1,6 @@
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# OPTIONS_GHC -fno-warn-name-shadowing #-}
+{-# OPTIONS_GHC -fno-warn-type-defaults #-}
 module Generate
        (typeToHs,
         typicalConstructorG,
diff --git a/src/Graphics/UI/FLTK/LowLevel/FL.chs b/src/Graphics/UI/FLTK/LowLevel/FL.chs
--- a/src/Graphics/UI/FLTK/LowLevel/FL.chs
+++ b/src/Graphics/UI/FLTK/LowLevel/FL.chs
@@ -411,8 +411,18 @@
        {  } -> `Bool' toBool #}
 {# fun Fl_set_event_is_click as setEventIsClick
        { `Int' } -> `()' supressWarningAboutRes #}
-{# fun Fl_event_button as eventButton
-       {  } -> `MouseButton' cToEnum #}
+
+{# fun Fl_event_button as eventButton'
+       {  } -> `Int' #}
+eventButton :: IO (Maybe MouseButton)
+eventButton = do
+  mb <- eventButton'
+  case mb of
+    mb' | mb' == (fromEnum Mouse_Left) -> return (Just Mouse_Left)
+    mb' | mb' == (fromEnum Mouse_Middle) -> return (Just Mouse_Right)
+    mb' | mb' == (fromEnum Mouse_Right) -> return (Just Mouse_Middle)
+    _ -> return Nothing
+
 eventStates :: [EventState]
 eventStates = [
                Kb_ShiftState,
@@ -428,13 +438,7 @@
               ]
 extractEventStates :: CInt -> [EventState]
 extractEventStates = extract eventStates
--- foldModifiers :: [KeyboardCode] -> CInt
--- foldModifiers codes =
---     let validKeysyms = map cFromEnum (filter (\c -> c `elem` validKeyboardStates) codes)
---     in
---       case validKeysyms of
---         [] -> (-1)
---         (k:ks) -> foldl (\accum k' -> accum .&. k') k ks
+
 {# fun Fl_event_state as eventState
        {  } -> `[EventState]' extractEventStates #}
 {# fun Fl_contains_event_state as containsEventState
diff --git a/src/Graphics/UI/FLTK/LowLevel/Fl_Enumerations.chs b/src/Graphics/UI/FLTK/LowLevel/Fl_Enumerations.chs
--- a/src/Graphics/UI/FLTK/LowLevel/Fl_Enumerations.chs
+++ b/src/Graphics/UI/FLTK/LowLevel/Fl_Enumerations.chs
@@ -30,20 +30,6 @@
      Damage(..),
      -- * Cursor type
      Cursor(..),
-#ifdef GLSUPPORT
-     -- * Glut attributes
-     GlutDraw(..),
-     GlutMouseCodes(..),
-     GlutUpDown(..),
-     GlutVisibility(..),
-     GlutMenuProperties(..),
-     GlutEnteredLeft(..),
-     GlutKeyboardCodes(..),
-     GlutConstants(..),
-     GlutWindowProperties(..),
-     GlutCursor(..),
-     glutCursorFullCrossHair,
-#endif
      -- * Various modes
      Mode(..),
      Modes(..),
@@ -358,123 +344,6 @@
  DamageUser2   = FL_DAMAGE_USER2,
  DamageAll     = FL_DAMAGE_ALL
 };
-#ifdef GLSUPPORT
-enum GlutDraw {
- GlutNormal = GLUT_NORMAL,
- GlutOverlay = GLUT_OVERLAY
-};
-enum GlutMouseCodes {
- GlutLeftButton = GLUT_LEFT_BUTTON,
- GlutRightButton = GLUT_RIGHT_BUTTON,
- GlutMiddleButton = GLUT_MIDDLE_BUTTON
-};
-enum GlutUpDown {
- GlutUp = GLUT_UP,
- GlutDown = GLUT_DOWN
-};
-enum GlutVisibility {
- GlutVisible = GLUT_VISIBLE,
- GlutNotVisible = GLUT_NOT_VISIBLE
-};
-enum GlutMenuProperties {
- GlutMenuNotInUse = GLUT_MENU_NOT_IN_USE,
- GlutMenuInUse = GLUT_MENU_IN_USE,
- GlutMenuNumItems = GLUT_MENU_NUM_ITEMS
-};
-enum GlutEnteredLeft {
- GlutEntered = GLUT_ENTERED,
- GlutLeft = GLUT_LEFT
-};
-enum GlutKeyboardCodes {
- GlutKeyF1 =  GLUT_KEY_F1,
- GlutKeyF2 =  GLUT_KEY_F2,
- GlutKeyF3 =  GLUT_KEY_F3,
- GlutKeyF4 =  GLUT_KEY_F4,
- GlutKeyF5 =  GLUT_KEY_F5,
- GlutKeyF6 =  GLUT_KEY_F6,
- GlutKeyF7 =  GLUT_KEY_F7,
- GlutKeyF8 =  GLUT_KEY_F8,
- GlutKeyF9 =  GLUT_KEY_F9,
- GlutKeyF10 =  GLUT_KEY_F10,
- GlutKeyF11 =  GLUT_KEY_F11,
- GlutKeyF12 =  GLUT_KEY_F12,
- GlutKeyLeft =  GLUT_KEY_LEFT,
- GlutKeyUp =  GLUT_KEY_UP,
- GlutKeyRight =  GLUT_KEY_RIGHT,
- GlutKeyDown =  GLUT_KEY_DOWN,
- GlutKeyPageUp =  GLUT_KEY_PAGE_UP,
- GlutKeyPageDown =  GLUT_KEY_PAGE_DOWN,
- GlutKeyHome =  GLUT_KEY_HOME,
- GlutKeyEnd =  GLUT_KEY_END,
- GlutKeyInsert =  GLUT_KEY_INSERT,
- GlutActiveShift =  GLUT_ACTIVE_SHIFT,
- GlutActiveCtrl  =  GLUT_ACTIVE_CTRL,
- GlutActiveAlt   =  GLUT_ACTIVE_ALT
-};
-enum GlutConstants {
- GlutReturnZero =  GLUT_RETURN_ZERO,
- GlutDisplayModePossible =  GLUT_DISPLAY_MODE_POSSIBLE,
- GlutVersion =  GLUT_VERSION,
- GlutOverlayPossible =  GLUT_OVERLAY_POSSIBLE,
- GlutTransparentIndex =  GLUT_TRANSPARENT_INDEX,
- GlutNormalDamaged =  GLUT_NORMAL_DAMAGED,
- GlutOverlayDamaged =  GLUT_OVERLAY_DAMAGED
-};
-enum GlutWindowProperties {
- GlutWindowX =  GLUT_WINDOW_X,
- GlutWindowY =  GLUT_WINDOW_Y,
- GlutWindowWidth =  GLUT_WINDOW_WIDTH,
- GlutWindowHeight =  GLUT_WINDOW_HEIGHT,
- GlutWindowParent =  GLUT_WINDOW_PARENT,
- GlutScreenWidth =  GLUT_SCREEN_WIDTH,
- GlutScreenHeight =  GLUT_SCREEN_HEIGHT,
- GlutInitWindowX =  GLUT_INIT_WINDOW_X,
- GlutInitWindowY =  GLUT_INIT_WINDOW_Y,
- GlutInitWindowWidth =  GLUT_INIT_WINDOW_WIDTH,
- GlutInitWindowHeight =  GLUT_INIT_WINDOW_HEIGHT,
- GlutInitDisplayMode =  GLUT_INIT_DISPLAY_MODE,
- GlutWindowBufferSize =  GLUT_WINDOW_BUFFER_SIZE,
- GlutWindowStencilSize =  GLUT_WINDOW_STENCIL_SIZE,
- GlutWindowDepthSize =  GLUT_WINDOW_DEPTH_SIZE,
- GlutWindowRedSize =  GLUT_WINDOW_RED_SIZE,
- GlutWindowGreenSize =  GLUT_WINDOW_GREEN_SIZE,
- GlutWindowBlueSize =  GLUT_WINDOW_BLUE_SIZE,
- GlutWindowAlphaSize =  GLUT_WINDOW_ALPHA_SIZE,
- GlutWindowAccumRedSize =  GLUT_WINDOW_ACCUM_RED_SIZE,
- GlutWindowAccumGreenSize =  GLUT_WINDOW_ACCUM_GREEN_SIZE,
- GlutWindowAccumBlueSize =  GLUT_WINDOW_ACCUM_BLUE_SIZE,
- GlutWindowAccumAlphaSize =  GLUT_WINDOW_ACCUM_ALPHA_SIZE,
- GlutWindowDoublebuffer =  GLUT_WINDOW_DOUBLEBUFFER,
- GlutWindowRgba =  GLUT_WINDOW_RGBA,
- GlutWindowColormapSize =  GLUT_WINDOW_COLORMAP_SIZE,
- GlutWindowNumSamples =  GLUT_WINDOW_NUM_SAMPLES,
- GlutWindowStereo =  GLUT_WINDOW_STEREO
-};
-enum GlutCursor {
-  GlutCursorRightArrow = 2,
-  GlutCursorLeftArrow = 67,
-  GlutCursorDestroy = 45,
-  GlutCursorCycle = 26,
-  GlutCursorSpray = 63,
-  GlutCursorInfo = FL_CURSOR_HAND,
-  GlutCursorHelp = FL_CURSOR_HELP,
-  GlutCursorWait = FL_CURSOR_WAIT,
-  GlutCursorText = FL_CURSOR_INSERT,
-  GlutCursorLeftRight = FL_CURSOR_WE,
-  GlutCursorTopSide = FL_CURSOR_N,
-  GlutCursorBottomSide = FL_CURSOR_S,
-  GlutCursorLeftSide = FL_CURSOR_W,
-  GlutCursorRightSide = FL_CURSOR_E,
-  GlutCursorTopLeftCorner = FL_CURSOR_NW,
-  GlutCursorTopRightCorner = FL_CURSOR_NE,
-  GlutCursorBottomRightCorner = FL_CURSOR_SE,
-  GlutCursorBottomLeftCorner = FL_CURSOR_SW,
-  GlutCursorInherit = FL_CURSOR_DEFAULT,
-  GlutCursorNone = FL_CURSOR_NONE,
-  GlutCursorUpDown = FL_CURSOR_NS,
-  GlutCursorCrosshair = FL_CURSOR_CROSS
-};
-#endif
 enum Cursor {
  CursorDefault = FL_CURSOR_DEFAULT,
  CursorArrow   = FL_CURSOR_ARROW,
@@ -656,31 +525,6 @@
 kb_KpLast = Kb_F
 {#enum Damage {} deriving (Show) #}
 {#enum Cursor {} deriving (Show) #}
-#ifdef GLSUPPORT
--- | Only available if the 'opengl' flag is set (stack build --flag fltkhs:opengl).
-{#enum GlutDraw {} deriving (Show) #}
--- | Only available if the 'opengl' flag is set (stack build --flag fltkhs:opengl).
-{#enum GlutMouseCodes {} deriving (Show) #}
--- | Only available if the 'opengl' flag is set (stack build --flag fltkhs:opengl).
-{#enum GlutUpDown {} deriving (Show) #}
--- | Only available if the 'opengl' flag is set (stack build --flag fltkhs:opengl).
-{#enum GlutVisibility {} deriving (Show) #}
--- | Only available if the 'opengl' flag is set (stack build --flag fltkhs:opengl).
-{#enum GlutMenuProperties {} deriving (Show) #}
--- | Only available if the 'opengl' flag is set (stack build --flag fltkhs:opengl).
-{#enum GlutEnteredLeft {} deriving (Show) #}
--- | Only available if the 'opengl' flag is set (stack build --flag fltkhs:opengl).
-{#enum GlutKeyboardCodes {} deriving (Show) #}
--- | Only available if the 'opengl' flag is set (stack build --flag fltkhs:opengl).
-{#enum GlutConstants {} deriving (Show) #}
--- | Only available if the 'opengl' flag is set (stack build --flag fltkhs:opengl).
-{#enum GlutWindowProperties {} deriving (Show) #}
--- | Only available if the 'opengl' flag is set (stack build --flag fltkhs:opengl).
-{#enum GlutCursor {} deriving (Show) #}
--- | Only available if the 'opengl' flag is set (stack build --flag fltkhs:opengl).
-glutCursorFullCrossHair :: GlutCursor
-glutCursorFullCrossHair = GlutCursorCrosshair
-#endif /* GLSUPPORT */
 {#enum Mode   {} deriving (Show,Eq,Ord) #}
 -- Fl_Mode Aliases
 single :: Mode
diff --git a/src/Graphics/UI/FLTK/LowLevel/Fl_Types.chs b/src/Graphics/UI/FLTK/LowLevel/Fl_Types.chs
--- a/src/Graphics/UI/FLTK/LowLevel/Fl_Types.chs
+++ b/src/Graphics/UI/FLTK/LowLevel/Fl_Types.chs
@@ -249,17 +249,6 @@
 data StyleTableEntry = StyleTableEntry (Maybe Color) (Maybe Font) (Maybe FontSize) deriving Show
 
 {#enum PackType{} deriving (Show, Eq, Ord) #}
-#ifdef GLSUPPORT
-data GLUTproc = GLUTproc {#type GLUTproc#} deriving Show
-newtype GLUTIdleFunction = GLUTIdleFunction (FunPtr (IO ()))
-newtype GLUTMenuStateFunction = GLUTMenuStateFunction (FunPtr (CInt -> IO()))
-newtype GLUTMenuStatusFunction = GLUTMenuStatusFunction
-                                     (FunPtr (CInt -> CInt -> CInt -> IO ()))
-{#pointer *Fl_Glut_Bitmap_Font as GlutBitmapFontPtr newtype #}
-{#pointer *Fl_Glut_StrokeVertex as GlutStrokeVertexPtr newtype#}
-{#pointer *Fl_Glut_StrokeStrip as GlutStrokeStripPtr newtype#}
-{#pointer *Fl_Glut_StrokeFont as GlutStrokeFontPtr newtype#}
-#endif
 type FlShortcut = {#type Fl_Shortcut #}
 type FlColor    = {#type Fl_Color #}
 type FlFont     = {#type Fl_Font #}
diff --git a/src/Graphics/UI/FLTK/LowLevel/Glut.chs b/src/Graphics/UI/FLTK/LowLevel/Glut.chs
new file mode 100644
--- /dev/null
+++ b/src/Graphics/UI/FLTK/LowLevel/Glut.chs
@@ -0,0 +1,573 @@
+{-# LANGUAGE CPP, FlexibleContexts #-}
+{-# OPTIONS_GHC -fno-warn-name-shadowing #-}
+module Graphics.UI.FLTK.LowLevel.Glut
+  (
+   -- * Glut attributes
+   GlutDraw(..),
+   GlutMouseCodes(..),
+   GlutUpDown(..),
+   GlutVisibility(..),
+   GlutMenuState(..),
+   GlutMenuItems(..),
+   GlutEnteredLeft(..),
+   GlutKeyboardCodes(..),
+   GlutConstants(..),
+   GlutWindowProperties(..),
+   GlutCursor(..),
+   GlutDisplayMode(..),
+   GlutWindow(..),
+   GlutMenu(..),
+   glutInitDisplayMode ,
+   glutInitWindowPosition,
+   glutInitWindowSize,
+   glutCursorFullCrossHair,
+   glutMainLoop,
+   glutCreateWindow,
+   glutCreateSubWindow,
+   glutDestroyWindow,
+   glutPostRedisplay,
+   glutPostWindowRedisplay,
+   glutSwapBuffers,
+   glutGetWindow,
+   glutSetWindow,
+   glutSetWindowTitle,
+   glutSetIconTitle,
+   glutPositionWindow,
+   glutReshapeWindow,
+   glutPopWindow,
+   glutPushWindow,
+   glutIconifyWindow,
+   glutShowWindow,
+   glutHideWindow,
+   glutFullScreen,
+   glutSetCursor,
+   glutWarpPointer,
+   glutEstablishOverlay,
+   glutRemoveOverlay,
+   glutUseLayer,
+   glutPostOverlayRedisplay,
+   glutShowOverlay,
+   glutHideOverlay,
+   glutCreateMenu,
+   glutDestroyMenu,
+   glutGetMenu,
+   glutSetMenu,
+   glutAddMenuEntry,
+   glutAddSubMenu,
+   glutChangeToMenuEntry,
+   glutChangeToSubMenu,
+   glutRemoveMenuItem,
+   glutAttachMenu,
+   glutDetachMenu,
+   glutDisplayFunc,
+   glutReshapeFunc,
+   glutKeyboardFunc,
+   glutMouseFunc,
+   glutMotionFunc,
+   glutPassiveMotionFunc,
+   glutEntryFunc,
+   glutVisibilityFunc,
+   glutIdleFunc,
+   glutTimerFunc,
+   glutMenuStateFunc,
+   glutMenuStatusFunc,
+   glutSpecialFunc,
+   glutOverlayDisplayFunc,
+   glutGetWindowRectangle,
+   glutGetWindowParent,
+   glutGetScreenSize,
+   glutGetMenuNumItems,
+   glutDisplayModePossible,
+   glutWindowBufferSize,
+   glutVersion,
+   glutOther,
+   glutGetModifiers,
+   glutHasKeyboard,
+   glutHasMouse,
+   glutNumMouseButtons,
+   glutOverlayPossible,
+   glutTransparencyIndex,
+   glutNormalDamaged,
+   glutOverlayDamaged,
+   -- glutGetProcAddress,
+   -- glutBitmapCharacter,
+   -- glutBitmapHeight,
+   -- glutBitmapLength,
+   -- glutBitmapString,
+   -- glutBitmapWidth,
+   -- glutExtensionSupported,
+   -- glutStrokeCharacter,
+   -- glutStrokeHeight,
+   -- glutStrokeLength,
+   -- glutStrokeString,
+   -- glutStrokeWidth,
+   glutWireSphere,
+   glutSolidSphere,
+   glutWireCone,
+   glutSolidCone,
+   glutWireCube,
+   glutSolidCube,
+   glutWireTorus,
+   glutSolidTorus,
+   glutWireDodecahedron,
+   glutSolidDodecahedron,
+   glutWireTeapot,
+   glutSolidTeapot,
+   glutWireOctahedron,
+   glutSolidOctahedron,
+   glutWireTetrahedron,
+   glutSolidTetrahedron,
+   glutWireIcosahedron,
+   glutSolidIcosahedron
+  )
+where
+#include "Fl_C.h"
+#include "glutC.h"
+import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum)
+import Graphics.UI.FLTK.LowLevel.FL
+import Graphics.UI.FLTK.LowLevel.Fl_Types
+import qualified Data.Text as T
+import Graphics.UI.FLTK.LowLevel.Utils
+import Graphics.UI.FLTK.LowLevel.Fl_Enumerations
+
+#c
+enum GlutDraw {
+ GlutNormal = GLUT_NORMAL,
+ GlutOverlay = GLUT_OVERLAY
+};
+enum GlutMouseCodes {
+ GlutLeftButton = GLUT_LEFT_BUTTON,
+ GlutRightButton = GLUT_RIGHT_BUTTON,
+ GlutMiddleButton = GLUT_MIDDLE_BUTTON
+};
+enum GlutUpDown {
+ GlutUp = GLUT_UP,
+ GlutDown = GLUT_DOWN
+};
+enum GlutVisibility {
+ GlutVisible = GLUT_VISIBLE,
+ GlutNotVisible = GLUT_NOT_VISIBLE
+};
+enum GlutMenuState {
+ GlutMenuNotInUse = GLUT_MENU_NOT_IN_USE,
+ GlutMenuInUse = GLUT_MENU_IN_USE,
+};
+enum GlutMenuItems {
+ GlutMenuNumItems = GLUT_MENU_NUM_ITEMS
+};
+enum GlutEnteredLeft {
+ GlutEntered = GLUT_ENTERED,
+ GlutLeft = GLUT_LEFT
+};
+enum GlutKeyboardCodes {
+ GlutKeyF1 =  GLUT_KEY_F1,
+ GlutKeyF2 =  GLUT_KEY_F2,
+ GlutKeyF3 =  GLUT_KEY_F3,
+ GlutKeyF4 =  GLUT_KEY_F4,
+ GlutKeyF5 =  GLUT_KEY_F5,
+ GlutKeyF6 =  GLUT_KEY_F6,
+ GlutKeyF7 =  GLUT_KEY_F7,
+ GlutKeyF8 =  GLUT_KEY_F8,
+ GlutKeyF9 =  GLUT_KEY_F9,
+ GlutKeyF10 =  GLUT_KEY_F10,
+ GlutKeyF11 =  GLUT_KEY_F11,
+ GlutKeyF12 =  GLUT_KEY_F12,
+ GlutKeyLeft =  GLUT_KEY_LEFT,
+ GlutKeyUp =  GLUT_KEY_UP,
+ GlutKeyRight =  GLUT_KEY_RIGHT,
+ GlutKeyDown =  GLUT_KEY_DOWN,
+ GlutKeyPageUp =  GLUT_KEY_PAGE_UP,
+ GlutKeyPageDown =  GLUT_KEY_PAGE_DOWN,
+ GlutKeyHome =  GLUT_KEY_HOME,
+ GlutKeyEnd =  GLUT_KEY_END,
+ GlutKeyInsert =  GLUT_KEY_INSERT,
+ GlutActiveShift =  GLUT_ACTIVE_SHIFT,
+ GlutActiveCtrl  =  GLUT_ACTIVE_CTRL,
+ GlutActiveAlt   =  GLUT_ACTIVE_ALT
+};
+enum GlutConstants {
+ GlutReturnZero =  GLUT_RETURN_ZERO,
+ GlutDisplayModePossible =  GLUT_DISPLAY_MODE_POSSIBLE,
+ GlutVersion =  GLUT_VERSION,
+ GlutOverlayPossible =  GLUT_OVERLAY_POSSIBLE,
+ GlutTransparentIndex =  GLUT_TRANSPARENT_INDEX,
+ GlutNormalDamaged =  GLUT_NORMAL_DAMAGED,
+ GlutOverlayDamaged =  GLUT_OVERLAY_DAMAGED
+};
+
+enum GlutWindowProperties {
+ GlutWindowX =  GLUT_WINDOW_X,
+ GlutWindowY =  GLUT_WINDOW_Y,
+ GlutWindowWidth =  GLUT_WINDOW_WIDTH,
+ GlutWindowHeight =  GLUT_WINDOW_HEIGHT,
+ GlutWindowParent =  GLUT_WINDOW_PARENT,
+ GlutScreenWidth =  GLUT_SCREEN_WIDTH,
+ GlutScreenHeight =  GLUT_SCREEN_HEIGHT,
+ GlutInitWindowX =  GLUT_INIT_WINDOW_X,
+ GlutInitWindowY =  GLUT_INIT_WINDOW_Y,
+ GlutInitWindowWidth =  GLUT_INIT_WINDOW_WIDTH,
+ GlutInitWindowHeight =  GLUT_INIT_WINDOW_HEIGHT,
+ GlutInitDisplayMode =  GLUT_INIT_DISPLAY_MODE,
+ GlutWindowBufferSize =  GLUT_WINDOW_BUFFER_SIZE,
+ GlutWindowStencilSize =  GLUT_WINDOW_STENCIL_SIZE,
+ GlutWindowDepthSize =  GLUT_WINDOW_DEPTH_SIZE,
+ GlutWindowRedSize =  GLUT_WINDOW_RED_SIZE,
+ GlutWindowGreenSize =  GLUT_WINDOW_GREEN_SIZE,
+ GlutWindowBlueSize =  GLUT_WINDOW_BLUE_SIZE,
+ GlutWindowAlphaSize =  GLUT_WINDOW_ALPHA_SIZE,
+ GlutWindowAccumRedSize =  GLUT_WINDOW_ACCUM_RED_SIZE,
+ GlutWindowAccumGreenSize =  GLUT_WINDOW_ACCUM_GREEN_SIZE,
+ GlutWindowAccumBlueSize =  GLUT_WINDOW_ACCUM_BLUE_SIZE,
+ GlutWindowAccumAlphaSize =  GLUT_WINDOW_ACCUM_ALPHA_SIZE,
+ GlutWindowDoublebuffer =  GLUT_WINDOW_DOUBLEBUFFER,
+ GlutWindowRgba =  GLUT_WINDOW_RGBA,
+ GlutWindowColormapSize =  GLUT_WINDOW_COLORMAP_SIZE,
+ GlutWindowNumSamples =  GLUT_WINDOW_NUM_SAMPLES,
+ GlutWindowStereo =  GLUT_WINDOW_STEREO,
+};
+
+enum GlutPeripheralProperties {
+ GlutPeripheralHasKeyboard = GLUT_HAS_KEYBOARD,
+ GlutPeripheralHasMouse = GLUT_HAS_MOUSE,
+ GlutPeripheralHasSpaceball = GLUT_HAS_SPACEBALL,
+ GlutPeripheralHasDialAndButtonBox = GLUT_HAS_DIAL_AND_BUTTON_BOX,
+ GlutPeripheralHasTablet = GLUT_HAS_TABLET,
+ GlutPeripheralNumMouseButtons = GLUT_NUM_MOUSE_BUTTONS,
+ GlutPeripheralNumSpaceballButtons = GLUT_NUM_SPACEBALL_BUTTONS,
+ GlutPeripheralNumButtonBoxButtons = GLUT_NUM_BUTTON_BOX_BUTTONS,
+ GlutPeripheralNumDials = GLUT_NUM_DIALS,
+ GlutPeripheralNumTabletButtons = GLUT_NUM_TABLET_BUTTONS
+};
+
+enum GlutDisplayMode {
+ GlutDisplayModeRgb = GLUT_RGB,
+ GlutDisplayModeRgba = GLUT_RGBA,
+ GlutDisplayModeIndex = GLUT_INDEX,
+ GlutDisplayModeSingle = GLUT_SINGLE,
+ GlutDisplayModeDouble = GLUT_DOUBLE,
+ GlutDisplayModeAccum = GLUT_ACCUM,
+ GlutDisplayModeAlpha = GLUT_ALPHA,
+ GlutDisplayModeDepth = GLUT_DEPTH,
+ GlutDisplayModeStencil = GLUT_STENCIL,
+ GlutDisplayModeMultisample = GLUT_MULTISAMPLE,
+ GlutDisplayModeStereo = GLUT_STEREO
+};
+
+enum GlutCursor {
+  GlutCursorRightArrow = 2,
+  GlutCursorLeftArrow = 67,
+  GlutCursorDestroy = 45,
+  GlutCursorCycle = 26,
+  GlutCursorSpray = 63,
+  GlutCursorInfo = FL_CURSOR_HAND,
+  GlutCursorHelp = FL_CURSOR_HELP,
+  GlutCursorWait = FL_CURSOR_WAIT,
+  GlutCursorText = FL_CURSOR_INSERT,
+  GlutCursorLeftRight = FL_CURSOR_WE,
+  GlutCursorTopSide = FL_CURSOR_N,
+  GlutCursorBottomSide = FL_CURSOR_S,
+  GlutCursorLeftSide = FL_CURSOR_W,
+  GlutCursorRightSide = FL_CURSOR_E,
+  GlutCursorTopLeftCorner = FL_CURSOR_NW,
+  GlutCursorTopRightCorner = FL_CURSOR_NE,
+  GlutCursorBottomRightCorner = FL_CURSOR_SE,
+  GlutCursorBottomLeftCorner = FL_CURSOR_SW,
+  GlutCursorInherit = FL_CURSOR_DEFAULT,
+  GlutCursorNone = FL_CURSOR_NONE,
+  GlutCursorUpDown = FL_CURSOR_NS,
+  GlutCursorCrosshair = FL_CURSOR_CROSS
+};
+#endc
+
+{#enum GlutDraw {} deriving (Show) #}
+{#enum GlutMouseCodes {} deriving (Show) #}
+{#enum GlutUpDown {} deriving (Show) #}
+{#enum GlutVisibility {} deriving (Show) #}
+{#enum GlutMenuState {} deriving (Show) #}
+{#enum GlutMenuItems {} deriving (Show) #}
+{#enum GlutEnteredLeft {} deriving (Show) #}
+{#enum GlutKeyboardCodes {} deriving (Show) #}
+{#enum GlutConstants {} deriving (Show) #}
+{#enum GlutWindowProperties {} deriving (Show) #}
+{#enum GlutDisplayMode {} deriving (Show) #}
+{#enum GlutCursor {} deriving (Show) #}
+{#enum GlutPeripheralProperties {} deriving (Show) #}
+
+type GlutCreateMenuPrim = CInt -> IO ()
+type GlutSizePrim = CInt -> CInt -> IO ()
+type GlutPositionPrim = CInt -> CInt -> IO ()
+type GlutKeyboardPrim = CUChar -> CInt -> CInt -> IO ()
+type GlutMousePrim = CInt -> CInt -> CInt -> CInt -> IO ()
+type GlutEntryPrim = CInt -> IO ()
+type GlutVisibilityPrim = CInt -> IO ()
+type GlutTimerPrim = CInt -> IO ()
+type GlutMenuStatePrim = CInt -> IO ()
+type GlutMenuStatusPrim = CInt -> CInt -> CInt -> IO ()
+type GlutSpecialPrim = CInt -> CInt -> CInt -> IO ()
+
+data GlutWindow = GlutWindow { windowNumber :: CInt } deriving (Eq, Show)
+data GlutMenu = GlutMenu { menuNumber :: CInt } deriving (Eq, Show)
+
+glutCursorFullCrossHair :: GlutCursor
+glutCursorFullCrossHair = GlutCursorCrosshair
+data GLUTproc = GLUTproc {#type GLUTproc#} deriving Show
+
+foreign import ccall "wrapper"
+        mkGlutCreateMenuPtr :: GlutCreateMenuPrim -> IO (FunPtr GlutCreateMenuPrim)
+
+foreign import ccall "wrapper"
+        mkGlutSizeFPrim:: GlutSizePrim -> IO (FunPtr GlutSizePrim)
+
+foreign import ccall "wrapper"
+        mkGlutPositionFPrim:: GlutPositionPrim -> IO (FunPtr GlutPositionPrim)
+
+foreign import ccall "wrapper"
+        mkGlutKeyboardFPrim:: GlutKeyboardPrim -> IO (FunPtr GlutKeyboardPrim)
+
+foreign import ccall "wrapper"
+        mkGlutMousePrim:: GlutMousePrim -> IO (FunPtr GlutMousePrim)
+
+foreign import ccall "wrapper"
+        mkGlutEntryPrim:: GlutEntryPrim -> IO (FunPtr GlutEntryPrim)
+
+foreign import ccall "wrapper"
+        mkGlutVisibilityPrim:: GlutVisibilityPrim -> IO (FunPtr GlutVisibilityPrim)
+
+foreign import ccall "wrapper"
+        mkGlutTimerPtr :: GlutTimerPrim -> IO (FunPtr GlutTimerPrim)
+
+foreign import ccall "wrapper"
+        mkGlutMenuStatePrim:: GlutMenuStatePrim -> IO (FunPtr GlutMenuStatePrim)
+
+foreign import ccall "wrapper"
+        mkGlutMenuStatusPrim:: GlutMenuStatusPrim -> IO (FunPtr GlutMenuStatusPrim)
+
+foreign import ccall "wrapper"
+        mkGlutSpecialPrim:: GlutMenuStatusPrim -> IO (FunPtr GlutMenuStatusPrim)
+
+toGlutCreateMenuPrim :: (IO ()) -> IO (FunPtr GlutCreateMenuPrim)
+toGlutCreateMenuPrim f = mkGlutCreateMenuPtr (\_ -> f)
+
+toGlutSizePrim :: (Size -> IO ()) -> IO (FunPtr GlutSizePrim)
+toGlutSizePrim sizeF = mkGlutSizeFPrim (\w' h' ->
+                                           let s = Size (Width (fromIntegral w')) (Height (fromIntegral h'))
+                                           in sizeF s
+                                        )
+
+toGlutPositionPrim :: (Position -> IO ()) -> IO (FunPtr GlutPositionPrim)
+toGlutPositionPrim positionF = mkGlutPositionFPrim (\x' y' ->
+                                               let p = Position (X (fromIntegral x')) (Y (fromIntegral y'))
+                                               in positionF p
+                                            )
+
+toGlutKeyboardPrim :: (Char -> Position -> IO ()) -> IO (FunPtr GlutKeyboardPrim)
+toGlutKeyboardPrim keyboardF = mkGlutKeyboardFPrim (\k' x' y' ->
+                                                      let p = Position (X (fromIntegral x')) (Y (fromIntegral y'))
+                                                      in
+                                                      keyboardF (castCUCharToChar k') p
+                                                   )
+
+toGlutMousePrim :: (MouseButton -> GlutUpDown -> Position -> IO ()) -> IO (FunPtr GlutMousePrim)
+toGlutMousePrim mouseF = mkGlutMousePrim (\mb' downup x' y' ->
+                                             let p = Position (X (fromIntegral x')) (Y (fromIntegral y'))
+                                             in mouseF (cToEnum mb') (cToEnum downup) p
+                                         )
+
+toGlutEntryPrim :: (GlutEnteredLeft -> IO ()) -> IO (FunPtr GlutEntryPrim)
+toGlutEntryPrim f = mkGlutEntryPrim (\entry' -> f (toEnum (fromIntegral entry')))
+
+toGlutVisibilityPrim :: (GlutVisibility -> IO ()) -> IO (FunPtr GlutVisibilityPrim)
+toGlutVisibilityPrim f = mkGlutVisibilityPrim (\entry' -> f (toEnum (fromIntegral entry')))
+
+toGlutTimerPrim :: (IO ()) -> IO (FunPtr GlutTimerPrim)
+toGlutTimerPrim f = mkGlutTimerPtr (\_ -> f)
+
+toGlutMenuStatePrim :: (GlutMenuState -> IO ()) -> IO (FunPtr GlutMenuStatePrim)
+toGlutMenuStatePrim f = mkGlutMenuStatePrim (\ms' -> f (toEnum (fromIntegral ms')))
+
+toGlutMenuStatusPrim :: (GlutMenuState -> Position -> IO ()) -> IO (FunPtr GlutMenuStatusPrim)
+toGlutMenuStatusPrim f = mkGlutMenuStatusPrim (\ms' x' y' ->
+                                                let p = Position (X (fromIntegral x')) (Y (fromIntegral y'))
+                                                in f (toEnum (fromIntegral ms')) p
+                                            )
+toGlutSpecialPrim :: (GlutKeyboardCodes -> Position -> IO ()) -> IO (FunPtr GlutSpecialPrim)
+toGlutSpecialPrim f = mkGlutSpecialPrim (\k' x' y' ->
+                                            let p = Position (X (fromIntegral x')) (Y (fromIntegral y'))
+                                            in f (toEnum (fromIntegral k')) p
+                                        )
+{# fun flc_glutInitDisplayMode as glutInitDisplayMode {cFromEnum `GlutDisplayMode' } -> `()' #}
+{# fun flc_glutInitWindowPosition as glutInitWindowPosition' {`CInt', `CInt'} -> `()' #}
+glutInitWindowPosition :: Position -> IO ()
+glutInitWindowPosition (Position (X x) (Y y)) = glutInitWindowPosition' (fromIntegral x) (fromIntegral y)
+{# fun flc_glutInitWindowSize as glutInitWindowSize' {`CInt', `CInt'} -> `()' #}
+glutInitWindowSize :: Size -> IO ()
+glutInitWindowSize (Size (Width w) (Height h)) = glutInitWindowSize' (fromIntegral w) (fromIntegral h)
+{# fun flc_glutMainLoop as glutMainLoop { } -> `()' #}
+{# fun flc_glutCreateWindow as glutCreateWindow {unsafeToCString `T.Text'} -> `GlutWindow' GlutWindow #}
+{# fun flc_glutCreateSubWindow as glutCreateSubWindow' {windowNumber `GlutWindow',`Int',`Int',`Int',`Int'} -> `GlutWindow' GlutWindow #}
+glutCreateSubWindow :: GlutWindow -> Rectangle -> IO GlutWindow
+glutCreateSubWindow glutWindow (Rectangle (Position (X x) (Y y)) (Size (Width w) (Height h))) =
+  glutCreateSubWindow' glutWindow x y w h
+{# fun flc_glutDestroyWindow as glutDestroyWindow {windowNumber `GlutWindow' } -> `()' #}
+{# fun flc_glutPostRedisplay as glutPostRedisplay { } -> `()' #}
+{# fun flc_glutPostWindowRedisplay as glutPostWindowRedisplay {windowNumber `GlutWindow' } -> `()' #}
+{# fun flc_glutSwapBuffers as glutSwapBuffers { } -> `()' #}
+{# fun flc_glutGetWindow as glutGetWindow { } -> `GlutWindow' GlutWindow #}
+{# fun flc_glutSetWindow as glutSetWindow {windowNumber `GlutWindow' } -> `()' #}
+{# fun flc_glutSetWindowTitle as glutSetWindowTitle {unsafeToCString `T.Text' } -> `()' #}
+{# fun flc_glutSetIconTitle as glutSetIconTitle {unsafeToCString `T.Text' } -> `()' #}
+{# fun flc_glutPositionWindow as glutPositionWindow' {`Int', `Int' } -> `()' #}
+glutPositionWindow :: Position -> IO ()
+glutPositionWindow (Position (X x) (Y y)) = glutPositionWindow' x y
+{# fun flc_glutReshapeWindow as glutReshapeWindow' {`Int', `Int' } -> `()' #}
+glutReshapeWindow :: Size -> IO ()
+glutReshapeWindow (Size (Width w) (Height h)) = glutReshapeWindow' w h
+{# fun flc_glutPopWindow as glutPopWindow { } -> `()' #}
+{# fun flc_glutPushWindow as glutPushWindow { } -> `()' #}
+{# fun flc_glutIconifyWindow as glutIconifyWindow { } -> `()' #}
+{# fun flc_glutShowWindow as glutShowWindow { } -> `()' #}
+{# fun flc_glutHideWindow as glutHideWindow { } -> `()' #}
+{# fun flc_glutFullScreen as glutFullScreen { } -> `()' #}
+{# fun flc_glutSetCursor as glutSetCursor {cFromEnum `GlutCursor'} -> `()' #}
+{# fun flc_glutWarpPointer as glutWarpPointer' {`Int', `Int'} -> `()' #}
+glutWarpPointer :: Position -> IO ()
+glutWarpPointer (Position (X x) (Y y)) = glutWarpPointer' x y
+{# fun flc_glutEstablishOverlay as glutEstablishOverlay { } -> `()' #}
+{# fun flc_glutRemoveOverlay as glutRemoveOverlay { } -> `()' #}
+{# fun flc_glutUseLayer as glutUseLayer {`Word32'} -> `()' #}
+{# fun flc_glutPostOverlayRedisplay as glutPostOverlayRedisplay { } -> `()' #}
+{# fun flc_glutShowOverlay as glutShowOverlay { } -> `()' #}
+{# fun flc_glutHideOverlay as glutHideOverlay { } -> `()' #}
+{# fun flc_glutCreateMenu as glutCreateMenu' {id `FunPtr GlutCreateMenuPrim'} -> `()' #}
+glutCreateMenu :: IO () -> IO ()
+glutCreateMenu f = (toGlutCreateMenuPrim f) >>= glutCreateMenu'
+{# fun flc_glutDestroyMenu as glutDestroyMenu {menuNumber `GlutMenu'} -> `()' #}
+{# fun flc_glutGetMenu as glutGetMenu { } -> `GlutMenu' GlutMenu #}
+{# fun flc_glutSetMenu as glutSetMenu {menuNumber `GlutMenu'} -> `()' #}
+{# fun flc_glutAddMenuEntry as glutAddMenuEntry' {unsafeToCString `T.Text', `Int' } -> `()' #}
+glutAddMenuEntry :: T.Text -> IO ()
+glutAddMenuEntry l = glutAddMenuEntry' l 0
+{# fun flc_glutAddSubMenu as glutAddSubMenu {unsafeToCString `T.Text', menuNumber `GlutMenu' } -> `()' #}
+{# fun flc_glutChangeToMenuEntry as glutChangeToMenuEntry' {`Int', unsafeToCString `T.Text', `Int'} -> `()' #}
+glutChangeToMenuEntry :: Int -> T.Text -> IO ()
+glutChangeToMenuEntry index label = glutChangeToMenuEntry' index label 0
+{# fun flc_glutChangeToSubMenu as glutChangeToSubMenu {`Int', unsafeToCString `T.Text', menuNumber `GlutMenu' } -> `()' #}
+{# fun flc_glutRemoveMenuItem as glutRemoveMenuItem {`Int' } -> `()' #}
+{# fun flc_glutAttachMenu as glutAttachMenu {menuNumber `GlutMenu'} -> `()' #}
+{# fun flc_glutDetachMenu as glutDetachMenu {menuNumber `GlutMenu'} -> `()' #}
+{# fun flc_glutDisplayFunc as glutDisplayFunc' {id `FunPtr GlobalCallback' } -> `()' #}
+glutDisplayFunc :: (IO ()) -> IO ()
+glutDisplayFunc f = (mkGlobalCallbackPtr f) >>= glutDisplayFunc'
+{# fun flc_glutReshapeFunc as glutReshapeFunc' {id `FunPtr GlutSizePrim' } -> `()' #}
+glutReshapeFunc :: (Size -> IO ()) -> IO ()
+glutReshapeFunc f = toGlutSizePrim f >>= glutReshapeFunc'
+{# fun flc_glutKeyboardFunc as glutKeyboardFunc' {id `FunPtr GlutKeyboardPrim' } -> `()' #}
+glutKeyboardFunc :: (Char -> Position -> IO ()) -> IO ()
+glutKeyboardFunc f = toGlutKeyboardPrim f >>= glutKeyboardFunc'
+{# fun flc_glutMouseFunc as glutMouseFunc' {id `FunPtr GlutMousePrim' } -> `()' #}
+glutMouseFunc :: (MouseButton -> GlutUpDown -> Position -> IO ()) -> IO ()
+glutMouseFunc f = toGlutMousePrim f >>= glutMouseFunc'
+{# fun flc_glutMotionFunc as glutMotionFunc' {id `FunPtr GlutPositionPrim' } -> `()' #}
+glutMotionFunc :: (Position -> IO ()) -> IO ()
+glutMotionFunc f = toGlutPositionPrim f >>= glutMotionFunc'
+{# fun flc_glutPassiveMotionFunc as glutPassiveMotionFunc' {id `FunPtr GlutPositionPrim' } -> `()' #}
+glutPassiveMotionFunc :: (Position -> IO ()) -> IO ()
+glutPassiveMotionFunc f = toGlutPositionPrim f >>= glutPassiveMotionFunc'
+{# fun flc_glutEntryFunc as glutEntryFunc' { id `FunPtr GlutEntryPrim' } -> `()' #}
+glutEntryFunc :: (GlutEnteredLeft -> IO ()) -> IO ()
+glutEntryFunc f = toGlutEntryPrim f >>= glutEntryFunc'
+{# fun flc_glutVisibilityFunc as glutVisibilityFunc' { id `FunPtr GlutVisibilityPrim' } -> `()' #}
+glutVisibilityFunc :: (GlutVisibility -> IO ()) -> IO ()
+glutVisibilityFunc f = toGlutVisibilityPrim f >>= glutVisibilityFunc'
+{# fun flc_glutIdleFunc as glutIdleFunc' { id `FunPtr GlobalCallback' } -> `()' #}
+glutIdleFunc :: (IO ()) -> IO ()
+glutIdleFunc f = (mkGlobalCallbackPtr f) >>= glutIdleFunc'
+{# fun flc_glutTimerFunc as glutTimerFunc' { `Int', id `FunPtr GlutTimerPrim', `Int'} -> `()' #}
+glutTimerFunc :: Int -> (IO ()) -> IO ()
+glutTimerFunc timeout' f = (toGlutTimerPrim f) >>= \f' -> glutTimerFunc' timeout' f' 0
+{# fun flc_glutMenuStateFunc as glutMenuStateFunc' {id `FunPtr GlutMenuStatePrim' } -> `()' #}
+glutMenuStateFunc :: (GlutMenuState -> IO()) -> IO ()
+glutMenuStateFunc f = toGlutMenuStatePrim f >>= glutMenuStateFunc'
+{# fun flc_glutMenuStatusFunc as glutMenuStatusFunc' {id `FunPtr GlutMenuStatusPrim' } -> `()' #}
+glutMenuStatusFunc :: (GlutMenuState -> Position -> IO ()) -> IO ()
+glutMenuStatusFunc f = toGlutMenuStatusPrim f >>= glutMenuStatusFunc'
+{# fun flc_glutSpecialFunc as glutSpecialFunc' { id `FunPtr GlutSpecialPrim' } -> `()' #}
+glutSpecialFunc :: (GlutKeyboardCodes -> Position -> IO ()) -> IO ()
+glutSpecialFunc f = toGlutSpecialPrim f >>= glutSpecialFunc'
+{# fun flc_glutOverlayDisplayFunc as glutOverlayDisplayFunc' { id `FunPtr GlobalCallback' } -> `()' #}
+glutOverlayDisplayFunc :: (IO ()) -> IO ()
+glutOverlayDisplayFunc f = mkGlobalCallbackPtr f >>= glutOverlayDisplayFunc'
+{# fun flc_glutGet as glutGet' {`Word32' } -> `Int' #}
+glutGetWindowRectangle :: IO Rectangle
+glutGetWindowRectangle = do
+  x <- glutGet' (fromIntegral (fromEnum GlutWindowX))
+  y <- glutGet' (fromIntegral (fromEnum GlutWindowY))
+  w <- glutGet' (fromIntegral (fromEnum GlutWindowWidth))
+  h <- glutGet' (fromIntegral (fromEnum GlutWindowHeight))
+  return (toRectangle (x,y,w,h))
+glutGetWindowParent :: IO (Maybe GlutWindow)
+glutGetWindowParent = do
+  n <- glutGet' (fromIntegral (fromEnum GlutWindowParent))
+  return (if (n == 0) then Nothing else (Just (GlutWindow (fromIntegral n))))
+glutGetScreenSize :: IO Size
+glutGetScreenSize = do
+  w <- glutGet' (fromIntegral (fromEnum GlutScreenWidth))
+  h <- glutGet' (fromIntegral (fromEnum GlutScreenHeight))
+  return (toSize (w,h))
+glutGetMenuNumItems :: IO Int
+glutGetMenuNumItems = glutGet' (fromIntegral (fromEnum GlutMenuNumItems))
+glutDisplayModePossible :: IO Bool
+glutDisplayModePossible = glutGet' (fromIntegral (fromEnum GlutDisplayModePossible)) >>= return . cToBool
+glutWindowBufferSize :: IO Int
+glutWindowBufferSize = glutGet' (fromIntegral (fromEnum GlutWindowBufferSize))
+glutVersion :: IO Int
+glutVersion = glutGet' (fromIntegral (fromEnum GlutVersion))
+glutOther :: Word32 -> IO Int
+glutOther constant = glutGet' (fromIntegral constant)
+{# fun flc_glutLayerGet as glutLayerGet' {`Word32'} -> `Int' #}
+glutOverlayPossible :: IO Bool
+glutOverlayPossible = glutLayerGet' (fromIntegral (fromEnum GlutOverlayPossible)) >>= return . cToBool
+glutTransparencyIndex :: IO Int
+glutTransparencyIndex = glutLayerGet' (fromIntegral (fromEnum GlutTransparentIndex))
+glutNormalDamaged :: IO Bool
+glutNormalDamaged = glutLayerGet' (fromIntegral (fromEnum GlutNormalDamaged)) >>= return . cToBool
+glutOverlayDamaged :: IO Bool
+glutOverlayDamaged = glutLayerGet' (fromIntegral (fromEnum GlutOverlayDamaged)) >>= return . cToBool
+{# fun flc_glutDeviceGet as glutDeviceGet' {`Word32'} -> `Int' #}
+glutHasKeyboard :: IO Bool
+glutHasKeyboard = glutDeviceGet' (fromIntegral (fromEnum GlutPeripheralHasKeyboard)) >>= return . cToBool
+glutHasMouse :: IO Bool
+glutHasMouse = glutDeviceGet' (fromIntegral (fromEnum GlutPeripheralHasMouse)) >>= return . cToBool
+glutNumMouseButtons :: IO Int
+glutNumMouseButtons = glutDeviceGet' (fromIntegral (fromEnum GlutPeripheralNumMouseButtons))
+{# fun flc_glutGetModifiers as glutGetModifiers { } -> `[EventState]' extractEventStates #}
+-- {# fun flc_glutGetProcAddress as glutGetProcAddress {const char* procName } -> `GLUTproc' #}
+-- {# fun flc_glutBitmapCharacter as glutBitmapCharacter {void* font, int character } -> `()' #}
+-- {# fun flc_glutBitmapHeight as glutBitmapHeight {void* font } -> `int' #}
+-- {# fun flc_glutBitmapLength as glutBitmapLength {void* font, const unsigned char* string } -> `int' #}
+-- {# fun flc_glutBitmapString as glutBitmapString {void* font, const unsigned char* string } -> `()' #}
+-- {# fun flc_glutBitmapWidth as glutBitmapWidth {void* font, int character } -> `int' #}
+-- {# fun flc_glutExtensionSupported as glutExtensionSupported {char* name } -> `int' #}
+-- {# fun flc_glutStrokeCharacter as glutStrokeCharacter {void* font, int character } -> `()' #}
+-- {# fun flc_glutStrokeHeight as glutStrokeHeight {void* font } -> `GLfloat' #}
+-- {# fun flc_glutStrokeLength as glutStrokeLength {void* font, const unsigned char* string } -> `int' #}
+-- {# fun flc_glutStrokeString as glutStrokeString {void* font, const unsigned char* string } -> `()' #}
+-- {# fun flc_glutStrokeWidth as glutStrokeWidth {void* font, int character } -> `int' #}
+{# fun flc_glutWireSphere as glutWireSphere {`Double', `Int32' , `Int32' } -> `()' #}
+{# fun flc_glutSolidSphere as glutSolidSphere {`Double', `Int32' , `Int32' } -> `()' #}
+{# fun flc_glutWireCone as glutWireCone {`Double', `Double', `Int32' , `Int32' } -> `()' #}
+{# fun flc_glutSolidCone as glutSolidCone {`Double', `Double', `Int32' , `Int32' } -> `()' #}
+{# fun flc_glutWireCube as glutWireCube {`Double'} -> `()' #}
+{# fun flc_glutSolidCube as glutSolidCube {`Double'} -> `()' #}
+{# fun flc_glutWireTorus as glutWireTorus {`Double', `Double', `Int32' , `Int32' } -> `()' #}
+{# fun flc_glutSolidTorus as glutSolidTorus {`Double', `Double', `Int32' , `Int32' } -> `()' #}
+{# fun flc_glutWireDodecahedron as glutWireDodecahedron { } -> `()' #}
+{# fun flc_glutSolidDodecahedron as glutSolidDodecahedron { } -> `()' #}
+{# fun flc_glutWireTeapot as glutWireTeapot {`Double'} -> `()' #}
+{# fun flc_glutSolidTeapot as glutSolidTeapot {`Double'} -> `()' #}
+{# fun flc_glutWireOctahedron as glutWireOctahedron { } -> `()' #}
+{# fun flc_glutSolidOctahedron as glutSolidOctahedron { } -> `()' #}
+{# fun flc_glutWireTetrahedron as glutWireTetrahedron { } -> `()' #}
+{# fun flc_glutSolidTetrahedron as glutSolidTetrahedron { } -> `()' #}
+{# fun flc_glutWireIcosahedron as glutWireIcosahedron { } -> `()' #}
+{# fun flc_glutSolidIcosahedron as glutSolidIcosahedron { } -> `()' #}
diff --git a/src/Graphics/UI/FLTK/LowLevel/Utils.hs b/src/Graphics/UI/FLTK/LowLevel/Utils.hs
--- a/src/Graphics/UI/FLTK/LowLevel/Utils.hs
+++ b/src/Graphics/UI/FLTK/LowLevel/Utils.hs
@@ -53,6 +53,8 @@
         mkTextPredeleteCb :: TextPredeleteCbPrim -> IO (FunPtr TextPredeleteCbPrim)
 foreign import ccall "wrapper"
         mkFDHandlerPrim :: FDHandlerPrim -> IO (FunPtr FDHandlerPrim)
+foreign import ccall "wrapper"
+        mkGlobalCallbackPtr:: GlobalCallback -> IO (FunPtr GlobalCallback)
 
 toCallbackPrim :: (Ref a -> IO ()) ->
                   IO (FunPtr (Ptr () -> IO ()))
diff --git a/src/Graphics/UI/FLTK/LowLevel/Window.chs b/src/Graphics/UI/FLTK/LowLevel/Window.chs
--- a/src/Graphics/UI/FLTK/LowLevel/Window.chs
+++ b/src/Graphics/UI/FLTK/LowLevel/Window.chs
@@ -36,8 +36,6 @@
 import Graphics.UI.FLTK.LowLevel.Hierarchy
 import Graphics.UI.FLTK.LowLevel.Widget
 
-import C2HS hiding (cFromEnum, toBool,cToEnum,cToBool)
-
 #c
  enum WindowType {
    SingleWindowType = FL_WINDOWC,
