Fix some #include problems.