#121: Added missing includes