Changed order of include files; removed extraneous whitespace