Merge with Barnex
Makefile: fix stray "-S"
define HEADER size