Fix cpp header order thing