Put libunicodenames stuff back in the same order as before

Moved to same spots in #include order.
Missed these moves during the copy done on 2013-03-13 20:04:26
Merge pull request #475 from JoesCat/master

Put libunicodenames back in same place