x86: break mutual header inclusion