7 files changed, 19 insertions, 20 deletions
diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp
index f6eb35e..aaab3e2 100644
--- a/c++/test/dsets.cpp
+++ b/c++/test/dsets.cpp
@@ -33,7 +33,6 @@
 
 #ifndef H5_NO_NAMESPACE
 #ifndef H5_NO_STD
-    using std::string;
     using std::cerr;
     using std::endl;
 #endif  // H5_NO_STD
@@ -43,7 +42,8 @@
 #include "H5Cpp.h"	// C++ API header file
 
 #ifndef H5_NO_NAMESPACE
-using namespace H5;
+    using namespace H5;
+    using H5_std::string;
 #endif
 
 #include "h5cpputil.h"	// C++ utilility header file
diff --git a/c++/test/h5cpputil.cpp b/c++/test/h5cpputil.cpp
index 1d320ca..a711f81 100644
--- a/c++/test/h5cpputil.cpp
+++ b/c++/test/h5cpputil.cpp
@@ -29,20 +29,21 @@
 
 #ifndef H5_NO_NAMESPACE
 #ifndef H5_NO_STD
-    using std::string;
     using std::cerr;
     using std::endl;
 #endif  // H5_NO_STD
 #endif
 
 #include "h5test.h"
-#include "H5Exception.h"
-#include "h5cpputil.h"
+#include "H5Cpp.h"
 
 #ifndef H5_NO_NAMESPACE
-using namespace H5;
+    using namespace H5;
+    using H5_std::string;
 #endif
 
+#include "h5cpputil.h"
+
 
 /*-------------------------------------------------------------------------
  * Function:	test_report
diff --git a/c++/test/h5cpputil.h b/c++/test/h5cpputil.h
index b6601db..abd076a 100644
--- a/c++/test/h5cpputil.h
+++ b/c++/test/h5cpputil.h
@@ -30,13 +30,12 @@ using namespace H5;
 #endif
 
 #ifndef H5_NO_STD
-int test_report (int, const std::string&);
 using std::cerr;
 using std::endl;
-#else
-int test_report (int, const string&);
 #endif
 
+int test_report (int, const string&);
+
 void issue_fail_msg(const char* where, int line, const char* file_name,
 		    const char* message="");
 
diff --git a/c++/test/tattr.cpp b/c++/test/tattr.cpp
index aed8a93..73c7390 100644
--- a/c++/test/tattr.cpp
+++ b/c++/test/tattr.cpp
@@ -24,12 +24,12 @@
 #else
 #include <iostream>
 #endif
-
 #include <string>
 
 #ifndef H5_NO_NAMESPACE
 #ifndef H5_NO_STD
-    using std::string;
+    using std::cerr;
+    using std::endl;
 #endif  // H5_NO_STD
 #endif
 
@@ -37,7 +37,8 @@
 #include "H5Cpp.h"	// C++ API header file
 
 #ifndef H5_NO_NAMESPACE
-using namespace H5;
+    using namespace H5;
+    using H5_std::string;
 #endif
 
 #include "h5cpputil.h"	// C++ utilility header file
diff --git a/c++/test/testhdf5.cpp b/c++/test/testhdf5.cpp
index c275a82..1951a99 100644
--- a/c++/test/testhdf5.cpp
+++ b/c++/test/testhdf5.cpp
@@ -42,10 +42,8 @@
 
  ***************************************************************************/
 
-// Use C version of the header file testhdf5.h instead of re-coding it
-#include "testhdf5.h"
-
-#include "H5Cpp.h"
+#include "testhdf5.h"   // C test header file
+#include "H5Cpp.h"      // C++ API header file
 
 #ifndef H5_NO_NAMESPACE
 using namespace H5;
diff --git a/c++/test/tfile.cpp b/c++/test/tfile.cpp
index 8910408..3541c2a 100644
--- a/c++/test/tfile.cpp
+++ b/c++/test/tfile.cpp
@@ -31,7 +31,6 @@
 
 #ifndef H5_NO_NAMESPACE
 #ifndef H5_NO_STD
-    using std::string;
     using std::cerr;
     using std::endl;
 #endif  // H5_NO_STD
@@ -41,7 +40,8 @@
 #include "H5Cpp.h"	// C++ API header file
 
 #ifndef H5_NO_NAMESPACE
-using namespace H5;
+    using namespace H5;
+    using H5_std::string;
 #endif
 
 #include "h5cpputil.h"	// C++ utilility header file
diff --git a/c++/test/th5s.cpp b/c++/test/th5s.cpp
index d8cdb0b..b54d89f 100644
--- a/c++/test/th5s.cpp
+++ b/c++/test/th5s.cpp
@@ -30,7 +30,6 @@
 
 #ifndef H5_NO_NAMESPACE
 #ifndef H5_NO_STD
-    using std::string;
     using std::cerr;
     using std::endl;
 #endif  // H5_NO_STD
@@ -40,7 +39,8 @@
 #include "H5Cpp.h"	// C++ API header file
 
 #ifndef H5_NO_NAMESPACE
-using namespace H5;
+    using namespace H5;
+    using H5_std::string;
 #endif
 
 #include "h5cpputil.h"	// C++ utilility header file