Fixed missing includes