diff --git a/Fltk/Colorbar_Window.h b/Fltk/Colorbar_Window.h
index 9bab815f5db19960f1f37a41c3284d110771edee..9bdc872a2e438953007eb874b77a263c7761cf06 100644
--- a/Fltk/Colorbar_Window.h
+++ b/Fltk/Colorbar_Window.h
@@ -1,8 +1,9 @@
 #ifndef _COLORBAR_WINDOW_H
 #define _COLORBAR_WINDOW_H
 
+#include "ColorTable.h"
+
 typedef struct _colorbar {
-  Window window;
   int width, height;           /* size */
   int wedge_y;                 /* top coord of color wedge */
   int marker_y;                /* top coord of marker arrow */
@@ -17,13 +18,4 @@ typedef struct _colorbar {
 #define WEDGE_HEIGHT    12  /* epaisseur de la colorbar */
 #define MARKER_HEIGHT   10  /* hauteur de la fleche */
 
-void ColorBarCreate(Window win, int width, int height);
-void ColorBarShow(void);
-void ColorBarChange(char *label, float min, float max, ColorTable *ct, int rgb);
-void ColorBarCopy(ColorTable *ct);
-void ColorBarPaste(ColorTable *ct);
-void ColorBarResizeCb(Widget w, XtPointer client_data, 
-                      XmDrawingAreaCallbackStruct *call_data);
-void ColorBarRedraw(void);
-
 #endif
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index fe6ceaf05b1ac9574373f8c68cf39e7801b1188f..9aa4e7048f3ac9d2c49340640de09871f7071f16 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,6 +1,6 @@
 
 // To make the interface as visually consistent as possible, please:
-// - use the BH and WB values for button heights and window borders
+// - use the BH, BW, WB, IW values for button heights/widths, window borders, etc.
 // - use CTX.fontsize for font sizes
 // - examine what's already done before adding something new...
 
diff --git a/Fltk/GUI.h b/Fltk/GUI.h
index 1312c42c38bc418e141efce39088bc35331cb242..dadfffe8ffef5e4d81ffc65a321333b0f1b9affa 100644
--- a/Fltk/GUI.h
+++ b/Fltk/GUI.h
@@ -23,6 +23,9 @@
 #include <FL/Fl_Browser.H>
 #include <FL/Fl_Bitmap.H>
 
+#include "Opengl_Window.h"
+#include "Colorbar_Window.h"
+
 #define NB_BUTT_MAX    100
 #define NB_HISTORY_MAX 1000
 
@@ -57,24 +60,6 @@ extern    Context_Item menu_mesh_define[];
 extern        Context_Item menu_mesh_define_transfinite[]; 
 extern Context_Item menu_post[]; 
 
-// New composite widgets
-
-class Opengl_Window : public Fl_Gl_Window {
-  void draw();
-  void draw_overlay();
-  int handle(int);
-
-  // new
-  void draw_highlight();
-  void clear_overlay();
-  void draw_overlay_zoom();
-  void draw_overlay_highlight();
-
-public:
-  Opengl_Window(int x,int y,int w,int h,const char *l=0)
-    : Fl_Gl_Window(x, y, w, h, l) {}
-};
-
 // The GUI class contains only the important widgets. All these
 // widgets should stay private, and be accessed only by the public
 // member functions.
diff --git a/Fltk/Makefile b/Fltk/Makefile
index 8ed53955a6b8a18b575d287301206562c149ecca..83dd6cd7b095102f107278c3aa8d0542e338bf7d 100644
--- a/Fltk/Makefile
+++ b/Fltk/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 2001-01-09 14:24:06 geuzaine Exp $
+# $Id: Makefile,v 1.3 2001-01-10 09:08:59 geuzaine Exp $
 #
 # Makefile for "libFltk.a"
 #
@@ -28,8 +28,9 @@ CFLAGS   = $(C_FLAGS) $(OS_FLAGS) $(VERSION_FLAGS) $(INCLUDE)\
 SRC = Main.cpp \
       Message.cpp \
       GUI.cpp\
-      Opengl.cpp\
-      Callbacks.cpp
+      Callbacks.cpp\
+      Opengl_Window.cpp\
+      Colorbar_Window.cpp
 
 
 OBJ = $(SRC:.cpp=.o)
diff --git a/Fltk/Opengl.cpp b/Fltk/Opengl_Window.cpp
similarity index 99%
rename from Fltk/Opengl.cpp
rename to Fltk/Opengl_Window.cpp
index 5fbfe6e1feac3acbbc77bd5e5c7b73f8fd179d0e..d5e3f1cb2233b3d27bc499b72d0d4e18163409ad 100644
--- a/Fltk/Opengl.cpp
+++ b/Fltk/Opengl_Window.cpp
@@ -1,4 +1,4 @@
-// $Id: Opengl.cpp,v 1.4 2001-01-09 15:45:03 geuzaine Exp $
+// $Id: Opengl_Window.cpp,v 1.1 2001-01-10 09:08:59 geuzaine Exp $
 
 #include "Gmsh.h"
 #include "GmshUI.h"
@@ -8,6 +8,7 @@
 #include "Mesh.h"
 #include "Draw.h"
 #include "GUI.h"
+#include "Opengl_Window.h"
 
 extern GUI *WID;
 extern Mesh M;
diff --git a/Fltk/Opengl_Window.h b/Fltk/Opengl_Window.h
new file mode 100644
index 0000000000000000000000000000000000000000..7bbedaa1e19abc957fbd68d177e9316b2a0af4e4
--- /dev/null
+++ b/Fltk/Opengl_Window.h
@@ -0,0 +1,20 @@
+#ifndef _OPENGL_WINDOW_H_
+#define _OPENGL_WINDOW_H_
+
+class Opengl_Window : public Fl_Gl_Window {
+  void draw();
+  void draw_overlay();
+  int handle(int);
+
+  // new
+  void draw_highlight();
+  void clear_overlay();
+  void draw_overlay_zoom();
+  void draw_overlay_highlight();
+
+public:
+  Opengl_Window(int x,int y,int w,int h,const char *l=0)
+    : Fl_Gl_Window(x, y, w, h, l) {}
+};
+
+#endif