Fixed some issues with missing includes and an update to build files.