fix some include dependencies for pre-processor