Fixed some warnings and Include statements