WIP
Removing changes for include pre-processing