Just make so that the declarations and definitions are in the same order for easy maintenance. (cherry picked from commit 91cb86d2)