Fix inclusion header problems.