diff --git a/Makefile.in b/Makefile.in
index 891c0bee27..4abe7f6053 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -334,6 +334,7 @@ ALL_BASE_HEADERS =  \
 	wx/defs.h \
 	wx/dir.h \
 	wx/dlimpexp.h \
+	wx/dlist.h \
 	wx/dynarray.h \
 	wx/dynlib.h \
 	wx/dynload.h \
@@ -485,6 +486,7 @@ ALL_PORTS_BASE_HEADERS =  \
 	wx/defs.h \
 	wx/dir.h \
 	wx/dlimpexp.h \
+	wx/dlist.h \
 	wx/dynarray.h \
 	wx/dynlib.h \
 	wx/dynload.h \
@@ -18532,8 +18534,8 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_taskbar.o: $(srcdir)/src/osx/carbon/taskbar.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_OSX_CARBON_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/taskbar.cpp
 
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_taskbar.o: $(srcdir)/src/osx/carbon/taskbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/taskbar.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_taskbar.o: $(srcdir)/src/osx/cocoa/taskbar.mm $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/taskbar.mm
 
 @COND_TOOLKIT_COCOA_USE_GUI_1@monodll_taskbar.o: $(srcdir)/src/cocoa/taskbar.mm $(MONODLL_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/taskbar.mm
@@ -23200,8 +23202,8 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_taskbar.o: $(srcdir)/src/osx/carbon/taskbar.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_OSX_CARBON_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/taskbar.cpp
 
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_taskbar.o: $(srcdir)/src/osx/carbon/taskbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/taskbar.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_taskbar.o: $(srcdir)/src/osx/cocoa/taskbar.mm $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/taskbar.mm
 
 @COND_TOOLKIT_COCOA_USE_GUI_1@monolib_taskbar.o: $(srcdir)/src/cocoa/taskbar.mm $(MONOLIB_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/taskbar.mm
@@ -31579,8 +31581,8 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_OSX_CARBON@advdll_taskbar.o: $(srcdir)/src/osx/carbon/taskbar.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_OSX_CARBON@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/taskbar.cpp
 
-@COND_TOOLKIT_OSX_COCOA@advdll_taskbar.o: $(srcdir)/src/osx/carbon/taskbar.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/taskbar.cpp
+@COND_TOOLKIT_OSX_COCOA@advdll_taskbar.o: $(srcdir)/src/osx/cocoa/taskbar.mm $(ADVDLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/taskbar.mm
 
 @COND_TOOLKIT_COCOA@advdll_taskbar.o: $(srcdir)/src/cocoa/taskbar.mm $(ADVDLL_ODEP)
 @COND_TOOLKIT_COCOA@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/cocoa/taskbar.mm
@@ -31882,8 +31884,8 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_OSX_CARBON@advlib_taskbar.o: $(srcdir)/src/osx/carbon/taskbar.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_OSX_CARBON@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/taskbar.cpp
 
-@COND_TOOLKIT_OSX_COCOA@advlib_taskbar.o: $(srcdir)/src/osx/carbon/taskbar.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/taskbar.cpp
+@COND_TOOLKIT_OSX_COCOA@advlib_taskbar.o: $(srcdir)/src/osx/cocoa/taskbar.mm $(ADVLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/taskbar.mm
 
 @COND_TOOLKIT_COCOA@advlib_taskbar.o: $(srcdir)/src/cocoa/taskbar.mm $(ADVLIB_ODEP)
 @COND_TOOLKIT_COCOA@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/cocoa/taskbar.mm
diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp
index 71642fd115..8bf8393d6b 100644
--- a/build/msw/wx_base.dsp
+++ b/build/msw/wx_base.dsp
@@ -1143,6 +1143,10 @@ SOURCE=..\..\include\wx\dlimpexp.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\dlist.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\dynarray.h
 # End Source File
 # Begin Source File
diff --git a/build/msw/wx_vc7_base.vcproj b/build/msw/wx_vc7_base.vcproj
index 7c42b5610f..92f2d19a72 100644
--- a/build/msw/wx_vc7_base.vcproj
+++ b/build/msw/wx_vc7_base.vcproj
@@ -1192,6 +1192,8 @@
 				RelativePath="..\..\include\wx\dir.h"/>
 			<File
 				RelativePath="..\..\include\wx\dlimpexp.h"/>
+			<File
+				RelativePath="..\..\include\wx\dlist.h"/>
 			<File
 				RelativePath="..\..\include\wx\dynarray.h"/>
 			<File
diff --git a/build/msw/wx_vc8_base.vcproj b/build/msw/wx_vc8_base.vcproj
index 9e29a8d1b4..ea94390207 100644
--- a/build/msw/wx_vc8_base.vcproj
+++ b/build/msw/wx_vc8_base.vcproj
@@ -1568,6 +1568,9 @@
 			<File
 				RelativePath="..\..\include\wx\dlimpexp.h"
 			/>
+			<File
+				RelativePath="..\..\include\wx\dlist.h"
+			/>
 			<File
 				RelativePath="..\..\include\wx\dynarray.h"
 			/>
diff --git a/wxGTK.spec b/wxGTK.spec
index 5394e40cef..fcecbff4c7 100644
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -234,6 +234,7 @@ wx/debug.h
 wx/defs.h
 wx/dir.h
 wx/dlimpexp.h
+wx/dlist.h
 wx/dynarray.h
 wx/dynlib.h
 wx/dynload.h
diff --git a/wxMotif.spec b/wxMotif.spec
index 1699d43604..68ff602a79 100644
--- a/wxMotif.spec
+++ b/wxMotif.spec
@@ -139,6 +139,7 @@ wx/debug.h
 wx/defs.h
 wx/dir.h
 wx/dlimpexp.h
+wx/dlist.h
 wx/dynarray.h
 wx/dynlib.h
 wx/dynload.h
diff --git a/wxX11.spec b/wxX11.spec
index dc56045691..79dc640de6 100644
--- a/wxX11.spec
+++ b/wxX11.spec
@@ -163,6 +163,7 @@ wx/debug.h
 wx/defs.h
 wx/dir.h
 wx/dlimpexp.h
+wx/dlist.h
 wx/dynarray.h
 wx/dynlib.h
 wx/dynload.h