diff --git a/v2/test/conditionals.py b/v2/test/conditionals.py
index 7cc16abba..7ca1d5b32 100644
--- a/v2/test/conditionals.py
+++ b/v2/test/conditionals.py
@@ -3,7 +3,8 @@
 # Copyright 2003 Dave Abrahams
 # Copyright 2002, 2003, 2004 Vladimir Prus
 # Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
 
 # Test conditional properties.
 
diff --git a/v2/tools/msvc.jam b/v2/tools/msvc.jam
index 30e2a03a6..87fc7d0e3 100644
--- a/v2/tools/msvc.jam
+++ b/v2/tools/msvc.jam
@@ -1,13 +1,13 @@
-# Copyright (c) 2003 David Abrahams.
-# Copyright (c) 2005 Vladimir Prus.
-# Copyright (c) 2005 Alexey Pakhunov.
-# Copyright (c) 2006 Bojan Resnik.
-# Copyright (c) 2006 Ilya Sokolov.
+# Copyright (c) 2003 David Abrahams
+# Copyright (c) 2005 Vladimir Prus
+# Copyright (c) 2005 Alexey Pakhunov
+# Copyright (c) 2006 Bojan Resnik
+# Copyright (c) 2006 Ilya Sokolov
 # Copyright (c) 2007 Rene Rivera
 # Copyright (c) 2008 Jurko Gospodnetic
 #
-# Use, modification and distribution is subject to the Boost Software
-# License Version 1.0. (See accompanying file LICENSE_1_0.txt or
+# 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)
 
 ################################################################################
@@ -23,7 +23,6 @@
 
 import "class" : new ;
 import common ;
-import errors ;
 import feature ;
 import generators ;
 import mc ;
@@ -42,6 +41,7 @@ feature.feature embed-manifest : on off : incidental propagated ;
 
 type.register PDB : pdb ;
 
+
 ################################################################################
 #
 # Public rules.
@@ -151,6 +151,7 @@ rule configure ( version ? : options * )
         case "all" :
             if $(options)
             {
+                import errors ;
                 errors.error "MSVC toolset configuration: options should be"
                     "empty when '$(version)' is specified." ;
             }
@@ -593,6 +594,7 @@ class msvc-pch-generator : pch-generator
 
         if ! $(pch-header)
         {
+            import errors : user-error : errors.user-error ;
             errors.user-error "can not build pch without pch-header" ;
         }
 
@@ -706,6 +708,7 @@ local rule configure-really ( version ? : options * )
         # identical sets of options are used.
         if $(options) && ( $(options) != [ $(.versions).get $(version) : options ] )
         {
+            import errors ;
             errors.error "MSVC toolset configuration: Toolset version"
                 "'$(version)' already configured." ;
         }