diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt
index 1ba90ce8a23..1c0c0784f50 100644
--- a/c++/src/CMakeLists.txt
+++ b/c++/src/CMakeLists.txt
@@ -75,6 +75,7 @@ set (CPP_HDRS
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5PropList.h
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5StrType.h
     ${HDF5_CPP_SRC_SOURCE_DIR}/H5VarLenType.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5Wrapper.h
 )
 
 if (BUILD_STATIC_LIBS)
diff --git a/c++/src/H5Wrapper.h b/c++/src/H5Wrapper.h
new file mode 100644
index 00000000000..556da0683ed
--- /dev/null
+++ b/c++/src/H5Wrapper.h
@@ -0,0 +1,21 @@
+// C++ informative line for the emacs editor: -*- C++ -*-
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef H5WRAPPER_H
+#define H5WRAPPER_H
+
+#if defined(__aarch64__) && defined(__GNUC__)
+#define _Float16 __fp16
+#endif
+
+#endif /* H5WRAPPER_H */
diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp
index 9de6db1319f..7331617b0fc 100644
--- a/c++/test/dsets.cpp
+++ b/c++/test/dsets.cpp
@@ -32,6 +32,7 @@ using std::endl;
 #include "H5Cpp.h" // C++ API header file
 using namespace H5;
 
+#include "H5Wrapper.h"
 #include "h5test.h"
 #include "h5cpputil.h" // C++ utilility header file
 
diff --git a/c++/test/h5cpputil.cpp b/c++/test/h5cpputil.cpp
index 933aa7da264..d683639fd3c 100644
--- a/c++/test/h5cpputil.cpp
+++ b/c++/test/h5cpputil.cpp
@@ -26,6 +26,7 @@ using std::endl;
 #include "H5Cpp.h" // C++ API header file
 using namespace H5;
 
+#include "H5Wrapper.h"
 #include "h5test.h"
 #include "h5cpputil.h" // C++ utilility header file
 
diff --git a/c++/test/h5cpputil.h b/c++/test/h5cpputil.h
index fa6822ad172..1add59aa750 100644
--- a/c++/test/h5cpputil.h
+++ b/c++/test/h5cpputil.h
@@ -21,6 +21,7 @@
 #ifndef H5cpputil_H
 #define H5cpputil_H
 
+#include "H5Wrapper.h"
 #include "h5test.h"
 
 using namespace H5;
diff --git a/c++/test/tarray.cpp b/c++/test/tarray.cpp
index 2d14264f006..1b0f61e3755 100644
--- a/c++/test/tarray.cpp
+++ b/c++/test/tarray.cpp
@@ -23,6 +23,7 @@ using std::endl;
 #include "H5Cpp.h" // C++ API header file
 using namespace H5;
 
+#include "H5Wrapper.h"
 #include "h5test.h"
 #include "h5cpputil.h" // C++ utilility header file
 
diff --git a/c++/test/tattr.cpp b/c++/test/tattr.cpp
index 5135e0c7fa7..544912b72e0 100644
--- a/c++/test/tattr.cpp
+++ b/c++/test/tattr.cpp
@@ -26,6 +26,7 @@ using std::endl;
 #include "H5Cpp.h" // C++ API header file
 using namespace H5;
 
+#include "H5Wrapper.h"
 #include "h5test.h"
 #include "h5cpputil.h" // C++ utilility header file
 
diff --git a/c++/test/tcompound.cpp b/c++/test/tcompound.cpp
index 53939dd1eb8..faca504679c 100644
--- a/c++/test/tcompound.cpp
+++ b/c++/test/tcompound.cpp
@@ -23,6 +23,7 @@ using std::endl;
 #include "H5Cpp.h" // C++ API header file
 using namespace H5;
 
+#include "H5Wrapper.h"
 #include "h5test.h"
 #include "h5cpputil.h" // C++ utilility header file
 
diff --git a/c++/test/tdspl.cpp b/c++/test/tdspl.cpp
index bccc41a568f..8b41e4c445a 100644
--- a/c++/test/tdspl.cpp
+++ b/c++/test/tdspl.cpp
@@ -24,6 +24,7 @@ using std::endl;
 #include "H5Cpp.h" // C++ API header file
 using namespace H5;
 
+#include "H5Wrapper.h"
 #include "h5test.h"
 #include "h5cpputil.h" // C++ utilility header file
 
diff --git a/c++/test/testhdf5.cpp b/c++/test/testhdf5.cpp
index 518227dd26c..e13e743aac7 100644
--- a/c++/test/testhdf5.cpp
+++ b/c++/test/testhdf5.cpp
@@ -45,6 +45,7 @@ using std::endl;
 #include "H5Cpp.h" // C++ API header file
 using namespace H5;
 
+#include "H5Wrapper.h"
 #include "h5test.h"
 #include "h5cpputil.h" // C++ utilility header file
 
diff --git a/c++/test/tfile.cpp b/c++/test/tfile.cpp
index 212a241a3d9..44ede5ea611 100644
--- a/c++/test/tfile.cpp
+++ b/c++/test/tfile.cpp
@@ -27,6 +27,7 @@ using std::endl;
 #include "H5Cpp.h" // C++ API header file
 using namespace H5;
 
+#include "H5Wrapper.h"
 #include "h5test.h"
 #include "h5cpputil.h" // C++ utilility header file
 
diff --git a/c++/test/tfilter.cpp b/c++/test/tfilter.cpp
index 26be0681c2d..037550041ce 100644
--- a/c++/test/tfilter.cpp
+++ b/c++/test/tfilter.cpp
@@ -23,6 +23,7 @@ using std::endl;
 #include "H5Cpp.h" // C++ API header file
 using namespace H5;
 
+#include "H5Wrapper.h"
 #include "h5test.h"
 #include "h5cpputil.h" // C++ utilility header file
 
diff --git a/c++/test/th5s.cpp b/c++/test/th5s.cpp
index 04bc3c0b188..f32630bd6ed 100644
--- a/c++/test/th5s.cpp
+++ b/c++/test/th5s.cpp
@@ -26,6 +26,7 @@ using std::endl;
 #include "H5Cpp.h" // C++ API header file
 using namespace H5;
 
+#include "H5Wrapper.h"
 #include "h5test.h"
 #include "h5cpputil.h" // C++ utilility header file
 #include "H5srcdir.h"  // srcdir querying header file
diff --git a/c++/test/titerate.cpp b/c++/test/titerate.cpp
index b9196d43976..052eee59d7a 100644
--- a/c++/test/titerate.cpp
+++ b/c++/test/titerate.cpp
@@ -23,6 +23,7 @@ using std::endl;
 #include "H5Cpp.h" // C++ API header file
 using namespace H5;
 
+#include "H5Wrapper.h"
 #include "h5test.h"
 #include "h5cpputil.h" // C++ utilility header file
 
diff --git a/c++/test/tlinks.cpp b/c++/test/tlinks.cpp
index 7017217009a..146f57ff4b2 100644
--- a/c++/test/tlinks.cpp
+++ b/c++/test/tlinks.cpp
@@ -24,6 +24,7 @@ using std::endl;
 #include "H5Cpp.h" // C++ API header file
 using namespace H5;
 
+#include "H5Wrapper.h"
 #include "h5test.h"
 #include "h5cpputil.h" // C++ utilility header file
 
diff --git a/c++/test/tobject.cpp b/c++/test/tobject.cpp
index 0affed1f838..8fd2c7cc633 100644
--- a/c++/test/tobject.cpp
+++ b/c++/test/tobject.cpp
@@ -21,6 +21,7 @@
 #include "H5Cpp.h" // C++ API header file
 using namespace H5;
 
+#include "H5Wrapper.h"
 #include "h5test.h"
 #include "h5cpputil.h" // C++ utilility header file
 
diff --git a/c++/test/trefer.cpp b/c++/test/trefer.cpp
index 31c50229a1e..9a7758929cc 100644
--- a/c++/test/trefer.cpp
+++ b/c++/test/trefer.cpp
@@ -24,6 +24,7 @@ using std::endl;
 #include "H5Cpp.h" // C++ API header file
 using namespace H5;
 
+#include "H5Wrapper.h"
 #include "h5test.h"
 #include "h5cpputil.h" // C++ utilility header file
 
diff --git a/c++/test/ttypes.cpp b/c++/test/ttypes.cpp
index 322b72f444e..101fd95350e 100644
--- a/c++/test/ttypes.cpp
+++ b/c++/test/ttypes.cpp
@@ -23,6 +23,7 @@ using std::endl;
 #include "H5Cpp.h" // C++ API header file
 using namespace H5;
 
+#include "H5Wrapper.h"
 #include "h5test.h"
 #include "h5cpputil.h" // C++ utilility header file
 
diff --git a/c++/test/tvlstr.cpp b/c++/test/tvlstr.cpp
index 33710a3ba17..3cd1fe562d6 100644
--- a/c++/test/tvlstr.cpp
+++ b/c++/test/tvlstr.cpp
@@ -25,6 +25,7 @@ using std::endl;
 #include "H5Cpp.h" // C++ API header file
 using namespace H5;
 
+#include "H5Wrapper.h"
 #include "h5test.h"
 #include "h5cpputil.h" // C++ utilility header file
 
diff --git a/hl/c++/src/H5PacketTable.cpp b/hl/c++/src/H5PacketTable.cpp
index 4cd3c034a48..4425e1b1ca6 100644
--- a/hl/c++/src/H5PacketTable.cpp
+++ b/hl/c++/src/H5PacketTable.cpp
@@ -18,6 +18,7 @@
  * February 2004
  */
 
+#include "H5Wrapper.h"
 /* High-level library internal header file */
 #include "H5HLprivate2.h"
 
diff --git a/hl/c++/src/Makefile.am b/hl/c++/src/Makefile.am
index 54fd52e8ee8..96fa18518d9 100644
--- a/hl/c++/src/Makefile.am
+++ b/hl/c++/src/Makefile.am
@@ -19,7 +19,7 @@ include $(top_srcdir)/config/commence.am
 include $(top_srcdir)/config/lt_vers.am
 
 # Include src directory
-AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/hl/src
+AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/c++/src -I$(top_srcdir)/hl/src
 
 # This is our main target
 lib_LTLIBRARIES=libhdf5_hl_cpp.la
diff --git a/hl/c++/test/ptableTest.cpp b/hl/c++/test/ptableTest.cpp
index efb97a6546a..fd8f93ea6b9 100644
--- a/hl/c++/test/ptableTest.cpp
+++ b/hl/c++/test/ptableTest.cpp
@@ -13,6 +13,7 @@
 /* ptableTest.cpp */
 
 #include <iostream>
+#include "H5Wrapper.h"
 #include "ptableTest.h"
 
 using namespace H5;