diff --git a/Makefile.am b/Makefile.am
index ffdf39c..8a0c34f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@ libhds_v5_la_SOURCES = \
 	$(PRIVATE_INCLUDES) \
 	$(C_ROUTINES)
 
-libhds_v5_la_LIBADD = `starmem_link` `ems_link` `one_link` -lhdf5 -lhdf5_hl
+libhds_v5_la_LIBADD = `starmem_link` `ems_link` `one_link` -lhdf5
 
 # Make all library code position independent. This is handy for creating
 # shareable libraries from the static ones (Java JNI libraries).
diff --git a/dat1Coords2CellName.c b/dat1Coords2CellName.c
index ed757a2..f8052fd 100644
--- a/dat1Coords2CellName.c
+++ b/dat1Coords2CellName.c
@@ -89,7 +89,6 @@
 #include <string.h>
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/dat1DumpLoc.c b/dat1DumpLoc.c
index d49cfd4..ecb23d8 100644
--- a/dat1DumpLoc.c
+++ b/dat1DumpLoc.c
@@ -61,7 +61,6 @@
 #include <stdio.h>
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "star/one.h"
 #include "ems.h"
diff --git a/dat1EncodeSubscript.c b/dat1EncodeSubscript.c
index 28c712d..66a6a7b 100644
--- a/dat1EncodeSubscript.c
+++ b/dat1EncodeSubscript.c
@@ -96,7 +96,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/dat1ExportDims.c b/dat1ExportDims.c
index 623967b..b05448e 100644
--- a/dat1ExportDims.c
+++ b/dat1ExportDims.c
@@ -86,7 +86,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/dat1FixNameCell.c b/dat1FixNameCell.c
index 7b58cff..c90f13b 100644
--- a/dat1FixNameCell.c
+++ b/dat1FixNameCell.c
@@ -95,7 +95,6 @@
 #include <string.h>
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/dat1H5EtoEMS.c b/dat1H5EtoEMS.c
index 3336813..342286c 100644
--- a/dat1H5EtoEMS.c
+++ b/dat1H5EtoEMS.c
@@ -82,7 +82,6 @@
 #include <string.h>
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "dat1.h"
diff --git a/dat1ImportDims.c b/dat1ImportDims.c
index c9d824f..65be2d5 100644
--- a/dat1ImportDims.c
+++ b/dat1ImportDims.c
@@ -86,7 +86,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/dat1Index2Coords.c b/dat1Index2Coords.c
index 528315c..68a3d23 100644
--- a/dat1Index2Coords.c
+++ b/dat1Index2Coords.c
@@ -85,7 +85,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/dat1InitHDF5.c b/dat1InitHDF5.c
index 2aa1d26..0139a71 100644
--- a/dat1InitHDF5.c
+++ b/dat1InitHDF5.c
@@ -77,7 +77,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 void dat1InitHDF5(void) {
   static int DONE = 0;
diff --git a/dat1IsStructure.c b/dat1IsStructure.c
index d110b54..a6e968e 100644
--- a/dat1IsStructure.c
+++ b/dat1IsStructure.c
@@ -83,7 +83,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/dat1NewPrim.c b/dat1NewPrim.c
index 2a485a9..867fa95 100644
--- a/dat1NewPrim.c
+++ b/dat1NewPrim.c
@@ -94,7 +94,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/dat1Type.c b/dat1Type.c
index eeaba57..63f9c63 100644
--- a/dat1Type.c
+++ b/dat1Type.c
@@ -82,7 +82,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "star/one.h"
 #include "ems.h"
diff --git a/dat1TypeInfo.c b/dat1TypeInfo.c
index d9f5a5e..a6427ab 100644
--- a/dat1TypeInfo.c
+++ b/dat1TypeInfo.c
@@ -77,7 +77,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datAlter.c b/datAlter.c
index 49fd507..ca0375e 100644
--- a/datAlter.c
+++ b/datAlter.c
@@ -100,7 +100,6 @@
 #include <string.h>
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datBasic.c b/datBasic.c
index 3cb7d97..8ca12e6 100644
--- a/datBasic.c
+++ b/datBasic.c
@@ -87,7 +87,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datCcopy.c b/datCcopy.c
index 4bb0aae..c9812e1 100644
--- a/datCcopy.c
+++ b/datCcopy.c
@@ -87,7 +87,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datClen.c b/datClen.c
index 79dfb76..0835734 100644
--- a/datClen.c
+++ b/datClen.c
@@ -92,7 +92,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datClone.c b/datClone.c
index 6b14d8a..cd5b37d 100644
--- a/datClone.c
+++ b/datClone.c
@@ -87,7 +87,6 @@
 #include <string.h>
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datCoerc.c b/datCoerc.c
index 6e0059a..5785683 100644
--- a/datCoerc.c
+++ b/datCoerc.c
@@ -91,7 +91,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datConv.c b/datConv.c
index dbf83ad..2bce65b 100644
--- a/datConv.c
+++ b/datConv.c
@@ -85,7 +85,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datCopy.c b/datCopy.c
index 4c31616..749f311 100644
--- a/datCopy.c
+++ b/datCopy.c
@@ -85,7 +85,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datDrep.c b/datDrep.c
index b81c99c..d2acc91 100644
--- a/datDrep.c
+++ b/datDrep.c
@@ -90,7 +90,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datExportFloc.c b/datExportFloc.c
index ff97fa0..787caf7 100644
--- a/datExportFloc.c
+++ b/datExportFloc.c
@@ -108,7 +108,6 @@
 #include <string.h>
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datFind.c b/datFind.c
index 5f41673..a33599c 100644
--- a/datFind.c
+++ b/datFind.c
@@ -90,7 +90,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 
diff --git a/datGet.c b/datGet.c
index 1bed37c..beb8ecf 100644
--- a/datGet.c
+++ b/datGet.c
@@ -89,7 +89,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datIndex.c b/datIndex.c
index 9c76550..0d76957 100644
--- a/datIndex.c
+++ b/datIndex.c
@@ -85,7 +85,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datLen.c b/datLen.c
index 3e38163..f6d197c 100644
--- a/datLen.c
+++ b/datLen.c
@@ -79,7 +79,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datMap.c b/datMap.c
index 5453e1d..216bc6f 100644
--- a/datMap.c
+++ b/datMap.c
@@ -114,7 +114,6 @@
 #include <errno.h>
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "star/util.h"
 #include "star/one.h"
diff --git a/datMould.c b/datMould.c
index ae32415..e5df351 100644
--- a/datMould.c
+++ b/datMould.c
@@ -84,7 +84,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datMove.c b/datMove.c
index aec2238..5937b6a 100644
--- a/datMove.c
+++ b/datMove.c
@@ -95,7 +95,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datName.c b/datName.c
index 9ddfde3..1e74134 100644
--- a/datName.c
+++ b/datName.c
@@ -82,7 +82,6 @@
 #include <string.h>
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "star/one.h"
 #include "ems.h"
diff --git a/datNcomp.c b/datNcomp.c
index 7fd1243..c48b36a 100644
--- a/datNcomp.c
+++ b/datNcomp.c
@@ -81,7 +81,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datNew.c b/datNew.c
index e26739d..942086b 100644
--- a/datNew.c
+++ b/datNew.c
@@ -94,7 +94,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "hds1.h"
 #include "dat1.h"
diff --git a/datParen.c b/datParen.c
index d3ecb4a..f27b10a 100644
--- a/datParen.c
+++ b/datParen.c
@@ -101,7 +101,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datPrim.c b/datPrim.c
index fc6aaec..ef41327 100644
--- a/datPrim.c
+++ b/datPrim.c
@@ -80,7 +80,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datPrmry.c b/datPrmry.c
index 0b745e0..342b611 100644
--- a/datPrmry.c
+++ b/datPrmry.c
@@ -110,7 +110,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datRefct.c b/datRefct.c
index b0caa5b..452071c 100644
--- a/datRefct.c
+++ b/datRefct.c
@@ -88,7 +88,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datRenam.c b/datRenam.c
index 9f28c29..d7335b5 100644
--- a/datRenam.c
+++ b/datRenam.c
@@ -82,7 +82,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datRetyp.c b/datRetyp.c
index 5b5d807..51baa39 100644
--- a/datRetyp.c
+++ b/datRetyp.c
@@ -80,7 +80,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datShape.c b/datShape.c
index 45a7763..301a419 100644
--- a/datShape.c
+++ b/datShape.c
@@ -82,7 +82,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datSize.c b/datSize.c
index 58ab1cf..d562cb0 100644
--- a/datSize.c
+++ b/datSize.c
@@ -78,7 +78,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "star/one.h"
 #include "ems.h"
diff --git a/datSlice.c b/datSlice.c
index 6796862..f10a730 100644
--- a/datSlice.c
+++ b/datSlice.c
@@ -90,7 +90,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datState.c b/datState.c
index 5066b01..5ee8615 100644
--- a/datState.c
+++ b/datState.c
@@ -80,7 +80,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datStruc.c b/datStruc.c
index cb47853..afe83d1 100644
--- a/datStruc.c
+++ b/datStruc.c
@@ -80,7 +80,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datThere.c b/datThere.c
index dc1ba5b..be6e10b 100644
--- a/datThere.c
+++ b/datThere.c
@@ -80,7 +80,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datType.c b/datType.c
index 4ffa49e..11ec418 100644
--- a/datType.c
+++ b/datType.c
@@ -79,7 +79,6 @@
 #include <string.h>
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "star/one.h"
 #include "ems.h"
diff --git a/datVec.c b/datVec.c
index 22577b9..ca3129d 100644
--- a/datVec.c
+++ b/datVec.c
@@ -82,7 +82,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/dau1CheckFileName.c b/dau1CheckFileName.c
index 672df1b..72b6ca9 100644
--- a/dau1CheckFileName.c
+++ b/dau1CheckFileName.c
@@ -92,7 +92,6 @@
 #include <ctype.h>
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "star/util.h"
 #include "ems.h"
diff --git a/dau1HdsType.c b/dau1HdsType.c
index 269291f..a0b9f47 100644
--- a/dau1HdsType.c
+++ b/dau1HdsType.c
@@ -86,7 +86,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "star/one.h"
 #include "ems.h"
diff --git a/hdsClose.c b/hdsClose.c
index 3a7e58e..02a3479 100644
--- a/hdsClose.c
+++ b/hdsClose.c
@@ -79,7 +79,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/hdsCopy.c b/hdsCopy.c
index a4bfcae..7a0e64a 100644
--- a/hdsCopy.c
+++ b/hdsCopy.c
@@ -89,7 +89,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/hdsErase.c b/hdsErase.c
index 35e331a..503bd9a 100644
--- a/hdsErase.c
+++ b/hdsErase.c
@@ -90,7 +90,6 @@
 #include <errno.h>
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/hdsEwild.c b/hdsEwild.c
index 6c644de..928aca4 100644
--- a/hdsEwild.c
+++ b/hdsEwild.c
@@ -88,7 +88,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/hdsGroup.c b/hdsGroup.c
index 3468496..abadce8 100644
--- a/hdsGroup.c
+++ b/hdsGroup.c
@@ -81,7 +81,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/hdsLock.c b/hdsLock.c
index 7961061..c52bfb7 100644
--- a/hdsLock.c
+++ b/hdsLock.c
@@ -81,7 +81,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/hdsNew.c b/hdsNew.c
index 57bc046..76e9b2d 100644
--- a/hdsNew.c
+++ b/hdsNew.c
@@ -118,7 +118,6 @@
 #include "star/one.h"
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 int
 hdsNew(const char *file_str,
diff --git a/hdsOpen.c b/hdsOpen.c
index bbf5fbe..a46801f 100644
--- a/hdsOpen.c
+++ b/hdsOpen.c
@@ -97,7 +97,6 @@
 #include <string.h>
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/hdsShow.c b/hdsShow.c
index cb0ab89..60e3377 100644
--- a/hdsShow.c
+++ b/hdsShow.c
@@ -84,7 +84,6 @@
 #include <string.h>
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/hdsState.c b/hdsState.c
index 766331a..b48ec03 100644
--- a/hdsState.c
+++ b/hdsState.c
@@ -79,7 +79,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/hdsStop.c b/hdsStop.c
index bcaf4b7..456d198 100644
--- a/hdsStop.c
+++ b/hdsStop.c
@@ -81,7 +81,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/hdsTrace.c b/hdsTrace.c
index 6093e65..92d5f7c 100644
--- a/hdsTrace.c
+++ b/hdsTrace.c
@@ -98,7 +98,6 @@
 #include "star/one.h"
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/hdsWild.c b/hdsWild.c
index 909b888..a73ca1b 100644
--- a/hdsWild.c
+++ b/hdsWild.c
@@ -101,7 +101,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"