Fixed up all the includes and compiled a test program