--- a/src/ov-cx-mat.cc
+++ b/src/ov-cx-mat.cc
@@ -461,7 +461,7 @@
   for (int i = 0; i < rank; i++)
     hdims[i] = d (rank-i-1);
  
-  space_hid = H5Screate_simple (rank, hdims, (hsize_t*) 0);
+  space_hid = H5Screate_simple (rank, hdims, 0);
   if (space_hid < 0) return false;
 
   hid_t save_type_hid = H5T_NATIVE_DOUBLE;
@@ -510,7 +510,7 @@
     {
       Complex *mtmp = m.fortran_vec ();
       if (H5Dwrite (data_hid, complex_type_hid, H5S_ALL, H5S_ALL, H5P_DEFAULT,
-		    (void*) X_CAST (double *, mtmp)) < 0)
+		    mtmp) < 0)
 	{
 	  H5Tclose (complex_type_hid);
 	  retval = false;
@@ -575,14 +575,14 @@
   else
     {
       dv.resize (rank);
-      for (int i = 0, j = rank - 1; i < (int)rank; i++, j--)
+      for (hsize_t i = 0, j = rank - 1; i < rank; i++, j--)
 	dv(j) = hdims[i];
     }
 
   ComplexNDArray m (dv);
   Complex *reim = m.fortran_vec ();
-  if (H5Dread (data_hid, complex_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, 
-	       (void *) X_CAST (double *, reim)) >= 0) 
+  if (H5Dread (data_hid, complex_type, H5S_ALL, H5S_ALL, H5P_DEFAULT,
+	       reim) >= 0) 
     {
       retval = true;
       matrix = m;