Move #ifdef __GLASGOW_HASKELL__ < 604 to cover the CSIDL definitions too