Correct includes and formatting in the parser