This patch fixes some issues with with some headers files that I faced when compiling gcc
This will create a new commit in order to revert the existing changes.
