split blocks.h
add forgotten headers