reorder class declarations for clang, maybe