Match function order in .cpp files with header