Clean up the contents of programs, add more guards to includes, move all
defines to the top of the top of files, remove some unused includes