Merge "Move header declarations around for clarity"