diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx
index 859898a87..b399f50f9 100644
--- a/src/Fl_win32.cxx
+++ b/src/Fl_win32.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_win32.cxx,v 1.33.2.37.2.20 2002/03/25 19:17:05 easysw Exp $"
+// "$Id: Fl_win32.cxx,v 1.33.2.37.2.21 2002/03/25 19:35:13 easysw Exp $"
 //
 // WIN32-specific code for the Fast Light Tool Kit (FLTK).
 //
@@ -776,7 +776,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
     return 1;
 
   case WM_RENDERALLFORMATS:
-    i_own_selection = false;
+    fl_i_own_selection[1] = 0;
     // Windoze seems unhappy unless I do these two steps. Documentation
     // seems to vary on whether opening the clipboard is necessary or
     // is in fact wrong:
@@ -1156,5 +1156,5 @@ void Fl_Window::make_current() {
 }
 
 //
-// End of "$Id: Fl_win32.cxx,v 1.33.2.37.2.20 2002/03/25 19:17:05 easysw Exp $".
+// End of "$Id: Fl_win32.cxx,v 1.33.2.37.2.21 2002/03/25 19:35:13 easysw Exp $".
 //
diff --git a/visualc/fltk.lib.dsp b/visualc/fltk.lib.dsp
index 842c3b8f7..cdbafd807 100644
--- a/visualc/fltk.lib.dsp
+++ b/visualc/fltk.lib.dsp
@@ -223,10 +223,6 @@ SOURCE=..\src\fl_curve.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_cutpaste.cxx
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\Fl_Dial.cxx
 # End Source File
 # Begin Source File
diff --git a/visualc/fltkdll.dsp b/visualc/fltkdll.dsp
index 0198d82fa..827724747 100644
--- a/visualc/fltkdll.dsp
+++ b/visualc/fltkdll.dsp
@@ -262,6 +262,7 @@ DEP_CPP_FL_AS=\
 	"..\fl\fl_ask.h"\
 	"..\fl\fl_box.h"\
 	"..\fl\fl_button.h"\
+	"..\fl\fl_draw.h"\
 	"..\fl\fl_export.h"\
 	"..\fl\fl_group.h"\
 	"..\fl\fl_input.h"\
@@ -561,23 +562,6 @@ DEP_CPP_FL_CUR=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_cutpaste.cxx
-DEP_CPP_FL_CUT=\
-	"..\fl\enumerations.h"\
-	"..\fl\fl.h"\
-	"..\fl\fl_export.h"\
-	"..\fl\fl_group.h"\
-	"..\fl\fl_widget.h"\
-	"..\fl\fl_window.h"\
-	"..\fl\mac.H"\
-	"..\fl\win32.h"\
-	"..\fl\x.h"\
-	"..\src\Fl_cutpaste_mac.cxx"\
-	"..\src\fl_cutpaste_win32.cxx"\
-	
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\Fl_Dial.cxx
 DEP_CPP_FL_DI=\
 	"..\fl\enumerations.h"\
@@ -622,7 +606,9 @@ DEP_CPP_FL_DN=\
 	"..\fl\mac.H"\
 	"..\fl\win32.h"\
 	"..\fl\x.h"\
+	"..\src\fl_dnd_mac.cxx"\
 	"..\src\fl_dnd_win32.cxx"\
+	"..\src\fl_dnd_x.cxx"\
 	".\config.h"\
 	
 # End Source File
@@ -881,6 +867,8 @@ DEP_CPP_FL_FO=\
 	"..\src\fl_font.h"\
 	"..\src\fl_font_mac.cxx"\
 	"..\src\fl_font_win32.cxx"\
+	"..\src\fl_font_x.cxx"\
+	"..\src\fl_font_xft.cxx"\
 	".\config.h"\
 	
 # End Source File
@@ -1659,6 +1647,9 @@ DEP_CPP_FL_SET=\
 	"..\src\fl_font.h"\
 	"..\src\fl_set_fonts_mac.cxx"\
 	"..\src\fl_set_fonts_win32.cxx"\
+	"..\src\fl_set_fonts_x.cxx"\
+	"..\src\fl_set_fonts_xft.cxx"\
+	".\config.h"\
 	
 # End Source File
 # Begin Source File
@@ -2041,6 +2032,7 @@ DEP_CPP_FL_X_=\
 	"..\fl\enumerations.h"\
 	"..\fl\filename.h"\
 	"..\fl\fl.h"\
+	"..\fl\fl_draw.h"\
 	"..\fl\fl_export.h"\
 	"..\fl\fl_group.h"\
 	"..\fl\fl_menu_.h"\