fix some bad includes for issue #465