[compilation] Fix compilation on x11-based systems
Merge pull request #6 from faenil/nemomerge_fixes

[compilation] Fix compilation on x11-based systems