Index: src/GMAudioScrobbler.cpp
--- src/GMAudioScrobbler.cpp.orig
+++ src/GMAudioScrobbler.cpp
@@ -870,9 +870,9 @@ void GMAudioScrobbler::set_submit_failed() {
 void GMAudioScrobbler::create_token_request(FXString & request) {
   FXMutexLock lock(mutex_data);
   FXTRACE((60,"GMAudioScrobbler::create_token_request\n"));
-  FXString signature="api_key"CLIENT_KEY"methodauth.getToken"CLIENT_SECRET;
+  FXString signature="api_key" CLIENT_KEY "methodauth.getToken" CLIENT_SECRET;
   checksum(signature);
-  request=GMStringFormat("method=auth.getToken&api_key="CLIENT_KEY"&api_sig=%s",signature.text());
+  request=GMStringFormat("method=auth.getToken&api_key=" CLIENT_KEY "&api_sig=%s",signature.text());
   flags&=~(FLAG_LOGIN_CHANGED);
   }
 
@@ -885,7 +885,7 @@ void GMAudioScrobbler::process_token_response(const FX
   if (service.parse(response) && service.getStatus()) {
     token=service.getToken();
     FXTRACE((60,"GMAudioScrobbler::process_token_response => token=%s\n",token.text()));
-    FXString url="http://www.last.fm/api/auth/?api_key="CLIENT_KEY"&token="+token;
+    FXString url="http://www.last.fm/api/auth/?api_key=" CLIENT_KEY "&token="+token;
     feedback.message(target,FXSEL(SEL_OPENED,message),url.text(),url.length());
     reset_timeout(); /// Reset timer
     set_timeout();   /// Let's wait at least 60s
@@ -911,7 +911,7 @@ FXuint GMAudioScrobbler::create_handshake_request(FXSt
     FXString timestamp_text = GMStringVal(timestamp);
     FXString tk = password + timestamp_text;
     checksum(tk);
-    request=GMStringFormat("/?hs=true&p=1.2&c="CLIENT_ID"&v="CLIENT_VERSION"&u=%s&t=%s&a=%s",username.text(),timestamp_text.text(),tk.text());
+    request=GMStringFormat("/?hs=true&p=1.2&c=" CLIENT_ID "&v=" CLIENT_VERSION "&u=%s&t=%s&a=%s",username.text(),timestamp_text.text(),tk.text());
     }
   flags&=~(FLAG_LOGIN_CHANGED);
   return mode;
@@ -1047,7 +1047,7 @@ void GMAudioScrobbler::create_nowplaying_request(FXStr
   FXTRACE((60,"GMAudioScrobbler::create_nowplaying_request\n"));
   if (mode==SERVICE_LASTFM) {
     FXString signature=GMStringFormat("album%s"
-                                      "api_key"CLIENT_KEY
+                                      "api_key" CLIENT_KEY
                                       "artist%s"
                                       "duration%d"
                                       "methodtrack.updateNowPlaying"
@@ -1070,7 +1070,7 @@ void GMAudioScrobbler::create_nowplaying_request(FXStr
                            "&album=%s"
                            "&trackNumber=%d"
                            "&duration=%d"
-                           "&api_key="CLIENT_KEY
+                           "&api_key=" CLIENT_KEY
                            "&api_sig=%s"
                            "&sk=%s",
                            gm_url_encode(nowplayingtrack.title).text(),
@@ -1133,7 +1133,7 @@ void GMAudioScrobbler::create_submit_request(FXString 
   if (mode==SERVICE_LASTFM) {
     if (ntracks==1) {
       signature=GMStringFormat("album[0]%s"
-                               "api_key"CLIENT_KEY
+                               "api_key" CLIENT_KEY
                                "artist[0]%s"
                                "duration[0]%d"
                                "methodtrack.scrobble"
@@ -1155,7 +1155,7 @@ void GMAudioScrobbler::create_submit_request(FXString 
       for (i=0;i<ntracks;i++)
         signature+=GMStringFormat("album[%d]%s",i,submitqueue[i].album.text());
 
-      signature+="api_key"CLIENT_KEY;
+      signature+="api_key" CLIENT_KEY;
 
       for (i=0;i<ntracks;i++)
         signature+=GMStringFormat("artist[%d]%s",i,submitqueue[i].artist.text());
@@ -1189,7 +1189,7 @@ void GMAudioScrobbler::create_submit_request(FXString 
       for (;s<10;s++)
         signature+=GMStringFormat("album[%d]%s",s,submitqueue[s].album.text());
 
-      signature+="api_key"CLIENT_KEY;
+      signature+="api_key" CLIENT_KEY;
 
       /// artists
       for (s=0,i=10;i<ntracks;i++){
@@ -1271,7 +1271,7 @@ void GMAudioScrobbler::create_submit_request(FXString 
                               i,submitqueue[i].no,
                               i,submitqueue[i].duration);
       }
-    request+=GMStringFormat("&api_key="CLIENT_KEY"&api_sig=%s&sk=%s",signature.text(),session.text());
+    request+=GMStringFormat("&api_key=" CLIENT_KEY "&api_sig=%s&sk=%s",signature.text(),session.text());
     }
   else {
     request+="s=";
@@ -1357,7 +1357,7 @@ void GMAudioScrobbler::create_loveban_request(FXString
   FXTRACE((60,"GMAudioScrobbler::create_loveban_request\n"));
   FXASSERT(mode==SERVICE_LASTFM);
 
-  FXString signature=GMStringFormat("api_key"CLIENT_KEY
+  FXString signature=GMStringFormat("api_key" CLIENT_KEY
                            "artist%s"
                            "methodtrack.love" //methodtrack.ban
                            "sk%s"
@@ -1372,7 +1372,7 @@ void GMAudioScrobbler::create_loveban_request(FXString
   request=GMStringFormat("method=track.love" ////method=track.ban
                          "&track=%s"
                          "&artist=%s"
-                         "&api_key="CLIENT_KEY
+                         "&api_key=" CLIENT_KEY
                          "&api_sig=%s"
                          "&sk=%s",
                          gm_url_encode(submitqueue[0].title).text(),
