Sort declarations added to .h and .cpp