diff --git a/src/modules/Image/encodings/psd.c b/src/modules/Image/encodings/psd.c
index c90d03998a19fe603cd98924c8055f08ba0d1209..5bebf253e82ddc93a2af11d4d990c7990cbc3c3d 100644
--- a/src/modules/Image/encodings/psd.c
+++ b/src/modules/Image/encodings/psd.c
@@ -1,5 +1,5 @@
 #include "global.h"
-RCSID("$Id: psd.c,v 1.12 1999/07/16 19:22:42 per Exp $");
+RCSID("$Id: psd.c,v 1.13 1999/09/06 10:52:19 grubba Exp $");
 
 #include "image_machine.h"
 
@@ -38,7 +38,7 @@ extern struct program *image_program;
 **!
 */
 
-#define STRING(X) static struct pike_string *s_##X;
+#define STRING(X) static struct pike_string *PIKE_CONCAT(s_, X);
 #include "psd_constant_strings.h"
 #undef STRING
 
@@ -646,7 +646,8 @@ void init_image_psd()
   add_integer_constant("LAYER_FLAG_BIT4", 0x04, 0 );
   add_integer_constant("LAYER_FLAG_NOPIX", 0x08, 0 );
 
-#define STRING(X) s_##X = make_shared_binary_string(#X,sizeof( #X )-sizeof(""));
+#define STRING(X) PIKE_CONCAT(s_, X) = \
+  make_shared_binary_string(#X,sizeof( #X )-sizeof(""))
 #include "psd_constant_strings.h"
 #undef STRING
 }
@@ -654,7 +655,7 @@ void init_image_psd()
 
 void exit_image_psd()
 {
-#define STRING(X) free_string(s_##X)
+#define STRING(X) free_string(PIKE_CONCAT(s_, X))
 #include "psd_constant_strings.h"
 #undef STRING
 }