Added header files. Fixed up DrawObject