Refactor source files preprocessing (#64)

Merged Loïc Bidoux requested to merge 64 into next-release

Merge request reports