This reverts commit 3ab08c8bfd.
3ab08c8bfd
so the filenames match the contained namespace. Sort includes in gimpui.h alphabetically.