Put libunicodenames back in same place

Moved to same spots in #include order.
Missed these moves during the copy done earlier on 2013-03-13 20:04:26