Merge pull request #425 from JoesCat/master

fix for Irix compiler - brackets required
Put libunicodenames stuff back in the same order as before

Moved to same spots in #include order, changed #if and #endif to no spaces.