Clean up some lua-hdf5 things for icc builds