Rearrange headers to build without KDE's fixx11h.h

Fixes issue #1
Merge pull request #2 from amoskvin/fix-build

Fix build without fixx11h.h

Thanks you