Bring r17573 from trunk to 1.8 branch: Fix several errors in code, which was not compiling... :-( Tested on: FreeBSD/32 6.3 (duty) in debug mode (h5committested on trunk)
Tested: local linux, h5committest