diff --git a/c++/src/H5AbstractDs.cpp b/c++/src/H5AbstractDs.cpp
index 055d6693e1..1a2e7aa4f4 100644
--- a/c++/src/H5AbstractDs.cpp
+++ b/c++/src/H5AbstractDs.cpp
@@ -13,8 +13,6 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
-#ifndef H5_NO_NAMESPACE
-#endif
 
 #include "H5Include.h"
 #include "H5Exception.h"
diff --git a/c++/src/H5ArrayType.cpp b/c++/src/H5ArrayType.cpp
index a19048fdca..74c572b255 100644
--- a/c++/src/H5ArrayType.cpp
+++ b/c++/src/H5ArrayType.cpp
@@ -13,8 +13,6 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
-#ifndef H5_NO_NAMESPACE
-#endif
 
 #include "H5Include.h"
 #include "H5Exception.h"
diff --git a/c++/src/H5AtomType.cpp b/c++/src/H5AtomType.cpp
index 2f988972ba..8ec0ca8704 100644
--- a/c++/src/H5AtomType.cpp
+++ b/c++/src/H5AtomType.cpp
@@ -13,8 +13,6 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
-#ifndef H5_NO_NAMESPACE
-#endif
 
 #include "H5Include.h"
 #include "H5Exception.h"
diff --git a/c++/src/H5Attribute.cpp b/c++/src/H5Attribute.cpp
index 48d1f10610..6398375740 100644
--- a/c++/src/H5Attribute.cpp
+++ b/c++/src/H5Attribute.cpp
@@ -19,8 +19,6 @@
 #endif
 
 #include <string>
-#ifndef H5_NO_NAMESPACE
-#endif
 
 #include "H5Include.h"
 #include "H5Exception.h"
diff --git a/c++/src/H5CommonFG.cpp b/c++/src/H5CommonFG.cpp
index f7a89bae5e..ebb5195b76 100644
--- a/c++/src/H5CommonFG.cpp
+++ b/c++/src/H5CommonFG.cpp
@@ -13,8 +13,6 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
-#ifndef H5_NO_NAMESPACE
-#endif
 
 #include "H5Include.h"
 #include "H5Exception.h"
diff --git a/c++/src/H5CompType.cpp b/c++/src/H5CompType.cpp
index 21a32f532c..a20ad37c43 100644
--- a/c++/src/H5CompType.cpp
+++ b/c++/src/H5CompType.cpp
@@ -13,8 +13,6 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
-#ifndef H5_NO_NAMESPACE
-#endif
 
 #include "H5Include.h"
 #include "H5Exception.h"
diff --git a/c++/src/H5DataSet.cpp b/c++/src/H5DataSet.cpp
index 46bfdec271..71bc4667f0 100644
--- a/c++/src/H5DataSet.cpp
+++ b/c++/src/H5DataSet.cpp
@@ -17,10 +17,7 @@
 #else
 #include <iostream>
 #endif
-
 #include <string>
-#ifndef H5_NO_NAMESPACE
-#endif
 
 #include "H5Include.h"
 #include "H5Exception.h"
diff --git a/c++/src/H5DataSpace.cpp b/c++/src/H5DataSpace.cpp
index 0befc6efbf..c7a098f5f6 100644
--- a/c++/src/H5DataSpace.cpp
+++ b/c++/src/H5DataSpace.cpp
@@ -17,10 +17,7 @@
 #else
 #include <iostream>
 #endif
-
 #include <string>
-#ifndef H5_NO_NAMESPACE
-#endif
 
 #include "H5Include.h"
 #include "H5Exception.h"
diff --git a/c++/src/H5DataType.cpp b/c++/src/H5DataType.cpp
index 6d3694e65f..985e6adc2e 100644
--- a/c++/src/H5DataType.cpp
+++ b/c++/src/H5DataType.cpp
@@ -17,10 +17,7 @@
 #else
 #include <iostream>
 #endif
-
 #include <string>
-#ifndef H5_NO_NAMESPACE
-#endif
 
 #include "H5Include.h"
 #include "H5Exception.h"
diff --git a/c++/src/H5DcreatProp.cpp b/c++/src/H5DcreatProp.cpp
index d63ec9e403..faa03dacdb 100644
--- a/c++/src/H5DcreatProp.cpp
+++ b/c++/src/H5DcreatProp.cpp
@@ -13,8 +13,6 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
-#ifndef H5_NO_NAMESPACE
-#endif
 
 #include "H5Include.h"
 #include "H5Exception.h"
diff --git a/c++/src/H5DxferProp.cpp b/c++/src/H5DxferProp.cpp
index b6da395fa0..bc3bbd19fc 100644
--- a/c++/src/H5DxferProp.cpp
+++ b/c++/src/H5DxferProp.cpp
@@ -13,8 +13,6 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
-#ifndef H5_NO_NAMESPACE
-#endif
 
 #include "H5Include.h"
 #include "H5Exception.h"
diff --git a/c++/src/H5EnumType.cpp b/c++/src/H5EnumType.cpp
index 462c767f09..c35e5c435b 100644
--- a/c++/src/H5EnumType.cpp
+++ b/c++/src/H5EnumType.cpp
@@ -13,8 +13,6 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
-#ifndef H5_NO_NAMESPACE
-#endif
 
 #include "H5Include.h"
 #include "H5Exception.h"
diff --git a/c++/src/H5Exception.cpp b/c++/src/H5Exception.cpp
index d7dd47568c..15efde0476 100644
--- a/c++/src/H5Exception.cpp
+++ b/c++/src/H5Exception.cpp
@@ -13,8 +13,6 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
-#ifndef H5_NO_NAMESPACE
-#endif
 
 #include "H5Include.h"
 #include "H5Exception.h"
diff --git a/c++/src/H5FaccProp.cpp b/c++/src/H5FaccProp.cpp
index 62d5f72784..e81a04b861 100644
--- a/c++/src/H5FaccProp.cpp
+++ b/c++/src/H5FaccProp.cpp
@@ -13,8 +13,6 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
-#ifndef H5_NO_NAMESPACE
-#endif
 
 #include "H5Include.h"
 #include "H5Exception.h"
diff --git a/c++/src/H5FcreatProp.cpp b/c++/src/H5FcreatProp.cpp
index aaee59c70b..65a03e64df 100644
--- a/c++/src/H5FcreatProp.cpp
+++ b/c++/src/H5FcreatProp.cpp
@@ -13,8 +13,6 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
-#ifndef H5_NO_NAMESPACE
-#endif
 
 #include "H5Include.h"
 #include "H5Exception.h"
diff --git a/c++/src/H5File.cpp b/c++/src/H5File.cpp
index a7a690dc00..3b4517f591 100644
--- a/c++/src/H5File.cpp
+++ b/c++/src/H5File.cpp
@@ -17,10 +17,7 @@
 #else
 #include <iostream>
 #endif
-
 #include <string>
-#ifndef H5_NO_NAMESPACE
-#endif
 
 #include "H5Include.h"
 #include "H5Exception.h"
diff --git a/c++/src/H5FloatType.cpp b/c++/src/H5FloatType.cpp
index 53d8de2f6b..0b6205045c 100644
--- a/c++/src/H5FloatType.cpp
+++ b/c++/src/H5FloatType.cpp
@@ -13,8 +13,6 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
-#ifndef H5_NO_NAMESPACE
-#endif
 
 #include "H5Include.h"
 #include "H5Exception.h"
diff --git a/c++/src/H5Group.cpp b/c++/src/H5Group.cpp
index 466e9d54ef..9e42daa866 100644
--- a/c++/src/H5Group.cpp
+++ b/c++/src/H5Group.cpp
@@ -17,10 +17,7 @@
 #else
 #include <iostream>
 #endif
-
 #include <string>
-#ifndef H5_NO_NAMESPACE
-#endif
 
 #include "H5Include.h"
 #include "H5Exception.h"
diff --git a/c++/src/H5IntType.cpp b/c++/src/H5IntType.cpp
index e5c6e3b939..a664641d14 100644
--- a/c++/src/H5IntType.cpp
+++ b/c++/src/H5IntType.cpp
@@ -13,8 +13,6 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
-#ifndef H5_NO_NAMESPACE
-#endif
 
 #include "H5Include.h"
 #include "H5Exception.h"
diff --git a/c++/src/H5Library.cpp b/c++/src/H5Library.cpp
index af6b8da82a..e7dc9026a8 100644
--- a/c++/src/H5Library.cpp
+++ b/c++/src/H5Library.cpp
@@ -13,8 +13,6 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
-#ifndef H5_NO_NAMESPACE
-#endif
 
 #include "H5CppDoc.h"	// included only for Doxygen to generate part of RM
 #include "H5Include.h"
diff --git a/c++/src/H5Object.cpp b/c++/src/H5Object.cpp
index 073c3d380a..54a2ed5387 100644
--- a/c++/src/H5Object.cpp
+++ b/c++/src/H5Object.cpp
@@ -13,8 +13,6 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
-#ifndef H5_NO_NAMESPACE
-#endif
 
 #include "H5Include.h"
 #include "H5Exception.h"
diff --git a/c++/src/H5PredType.cpp b/c++/src/H5PredType.cpp
index 69aae2a1fc..8801e6dee3 100644
--- a/c++/src/H5PredType.cpp
+++ b/c++/src/H5PredType.cpp
@@ -13,8 +13,6 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
-#ifndef H5_NO_NAMESPACE
-#endif
 
 #include "H5Include.h"
 #include "H5Exception.h"
diff --git a/c++/src/H5PropList.cpp b/c++/src/H5PropList.cpp
index 80c130068a..7cf0811d89 100644
--- a/c++/src/H5PropList.cpp
+++ b/c++/src/H5PropList.cpp
@@ -19,8 +19,6 @@
 #endif
 
 #include <string>
-#ifndef H5_NO_NAMESPACE
-#endif
 
 #include "H5Include.h"
 #include "H5Exception.h"
diff --git a/c++/src/H5StrType.cpp b/c++/src/H5StrType.cpp
index 1cfb1143cf..68ac1f30ba 100644
--- a/c++/src/H5StrType.cpp
+++ b/c++/src/H5StrType.cpp
@@ -13,8 +13,6 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
-#ifndef H5_NO_NAMESPACE
-#endif
 
 #include "H5Include.h"
 #include "H5Exception.h"
diff --git a/c++/src/H5VarLenType.cpp b/c++/src/H5VarLenType.cpp
index c7d3dc8807..0a186934af 100644
--- a/c++/src/H5VarLenType.cpp
+++ b/c++/src/H5VarLenType.cpp
@@ -13,8 +13,6 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
-#ifndef H5_NO_NAMESPACE
-#endif
 
 #include "H5Include.h"
 #include "H5Exception.h"