Cleaned up includes

git-svn-id: http://hxcpp.googlecode.com/svn/trunk@689 d391954c-4287-11de-baa7-5503b21fc9cb