Fixed Header linking with recent submodules cleanup