Cross Compiling Header Generation Rework [Patch 3/3]