Properly sort class registration for /includes/

Change-Id: I2b6f2e814cfd21dd96c34def8bc75e7825a2e98d