[dev] Returning hdf_io.h back to normal.
Merging in missing files from a previous commit.