diff --git a/Makefile.in b/Makefile.in
index 66f4bd7a22..e258d4dce2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4487,7 +4487,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
 	monodll_cshelp.o \
 	monodll_ctrlcmn.o \
 	monodll_ctrlsub.o \
-	monodll_datacmn.o \
 	monodll_dcbase.o \
 	monodll_dcbufcmn.o \
 	monodll_dcgraph.o \
@@ -4699,7 +4698,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
 	monodll_cshelp.o \
 	monodll_ctrlcmn.o \
 	monodll_ctrlsub.o \
-	monodll_datacmn.o \
 	monodll_dcbase.o \
 	monodll_dcbufcmn.o \
 	monodll_dcgraph.o \
@@ -6395,7 +6393,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
 	monolib_cshelp.o \
 	monolib_ctrlcmn.o \
 	monolib_ctrlsub.o \
-	monolib_datacmn.o \
 	monolib_dcbase.o \
 	monolib_dcbufcmn.o \
 	monolib_dcgraph.o \
@@ -6607,7 +6604,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
 	monolib_cshelp.o \
 	monolib_ctrlcmn.o \
 	monolib_ctrlsub.o \
-	monolib_datacmn.o \
 	monolib_dcbase.o \
 	monolib_dcbufcmn.o \
 	monolib_dcgraph.o \
@@ -8487,7 +8483,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
 	coredll_cshelp.o \
 	coredll_ctrlcmn.o \
 	coredll_ctrlsub.o \
-	coredll_datacmn.o \
 	coredll_dcbase.o \
 	coredll_dcbufcmn.o \
 	coredll_dcgraph.o \
@@ -8699,7 +8694,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
 	coredll_cshelp.o \
 	coredll_ctrlcmn.o \
 	coredll_ctrlsub.o \
-	coredll_datacmn.o \
 	coredll_dcbase.o \
 	coredll_dcbufcmn.o \
 	coredll_dcgraph.o \
@@ -10057,7 +10051,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
 	corelib_cshelp.o \
 	corelib_ctrlcmn.o \
 	corelib_ctrlsub.o \
-	corelib_datacmn.o \
 	corelib_dcbase.o \
 	corelib_dcbufcmn.o \
 	corelib_dcgraph.o \
@@ -10269,7 +10262,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
 	corelib_cshelp.o \
 	corelib_ctrlcmn.o \
 	corelib_ctrlsub.o \
-	corelib_datacmn.o \
 	corelib_dcbase.o \
 	corelib_dcbufcmn.o \
 	corelib_dcgraph.o \
@@ -19757,9 +19749,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@monodll_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/ctrlsub.cpp
 
-@COND_USE_GUI_1@monodll_datacmn.o: $(srcdir)/src/common/datacmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/datacmn.cpp
-
 @COND_USE_GUI_1@monodll_dcbase.o: $(srcdir)/src/common/dcbase.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dcbase.cpp
 
@@ -25031,9 +25020,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@monolib_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/ctrlsub.cpp
 
-@COND_USE_GUI_1@monolib_datacmn.o: $(srcdir)/src/common/datacmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/datacmn.cpp
-
 @COND_USE_GUI_1@monolib_dcbase.o: $(srcdir)/src/common/dcbase.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dcbase.cpp
 
@@ -30482,9 +30468,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1@coredll_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/ctrlsub.cpp
 
-@COND_USE_GUI_1@coredll_datacmn.o: $(srcdir)/src/common/datacmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/datacmn.cpp
-
 @COND_USE_GUI_1@coredll_dcbase.o: $(srcdir)/src/common/dcbase.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dcbase.cpp
 
@@ -34442,9 +34425,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@corelib_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/ctrlsub.cpp
 
-@COND_USE_GUI_1@corelib_datacmn.o: $(srcdir)/src/common/datacmn.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/datacmn.cpp
-
 @COND_USE_GUI_1@corelib_dcbase.o: $(srcdir)/src/common/dcbase.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/dcbase.cpp
 
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 282cafb972..bf87ba2299 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -670,7 +670,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/cshelp.cpp
     src/common/ctrlcmn.cpp
     src/common/ctrlsub.cpp
-    src/common/datacmn.cpp
     src/common/dcbase.cpp
     src/common/dcbufcmn.cpp
     src/common/dcgraph.cpp
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 5a776cac26..2488e1d74b 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1808,7 +1808,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_cshelp.obj \
 	$(OBJS)\monodll_ctrlcmn.obj \
 	$(OBJS)\monodll_ctrlsub.obj \
-	$(OBJS)\monodll_datacmn.obj \
 	$(OBJS)\monodll_dcbase.obj \
 	$(OBJS)\monodll_dcbufcmn.obj \
 	$(OBJS)\monodll_dcgraph.obj \
@@ -2068,7 +2067,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_cshelp.obj \
 	$(OBJS)\monodll_ctrlcmn.obj \
 	$(OBJS)\monodll_ctrlsub.obj \
-	$(OBJS)\monodll_datacmn.obj \
 	$(OBJS)\monodll_dcbase.obj \
 	$(OBJS)\monodll_dcbufcmn.obj \
 	$(OBJS)\monodll_dcgraph.obj \
@@ -2560,7 +2558,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_cshelp.obj \
 	$(OBJS)\monolib_ctrlcmn.obj \
 	$(OBJS)\monolib_ctrlsub.obj \
-	$(OBJS)\monolib_datacmn.obj \
 	$(OBJS)\monolib_dcbase.obj \
 	$(OBJS)\monolib_dcbufcmn.obj \
 	$(OBJS)\monolib_dcgraph.obj \
@@ -2820,7 +2817,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_cshelp.obj \
 	$(OBJS)\monolib_ctrlcmn.obj \
 	$(OBJS)\monolib_ctrlsub.obj \
-	$(OBJS)\monolib_datacmn.obj \
 	$(OBJS)\monolib_dcbase.obj \
 	$(OBJS)\monolib_dcbufcmn.obj \
 	$(OBJS)\monolib_dcgraph.obj \
@@ -3200,7 +3196,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_cshelp.obj \
 	$(OBJS)\coredll_ctrlcmn.obj \
 	$(OBJS)\coredll_ctrlsub.obj \
-	$(OBJS)\coredll_datacmn.obj \
 	$(OBJS)\coredll_dcbase.obj \
 	$(OBJS)\coredll_dcbufcmn.obj \
 	$(OBJS)\coredll_dcgraph.obj \
@@ -3460,7 +3455,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_cshelp.obj \
 	$(OBJS)\coredll_ctrlcmn.obj \
 	$(OBJS)\coredll_ctrlsub.obj \
-	$(OBJS)\coredll_datacmn.obj \
 	$(OBJS)\coredll_dcbase.obj \
 	$(OBJS)\coredll_dcbufcmn.obj \
 	$(OBJS)\coredll_dcgraph.obj \
@@ -3729,7 +3723,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_cshelp.obj \
 	$(OBJS)\corelib_ctrlcmn.obj \
 	$(OBJS)\corelib_ctrlsub.obj \
-	$(OBJS)\corelib_datacmn.obj \
 	$(OBJS)\corelib_dcbase.obj \
 	$(OBJS)\corelib_dcbufcmn.obj \
 	$(OBJS)\corelib_dcgraph.obj \
@@ -3989,7 +3982,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_cshelp.obj \
 	$(OBJS)\corelib_ctrlcmn.obj \
 	$(OBJS)\corelib_ctrlsub.obj \
-	$(OBJS)\corelib_datacmn.obj \
 	$(OBJS)\corelib_dcbase.obj \
 	$(OBJS)\corelib_dcbufcmn.obj \
 	$(OBJS)\corelib_dcgraph.obj \
@@ -7335,11 +7327,6 @@ $(OBJS)\monodll_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ctrlsub.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_datacmn.obj: ..\..\src\common\datacmn.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datacmn.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dcbase.obj: ..\..\src\common\dcbase.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcbase.cpp
@@ -9652,11 +9639,6 @@ $(OBJS)\monolib_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ctrlsub.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_datacmn.obj: ..\..\src\common\datacmn.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datacmn.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dcbase.obj: ..\..\src\common\dcbase.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcbase.cpp
@@ -11960,11 +11942,6 @@ $(OBJS)\coredll_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\ctrlsub.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_datacmn.obj: ..\..\src\common\datacmn.cpp
-	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\datacmn.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dcbase.obj: ..\..\src\common\dcbase.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcbase.cpp
@@ -13335,11 +13312,6 @@ $(OBJS)\corelib_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\ctrlsub.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_datacmn.obj: ..\..\src\common\datacmn.cpp
-	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\datacmn.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dcbase.obj: ..\..\src\common\dcbase.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dcbase.cpp
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 8fc2bc069c..64303ed08c 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1819,7 +1819,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_cshelp.o \
 	$(OBJS)\monodll_ctrlcmn.o \
 	$(OBJS)\monodll_ctrlsub.o \
-	$(OBJS)\monodll_datacmn.o \
 	$(OBJS)\monodll_dcbase.o \
 	$(OBJS)\monodll_dcbufcmn.o \
 	$(OBJS)\monodll_dcgraph.o \
@@ -2081,7 +2080,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_cshelp.o \
 	$(OBJS)\monodll_ctrlcmn.o \
 	$(OBJS)\monodll_ctrlsub.o \
-	$(OBJS)\monodll_datacmn.o \
 	$(OBJS)\monodll_dcbase.o \
 	$(OBJS)\monodll_dcbufcmn.o \
 	$(OBJS)\monodll_dcgraph.o \
@@ -2577,7 +2575,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_cshelp.o \
 	$(OBJS)\monolib_ctrlcmn.o \
 	$(OBJS)\monolib_ctrlsub.o \
-	$(OBJS)\monolib_datacmn.o \
 	$(OBJS)\monolib_dcbase.o \
 	$(OBJS)\monolib_dcbufcmn.o \
 	$(OBJS)\monolib_dcgraph.o \
@@ -2839,7 +2836,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_cshelp.o \
 	$(OBJS)\monolib_ctrlcmn.o \
 	$(OBJS)\monolib_ctrlsub.o \
-	$(OBJS)\monolib_datacmn.o \
 	$(OBJS)\monolib_dcbase.o \
 	$(OBJS)\monolib_dcbufcmn.o \
 	$(OBJS)\monolib_dcgraph.o \
@@ -3233,7 +3229,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_cshelp.o \
 	$(OBJS)\coredll_ctrlcmn.o \
 	$(OBJS)\coredll_ctrlsub.o \
-	$(OBJS)\coredll_datacmn.o \
 	$(OBJS)\coredll_dcbase.o \
 	$(OBJS)\coredll_dcbufcmn.o \
 	$(OBJS)\coredll_dcgraph.o \
@@ -3495,7 +3490,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_cshelp.o \
 	$(OBJS)\coredll_ctrlcmn.o \
 	$(OBJS)\coredll_ctrlsub.o \
-	$(OBJS)\coredll_datacmn.o \
 	$(OBJS)\coredll_dcbase.o \
 	$(OBJS)\coredll_dcbufcmn.o \
 	$(OBJS)\coredll_dcgraph.o \
@@ -3770,7 +3764,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_cshelp.o \
 	$(OBJS)\corelib_ctrlcmn.o \
 	$(OBJS)\corelib_ctrlsub.o \
-	$(OBJS)\corelib_datacmn.o \
 	$(OBJS)\corelib_dcbase.o \
 	$(OBJS)\corelib_dcbufcmn.o \
 	$(OBJS)\corelib_dcgraph.o \
@@ -4032,7 +4025,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_cshelp.o \
 	$(OBJS)\corelib_ctrlcmn.o \
 	$(OBJS)\corelib_ctrlsub.o \
-	$(OBJS)\corelib_datacmn.o \
 	$(OBJS)\corelib_dcbase.o \
 	$(OBJS)\corelib_dcbufcmn.o \
 	$(OBJS)\corelib_dcgraph.o \
@@ -7485,11 +7477,6 @@ $(OBJS)\monodll_ctrlsub.o: ../../src/common/ctrlsub.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_datacmn.o: ../../src/common/datacmn.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_dcbase.o: ../../src/common/dcbase.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -9802,11 +9789,6 @@ $(OBJS)\monolib_ctrlsub.o: ../../src/common/ctrlsub.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_datacmn.o: ../../src/common/datacmn.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_dcbase.o: ../../src/common/dcbase.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -12110,11 +12092,6 @@ $(OBJS)\coredll_ctrlsub.o: ../../src/common/ctrlsub.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\coredll_datacmn.o: ../../src/common/datacmn.cpp
-	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_dcbase.o: ../../src/common/dcbase.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -13485,11 +13462,6 @@ $(OBJS)\corelib_ctrlsub.o: ../../src/common/ctrlsub.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\corelib_datacmn.o: ../../src/common/datacmn.cpp
-	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_dcbase.o: ../../src/common/dcbase.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index c547de1ce0..1624e79e3d 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -2016,7 +2016,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_cshelp.obj \
 	$(OBJS)\monodll_ctrlcmn.obj \
 	$(OBJS)\monodll_ctrlsub.obj \
-	$(OBJS)\monodll_datacmn.obj \
 	$(OBJS)\monodll_dcbase.obj \
 	$(OBJS)\monodll_dcbufcmn.obj \
 	$(OBJS)\monodll_dcgraph.obj \
@@ -2276,7 +2275,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_cshelp.obj \
 	$(OBJS)\monodll_ctrlcmn.obj \
 	$(OBJS)\monodll_ctrlsub.obj \
-	$(OBJS)\monodll_datacmn.obj \
 	$(OBJS)\monodll_dcbase.obj \
 	$(OBJS)\monodll_dcbufcmn.obj \
 	$(OBJS)\monodll_dcgraph.obj \
@@ -2774,7 +2772,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_cshelp.obj \
 	$(OBJS)\monolib_ctrlcmn.obj \
 	$(OBJS)\monolib_ctrlsub.obj \
-	$(OBJS)\monolib_datacmn.obj \
 	$(OBJS)\monolib_dcbase.obj \
 	$(OBJS)\monolib_dcbufcmn.obj \
 	$(OBJS)\monolib_dcgraph.obj \
@@ -3034,7 +3031,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_cshelp.obj \
 	$(OBJS)\monolib_ctrlcmn.obj \
 	$(OBJS)\monolib_ctrlsub.obj \
-	$(OBJS)\monolib_datacmn.obj \
 	$(OBJS)\monolib_dcbase.obj \
 	$(OBJS)\monolib_dcbufcmn.obj \
 	$(OBJS)\monolib_dcgraph.obj \
@@ -3480,7 +3476,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_cshelp.obj \
 	$(OBJS)\coredll_ctrlcmn.obj \
 	$(OBJS)\coredll_ctrlsub.obj \
-	$(OBJS)\coredll_datacmn.obj \
 	$(OBJS)\coredll_dcbase.obj \
 	$(OBJS)\coredll_dcbufcmn.obj \
 	$(OBJS)\coredll_dcgraph.obj \
@@ -3740,7 +3735,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_cshelp.obj \
 	$(OBJS)\coredll_ctrlcmn.obj \
 	$(OBJS)\coredll_ctrlsub.obj \
-	$(OBJS)\coredll_datacmn.obj \
 	$(OBJS)\coredll_dcbase.obj \
 	$(OBJS)\coredll_dcbufcmn.obj \
 	$(OBJS)\coredll_dcgraph.obj \
@@ -4015,7 +4009,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_cshelp.obj \
 	$(OBJS)\corelib_ctrlcmn.obj \
 	$(OBJS)\corelib_ctrlsub.obj \
-	$(OBJS)\corelib_datacmn.obj \
 	$(OBJS)\corelib_dcbase.obj \
 	$(OBJS)\corelib_dcbufcmn.obj \
 	$(OBJS)\corelib_dcgraph.obj \
@@ -4275,7 +4268,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_cshelp.obj \
 	$(OBJS)\corelib_ctrlcmn.obj \
 	$(OBJS)\corelib_ctrlsub.obj \
-	$(OBJS)\corelib_datacmn.obj \
 	$(OBJS)\corelib_dcbase.obj \
 	$(OBJS)\corelib_dcbufcmn.obj \
 	$(OBJS)\corelib_dcgraph.obj \
@@ -7915,11 +7907,6 @@ $(OBJS)\monodll_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ctrlsub.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_datacmn.obj: ..\..\src\common\datacmn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datacmn.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dcbase.obj: ..\..\src\common\dcbase.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcbase.cpp
@@ -10232,11 +10219,6 @@ $(OBJS)\monolib_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ctrlsub.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_datacmn.obj: ..\..\src\common\datacmn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datacmn.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dcbase.obj: ..\..\src\common\dcbase.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcbase.cpp
@@ -12540,11 +12522,6 @@ $(OBJS)\coredll_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\ctrlsub.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_datacmn.obj: ..\..\src\common\datacmn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\datacmn.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dcbase.obj: ..\..\src\common\dcbase.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcbase.cpp
@@ -13915,11 +13892,6 @@ $(OBJS)\corelib_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\ctrlsub.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_datacmn.obj: ..\..\src\common\datacmn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\datacmn.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dcbase.obj: ..\..\src\common\dcbase.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dcbase.cpp
diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index 838158f7aa..ac192250a6 100644
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -374,7 +374,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_cshelp.obj &
 	$(OBJS)\monodll_ctrlcmn.obj &
 	$(OBJS)\monodll_ctrlsub.obj &
-	$(OBJS)\monodll_datacmn.obj &
 	$(OBJS)\monodll_dcbase.obj &
 	$(OBJS)\monodll_dcbufcmn.obj &
 	$(OBJS)\monodll_dcgraph.obj &
@@ -636,7 +635,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_cshelp.obj &
 	$(OBJS)\monodll_ctrlcmn.obj &
 	$(OBJS)\monodll_ctrlsub.obj &
-	$(OBJS)\monodll_datacmn.obj &
 	$(OBJS)\monodll_dcbase.obj &
 	$(OBJS)\monodll_dcbufcmn.obj &
 	$(OBJS)\monodll_dcgraph.obj &
@@ -1137,7 +1135,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_cshelp.obj &
 	$(OBJS)\monolib_ctrlcmn.obj &
 	$(OBJS)\monolib_ctrlsub.obj &
-	$(OBJS)\monolib_datacmn.obj &
 	$(OBJS)\monolib_dcbase.obj &
 	$(OBJS)\monolib_dcbufcmn.obj &
 	$(OBJS)\monolib_dcgraph.obj &
@@ -1399,7 +1396,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_cshelp.obj &
 	$(OBJS)\monolib_ctrlcmn.obj &
 	$(OBJS)\monolib_ctrlsub.obj &
-	$(OBJS)\monolib_datacmn.obj &
 	$(OBJS)\monolib_dcbase.obj &
 	$(OBJS)\monolib_dcbufcmn.obj &
 	$(OBJS)\monolib_dcgraph.obj &
@@ -1804,7 +1800,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_cshelp.obj &
 	$(OBJS)\coredll_ctrlcmn.obj &
 	$(OBJS)\coredll_ctrlsub.obj &
-	$(OBJS)\coredll_datacmn.obj &
 	$(OBJS)\coredll_dcbase.obj &
 	$(OBJS)\coredll_dcbufcmn.obj &
 	$(OBJS)\coredll_dcgraph.obj &
@@ -2066,7 +2061,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_cshelp.obj &
 	$(OBJS)\coredll_ctrlcmn.obj &
 	$(OBJS)\coredll_ctrlsub.obj &
-	$(OBJS)\coredll_datacmn.obj &
 	$(OBJS)\coredll_dcbase.obj &
 	$(OBJS)\coredll_dcbufcmn.obj &
 	$(OBJS)\coredll_dcgraph.obj &
@@ -2343,7 +2337,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_cshelp.obj &
 	$(OBJS)\corelib_ctrlcmn.obj &
 	$(OBJS)\corelib_ctrlsub.obj &
-	$(OBJS)\corelib_datacmn.obj &
 	$(OBJS)\corelib_dcbase.obj &
 	$(OBJS)\corelib_dcbufcmn.obj &
 	$(OBJS)\corelib_dcgraph.obj &
@@ -2605,7 +2598,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_cshelp.obj &
 	$(OBJS)\corelib_ctrlcmn.obj &
 	$(OBJS)\corelib_ctrlsub.obj &
-	$(OBJS)\corelib_datacmn.obj &
 	$(OBJS)\corelib_dcbase.obj &
 	$(OBJS)\corelib_dcbufcmn.obj &
 	$(OBJS)\corelib_dcgraph.obj &
@@ -7744,11 +7736,6 @@ $(OBJS)\monodll_ctrlsub.obj :  .AUTODEPEND ..\..\src\common\ctrlsub.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monodll_datacmn.obj :  .AUTODEPEND ..\..\src\common\datacmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\monodll_dcbase.obj :  .AUTODEPEND ..\..\src\common\dcbase.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -10061,11 +10048,6 @@ $(OBJS)\monolib_ctrlsub.obj :  .AUTODEPEND ..\..\src\common\ctrlsub.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monolib_datacmn.obj :  .AUTODEPEND ..\..\src\common\datacmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\monolib_dcbase.obj :  .AUTODEPEND ..\..\src\common\dcbase.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -12369,11 +12351,6 @@ $(OBJS)\coredll_ctrlsub.obj :  .AUTODEPEND ..\..\src\common\ctrlsub.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\coredll_datacmn.obj :  .AUTODEPEND ..\..\src\common\datacmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\coredll_dcbase.obj :  .AUTODEPEND ..\..\src\common\dcbase.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -13744,11 +13721,6 @@ $(OBJS)\corelib_ctrlsub.obj :  .AUTODEPEND ..\..\src\common\ctrlsub.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\corelib_datacmn.obj :  .AUTODEPEND ..\..\src\common\datacmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\corelib_dcbase.obj :  .AUTODEPEND ..\..\src\common\dcbase.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index fccb085534..8d8d98e562 100644
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -344,10 +344,6 @@ SOURCE=..\..\src\common\ctrlsub.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\common\datacmn.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\common\dcbase.cpp
 # End Source File
 # Begin Source File
diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index 470e79d73e..6f73605f16 100644
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -603,9 +603,6 @@
 			<File
 				RelativePath="..\..\src\common\ctrlsub.cpp">
 			</File>
-			<File
-				RelativePath="..\..\src\common\datacmn.cpp">
-			</File>
 			<File
 				RelativePath="..\..\src\common\dcbase.cpp">
 			</File>
diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index f7b158bc39..74138c5e0f 100644
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -838,10 +838,6 @@
 				RelativePath="..\..\src\common\ctrlsub.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\common\datacmn.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\common\dcbase.cpp"
 				>
diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj
index cffda174e4..379154fd58 100644
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -834,10 +834,6 @@
 				RelativePath="..\..\src\common\ctrlsub.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\common\datacmn.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\common\dcbase.cpp"
 				>
diff --git a/src/common/accelcmn.cpp b/src/common/accelcmn.cpp
index 5df35dc39f..4d05f3de4d 100644
--- a/src/common/accelcmn.cpp
+++ b/src/common/accelcmn.cpp
@@ -26,13 +26,15 @@
 #if wxUSE_ACCEL
 
 #ifndef WX_PRECOMP
+    #include "wx/accel.h"
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/log.h"
-    #include "wx/accel.h"
     #include "wx/crt.h"
 #endif //WX_PRECOMP
 
+wxAcceleratorTable wxNullAcceleratorTable;
+
 // ============================================================================
 // wxAcceleratorEntry implementation
 // ============================================================================
diff --git a/src/common/btncmn.cpp b/src/common/btncmn.cpp
index fc96b64509..f8be59aabb 100644
--- a/src/common/btncmn.cpp
+++ b/src/common/btncmn.cpp
@@ -30,6 +30,7 @@
     #include "wx/toplevel.h"
 #endif //WX_PRECOMP
 
+extern WXDLLEXPORT_DATA(const char) wxButtonNameStr[] = "button";
 
 // ----------------------------------------------------------------------------
 // XTI
diff --git a/src/common/checkboxcmn.cpp b/src/common/checkboxcmn.cpp
index ba419d86ae..0eb628c744 100644
--- a/src/common/checkboxcmn.cpp
+++ b/src/common/checkboxcmn.cpp
@@ -28,6 +28,8 @@
 
 #include "wx/checkbox.h"
 
+extern WXDLLEXPORT_DATA(const char) wxCheckBoxNameStr[] = "check";
+
 // ----------------------------------------------------------------------------
 // XTI
 // ----------------------------------------------------------------------------
diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index 3c47380fc7..7d41ea207a 100644
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -23,9 +23,12 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_COMBOCTRL
-
+#if wxUSE_COMBOBOX
 #include "wx/combobox.h"
+extern WXDLLEXPORT_DATA(const char) wxComboBoxNameStr[] = "comboBox";
+#endif
+
+#if wxUSE_COMBOCTRL
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
diff --git a/src/common/datacmn.cpp b/src/common/datacmn.cpp
deleted file mode 100644
index e66ecf892a..0000000000
--- a/src/common/datacmn.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        common/datacmn.cpp
-// Purpose:     contains definitions of various global wxWidgets variables
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     10.04.03 (from src/*/data.cpp files)
-// RCS-ID:      $Id$
-// Copyright:   (c) 1997-2002 wxWidgets development team
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#endif // WX_PRECOMP
-
-#include "wx/accel.h"
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// 'Null' objects
-#if wxUSE_ACCEL
-wxAcceleratorTable wxNullAcceleratorTable;
-#endif // wxUSE_ACCEL
-
-// Default window names
-extern WXDLLEXPORT_DATA(const char) wxButtonNameStr[] = "button";
-extern WXDLLEXPORT_DATA(const char) wxCheckBoxNameStr[] = "check";
-extern WXDLLEXPORT_DATA(const char) wxComboBoxNameStr[] = "comboBox";
-extern WXDLLEXPORT_DATA(const char) wxDialogNameStr[] = "dialog";
-extern WXDLLEXPORT_DATA(const char) wxFrameNameStr[] = "frame";
-extern WXDLLEXPORT_DATA(const char) wxStaticBoxNameStr[] = "groupBox";
-extern WXDLLEXPORT_DATA(const char) wxListBoxNameStr[] = "listBox";
-extern WXDLLEXPORT_DATA(const char) wxStaticLineNameStr[] = "staticLine";
-extern WXDLLEXPORT_DATA(const char) wxStaticTextNameStr[] = "staticText";
-extern WXDLLEXPORT_DATA(const char) wxStaticBitmapNameStr[] = "staticBitmap";
-extern WXDLLEXPORT_DATA(const char) wxNotebookNameStr[] = "notebook";
-extern WXDLLEXPORT_DATA(const char) wxPanelNameStr[] = "panel";
-extern WXDLLEXPORT_DATA(const char) wxRadioBoxNameStr[] = "radioBox";
-extern WXDLLEXPORT_DATA(const char) wxRadioButtonNameStr[] = "radioButton";
-extern WXDLLEXPORT_DATA(const char) wxBitmapRadioButtonNameStr[] = "radioButton";
-extern WXDLLEXPORT_DATA(const char) wxScrollBarNameStr[] = "scrollBar";
-extern WXDLLEXPORT_DATA(const char) wxSliderNameStr[] = "slider";
-extern WXDLLEXPORT_DATA(const char) wxStatusLineNameStr[] = "status_line";
-extern WXDLLEXPORT_DATA(const char) wxTextCtrlNameStr[] = "text";
-extern WXDLLEXPORT_DATA(const char) wxTreeCtrlNameStr[] = "treeCtrl";
-extern WXDLLEXPORT_DATA(const char) wxToolBarNameStr[] = "toolbar";
-
-// Default messages
-extern WXDLLEXPORT_DATA(const char) wxMessageBoxCaptionStr[] = "Message";
-extern WXDLLEXPORT_DATA(const char) wxFileSelectorPromptStr[] = "Select a file";
-extern WXDLLEXPORT_DATA(const char) wxDirSelectorPromptStr[] = "Select a directory";
-
-// Other default strings
-extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[] =
-#if defined(__WXMSW__) || defined(__OS2__)
-    "*.*"
-#else // Unix/Mac
-    "*"
-#endif
-    ;
-extern WXDLLEXPORT_DATA(const char) wxDirDialogNameStr[] = "wxDirCtrl";
-extern WXDLLEXPORT_DATA(const char) wxDirDialogDefaultFolderStr[] = "/";
-
-extern WXDLLEXPORT_DATA(const char) wxFileDialogNameStr[] = "filedlg";
diff --git a/src/common/dirctrlcmn.cpp b/src/common/dirctrlcmn.cpp
index 9415453d83..394c0c6c7c 100644
--- a/src/common/dirctrlcmn.cpp
+++ b/src/common/dirctrlcmn.cpp
@@ -20,6 +20,10 @@
 
 #include "wx/generic/dirctrlg.h"
 
+extern WXDLLEXPORT_DATA(const char) wxDirDialogNameStr[] = "wxDirCtrl";
+extern WXDLLEXPORT_DATA(const char) wxDirDialogDefaultFolderStr[] = "/";
+extern WXDLLEXPORT_DATA(const char) wxDirSelectorPromptStr[] = "Select a directory";
+
 //-----------------------------------------------------------------------------
 // XTI
 //-----------------------------------------------------------------------------
diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index 6ac7f13029..6b70e66e97 100644
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -48,6 +48,7 @@
 #include "wx/display.h"
 #endif
 
+extern WXDLLEXPORT_DATA(const char) wxDialogNameStr[] = "dialog";
 
 // ----------------------------------------------------------------------------
 // XTI
diff --git a/src/common/fldlgcmn.cpp b/src/common/fldlgcmn.cpp
index c4118017a0..17ff42633b 100644
--- a/src/common/fldlgcmn.cpp
+++ b/src/common/fldlgcmn.cpp
@@ -28,6 +28,16 @@
     #include "wx/window.h"
 #endif // WX_PRECOMP
 
+extern WXDLLEXPORT_DATA(const char) wxFileDialogNameStr[] = "filedlg";
+extern WXDLLEXPORT_DATA(const char) wxFileSelectorPromptStr[] = "Select a file";
+extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[] =
+#if defined(__WXMSW__) || defined(__OS2__)
+    "*.*"
+#else // Unix/Mac
+    "*"
+#endif
+    ;
+
 //----------------------------------------------------------------------------
 // wxFileDialogBase
 //----------------------------------------------------------------------------
diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index 8f3d81c6e4..11d35444bc 100644
--- a/src/common/framecmn.cpp
+++ b/src/common/framecmn.cpp
@@ -33,6 +33,9 @@
     #include "wx/statusbr.h"
 #endif // WX_PRECOMP
 
+extern WXDLLEXPORT_DATA(const char) wxFrameNameStr[] = "frame";
+extern WXDLLEXPORT_DATA(const char) wxStatusLineNameStr[] = "status_line";
+
 // ----------------------------------------------------------------------------
 // event table
 // ----------------------------------------------------------------------------
diff --git a/src/common/lboxcmn.cpp b/src/common/lboxcmn.cpp
index da8bc5f35d..ce0cbbb16e 100644
--- a/src/common/lboxcmn.cpp
+++ b/src/common/lboxcmn.cpp
@@ -31,9 +31,10 @@
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/arrstr.h"
+    #include "wx/log.h"
 #endif
 
-#include "wx/log.h"
+extern WXDLLEXPORT_DATA(const char) wxListBoxNameStr[] = "listBox";
 
 // ============================================================================
 // implementation
diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
index e01073c909..975dabe0ae 100644
--- a/src/common/msgout.cpp
+++ b/src/common/msgout.cpp
@@ -195,6 +195,8 @@ void wxMessageOutputLog::Output(const wxString& str)
 
 #if wxUSE_GUI && wxUSE_MSGDLG
 
+extern WXDLLEXPORT_DATA(const char) wxMessageBoxCaptionStr[] = "Message";
+
 void wxMessageOutputMessageBox::Output(const wxString& str)
 {
     wxString out(str);
diff --git a/src/common/nbkbase.cpp b/src/common/nbkbase.cpp
index 6842afdb5b..25f336f0b7 100644
--- a/src/common/nbkbase.cpp
+++ b/src/common/nbkbase.cpp
@@ -35,6 +35,8 @@
 // implementation
 // ============================================================================
 
+extern WXDLLEXPORT_DATA(const char) wxNotebookNameStr[] = "notebook";
+
 wxDEFINE_EVENT( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxBookCtrlEvent );
 wxDEFINE_EVENT( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, wxBookCtrlEvent );
 
diff --git a/src/common/radiobtncmn.cpp b/src/common/radiobtncmn.cpp
index 5623b274e3..b32dbff048 100644
--- a/src/common/radiobtncmn.cpp
+++ b/src/common/radiobtncmn.cpp
@@ -33,6 +33,9 @@
     #include "wx/dcscreen.h"
 #endif
 
+extern WXDLLEXPORT_DATA(const char) wxRadioButtonNameStr[] = "radioButton";
+extern WXDLLEXPORT_DATA(const char) wxBitmapRadioButtonNameStr[] = "radioButton";
+
 // ----------------------------------------------------------------------------
 // XTI
 // ----------------------------------------------------------------------------
diff --git a/src/common/radiocmn.cpp b/src/common/radiocmn.cpp
index b9f2653b03..538281a0ed 100644
--- a/src/common/radiocmn.cpp
+++ b/src/common/radiocmn.cpp
@@ -38,6 +38,8 @@
     #include "wx/cshelp.h"
 #endif
 
+extern WXDLLEXPORT_DATA(const char) wxRadioBoxNameStr[] = "radioBox";
+
 // ============================================================================
 // implementation
 // ============================================================================
diff --git a/src/common/scrolbarcmn.cpp b/src/common/scrolbarcmn.cpp
index 2825d47cd5..4e720eaddc 100644
--- a/src/common/scrolbarcmn.cpp
+++ b/src/common/scrolbarcmn.cpp
@@ -25,6 +25,8 @@
     #include "wx/settings.h"
 #endif
 
+extern WXDLLEXPORT_DATA(const char) wxScrollBarNameStr[] = "scrollBar";
+
 // ----------------------------------------------------------------------------
 // XTI
 // ----------------------------------------------------------------------------
diff --git a/src/common/slidercmn.cpp b/src/common/slidercmn.cpp
index 998593b7ee..04abd16f0b 100644
--- a/src/common/slidercmn.cpp
+++ b/src/common/slidercmn.cpp
@@ -29,6 +29,8 @@
 
 #include "wx/slider.h"
 
+extern WXDLLEXPORT_DATA(const char) wxSliderNameStr[] = "slider";
+
 // ----------------------------------------------------------------------------
 // XTI
 // ----------------------------------------------------------------------------
diff --git a/src/common/statbmpcmn.cpp b/src/common/statbmpcmn.cpp
index 0b51444db8..393d373724 100644
--- a/src/common/statbmpcmn.cpp
+++ b/src/common/statbmpcmn.cpp
@@ -28,6 +28,8 @@
 
 #include "wx/statbmp.h"
 
+extern WXDLLEXPORT_DATA(const char) wxStaticBitmapNameStr[] = "staticBitmap";
+
 // ---------------------------------------------------------------------------
 // XTI
 // ---------------------------------------------------------------------------
diff --git a/src/common/statboxcmn.cpp b/src/common/statboxcmn.cpp
index 5038b4c3c2..9650acddfd 100644
--- a/src/common/statboxcmn.cpp
+++ b/src/common/statboxcmn.cpp
@@ -28,6 +28,8 @@
 
 #include "wx/statbox.h"
 
+extern WXDLLEXPORT_DATA(const char) wxStaticBoxNameStr[] = "groupBox";
+
 // ----------------------------------------------------------------------------
 // XTI
 // ----------------------------------------------------------------------------
diff --git a/src/common/statlinecmn.cpp b/src/common/statlinecmn.cpp
index f2b0de3a30..ec557f8e0f 100644
--- a/src/common/statlinecmn.cpp
+++ b/src/common/statlinecmn.cpp
@@ -27,6 +27,8 @@
 
 #if wxUSE_STATLINE
 
+extern WXDLLEXPORT_DATA(const char) wxStaticLineNameStr[] = "staticLine";
+
 // ----------------------------------------------------------------------------
 // XTI
 // ----------------------------------------------------------------------------
diff --git a/src/common/stattextcmn.cpp b/src/common/stattextcmn.cpp
index 9bea608b3d..2da27afef7 100644
--- a/src/common/stattextcmn.cpp
+++ b/src/common/stattextcmn.cpp
@@ -24,20 +24,8 @@
     #pragma hdrstop
 #endif
 
-#include "wx/textwrapper.h"
 #include "wx/private/stattext.h"
 
-#ifndef WX_PRECOMP
-    #include "wx/button.h"
-    #include "wx/dcclient.h"
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #include "wx/settings.h"
-    #include "wx/stattext.h"
-    #include "wx/sizer.h"
-    #include "wx/containr.h"
-#endif
-
 const wxChar *wxMarkupEntities[][wxMARKUP_ENTITY_MAX] =
 {
     // the entities handled by SetLabel() when wxST_MARKUP is used and their referenced string
@@ -48,6 +36,21 @@ const wxChar *wxMarkupEntities[][wxMARKUP_ENTITY_MAX] =
 
 #if wxUSE_STATTEXT
 
+#ifndef WX_PRECOMP
+    #include "wx/stattext.h"
+    #include "wx/button.h"
+    #include "wx/dcclient.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/settings.h"
+    #include "wx/sizer.h"
+    #include "wx/containr.h"
+#endif
+
+#include "wx/textwrapper.h"
+
+extern WXDLLEXPORT_DATA(const char) wxStaticTextNameStr[] = "staticText";
+
 // ----------------------------------------------------------------------------
 // XTI
 // ----------------------------------------------------------------------------
diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index 94d015f155..13fbbc0269 100644
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -38,6 +38,8 @@
     #include "wx/menu.h"
 #endif
 
+extern WXDLLEXPORT_DATA(const char) wxToolBarNameStr[] = "toolbar";
+
 // ----------------------------------------------------------------------------
 // wxWidgets macros
 // ----------------------------------------------------------------------------
diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp
index d7ed630390..d38b4dfbb0 100644
--- a/src/common/textcmn.cpp
+++ b/src/common/textcmn.cpp
@@ -35,6 +35,8 @@
 
 #include "wx/ffile.h"
 
+extern WXDLLEXPORT_DATA(const char) wxTextCtrlNameStr[] = "text";
+
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
diff --git a/src/common/treebase.cpp b/src/common/treebase.cpp
index c8b9906307..e573f9cec9 100644
--- a/src/common/treebase.cpp
+++ b/src/common/treebase.cpp
@@ -29,6 +29,8 @@
 #include "wx/treectrl.h"
 #include "wx/imaglist.h"
 
+extern WXDLLEXPORT_DATA(const char) wxTreeCtrlNameStr[] = "treeCtrl";
+
 // ----------------------------------------------------------------------------
 // events
 // ----------------------------------------------------------------------------
diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index dc64619a86..337f86e330 100644
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -87,6 +87,8 @@ WXDLLIMPEXP_DATA_CORE(wxWindowList) wxTopLevelWindows;
 wxMenu *wxCurrentPopupMenu = NULL;
 #endif // wxUSE_MENUS
 
+extern WXDLLEXPORT_DATA(const char) wxPanelNameStr[] = "panel";
+
 // ----------------------------------------------------------------------------
 // static data
 // ----------------------------------------------------------------------------