Version 1.02 Trim #includes and files