1. Added includes
2. Code-style fixes