Fix some minor #include errors.