Index: src/raster/ftraster.c
===================================================================
--- src/raster/ftraster.c	(revision 1014)
+++ src/raster/ftraster.c	(working copy)
@@ -381,6 +381,11 @@
   ( ( sizeof ( TProfile ) + sizeof ( Alignment ) - 1 ) / sizeof ( long ) )
 
 
+#undef RAS_ARG
+#undef RAS_ARGS
+#undef RAS_VAR
+#undef RAS_VARS
+
 #ifdef FT_STATIC_RASTER
 
 
@@ -544,7 +549,7 @@
   };
 
 
-  typedef struct  TRaster_
+  typedef struct  black_TRaster_
   {
     char*    buffer;
     long     buffer_size;
@@ -553,7 +558,7 @@
     Byte     grays[5];
     Short    gray_width;
 
-  } TRaster, *PRaster;
+  } black_TRaster, *black_PRaster;
 
 #ifdef FT_STATIC_RASTER
 
@@ -3395,7 +3400,7 @@
 
 
   static void
-  ft_black_init( PRaster  raster )
+  ft_black_init( black_PRaster  raster )
   {
 #ifdef FT_RASTER_OPTION_ANTI_ALIASING
     FT_UInt  n;
@@ -3423,7 +3428,7 @@
   ft_black_new( void*       memory,
                 FT_Raster  *araster )
   {
-     static TRaster  the_raster;
+     static black_TRaster  the_raster;
      FT_UNUSED( memory );
 
 
@@ -3448,10 +3453,10 @@
 
   static int
   ft_black_new( FT_Memory   memory,
-                PRaster    *araster )
+                black_PRaster    *araster )
   {
     FT_Error  error;
-    PRaster   raster = NULL;
+    black_PRaster   raster = NULL;
 
 
     *araster = 0;
@@ -3468,7 +3473,7 @@
 
 
   static void
-  ft_black_done( PRaster  raster )
+  ft_black_done( black_PRaster  raster )
   {
     FT_Memory  memory = (FT_Memory)raster->memory;
     FT_FREE( raster );
@@ -3479,7 +3484,7 @@
 
 
   static void
-  ft_black_reset( PRaster  raster,
+  ft_black_reset( black_PRaster  raster,
                   char*    pool_base,
                   long     pool_size )
   {
@@ -3505,7 +3510,7 @@
 
 
   static void
-  ft_black_set_mode( PRaster        raster,
+  ft_black_set_mode( black_PRaster        raster,
                      unsigned long  mode,
                      const char*    palette )
   {
@@ -3532,7 +3537,7 @@
 
 
   static int
-  ft_black_render( PRaster                  raster,
+  ft_black_render( black_PRaster                  raster,
                    const FT_Raster_Params*  params )
   {
     const FT_Outline*  outline    = (const FT_Outline*)params->source;
Index: src/smooth/ftgrays.c
===================================================================
--- src/smooth/ftgrays.c	(revision 1014)
+++ src/smooth/ftgrays.c	(working copy)
@@ -232,6 +232,11 @@
 
   /* as usual, for the speed hungry :-) */
 
+#undef RAS_ARG
+#undef RAS_ARG_
+#undef RAS_VAR
+#undef RAS_VAR_
+
 #ifndef FT_STATIC_RASTER
 
 #define RAS_ARG   gray_PWorker  worker
@@ -378,7 +383,7 @@
 #endif
 
 
-  typedef struct TRaster_
+  typedef struct gray_TRaster_
   {
     void*    buffer;
     long     buffer_size;
@@ -386,7 +391,7 @@
     void*    memory;
     gray_PWorker  worker;
 
-  } TRaster, *PRaster;
+  } gray_TRaster, *gray_PRaster;
 
 
 
@@ -1856,7 +1861,7 @@
 
 
   static int
-  gray_raster_render( PRaster                  raster,
+  gray_raster_render( gray_PRaster                  raster,
                       const FT_Raster_Params*  params )
   {
     const FT_Outline*  outline    = (const FT_Outline*)params->source;
@@ -1953,7 +1958,7 @@
   gray_raster_new( void*       memory,
                    FT_Raster*  araster )
   {
-    static TRaster  the_raster;
+    static gray_TRaster  the_raster;
 
     FT_UNUSED( memory );
 
@@ -1979,11 +1984,11 @@
                    FT_Raster*  araster )
   {
     FT_Error  error;
-    PRaster   raster = NULL;
+    gray_PRaster   raster = NULL;
 
 
     *araster = 0;
-    if ( !FT_ALLOC( raster, sizeof ( TRaster ) ) )
+    if ( !FT_ALLOC( raster, sizeof ( gray_TRaster ) ) )
     {
       raster->memory = memory;
       *araster = (FT_Raster)raster;
@@ -1996,7 +2001,7 @@
   static void
   gray_raster_done( FT_Raster  raster )
   {
-    FT_Memory  memory = (FT_Memory)((PRaster)raster)->memory;
+    FT_Memory  memory = (FT_Memory)((gray_PRaster)raster)->memory;
 
 
     FT_FREE( raster );
@@ -2010,7 +2015,7 @@
                      char*      pool_base,
                      long       pool_size )
   {
-    PRaster  rast = (PRaster)raster;
+    gray_PRaster  rast = (gray_PRaster)raster;
 
 
     if ( raster )