diff --git a/c++/src/H5DataType.h b/c++/src/H5DataType.h
index 7442edca016..109dcbbcff8 100644
--- a/c++/src/H5DataType.h
+++ b/c++/src/H5DataType.h
@@ -15,9 +15,6 @@
 #ifndef H5DataType_H
 #define H5DataType_H
 
-/* Include package's developer header */
-#include "H5Tdevelop.h"
-
 namespace H5 {
 
 /*! \class DataType
diff --git a/fortran/src/H5Tf.c b/fortran/src/H5Tf.c
index 3da4a295788..1516cc78381 100644
--- a/fortran/src/H5Tf.c
+++ b/fortran/src/H5Tf.c
@@ -21,9 +21,6 @@
 
 #include "H5f90.h"
 
-/* Include package's developer header */
-#include "H5Tdevelop.h"
-
 /****if* H5Tf/h5topen_c
  * NAME
  *  h5topen_c
diff --git a/test/h5test.c b/test/h5test.c
index 4dff00d278f..755ae93184c 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -1195,7 +1195,7 @@ h5_set_info_object(void)
                 valp++;
 
             /* copy key/value pair into temporary buffer */
-            len  = strcspn(valp, ";");
+            len  = HDstrcspn(valp, ";");
             next = &valp[len];
             if (NULL == (key_val = (char *)HDcalloc(1, len + 1)))
                 return -1;
diff --git a/test/h5test.h b/test/h5test.h
index db1a887a63e..2855fb5b879 100644
--- a/test/h5test.h
+++ b/test/h5test.h
@@ -22,7 +22,7 @@
 
 /*
  * Include required headers.  This file tests internal library functions,
- * so we include the private headers here, along with developer routines.
+ * so we include the private headers here.
  */
 #include "hdf5.h"
 #include "H5private.h"