Make header replaceable

Signed-off-by: Max Sikstrom <msikstrom@op5.com>
Some style improvements

Signed-off-by: Max Sikstrom <msikstrom@op5.com>