diff --git a/src/gtk/files.lst b/src/gtk/files.lst
index 77e77ca154..764c334a7c 100644
--- a/src/gtk/files.lst
+++ b/src/gtk/files.lst
@@ -88,6 +88,7 @@ ALL_SOURCES = \
 		common/filefn.cpp \
 		common/filename.cpp \
 		common/filesys.cpp \
+		common/fldlgcmn.cpp \
 		common/fontcmn.cpp \
 		common/fontmap.cpp \
 		common/framecmn.cpp \
@@ -678,6 +679,7 @@ COMMONOBJS = \
 		filefn.o \
 		filename.o \
 		filesys.o \
+		fldlgcmn.o \
 		fontcmn.o \
 		fontmap.o \
 		framecmn.o \
diff --git a/src/gtk1/files.lst b/src/gtk1/files.lst
index 77e77ca154..764c334a7c 100644
--- a/src/gtk1/files.lst
+++ b/src/gtk1/files.lst
@@ -88,6 +88,7 @@ ALL_SOURCES = \
 		common/filefn.cpp \
 		common/filename.cpp \
 		common/filesys.cpp \
+		common/fldlgcmn.cpp \
 		common/fontcmn.cpp \
 		common/fontmap.cpp \
 		common/framecmn.cpp \
@@ -678,6 +679,7 @@ COMMONOBJS = \
 		filefn.o \
 		filename.o \
 		filesys.o \
+		fldlgcmn.o \
 		fontcmn.o \
 		fontmap.o \
 		framecmn.o \
diff --git a/src/mac/carbon/files.lst b/src/mac/carbon/files.lst
index 0ea69981c8..c8e2c5552f 100644
--- a/src/mac/carbon/files.lst
+++ b/src/mac/carbon/files.lst
@@ -85,6 +85,7 @@ ALL_SOURCES = \
 		common/filefn.cpp \
 		common/filename.cpp \
 		common/filesys.cpp \
+		common/fldlgcmn.cpp \
 		common/fontcmn.cpp \
 		common/fontmap.cpp \
 		common/framecmn.cpp \
@@ -700,6 +701,7 @@ COMMONOBJS = \
 		filefn.o \
 		filename.o \
 		filesys.o \
+		fldlgcmn.o \
 		fontcmn.o \
 		fontmap.o \
 		framecmn.o \
diff --git a/src/mac/files.lst b/src/mac/files.lst
index 0ea69981c8..c8e2c5552f 100644
--- a/src/mac/files.lst
+++ b/src/mac/files.lst
@@ -85,6 +85,7 @@ ALL_SOURCES = \
 		common/filefn.cpp \
 		common/filename.cpp \
 		common/filesys.cpp \
+		common/fldlgcmn.cpp \
 		common/fontcmn.cpp \
 		common/fontmap.cpp \
 		common/framecmn.cpp \
@@ -700,6 +701,7 @@ COMMONOBJS = \
 		filefn.o \
 		filename.o \
 		filesys.o \
+		fldlgcmn.o \
 		fontcmn.o \
 		fontmap.o \
 		framecmn.o \
diff --git a/src/mgl/files.lst b/src/mgl/files.lst
index 0e6da580f2..73cc43fac6 100644
--- a/src/mgl/files.lst
+++ b/src/mgl/files.lst
@@ -89,6 +89,7 @@ ALL_SOURCES = \
 		common/filefn.cpp \
 		common/filename.cpp \
 		common/filesys.cpp \
+		common/fldlgcmn.cpp \
 		common/fontcmn.cpp \
 		common/fontmap.cpp \
 		common/framecmn.cpp \
@@ -598,6 +599,7 @@ COMMONOBJS = \
 		filefn.o \
 		filename.o \
 		filesys.o \
+		fldlgcmn.o \
 		fontcmn.o \
 		fontmap.o \
 		framecmn.o \
diff --git a/src/mgl/makefile.wat b/src/mgl/makefile.wat
index 6e21f6df05..38c898a921 100644
--- a/src/mgl/makefile.wat
+++ b/src/mgl/makefile.wat
@@ -131,6 +131,7 @@ COMMONOBJS = &
 	filefn.obj &
 	filename.obj &
 	filesys.obj &
+	fldlgcmn.obj &
 	fontcmn.obj &
 	fontmap.obj &
 	framecmn.obj &
@@ -667,6 +668,9 @@ filename.obj:     $(COMMDIR)\filename.cpp
 filesys.obj:     $(COMMDIR)\filesys.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+fldlgcmn.obj:     $(COMMDIR)\fldlgcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 fontcmn.obj:     $(COMMDIR)\fontcmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
diff --git a/src/microwin/files.lst b/src/microwin/files.lst
index ea3c481a7d..5b4080ea22 100644
--- a/src/microwin/files.lst
+++ b/src/microwin/files.lst
@@ -86,6 +86,7 @@ ALL_SOURCES = \
 		common/filefn.cpp \
 		common/filename.cpp \
 		common/filesys.cpp \
+		common/fldlgcmn.cpp \
 		common/fontcmn.cpp \
 		common/fontmap.cpp \
 		common/framecmn.cpp \
@@ -669,6 +670,7 @@ COMMONOBJS = \
 		filefn.o \
 		filename.o \
 		filesys.o \
+		fldlgcmn.o \
 		fontcmn.o \
 		fontmap.o \
 		framecmn.o \
diff --git a/src/motif/files.lst b/src/motif/files.lst
index 1a2d781d57..99b5e694f2 100644
--- a/src/motif/files.lst
+++ b/src/motif/files.lst
@@ -89,6 +89,7 @@ ALL_SOURCES = \
 		common/filefn.cpp \
 		common/filename.cpp \
 		common/filesys.cpp \
+		common/fldlgcmn.cpp \
 		common/fontcmn.cpp \
 		common/fontmap.cpp \
 		common/framecmn.cpp \
@@ -674,6 +675,7 @@ COMMONOBJS = \
 		filefn.o \
 		filename.o \
 		filesys.o \
+		fldlgcmn.o \
 		fontcmn.o \
 		fontmap.o \
 		framecmn.o \
diff --git a/src/msw/files.lst b/src/msw/files.lst
index 5d96537498..2421fc9735 100644
--- a/src/msw/files.lst
+++ b/src/msw/files.lst
@@ -73,6 +73,7 @@ ALL_SOURCES = \
 		common/filefn.cpp \
 		common/filename.cpp \
 		common/filesys.cpp \
+		common/fldlgcmn.cpp \
 		common/fontcmn.cpp \
 		common/fontmap.cpp \
 		common/framecmn.cpp \
@@ -740,6 +741,7 @@ COMMONOBJS = \
 		filefn.o \
 		filename.o \
 		filesys.o \
+		fldlgcmn.o \
 		fontcmn.o \
 		fontmap.o \
 		framecmn.o \
diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 06cac00b38..e704dc6908 100644
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -420,6 +420,7 @@ COMMONOBJS = \
 		$(OBJ_PATH)\filefn.obj \
 		$(OBJ_PATH)\filename.obj \
 		$(OBJ_PATH)\filesys.obj \
+		$(OBJ_PATH)\fldlgcmn.obj \
 		$(OBJ_PATH)\fontcmn.obj \
 		$(OBJ_PATH)\fontmap.obj \
 		$(OBJ_PATH)\framecmn.obj \
@@ -1107,6 +1108,8 @@ $(OBJ_PATH)\filename.obj: $(COMMDIR)\filename.$(SRCSUFF)
 
 $(OBJ_PATH)\filesys.obj: $(COMMDIR)\filesys.$(SRCSUFF)
 
+$(OBJ_PATH)\fldlgcmn.obj: $(COMMDIR)\fldlgcmn.$(SRCSUFF)
+
 $(OBJ_PATH)\fontcmn.obj: $(COMMDIR)\fontcmn.$(SRCSUFF)
 
 $(OBJ_PATH)\fontmap.obj: $(COMMDIR)\fontmap.$(SRCSUFF)
diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index 3798ba4eba..21283eb4f1 100644
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -144,6 +144,7 @@ COMMONOBJS = \
 		$(MSWDIR)\filefn.obj \
 		$(MSWDIR)\filename.obj \
 		$(MSWDIR)\filesys.obj \
+		$(MSWDIR)\fldlgcmn.obj \
 		$(MSWDIR)\fontcmn.obj \
 		$(MSWDIR)\fontmap.obj \
 		$(MSWDIR)\framecmn.obj \
@@ -584,6 +585,8 @@ $(MSWDIR)\filename.obj: $(COMMDIR)\filename.$(SRCSUFF)
 
 $(MSWDIR)\filesys.obj: $(COMMDIR)\filesys.$(SRCSUFF)
 
+$(MSWDIR)\fldlgcmn.obj: $(COMMDIR)\fldlgcmn.$(SRCSUFF)
+
 $(MSWDIR)\fontcmn.obj: $(COMMDIR)\fontcmn.$(SRCSUFF)
 
 $(MSWDIR)\fontmap.obj: $(COMMDIR)\fontmap.$(SRCSUFF)
diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index dfdea5d891..70d1302663 100644
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -129,6 +129,7 @@ COMMONOBJS1 = \
 		$(COMMDIR)\filefn.obj \
 		$(COMMDIR)\filename.obj \
 		$(COMMDIR)\filesys.obj \
+		$(COMMDIR)\fldlgcmn.obj \
 		$(COMMDIR)\fontcmn.obj \
 		$(COMMDIR)\fontmap.obj \
 		$(COMMDIR)\framecmn.obj \
@@ -1004,6 +1005,11 @@ $(COMMDIR)/filesys.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/fldlgcmn.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/fontcmn.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 2199dd6b5b..aebd230f38 100644
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -201,6 +201,7 @@ COMMONOBJS  = \
 		$(COMMDIR)/dseldlg.$(OBJSUFF) \
 		$(COMMDIR)/effects.$(OBJSUFF) \
 		$(COMMDIR)/fddlgcmn.$(OBJSUFF) \
+		$(COMMDIR)/fldlgcmn.$(OBJSUFF) \
 		$(COMMDIR)/fontcmn.$(OBJSUFF) \
 		$(COMMDIR)/framecmn.$(OBJSUFF) \
 		$(COMMDIR)/gaugecmn.$(OBJSUFF) \
diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index 2a967cffc8..686132b9d6 100644
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -101,6 +101,7 @@ COMMONOBJS = $(COMMDIR)\accesscmn.obj \
 		$(COMMDIR)\filefn.obj \
 		$(COMMDIR)\filename.obj \
 		$(COMMDIR)\filesys.obj \
+		$(COMMDIR)\fldlgcmn.obj \
 		$(COMMDIR)\fontcmn.obj \
 		$(COMMDIR)\fontmap.obj \
 		$(COMMDIR)\framecmn.obj \
diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index a7ac76192e..15d850b600 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -176,6 +176,7 @@ COMMONOBJS = \
 		$(COMMDIR)\$D\filefn.obj \
 		$(COMMDIR)\$D\filename.obj \
 		$(COMMDIR)\$D\filesys.obj \
+		$(COMMDIR)\$D\fldlgcmn.obj \
 		$(COMMDIR)\$D\fontcmn.obj \
 		$(COMMDIR)\$D\fontmap.obj \
 		$(COMMDIR)\$D\framecmn.obj \
diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 76fd300005..fcea70618c 100644
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -121,6 +121,7 @@ COMMONOBJS = &
 	$(OUTPUTDIR)\filefn.obj &
 	$(OUTPUTDIR)\filename.obj &
 	$(OUTPUTDIR)\filesys.obj &
+	$(OUTPUTDIR)\fldlgcmn.obj &
 	$(OUTPUTDIR)\fontcmn.obj &
 	$(OUTPUTDIR)\fontmap.obj &
 	$(OUTPUTDIR)\framecmn.obj &
@@ -847,6 +848,9 @@ $(OUTPUTDIR)\filename.obj:     $(COMMDIR)\filename.cpp
 $(OUTPUTDIR)\filesys.obj:     $(COMMDIR)\filesys.cpp
   *$(CXX) $(CXXFLAGS) $<
 
+$(OUTPUTDIR)\fldlgcmn.obj:     $(COMMDIR)\fldlgcmn.cpp
+  *$(CXX) $(CXXFLAGS) $<
+
 $(OUTPUTDIR)\fontcmn.obj:     $(COMMDIR)\fontcmn.cpp
   *$(CXX) $(CXXFLAGS) $<
 
diff --git a/src/wxUniv.dsp b/src/wxUniv.dsp
index 2211badf89..f423fa1662 100644
--- a/src/wxUniv.dsp
+++ b/src/wxUniv.dsp
@@ -261,6 +261,10 @@ SOURCE=.\common\filesys.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\fldlgcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\fontcmn.cpp
 # End Source File
 # Begin Source File
diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp
index 68faeb3729..7d981424aa 100644
--- a/src/wxWindows.dsp
+++ b/src/wxWindows.dsp
@@ -420,6 +420,10 @@ SOURCE=.\common\filesys.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\fldlgcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\fontcmn.cpp
 # End Source File
 # Begin Source File
diff --git a/src/x11/files.lst b/src/x11/files.lst
index 809074b21f..ab87a2abfd 100644
--- a/src/x11/files.lst
+++ b/src/x11/files.lst
@@ -121,6 +121,7 @@ ALL_SOURCES = \
 		common/filefn.cpp \
 		common/filename.cpp \
 		common/filesys.cpp \
+		common/fldlgcmn.cpp \
 		common/fontcmn.cpp \
 		common/fontmap.cpp \
 		common/framecmn.cpp \
@@ -691,6 +692,7 @@ COMMONOBJS = \
 		filefn.o \
 		filename.o \
 		filesys.o \
+		fldlgcmn.o \
 		fontcmn.o \
 		fontmap.o \
 		framecmn.o \