style fix (includes, function header, types)