diff --git a/src/os2/files.lst b/src/os2/files.lst
index 2ff83d101d..df11ea1fd6 100644
--- a/src/os2/files.lst
+++ b/src/os2/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 11:57, 2000/09/08
+# This file was automatically generated by tmake at 13:01, 2001/03/22
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE OS2.T!
 ALL_SOURCES = \
 		generic/busyinfo.cpp \
@@ -21,7 +21,6 @@ ALL_SOURCES = \
 		generic/msgdlgg.cpp \
 		generic/numdlgg.cpp \
 		generic/panelg.cpp \
-		generic/plot.cpp \
 		generic/printps.cpp \
 		generic/prntdlgg.cpp \
 		generic/progdlgg.cpp \
@@ -36,6 +35,7 @@ ALL_SOURCES = \
 		generic/tbarsmpl.cpp \
 		generic/textdlgg.cpp \
 		generic/tipdlg.cpp \
+		generic/tipwin.cpp \
 		generic/treectlg.cpp \
 		generic/treelay.cpp \
 		generic/wizard.cpp \
@@ -68,6 +68,7 @@ ALL_SOURCES = \
 		common/file.cpp \
 		common/fileconf.cpp \
 		common/filefn.cpp \
+		common/filename.cpp \
 		common/filesys.cpp \
 		common/fontcmn.cpp \
 		common/fontmap.cpp \
@@ -98,6 +99,7 @@ ALL_SOURCES = \
 		common/list.cpp \
 		common/log.cpp \
 		common/longlong.cpp \
+		common/matrix.cpp \
 		common/memory.cpp \
 		common/menucmn.cpp \
 		common/mimecmn.cpp \
@@ -218,6 +220,7 @@ ALL_SOURCES = \
 		os2/utilsexc.cpp \
 		os2/wave.cpp \
 		os2/window.cpp \
+		os2/xpmhand.cpp \
 		html/helpctrl.cpp \
 		html/helpdata.cpp \
 		html/helpfrm.cpp \
@@ -301,6 +304,7 @@ ALL_HEADERS = \
 		fileconf.h \
 		filedlg.h \
 		filefn.h \
+		filename.h \
 		filesys.h \
 		font.h \
 		fontdlg.h \
@@ -372,7 +376,6 @@ ALL_HEADERS = \
 		panel.h \
 		paper.h \
 		pen.h \
-		plot.h \
 		print.h \
 		printdlg.h \
 		prntbase.h \
@@ -399,6 +402,7 @@ ALL_HEADERS = \
 		socket.h \
 		spinbutt.h \
 		spinctrl.h \
+		splash.h \
 		splitter.h \
 		statbmp.h \
 		statbox.h \
@@ -416,10 +420,12 @@ ALL_HEADERS = \
 		textctrl.h \
 		textdlg.h \
 		textfile.h \
+		tglbtn.h \
 		thread.h \
 		time.h \
 		timer.h \
 		tipdlg.h \
+		tipwin.h \
 		tokenzr.h \
 		toolbar.h \
 		tooltip.h \
@@ -543,12 +549,12 @@ ALL_HEADERS = \
 		generic/msgdlgg.h \
 		generic/notebook.h \
 		generic/panelg.h \
-		generic/plot.h \
 		generic/printps.h \
 		generic/prntdlgg.h \
 		generic/progdlgg.h \
 		generic/sashwin.h \
 		generic/scrolwin.h \
+		generic/splash.h \
 		generic/splitter.h \
 		generic/statusbr.h \
 		generic/tabg.h \
@@ -604,6 +610,7 @@ COMMONOBJS = \
 		file.o \
 		fileconf.o \
 		filefn.o \
+		filename.o \
 		filesys.o \
 		fontcmn.o \
 		fontmap.o \
@@ -634,6 +641,7 @@ COMMONOBJS = \
 		list.o \
 		log.o \
 		longlong.o \
+		matrix.o \
 		memory.o \
 		menucmn.o \
 		mimecmn.o \
@@ -709,6 +717,7 @@ COMMONDEPS = \
 		file.d \
 		fileconf.d \
 		filefn.d \
+		filename.d \
 		filesys.d \
 		fontcmn.d \
 		fontmap.d \
@@ -739,6 +748,7 @@ COMMONDEPS = \
 		list.d \
 		log.d \
 		longlong.d \
+		matrix.d \
 		memory.d \
 		menucmn.d \
 		mimecmn.d \
@@ -804,7 +814,6 @@ GENERICOBJS = \
 		msgdlgg.o \
 		numdlgg.o \
 		panelg.o \
-		plot.o \
 		printps.o \
 		prntdlgg.o \
 		progdlgg.o \
@@ -819,6 +828,7 @@ GENERICOBJS = \
 		tbarsmpl.o \
 		textdlgg.o \
 		tipdlg.o \
+		tipwin.o \
 		treectlg.o \
 		treelay.o \
 		wizard.o
@@ -844,7 +854,6 @@ GENERICDEPS = \
 		msgdlgg.d \
 		numdlgg.d \
 		panelg.d \
-		plot.d \
 		printps.d \
 		prntdlgg.d \
 		progdlgg.d \
@@ -859,6 +868,7 @@ GENERICDEPS = \
 		tbarsmpl.d \
 		textdlgg.d \
 		tipdlg.d \
+		tipwin.d \
 		treectlg.d \
 		treelay.d \
 		wizard.d
@@ -940,7 +950,8 @@ GUIOBJS = \
 		utils.o \
 		utilsexc.o \
 		wave.o \
-		window.o
+		window.o \
+		xpmhand.o
 
 GUIDEPS = \
 		accel.d \
@@ -1019,7 +1030,8 @@ GUIDEPS = \
 		utils.d \
 		utilsexc.d \
 		wave.d \
-		window.d
+		window.d \
+		xpmhand.d
 
 UNIXOBJS = \