diff --git a/Makefile.in b/Makefile.in
index 3d6628788b..3f9e482c35 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -412,6 +412,7 @@ ALL_BASE_HEADERS =  \
 	wx/thread.h \
 	wx/thrimpl.cpp \
 	wx/timer.h \
+	wx/tls.h \
 	wx/tokenzr.h \
 	wx/tracker.h \
 	wx/txtstrm.h \
@@ -566,6 +567,7 @@ ALL_PORTS_BASE_HEADERS =  \
 	wx/thread.h \
 	wx/thrimpl.cpp \
 	wx/timer.h \
+	wx/tls.h \
 	wx/tokenzr.h \
 	wx/tracker.h \
 	wx/txtstrm.h \
@@ -3714,7 +3716,6 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
 	wx/textctrl.h \
 	wx/textdlg.h \
 	wx/textentry.h \
-	wx/tls.h \
 	wx/toolbar.h \
 	wx/validate.h \
 	wx/valtext.h \
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index db6ee2173b..af7aedd79a 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -503,6 +503,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/thread.h
     wx/thrimpl.cpp
     wx/timer.h
+    wx/tls.h
     wx/tokenzr.h
     wx/tracker.h
     wx/txtstrm.h
@@ -831,7 +832,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/textctrl.h
     wx/textdlg.h
     wx/textentry.h
-    wx/tls.h
     wx/toolbar.h
     wx/validate.h
     wx/valtext.h
diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp
index e7135aa8b5..d6c69b16cb 100644
--- a/build/msw/wx_base.dsp
+++ b/build/msw/wx_base.dsp
@@ -1451,6 +1451,10 @@ SOURCE=..\..\include\wx\timer.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\tls.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\tokenzr.h
 # End Source File
 # Begin Source File
diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index aa79954e78..1cdf8b9d31 100644
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -6462,10 +6462,6 @@ SOURCE=..\..\include\wx\tipwin.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\tls.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\toolbar.h
 # End Source File
 # Begin Source File
diff --git a/build/msw/wx_vc7_base.vcproj b/build/msw/wx_vc7_base.vcproj
index 8a5445ab75..346a695396 100644
--- a/build/msw/wx_vc7_base.vcproj
+++ b/build/msw/wx_vc7_base.vcproj
@@ -1506,6 +1506,9 @@
 			<File
 				RelativePath="..\..\include\wx\timer.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\tls.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\tokenzr.h">
 			</File>
diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index 3b9c2e76ae..d0be2e1bb9 100644
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -4096,9 +4096,6 @@
 			<File
 				RelativePath="..\..\include\wx\tipwin.h">
 			</File>
-			<File
-				RelativePath="..\..\include\wx\tls.h">
-			</File>
 			<File
 				RelativePath="..\..\include\wx\toolbar.h">
 			</File>
diff --git a/build/msw/wx_vc8_base.vcproj b/build/msw/wx_vc8_base.vcproj
index dad89b94be..5488e4a90e 100644
--- a/build/msw/wx_vc8_base.vcproj
+++ b/build/msw/wx_vc8_base.vcproj
@@ -2031,6 +2031,10 @@
 				RelativePath="..\..\include\wx\timer.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\tls.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\tokenzr.h"
 				>
diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index b3e09054e9..28360a98a0 100644
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -5483,10 +5483,6 @@
 				RelativePath="..\..\include\wx\tipwin.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\tls.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\wx\toolbar.h"
 				>
diff --git a/build/msw/wx_vc9_base.vcproj b/build/msw/wx_vc9_base.vcproj
index 76c4048ff2..ca63c03a7a 100644
--- a/build/msw/wx_vc9_base.vcproj
+++ b/build/msw/wx_vc9_base.vcproj
@@ -2027,6 +2027,10 @@
 				RelativePath="..\..\include\wx\timer.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\tls.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\tokenzr.h"
 				>
diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj
index 24ebaad88e..f6fb8da4e7 100644
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -5479,10 +5479,6 @@
 				RelativePath="..\..\include\wx\tipwin.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\tls.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\wx\toolbar.h"
 				>
diff --git a/wxGTK.spec b/wxGTK.spec
index 96ccc0d06c..15bda24395 100644
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -311,6 +311,7 @@ wx/textfile.h
 wx/thread.h
 wx/thrimpl.cpp
 wx/timer.h
+wx/tls.h
 wx/tokenzr.h
 wx/tracker.h
 wx/txtstrm.h
diff --git a/wxMotif.spec b/wxMotif.spec
index 43a9968d9a..817e118617 100644
--- a/wxMotif.spec
+++ b/wxMotif.spec
@@ -216,6 +216,7 @@ wx/textfile.h
 wx/thread.h
 wx/thrimpl.cpp
 wx/timer.h
+wx/tls.h
 wx/tokenzr.h
 wx/tracker.h
 wx/txtstrm.h
diff --git a/wxX11.spec b/wxX11.spec
index 6d142abc0d..bcec15dff0 100644
--- a/wxX11.spec
+++ b/wxX11.spec
@@ -240,6 +240,7 @@ wx/textfile.h
 wx/thread.h
 wx/thrimpl.cpp
 wx/timer.h
+wx/tls.h
 wx/tokenzr.h
 wx/tracker.h
 wx/txtstrm.h