Unify paths for X11 and Win32 drivers