This is a continuation of the previous include sort patch, which only sorted for .c files.
No functional changes, just moving definitions into separate header files.