Fix structure and auto inclusion