diff --git a/FL/Fl_Device.H b/FL/Fl_Device.H
index 975c99aa2..38a7f9500 100644
--- a/FL/Fl_Device.H
+++ b/FL/Fl_Device.H
@@ -69,7 +69,7 @@ typedef void (*Fl_Draw_Image_Cb)(void* data,int x,int y,int w,uchar* buf);
 /**
  \brief All graphical output devices and all graphics systems.
  */
-class Fl_Device {
+class FL_EXPORT Fl_Device {
 protected:
   /** \brief The device type */
   const char *type_; 
@@ -98,7 +98,7 @@ public:
  <br> The public API for drawing operations is functionally presented in \ref drawing and as function lists
  in the \ref fl_drawings and \ref fl_attributes modules. 
   */
-class Fl_Graphics_Driver : public Fl_Device {
+class FL_EXPORT Fl_Graphics_Driver : public Fl_Device {
 protected:
 /*  ** \brief red color for background and/or mixing if device does not support masking or alpha *
   uchar bg_r_; 
@@ -296,7 +296,7 @@ public:
  *
  This class is implemented only on the Mac OS X platform.
  */
-class Fl_Quartz_Graphics_Driver : public Fl_Graphics_Driver {
+class FL_EXPORT Fl_Quartz_Graphics_Driver : public Fl_Graphics_Driver {
 public:
   /** \brief The constructor. */
   Fl_Quartz_Graphics_Driver() { type_ = device_type; };
@@ -312,7 +312,7 @@ public:
  *
  This class is implemented only on the MSWindows platform.
  */
-class Fl_GDI_Graphics_Driver : public Fl_Graphics_Driver {
+class FL_EXPORT Fl_GDI_Graphics_Driver : public Fl_Graphics_Driver {
 public:
   /** \brief The constructor. */
   Fl_GDI_Graphics_Driver() { type_ = device_type; };
@@ -342,7 +342,7 @@ public:
 /**
  \brief A surface that's susceptible to receive graphical output.
  */
-class Fl_Surface_Device : public Fl_Device {
+class FL_EXPORT Fl_Surface_Device : public Fl_Device {
   /** \brief The graphics driver in use by this surface. */
   Fl_Graphics_Driver *_driver;
 protected:
@@ -364,7 +364,7 @@ public:
 /**
  \brief A display to which the computer can draw.
  */
-class Fl_Display_Device : public Fl_Surface_Device {
+class FL_EXPORT Fl_Display_Device : public Fl_Surface_Device {
 public:
   static const char *device_type;
   /** \brief A constructor that sets the graphics driver used by the display */
@@ -380,7 +380,7 @@ public:
  window or screen types. It is currently used to provide an automated printing
  service for OpenGL windows, if linked with fltk_gl.
  */
-class Fl_Device_Plugin : public Fl_Plugin {
+class FL_EXPORT Fl_Device_Plugin : public Fl_Plugin {
 public:
   /** \brief The constructor */
   Fl_Device_Plugin(const char *name)
diff --git a/FL/Fl_Fill_Dial.H b/FL/Fl_Fill_Dial.H
index 529f857dd..4f1d485bc 100644
--- a/FL/Fl_Fill_Dial.H
+++ b/FL/Fl_Fill_Dial.H
@@ -34,7 +34,7 @@
 #include "Fl_Dial.H"
 
 /** Draws a dial with a filled arc */
-class Fl_Fill_Dial : public Fl_Dial {
+class FL_EXPORT Fl_Fill_Dial : public Fl_Dial {
 public:
     /** Creates a filled dial, also setting its type to FL_FILL_DIAL. */
     Fl_Fill_Dial(int x,int y,int w,int h, const char *l = 0)
diff --git a/FL/Fl_Fill_Slider.H b/FL/Fl_Fill_Slider.H
index 590779e84..f58634f1e 100644
--- a/FL/Fl_Fill_Slider.H
+++ b/FL/Fl_Fill_Slider.H
@@ -33,7 +33,7 @@
 
 #include "Fl_Slider.H"
 /** Widget that draws a filled horizontal  slider,  useful as a progress or value meter*/
-class Fl_Fill_Slider : public Fl_Slider {
+class FL_EXPORT Fl_Fill_Slider : public Fl_Slider {
 public:
     /** Creates the slider from its position,size and optional title. */
     Fl_Fill_Slider(int x,int y,int w,int h,const char *l=0)
diff --git a/FL/Fl_Float_Input.H b/FL/Fl_Float_Input.H
index be98b8a16..09267f99d 100644
--- a/FL/Fl_Float_Input.H
+++ b/FL/Fl_Float_Input.H
@@ -39,7 +39,7 @@
   that only allows the user to type floating point numbers (sign,
   digits, decimal point, more digits, 'E' or 'e', sign, digits).
 */
-class Fl_Float_Input : public Fl_Input {
+class FL_EXPORT Fl_Float_Input : public Fl_Input {
 public:
   /**
       Creates a new Fl_Float_Input widget using the given position,
diff --git a/FL/Fl_Hold_Browser.H b/FL/Fl_Hold_Browser.H
index 486fe8bd3..3b69c3b56 100644
--- a/FL/Fl_Hold_Browser.H
+++ b/FL/Fl_Hold_Browser.H
@@ -42,7 +42,7 @@
   user releases the mouse, but you can change this with when().
   <P>See Fl_Browser for methods to add and remove lines from the browser.
 */
-class Fl_Hold_Browser : public Fl_Browser {
+class FL_EXPORT Fl_Hold_Browser : public Fl_Browser {
 public:
   /**
     Creates a new Fl_Hold_Browser widget using the given
diff --git a/FL/Fl_Hor_Fill_Slider.H b/FL/Fl_Hor_Fill_Slider.H
index 5b7e68b5b..5c16ce679 100644
--- a/FL/Fl_Hor_Fill_Slider.H
+++ b/FL/Fl_Hor_Fill_Slider.H
@@ -33,7 +33,7 @@
 
 #include "Fl_Slider.H"
 
-class Fl_Hor_Fill_Slider : public Fl_Slider {
+class FL_EXPORT Fl_Hor_Fill_Slider : public Fl_Slider {
 public:
     Fl_Hor_Fill_Slider(int x,int y,int w,int h,const char *l=0)
 	: Fl_Slider(x,y,w,h,l) {type(FL_HOR_FILL_SLIDER);}
diff --git a/FL/Fl_Hor_Nice_Slider.H b/FL/Fl_Hor_Nice_Slider.H
index 5bea39ff0..a80b40467 100644
--- a/FL/Fl_Hor_Nice_Slider.H
+++ b/FL/Fl_Hor_Nice_Slider.H
@@ -33,7 +33,7 @@
 
 #include "Fl_Slider.H"
 
-class Fl_Hor_Nice_Slider : public Fl_Slider {
+class FL_EXPORT Fl_Hor_Nice_Slider : public Fl_Slider {
 public:
     Fl_Hor_Nice_Slider(int x,int y,int w,int h,const char *l=0)
 	: Fl_Slider(x,y,w,h,l) {type(FL_HOR_NICE_SLIDER); box(FL_FLAT_BOX);}
diff --git a/FL/Fl_Hor_Value_Slider.H b/FL/Fl_Hor_Value_Slider.H
index 9f3d1bae6..feb794426 100644
--- a/FL/Fl_Hor_Value_Slider.H
+++ b/FL/Fl_Hor_Value_Slider.H
@@ -33,7 +33,7 @@
 
 #include "Fl_Value_Slider.H"
 
-class Fl_Hor_Value_Slider : public Fl_Value_Slider {
+class FL_EXPORT Fl_Hor_Value_Slider : public Fl_Value_Slider {
 public:
     Fl_Hor_Value_Slider(int X,int Y,int W,int H,const char *l=0)
 	: Fl_Value_Slider(X,Y,W,H,l) {type(FL_HOR_SLIDER);}
diff --git a/FL/Fl_Input_Choice.H b/FL/Fl_Input_Choice.H
index 5c5ff23d0..24c3f45eb 100644
--- a/FL/Fl_Input_Choice.H
+++ b/FL/Fl_Input_Choice.H
@@ -56,7 +56,7 @@
   widgets directly, using the menubutton()
   and input() accessor methods.
 */
-class Fl_Input_Choice : public Fl_Group {
+class FL_EXPORT Fl_Input_Choice : public Fl_Group {
   // Private class to handle slightly 'special' behavior of menu button
   class InputMenuButton : public Fl_Menu_Button {
     void draw() {
diff --git a/FL/Fl_Int_Input.H b/FL/Fl_Int_Input.H
index a99ebe3ed..37dc24222 100644
--- a/FL/Fl_Int_Input.H
+++ b/FL/Fl_Int_Input.H
@@ -37,7 +37,7 @@
   The Fl_Int_Input class is a subclass of Fl_Input
   that only allows the user to type decimal digits (or hex numbers of the form 0xaef).
 */
-class Fl_Int_Input : public Fl_Input {
+class FL_EXPORT Fl_Int_Input : public Fl_Input {
 public:
   /**
     Creates a new Fl_Int_Input widget using the given position,
diff --git a/FL/Fl_Line_Dial.H b/FL/Fl_Line_Dial.H
index 46d66faea..3198d11f5 100644
--- a/FL/Fl_Line_Dial.H
+++ b/FL/Fl_Line_Dial.H
@@ -33,7 +33,7 @@
 
 #include "Fl_Dial.H"
 
-class Fl_Line_Dial : public Fl_Dial {
+class FL_EXPORT Fl_Line_Dial : public Fl_Dial {
 public:
     Fl_Line_Dial(int x,int y,int w,int h, const char *l = 0)
 	: Fl_Dial(x,y,w,h,l) {type(FL_LINE_DIAL);}
diff --git a/FL/Fl_Multi_Browser.H b/FL/Fl_Multi_Browser.H
index 24b48fe34..3502c4e63 100644
--- a/FL/Fl_Multi_Browser.H
+++ b/FL/Fl_Multi_Browser.H
@@ -43,7 +43,7 @@
   mouse, but you can change this with when().
   <P>See Fl_Browser for methods to add and remove lines from the browser.
 */
-class Fl_Multi_Browser : public Fl_Browser {
+class FL_EXPORT Fl_Multi_Browser : public Fl_Browser {
 public:
   /**
       Creates a new Fl_Multi_Browser widget using the given
diff --git a/FL/Fl_Multiline_Input.H b/FL/Fl_Multiline_Input.H
index c08dd1a3f..8566063df 100644
--- a/FL/Fl_Multiline_Input.H
+++ b/FL/Fl_Multiline_Input.H
@@ -47,7 +47,7 @@
   or full color control of characters, you probably want Fl_Text_Editor
   instead.
 */
-class Fl_Multiline_Input : public Fl_Input {
+class FL_EXPORT Fl_Multiline_Input : public Fl_Input {
 public:
   /**
     Creates a new Fl_Multiline_Input widget using the given
diff --git a/FL/Fl_Multiline_Output.H b/FL/Fl_Multiline_Output.H
index 3f02f087c..a8de41614 100644
--- a/FL/Fl_Multiline_Output.H
+++ b/FL/Fl_Multiline_Output.H
@@ -46,7 +46,7 @@
   then use Fl_Text_Display. If you want to display HTML text,
   use Fl_Help_View.
 */
-class Fl_Multiline_Output : public Fl_Output {
+class FL_EXPORT Fl_Multiline_Output : public Fl_Output {
 public:
   /**
     Creates a new Fl_Multiline_Output widget using the given
diff --git a/FL/Fl_Native_File_Chooser_FLTK.H b/FL/Fl_Native_File_Chooser_FLTK.H
index bd0337466..db40523f6 100644
--- a/FL/Fl_Native_File_Chooser_FLTK.H
+++ b/FL/Fl_Native_File_Chooser_FLTK.H
@@ -66,7 +66,7 @@
   - Some operating systems support certain OS specific options; see 
     Fl_Native_File_Chooser::options() for a list.
 */
-class Fl_Native_File_Chooser {
+class FL_EXPORT Fl_Native_File_Chooser {
 public:
   enum Type {
     BROWSE_FILE = 0,			///< browse files (lets user choose one file)
diff --git a/FL/Fl_Native_File_Chooser_MAC.H b/FL/Fl_Native_File_Chooser_MAC.H
index 4cbd58396..31fc2a426 100644
--- a/FL/Fl_Native_File_Chooser_MAC.H
+++ b/FL/Fl_Native_File_Chooser_MAC.H
@@ -36,7 +36,7 @@
 #include <FL/filename.H>
 #define MAXFILTERS	80
 
-class Fl_Native_File_Chooser {
+class FL_EXPORT Fl_Native_File_Chooser {
 public:
   enum Type {
     BROWSE_FILE = 0,
diff --git a/FL/Fl_Native_File_Chooser_WIN32.H b/FL/Fl_Native_File_Chooser_WIN32.H
index 8cdb3b601..00f64e235 100644
--- a/FL/Fl_Native_File_Chooser_WIN32.H
+++ b/FL/Fl_Native_File_Chooser_WIN32.H
@@ -36,7 +36,7 @@
 #include <commdlg.h>		// OPENFILENAME, GetOpenFileName()
 #include <shlobj.h>		// BROWSEINFO, SHBrowseForFolder()
 
-class Fl_Native_File_Chooser {
+class FL_EXPORT Fl_Native_File_Chooser {
 public:
   enum Type {
     BROWSE_FILE = 0,
diff --git a/FL/Fl_Nice_Slider.H b/FL/Fl_Nice_Slider.H
index adf3c56a0..7f093dcc1 100644
--- a/FL/Fl_Nice_Slider.H
+++ b/FL/Fl_Nice_Slider.H
@@ -33,7 +33,7 @@
 
 #include "Fl_Slider.H"
 
-class Fl_Nice_Slider : public Fl_Slider {
+class FL_EXPORT Fl_Nice_Slider : public Fl_Slider {
 public:
     Fl_Nice_Slider(int x,int y,int w,int h,const char *l=0)
 	: Fl_Slider(x,y,w,h,l) {type(FL_VERT_NICE_SLIDER); box(FL_FLAT_BOX);}
diff --git a/FL/Fl_Output.H b/FL/Fl_Output.H
index 321ad00c8..370eb4ba0 100644
--- a/FL/Fl_Output.H
+++ b/FL/Fl_Output.H
@@ -50,7 +50,7 @@
   assumes the font can draw any characters in the ISO-Latin1 character
   set.
 */
-class Fl_Output : public Fl_Input {
+class FL_EXPORT Fl_Output : public Fl_Input {
 public:
   /**
     Creates a new Fl_Output widget using the given position,
diff --git a/FL/Fl_Radio_Button.H b/FL/Fl_Radio_Button.H
index 6c32647b9..dd321c42e 100644
--- a/FL/Fl_Radio_Button.H
+++ b/FL/Fl_Radio_Button.H
@@ -33,7 +33,7 @@
 
 #include "Fl_Button.H"
 
-class Fl_Radio_Button : public Fl_Button {
+class FL_EXPORT Fl_Radio_Button : public Fl_Button {
 public:
     Fl_Radio_Button(int x,int y,int w,int h,const char *l=0)
 	: Fl_Button(x,y,w,h,l) {type(FL_RADIO_BUTTON);}
diff --git a/FL/Fl_Radio_Light_Button.H b/FL/Fl_Radio_Light_Button.H
index e122f6633..eddc14933 100644
--- a/FL/Fl_Radio_Light_Button.H
+++ b/FL/Fl_Radio_Light_Button.H
@@ -33,7 +33,7 @@
 
 #include "Fl_Light_Button.H"
 
-class Fl_Radio_Light_Button : public Fl_Light_Button {
+class FL_EXPORT Fl_Radio_Light_Button : public Fl_Light_Button {
 public:
     Fl_Radio_Light_Button(int X,int Y,int W,int H,const char *l=0)
 	: Fl_Light_Button(X,Y,W,H,l) {type(FL_RADIO_BUTTON);}
diff --git a/FL/Fl_Radio_Round_Button.H b/FL/Fl_Radio_Round_Button.H
index 52e172bfb..e282ec58d 100644
--- a/FL/Fl_Radio_Round_Button.H
+++ b/FL/Fl_Radio_Round_Button.H
@@ -33,7 +33,7 @@
 
 #include "Fl_Round_Button.H"
 
-class Fl_Radio_Round_Button : public Fl_Round_Button {
+class FL_EXPORT Fl_Radio_Round_Button : public Fl_Round_Button {
 public:
     Fl_Radio_Round_Button(int x,int y,int w,int h,const char *l=0)
 	: Fl_Round_Button(x,y,w,h,l) {type(FL_RADIO_BUTTON);}
diff --git a/FL/Fl_Round_Clock.H b/FL/Fl_Round_Clock.H
index 8f9ab913b..9fb900534 100644
--- a/FL/Fl_Round_Clock.H
+++ b/FL/Fl_Round_Clock.H
@@ -34,7 +34,7 @@
 #include "Fl_Clock.H"
 
 /** A clock widget of type FL_ROUND_CLOCK. Has no box. */
-class Fl_Round_Clock : public Fl_Clock {
+class FL_EXPORT Fl_Round_Clock : public Fl_Clock {
 public:
     /** Creates the clock widget, setting his type and box. */
     Fl_Round_Clock(int x,int y,int w,int h, const char *l = 0)
diff --git a/FL/Fl_Secret_Input.H b/FL/Fl_Secret_Input.H
index 6a39c7f23..f5ef5e6be 100644
--- a/FL/Fl_Secret_Input.H
+++ b/FL/Fl_Secret_Input.H
@@ -38,7 +38,7 @@
   that displays its input as a string of asterisks.  This subclass is
   usually used to receive passwords and other "secret" information.
 */
-class Fl_Secret_Input : public Fl_Input {
+class FL_EXPORT Fl_Secret_Input : public Fl_Input {
 public:
   /**
     Creates a new Fl_Secret_Input widget using the given
diff --git a/FL/Fl_Select_Browser.H b/FL/Fl_Select_Browser.H
index 0b581935b..9745f6a45 100644
--- a/FL/Fl_Select_Browser.H
+++ b/FL/Fl_Select_Browser.H
@@ -41,7 +41,7 @@
   user presses the mouse, but you can change this with when().
   <P>See Fl_Browser for  methods to add and remove lines from the browser.
 */
-class Fl_Select_Browser : public Fl_Browser {
+class FL_EXPORT Fl_Select_Browser : public Fl_Browser {
 public:
   /** 
     Creates a new Fl_Select_Browser widget using the given
diff --git a/FL/Fl_Simple_Counter.H b/FL/Fl_Simple_Counter.H
index c870ec869..db5d68ffc 100644
--- a/FL/Fl_Simple_Counter.H
+++ b/FL/Fl_Simple_Counter.H
@@ -37,7 +37,7 @@
   <P align=center>\image html counter.png</P> 
   \image latex  counter.png "Fl_Simple_Counter" width=4cm
 */
-class Fl_Simple_Counter : public Fl_Counter {
+class FL_EXPORT Fl_Simple_Counter : public Fl_Counter {
 public:
     Fl_Simple_Counter(int x,int y,int w,int h, const char *l = 0)
 	: Fl_Counter(x,y,w,h,l) {type(FL_SIMPLE_COUNTER);}
diff --git a/FL/Fl_Spinner.H b/FL/Fl_Spinner.H
index d791bfd1b..b131ba67f 100644
--- a/FL/Fl_Spinner.H
+++ b/FL/Fl_Spinner.H
@@ -48,7 +48,7 @@
   widget and repeat buttons. The user can either type into the
   input area or use the buttons to change the value.
 */
-class Fl_Spinner : public Fl_Group
+class FL_EXPORT Fl_Spinner : public Fl_Group
 {
   double	value_;			// Current value
   double	minimum_;		// Minimum value
diff --git a/FL/Fl_Table.H b/FL/Fl_Table.H
index 0af1b9b00..7b4387d82 100644
--- a/FL/Fl_Table.H
+++ b/FL/Fl_Table.H
@@ -178,7 +178,7 @@
  
  
  */
-class Fl_Table : public Fl_Group {
+class FL_EXPORT Fl_Table : public Fl_Group {
 public:
   /**
    The context bit flags for Fl_Table related callbacks (eg. draw_cell(), callback(), etc)
diff --git a/FL/Fl_Table_Row.H b/FL/Fl_Table_Row.H
index 0cfb1073d..fb623a86c 100644
--- a/FL/Fl_Table_Row.H
+++ b/FL/Fl_Table_Row.H
@@ -51,7 +51,7 @@
  clicked by the user.  You control when events are generated based on
  the values you supply for Fl_Table::when().
  */
-class Fl_Table_Row : public Fl_Table {
+class FL_EXPORT Fl_Table_Row : public Fl_Table {
 public:
   enum TableRowSelectMode {
     SELECT_NONE,		// no selection allowed
diff --git a/FL/Fl_Toggle_Button.H b/FL/Fl_Toggle_Button.H
index 46ae636c8..a73735b26 100644
--- a/FL/Fl_Toggle_Button.H
+++ b/FL/Fl_Toggle_Button.H
@@ -42,7 +42,7 @@
   control exactly when and how by changing the values for type()
   and when().
 */
-class Fl_Toggle_Button : public Fl_Button {
+class FL_EXPORT Fl_Toggle_Button : public Fl_Button {
 public:
   /**
     Creates a new Fl_Toggle_Button widget using the given