Move blksize_t and blkcnt_t to replace.h from includes.h. Should help with platforms...