more changes to re-align libunicodenames

Moved to same spots in #include order, changed #if and #endif to no spaces.

Did not yet change function in m4/fontforge_arg_with.m4 currently named FONTFORGE_ARG_WITH_LIBUNICODENAMES

Would like to see if we can remain with FONTFORGE_ARG_WITH_BASE() instead of going to FONTFORGE_ARG_WITH()