Fixing some includes