Bugfix to preserve include ordering during preprocessing