Fixed some minor issues (includes mostly, added header files for two files)