Declaration of unmodified variables were moved to C++ head file