[PATCH 0/2] Correct ELL header errors included C++ code.