add missing includes and fix one class initialization