diff --git a/include/boost/thread/detail/thread.hpp b/include/boost/thread/detail/thread.hpp
index 3f922e5f..c9dc3b2f 100644
--- a/include/boost/thread/detail/thread.hpp
+++ b/include/boost/thread/detail/thread.hpp
@@ -1,10 +1,10 @@
-//  (C) Copyright 2007-2010 Anthony Williams
-//  (C) Copyright 20011-2012 Vicente J. Botet Escriba
-//  Distributed under the Boost Software License, Version 1.0. (See
-//  accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
 #ifndef BOOST_THREAD_THREAD_COMMON_HPP
 #define BOOST_THREAD_THREAD_COMMON_HPP
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+// (C) Copyright 2007-2010 Anthony Williams
+// (C) Copyright 2011-2012 Vicente J. Botet Escriba
 
 #include <boost/thread/detail/config.hpp>
 #include <boost/predef/platform.h>
diff --git a/include/boost/thread/win32/condition_variable.hpp b/include/boost/thread/win32/condition_variable.hpp
index c2c6ee7d..14c23ce0 100644
--- a/include/boost/thread/win32/condition_variable.hpp
+++ b/include/boost/thread/win32/condition_variable.hpp
@@ -1,11 +1,10 @@
 #ifndef BOOST_THREAD_CONDITION_VARIABLE_WIN32_HPP
 #define BOOST_THREAD_CONDITION_VARIABLE_WIN32_HPP
-
-//  (C) Copyright 2007-8 Anthony Williams
-//  (C) Copyright 2011-2012 Vicente J. Botet Escriba
-//  Distributed under the Boost Software License, Version 1.0. (See
-//  accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+// (C) Copyright 2007-8 Anthony Williams
+// (C) Copyright 2011-2012 Vicente J. Botet Escriba
 
 #include <boost/thread/win32/thread_primitives.hpp>
 #include <boost/thread/win32/thread_data.hpp>
diff --git a/include/boost/thread/win32/thread_data.hpp b/include/boost/thread/win32/thread_data.hpp
index 017ded0f..b916901d 100644
--- a/include/boost/thread/win32/thread_data.hpp
+++ b/include/boost/thread/win32/thread_data.hpp
@@ -1,11 +1,10 @@
-//  (C) Copyright 2008 Anthony Williams
-//  (C) Copyright 2011-2012 Vicente J. Botet Escriba
-//  Distributed under the Boost Software License, Version 1.0. (See
-//  accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-
 #ifndef BOOST_THREAD_PTHREAD_THREAD_DATA_HPP
 #define BOOST_THREAD_PTHREAD_THREAD_DATA_HPP
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+// (C) Copyright 2008 Anthony Williams
+// (C) Copyright 2011-2012 Vicente J. Botet Escriba
 
 #include <boost/thread/detail/config.hpp>
 #include <boost/thread/thread_time.hpp>
diff --git a/src/win32/thread.cpp b/src/win32/thread.cpp
index 1d815f24..d2a272ee 100644
--- a/src/win32/thread.cpp
+++ b/src/win32/thread.cpp
@@ -1,9 +1,9 @@
-//  (C) Copyright 2007 Anthony Williams
-//  (C) Copyright 2007 David Deakins
-//  (C) Copyright 2011-2012 Vicente J. Botet Escriba
-//  Distributed under the Boost Software License, Version 1.0. (See
-//  accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+// (C) Copyright 2007 Anthony Williams
+// (C) Copyright 2007 David Deakins
+// (C) Copyright 2011-2013 Vicente J. Botet Escriba
 
 #ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x400
diff --git a/test/test_tss.cpp b/test/test_tss.cpp
index edb240e4..c5a4cfc7 100644
--- a/test/test_tss.cpp
+++ b/test/test_tss.cpp
@@ -1,5 +1,7 @@
-//  Copyright (C) 2001-2003 William E. Kempf
-//  Copyright (C) 2007 Anthony Williams
+// Copyright (C) 2001-2003
+// William E. Kempf
+// Copyright (C) 2007 Anthony Williams
+//
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)