Fixed type and include errors.