30 files changed, 32 insertions, 3 deletions
diff --git a/c++/src/H5AbstractDs.h b/c++/src/H5AbstractDs.h
index 924b63b..24f0c1c 100644
--- a/c++/src/H5AbstractDs.h
+++ b/c++/src/H5AbstractDs.h
@@ -1,3 +1,4 @@
+// This may look like C code, but it is really -*- C++ -*-
 // Class AbstractDs is an abstract base class, from which Attribute and
 // DataSet inherit.  It provides the services that are common to both
 // Attribute and DataSet.  It also inherits from H5Object and passes down
diff --git a/c++/src/H5Alltypes.h b/c++/src/H5Alltypes.h
index 11af047..e4d86ca 100644
--- a/c++/src/H5Alltypes.h
+++ b/c++/src/H5Alltypes.h
@@ -1,3 +1,4 @@
+// This may look like C code, but it is really -*- C++ -*-
 // This header file simply serves as a container to hold the
 // header files of all datatypes.  It simplifies the header
 // file including in the code.
diff --git a/c++/src/H5AtomType.h b/c++/src/H5AtomType.h
index bd8467c..9159518 100644
--- a/c++/src/H5AtomType.h
+++ b/c++/src/H5AtomType.h
@@ -1,3 +1,4 @@
+// This may look like C code, but it is really -*- C++ -*-
 // Class AtomType is a base class, from which IntType, FloatType, StrType,
 // and PredType inherit.  It provides the services that are common to these
 // subclasses.  It also inherits from DataType and passes down the
diff --git a/c++/src/H5Attribute.h b/c++/src/H5Attribute.h
index 142a829..4a06d3f 100644
--- a/c++/src/H5Attribute.h
+++ b/c++/src/H5Attribute.h
@@ -1,5 +1,6 @@
-#ifndef _H5Attribute_H
-#define _H5Attribute_H
+// This may look like C code, but it is really -*- C++ -*-
+#ifndef H5Attribute_H_
+#define H5Attribute_H_
 
 #ifndef H5_NO_NAMESPACE
 namespace H5 {
diff --git a/c++/src/H5Classes.h b/c++/src/H5Classes.h
index 89e11dc..85e84d3 100644
--- a/c++/src/H5Classes.h
+++ b/c++/src/H5Classes.h
@@ -1,3 +1,4 @@
+// This may look like C code, but it is really -*- C++ -*-
 #ifndef _H5Classes_H
 #define _H5Classes_H
 
diff --git a/c++/src/H5CommonFG.h b/c++/src/H5CommonFG.h
index 0fdf3d5..1126e16 100644
--- a/c++/src/H5CommonFG.h
+++ b/c++/src/H5CommonFG.h
@@ -1,3 +1,4 @@
+// This may look like C code, but it is really -*- C++ -*-
 // CommonFG is a protocol class.  Its existence is simply to provide the
 // common services that are provided by H5File and Group.  The file or
 // group in the context of this class is referred to as 'location'.
diff --git a/c++/src/H5CompType.h b/c++/src/H5CompType.h
index 4b1c28e..e76d86b 100644
--- a/c++/src/H5CompType.h
+++ b/c++/src/H5CompType.h
@@ -1,3 +1,4 @@
+// This may look like C code, but it is really -*- C++ -*-
 // Class CompType inherits from DataType and provides accesses to a compound
 // datatype.
 
diff --git a/c++/src/H5Cpp.h b/c++/src/H5Cpp.h
index a8409b5..dce8838 100644
--- a/c++/src/H5Cpp.h
+++ b/c++/src/H5Cpp.h
@@ -1,3 +1,4 @@
+// This may look like C code, but it is really -*- C++ -*-
 #ifndef _H5CPP_H
 #define _H5CPP_H
 
diff --git a/c++/src/H5DataSet.h b/c++/src/H5DataSet.h
index e094159..4afe57b 100644
--- a/c++/src/H5DataSet.h
+++ b/c++/src/H5DataSet.h
@@ -1,4 +1,4 @@
-
+// This may look like C code, but it is really -*- C++ -*-
 // Class DataSet inherits from AbstractDs and provides accesses to a dataset.
 
 #ifndef _H5DataSet_H
diff --git a/c++/src/H5DataSpace.h b/c++/src/H5DataSpace.h
index 5da7299..0508adc 100644
--- a/c++/src/H5DataSpace.h
+++ b/c++/src/H5DataSpace.h
@@ -1,3 +1,4 @@
+// This may look like C code, but it is really -*- C++ -*-
 #ifndef _H5DataSpace_H
 #define _H5DataSpace_H
 
diff --git a/c++/src/H5DataType.h b/c++/src/H5DataType.h
index 8e6b82e..d3e8801 100644
--- a/c++/src/H5DataType.h
+++ b/c++/src/H5DataType.h
@@ -1,3 +1,4 @@
+// This may look like C code, but it is really -*- C++ -*-
 #ifndef _H5DataType_H
 #define _H5DataType_H
 
diff --git a/c++/src/H5DcreatProp.h b/c++/src/H5DcreatProp.h
index b4e1e9a..18d05e5 100644
--- a/c++/src/H5DcreatProp.h
+++ b/c++/src/H5DcreatProp.h
@@ -1,3 +1,4 @@
+// This may look like C code, but it is really -*- C++ -*-
 #ifndef _H5DSCreatPropList_H
 #define _H5DSCreatPropList_H
 
diff --git a/c++/src/H5DxferProp.h b/c++/src/H5DxferProp.h
index bb25862..a805334 100644
--- a/c++/src/H5DxferProp.h
+++ b/c++/src/H5DxferProp.h
@@ -1,3 +1,4 @@
+// This may look like C code, but it is really -*- C++ -*-
 #ifndef _H5DSetMemXferPropList_H
 #define _H5DSetMemXferPropList_H
 
diff --git a/c++/src/H5EnumType.h b/c++/src/H5EnumType.h
index d74ca58..1c62dc1 100644
--- a/c++/src/H5EnumType.h
+++ b/c++/src/H5EnumType.h
@@ -1,3 +1,4 @@
+// This may look like C code, but it is really -*- C++ -*-
 #ifndef _H5EnumType_H
 #define _H5EnumType_H
 
diff --git a/c++/src/H5Exception.h b/c++/src/H5Exception.h
index c8e4132..81d1ab2 100644
--- a/c++/src/H5Exception.h
+++ b/c++/src/H5Exception.h
@@ -1,3 +1,4 @@
+// This may look like C code, but it is really -*- C++ -*-
 #ifndef _H5Exception_H
 #define _H5Exception_H
 
diff --git a/c++/src/H5FaccProp.h b/c++/src/H5FaccProp.h
index 1a4de40..1db2a1d 100644
--- a/c++/src/H5FaccProp.h
+++ b/c++/src/H5FaccProp.h
@@ -1,3 +1,4 @@
+// This may look like C code, but it is really -*- C++ -*-
 #ifndef _H5FileAccPropList_H
 #define _H5FileAccPropList_H
 
diff --git a/c++/src/H5FcreatProp.h b/c++/src/H5FcreatProp.h
index 503caca..5cba6b0 100644
--- a/c++/src/H5FcreatProp.h
+++ b/c++/src/H5FcreatProp.h
@@ -1,3 +1,4 @@
+// This may look like C code, but it is really -*- C++ -*-
 #ifndef _H5FileCreatPropList_H
 #define _H5FileCreatPropList_H
 
diff --git a/c++/src/H5File.h b/c++/src/H5File.h
index dfca992..608ec9b 100644
--- a/c++/src/H5File.h
+++ b/c++/src/H5File.h
@@ -1,3 +1,4 @@
+// This may look like C code, but it is really -*- C++ -*-
 #ifndef _H5File_H
 #define _H5File_H
 
diff --git a/c++/src/H5FloatType.h b/c++/src/H5FloatType.h
index 865d384..113b7b7 100644
--- a/c++/src/H5FloatType.h
+++ b/c++/src/H5FloatType.h
@@ -1,3 +1,4 @@
+// This may look like C code, but it is really -*- C++ -*-
 #ifndef _H5FloatType_H
 #define _H5FloatType_H
 
diff --git a/c++/src/H5Group.h b/c++/src/H5Group.h
index 66578b5..5118fed 100644
--- a/c++/src/H5Group.h
+++ b/c++/src/H5Group.h
@@ -1,3 +1,4 @@
+// This may look like C code, but it is really -*- C++ -*-
 #ifndef _H5Group_H
 #define _H5Group_H
 
diff --git a/c++/src/H5IdComponent.h b/c++/src/H5IdComponent.h
index 3ab341c..70f52d8 100644
--- a/c++/src/H5IdComponent.h
+++ b/c++/src/H5IdComponent.h
@@ -1,3 +1,4 @@
+// This may look like C code, but it is really -*- C++ -*-
 #ifndef _IdComponent_H
 #define _IdComponent_H
 
diff --git a/c++/src/H5Idtemplates.h b/c++/src/H5Idtemplates.h
index 220be6d..3b83065 100644
--- a/c++/src/H5Idtemplates.h
+++ b/c++/src/H5Idtemplates.h
@@ -1,3 +1,4 @@
+// This may look like C code, but it is really -*- C++ -*-
 #ifndef _Reset_h
 #define _Reset_h
 
diff --git a/c++/src/H5Include.h b/c++/src/H5Include.h
index 0a1a3d3..e14c9d2 100644
--- a/c++/src/H5Include.h
+++ b/c++/src/H5Include.h
@@ -1,3 +1,4 @@
+// This may look like C code, but it is really -*- C++ -*-
 // Added this line for CC to compile at this time.  Will remove it when
 // the problem of "Multiple declaration for RcsId" is fixed. BMR - 10/30/00
 #ifdef RCSID
diff --git a/c++/src/H5IntType.h b/c++/src/H5IntType.h
index 224a2cc..2170967 100644
--- a/c++/src/H5IntType.h
+++ b/c++/src/H5IntType.h
@@ -1,3 +1,4 @@
+// This may look like C code, but it is really -*- C++ -*-
 #ifndef _H5IntType_H
 #define _H5IntType_H
 
diff --git a/c++/src/H5Library.h b/c++/src/H5Library.h
index ed2feef..07d1fad 100644
--- a/c++/src/H5Library.h
+++ b/c++/src/H5Library.h
@@ -1,3 +1,4 @@
+// This may look like C code, but it is really -*- C++ -*-
 #ifndef _H5Library_H
 #define _H5Library_H
 
diff --git a/c++/src/H5Object.h b/c++/src/H5Object.h
index 65e7119..13ad954 100644
--- a/c++/src/H5Object.h
+++ b/c++/src/H5Object.h
@@ -1,3 +1,4 @@
+// This may look like C code, but it is really -*- C++ -*-
 #ifndef _H5Object_H
 #define _H5Object_H
 
diff --git a/c++/src/H5PredType.h b/c++/src/H5PredType.h
index 15168fb..ff2b191 100644
--- a/c++/src/H5PredType.h
+++ b/c++/src/H5PredType.h
@@ -1,3 +1,4 @@
+// This may look like C code, but it is really -*- C++ -*-
 // PredType holds the definition of all the HDF5 predefined datatypes.
 // These types can only be made copy of, not created by H5Tcreate or
 // closed by H5Tclose.  They are treated as constants.
diff --git a/c++/src/H5PropList.h b/c++/src/H5PropList.h
index 5e4a656..0fcec6a 100644
--- a/c++/src/H5PropList.h
+++ b/c++/src/H5PropList.h
@@ -1,3 +1,4 @@
+// This may look like C code, but it is really -*- C++ -*-
 #ifndef _H5PropList_H
 #define _H5PropList_H
 
diff --git a/c++/src/H5RefCounter.h b/c++/src/H5RefCounter.h
index f5d832c..3e74b0f 100644
--- a/c++/src/H5RefCounter.h
+++ b/c++/src/H5RefCounter.h
@@ -1,3 +1,4 @@
+// This may look like C code, but it is really -*- C++ -*-
 #ifndef _H5RefCounter_H
 #define _H5RefCounter_H
 
diff --git a/c++/src/H5StrType.h b/c++/src/H5StrType.h
index 9b504f4..94af416 100644
--- a/c++/src/H5StrType.h
+++ b/c++/src/H5StrType.h
@@ -1,3 +1,4 @@
+// This may look like C code, but it is really -*- C++ -*-
 #ifndef _H5StrType_H
 #define _H5StrType_H