diff --git a/build/filemgr.py b/build/filemgr.py
index 51c87403..49000b1c 100644
--- a/build/filemgr.py
+++ b/build/filemgr.py
@@ -37,12 +37,18 @@ bpl_exa + "/noncopyable.h",
 bpl_exa + "/noncopyable_export.cpp",
 bpl_exa + "/noncopyable_import.cpp",
 bpl_exa + "/tst_noncopyable.py",
-bpl_exa + "/ivect.h",
-bpl_exa + "/ivect.cpp",
 bpl_exa + "/dvect.h",
 bpl_exa + "/dvect.cpp",
-bpl_exa + "/tst_ivect.py",
-bpl_exa + "/tst_dvect.py",
+bpl_exa + "/dvect_conversions.cpp",
+bpl_exa + "/dvect_defs.cpp",
+bpl_exa + "/ivect.h",
+bpl_exa + "/ivect.cpp",
+bpl_exa + "/ivect_conversions.cpp",
+bpl_exa + "/ivect_defs.cpp",
+bpl_exa + "/tst_dvect1.py",
+bpl_exa + "/tst_dvect2.py",
+bpl_exa + "/tst_ivect1.py",
+bpl_exa + "/tst_ivect2.py",
 )
 
 defs = (
@@ -89,6 +95,7 @@ if (__name__ == "__main__"):
       if (os.access(f, os.F_OK)):
         print "File exists: " + f
       else:
+        print "Linking: " + f
         os.system("ln -s " + path + os.sep + fn + " .")
 
   elif (mode in ("rm", "del")):
diff --git a/build/linux_gcc.mak b/build/linux_gcc.mak
index 453b077b..d18a4884 100644
--- a/build/linux_gcc.mak
+++ b/build/linux_gcc.mak
@@ -118,8 +118,10 @@ test:
 
 tst:
 	$(PYEXE) tst_noncopyable.py
-	$(PYEXE) tst_ivect.py
-	$(PYEXE) tst_dvect.py
+	$(PYEXE) tst_ivect1.py
+	$(PYEXE) tst_dvect1.py
+	$(PYEXE) tst_ivect2.py
+	$(PYEXE) tst_dvect2.py
 
 clean:
 	rm -f $(OBJ) libboost_python.a libboost_python.a.input
@@ -141,16 +143,16 @@ clean:
 	rm -rf cxx_repository
 
 softlinks:
-	python $(BOOST)/libs/python/build/filemgr.py $(BOOST) softlinks
+	$(PYEXE) $(BOOST)/libs/python/build/filemgr.py $(BOOST) softlinks
 
 unlink:
-	python $(BOOST)/libs/python/build/filemgr.py $(BOOST) unlink
+	$(PYEXE) $(BOOST)/libs/python/build/filemgr.py $(BOOST) unlink
 
 cp:
-	python $(BOOST)/libs/python/build/filemgr.py $(BOOST) cp
+	$(PYEXE) $(BOOST)/libs/python/build/filemgr.py $(BOOST) cp
 
 rm:
-	python $(BOOST)/libs/python/build/filemgr.py $(BOOST) rm
+	$(PYEXE) $(BOOST)/libs/python/build/filemgr.py $(BOOST) rm
 
 depend:
 	@ cat Makefile.nodepend; \
diff --git a/build/mingw32.mak b/build/mingw32.mak
index 77b6523b..e3fe9821 100644
--- a/build/mingw32.mak
+++ b/build/mingw32.mak
@@ -165,8 +165,10 @@ test:
 
 tst:
 	$(PYEXE) tst_noncopyable.py
-	$(PYEXE) tst_ivect.py
-	$(PYEXE) tst_dvect.py
+	$(PYEXE) tst_ivect1.py
+	$(PYEXE) tst_dvect1.py
+	$(PYEXE) tst_ivect2.py
+	$(PYEXE) tst_dvect2.py
 
 clean:
 	del *.o
@@ -187,7 +189,7 @@ rm:
 	python $(BOOST_UNIX)/libs/python/build/filemgr.py $(BOOST_UNIX) rm
 
 copy:
-	python $(BOOST_WIN)\libs\python\build\filemgr.py $(BOOST_WIN) copy
+	$(PYEXE) $(BOOST_WIN)\libs\python\build\filemgr.py $(BOOST_WIN) copy
 
 del:
-	python $(BOOST_WIN)\libs\python\build\filemgr.py $(BOOST_WIN) del
+	$(PYEXE) $(BOOST_WIN)\libs\python\build\filemgr.py $(BOOST_WIN) del
diff --git a/build/tru64_cxx.mak b/build/tru64_cxx.mak
index 57f79345..85753bdd 100644
--- a/build/tru64_cxx.mak
+++ b/build/tru64_cxx.mak
@@ -27,7 +27,7 @@ PYINC= -I/usr/local/Python-1.5.2/include/python1.5
 # -D_RWSTD_COMPILE_INSTANTIATE=1
 STLPORTINC= -I/net/cci/xp/C++_C_headers
 
-STDOPTS= -std strict_ansi -DBOOST_PYTHON_TRU64_CXX_PROBLEM
+STDOPTS= -std strict_ansi
 WARNOPTS= -msg_disable 186,450,1115
 # use -msg_display_number to obtain integer tags for -msg_disable
 
@@ -133,8 +133,10 @@ test:
 
 tst:
 	$(PYEXE) tst_noncopyable.py
-	$(PYEXE) tst_ivect.py
-	$(PYEXE) tst_dvect.py
+	$(PYEXE) tst_ivect1.py
+	$(PYEXE) tst_dvect1.py
+	$(PYEXE) tst_ivect2.py
+	$(PYEXE) tst_dvect2.py
 
 clean:
 	rm -f $(OBJ) libboost_python.a libboost_python.a.input
@@ -156,16 +158,16 @@ clean:
 	rm -rf cxx_repository
 
 softlinks:
-	python $(BOOST)/libs/python/build/filemgr.py $(BOOST) softlinks
+	$(PYEXE) $(BOOST)/libs/python/build/filemgr.py $(BOOST) softlinks
 
 unlink:
-	python $(BOOST)/libs/python/build/filemgr.py $(BOOST) unlink
+	$(PYEXE) $(BOOST)/libs/python/build/filemgr.py $(BOOST) unlink
 
 cp:
-	python $(BOOST)/libs/python/build/filemgr.py $(BOOST) cp
+	$(PYEXE) $(BOOST)/libs/python/build/filemgr.py $(BOOST) cp
 
 rm:
-	python $(BOOST)/libs/python/build/filemgr.py $(BOOST) rm
+	$(PYEXE) $(BOOST)/libs/python/build/filemgr.py $(BOOST) rm
 
 depend:
 	@ cat Makefile.nodepend; \
diff --git a/build/vc60.mak b/build/vc60.mak
index a05d04f4..6a878ca0 100644
--- a/build/vc60.mak
+++ b/build/vc60.mak
@@ -99,8 +99,10 @@ test:
 
 tst:
 	$(PYEXE) tst_noncopyable.py
-	$(PYEXE) tst_ivect.py
-	$(PYEXE) tst_dvect.py
+	$(PYEXE) tst_ivect1.py
+	$(PYEXE) tst_dvect1.py
+	$(PYEXE) tst_ivect2.py
+	$(PYEXE) tst_dvect2.py
 
 clean:
 	del *.obj
@@ -123,7 +125,7 @@ rm:
 	python $(BOOST_UNIX)/libs/python/build/filemgr.py $(BOOST_UNIX) rm
 
 copy:
-	python $(BOOST_WIN)\libs\python\build\filemgr.py $(BOOST_WIN) copy
+	$(PYEXE) $(BOOST_WIN)\libs\python\build\filemgr.py $(BOOST_WIN) copy
 
 del:
-	python $(BOOST_WIN)\libs\python\build\filemgr.py $(BOOST_WIN) del
+	$(PYEXE) $(BOOST_WIN)\libs\python\build\filemgr.py $(BOOST_WIN) del