Reformatted include files and added headers