split headers on : or /

Signed-off-by: James Rubingh <james@wrive.com>
fix header bugs

Signed-off-by: James Rubingh <james@wrive.com>