Fix #2 Remove headers from included files