Const and extern declaration fix