Put libunicodenames stuff back in the same order as before

Moved to same spots in #include order, changed #if and #endif to no spaces.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	fontforge/startui.c
Merge pull request #428 from JoesCat/master

more changes to re-align libunicodenames