diff --git a/coders/art.c b/coders/art.c
index 8086510..d13c98d 100644
--- a/coders/art.c
+++ b/coders/art.c
@@ -163,7 +163,7 @@
   for (y=0; y < (long) image->rows; y++)
   {
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
     if (q == (PixelPacket *) NULL)
diff --git a/coders/cmyk.c b/coders/cmyk.c
index 78989b0..576e3c3 100644
--- a/coders/cmyk.c
+++ b/coders/cmyk.c
@@ -218,19 +218,19 @@
         for (y=0; y < (long) image->extract_info.height; y++)
         {
           register const IndexPacket
-            *__restrict canvas_indexes;
+            *restrict canvas_indexes;
 
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register IndexPacket
-            *__restrict indexes;
+            *restrict indexes;
 
           register long
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           if (count != (ssize_t) length)
             {
@@ -306,19 +306,19 @@
         for (y=0; y < (long) image->extract_info.height; y++)
         {
           register const IndexPacket
-            *__restrict canvas_indexes;
+            *restrict canvas_indexes;
 
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register IndexPacket
-            *__restrict indexes;
+            *restrict indexes;
 
           register long
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           if (count != (ssize_t) length)
             {
@@ -391,13 +391,13 @@
         for (y=0; y < (long) image->extract_info.height; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register long
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           if (count != (ssize_t) length)
             {
@@ -443,13 +443,13 @@
         for (y=0; y < (long) image->extract_info.height; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register long
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           if (count != (ssize_t) length)
             {
@@ -495,13 +495,13 @@
         for (y=0; y < (long) image->extract_info.height; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register long
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           if (count != (ssize_t) length)
             {
@@ -547,19 +547,19 @@
         for (y=0; y < (long) image->extract_info.height; y++)
         {
           register const IndexPacket
-            *__restrict canvas_indexes;
+            *restrict canvas_indexes;
 
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register IndexPacket
-            *__restrict indexes;
+            *restrict indexes;
 
           register long
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           if (count != (ssize_t) length)
             {
@@ -609,13 +609,13 @@
             for (y=0; y < (long) image->extract_info.height; y++)
             {
               register const PixelPacket
-                *__restrict p;
+                *restrict p;
 
               register long
                 x;
 
               register PixelPacket
-                *__restrict q;
+                *restrict q;
 
               if (count != (ssize_t) length)
                 {
@@ -701,13 +701,13 @@
         for (y=0; y < (long) image->extract_info.height; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register long
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           if (count != (ssize_t) length)
             {
@@ -772,13 +772,13 @@
         for (y=0; y < (long) image->extract_info.height; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register long
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           if (count != (ssize_t) length)
             {
@@ -843,13 +843,13 @@
         for (y=0; y < (long) image->extract_info.height; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register long
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           if (count != (ssize_t) length)
             {
@@ -914,19 +914,19 @@
         for (y=0; y < (long) image->extract_info.height; y++)
         {
           register const IndexPacket
-            *__restrict canvas_indexes;
+            *restrict canvas_indexes;
 
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register IndexPacket
-            *__restrict indexes;
+            *restrict indexes;
 
           register long
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           if (count != (ssize_t) length)
             {
@@ -995,13 +995,13 @@
             for (y=0; y < (long) image->extract_info.height; y++)
             {
               register const PixelPacket
-                *__restrict p;
+                *restrict p;
 
               register long
                 x;
 
               register PixelPacket
-                *__restrict q;
+                *restrict q;
 
               if (count != (ssize_t) length)
                 {
@@ -1266,7 +1266,7 @@
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
           if (p == (const PixelPacket *) NULL)
@@ -1293,7 +1293,7 @@
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
           if (p == (const PixelPacket *) NULL)
@@ -1343,7 +1343,7 @@
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
           if (p == (const PixelPacket *) NULL)
@@ -1363,7 +1363,7 @@
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
           if (p == (const PixelPacket *) NULL)
@@ -1383,7 +1383,7 @@
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
           if (p == (const PixelPacket *) NULL)
@@ -1403,7 +1403,7 @@
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
           if (p == (const PixelPacket *) NULL)
@@ -1425,7 +1425,7 @@
             for (y=0; y < (long) image->rows; y++)
             {
               register const PixelPacket
-                *__restrict p;
+                *restrict p;
 
               p=GetVirtualPixels(image,0,y,image->columns,1,
                 &image->exception);
@@ -1468,7 +1468,7 @@
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
           if (p == (const PixelPacket *) NULL)
@@ -1494,7 +1494,7 @@
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
           if (p == (const PixelPacket *) NULL)
@@ -1520,7 +1520,7 @@
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
           if (p == (const PixelPacket *) NULL)
@@ -1546,7 +1546,7 @@
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
           if (p == (const PixelPacket *) NULL)
@@ -1574,7 +1574,7 @@
             for (y=0; y < (long) image->rows; y++)
             {
               register const PixelPacket
-                *__restrict p;
+                *restrict p;
 
               p=GetVirtualPixels(image,0,y,image->columns,1,
                 &image->exception);
diff --git a/coders/gif.c b/coders/gif.c
index 440d0c7..003d232 100644
--- a/coders/gif.c
+++ b/coders/gif.c
@@ -412,13 +412,13 @@
   for (y=0; y < (long) image->rows; y++)
   {
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     q=GetAuthenticPixels(image,0,offset,image->columns,1,exception);
     if (q == (PixelPacket *) NULL)
@@ -642,10 +642,10 @@
   for (y=0; y < (long) image->rows; y++)
   {
     register const IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register long
       x;
diff --git a/coders/gray.c b/coders/gray.c
index a3e9139..2169bd6 100644
--- a/coders/gray.c
+++ b/coders/gray.c
@@ -200,13 +200,13 @@
     for (y=0; y < (long) image->extract_info.height; y++)
     {
       register const PixelPacket
-        *__restrict p;
+        *restrict p;
 
       register long
         x;
 
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       if (count != (ssize_t) length)
         {
@@ -427,7 +427,7 @@
     for (y=0; y < (long) image->rows; y++)
     {
       register const PixelPacket
-        *__restrict p;
+        *restrict p;
 
       p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
       if (p == (const PixelPacket *) NULL)
diff --git a/coders/hald.c b/coders/hald.c
index 95a028a..af56cc6 100644
--- a/coders/hald.c
+++ b/coders/hald.c
@@ -136,7 +136,7 @@
       red;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
diff --git a/coders/jpeg.c b/coders/jpeg.c
index c64b380..70c188b 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -1154,13 +1154,13 @@
   for (y=0; y < (long) image->rows; y++)
   {
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (jpeg_read_scanlines(&jpeg_info,scanline,1) != 1)
       {
diff --git a/coders/miff.c b/coders/miff.c
index 80a37c2..ade4d78 100644
--- a/coders/miff.c
+++ b/coders/miff.c
@@ -1222,13 +1222,13 @@
     for (y=0; y < (long) image->rows; y++)
     {
       register IndexPacket
-        *__restrict indexes;
+        *restrict indexes;
 
       register long
         x;
 
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
       if (q == (PixelPacket *) NULL)
@@ -2128,10 +2128,10 @@
     for (y=0; y < (long) image->rows; y++)
     {
       register const IndexPacket
-        *__restrict indexes;
+        *restrict indexes;
 
       register const PixelPacket
-        *__restrict p;
+        *restrict p;
 
       register long
         x;
diff --git a/coders/pnm.c b/coders/pnm.c
index e8b0fdf..65699a2 100644
--- a/coders/pnm.c
+++ b/coders/pnm.c
@@ -434,7 +434,7 @@
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
           if (q == (PixelPacket *) NULL)
@@ -485,7 +485,7 @@
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
           if (q == (PixelPacket *) NULL)
@@ -542,7 +542,7 @@
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
           if (q == (PixelPacket *) NULL)
@@ -605,7 +605,7 @@
             sync;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           ssize_t
             count;
@@ -693,7 +693,7 @@
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           ssize_t
             count;
@@ -811,7 +811,7 @@
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           ssize_t
             count;
@@ -866,7 +866,7 @@
                   pixel;
 
                 register PixelPacket
-                  *__restrict r;
+                  *restrict r;
 
                 r=q;
                 for (x=0; x < (long) image->columns; x++)
@@ -886,7 +886,7 @@
                   pixel;
 
                 register PixelPacket
-                  *__restrict r;
+                  *restrict r;
 
                 r=q;
                 for (x=0; x < (long) image->columns; x++)
@@ -985,7 +985,7 @@
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           ssize_t
             count;
@@ -1222,7 +1222,7 @@
             sync;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           ssize_t
             count;
@@ -1669,10 +1669,10 @@
         for (y=0; y < (long) image->rows; y++)
         {
           register const IndexPacket
-            *__restrict indexes;
+            *restrict indexes;
 
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register long
             x;
@@ -1726,7 +1726,7 @@
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register long
             x;
@@ -1784,7 +1784,7 @@
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register long
             x;
@@ -1841,7 +1841,7 @@
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
           if (p == (const PixelPacket *) NULL)
@@ -1884,7 +1884,7 @@
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register long
             x;
@@ -1965,7 +1965,7 @@
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register long
             x;
@@ -2044,10 +2044,10 @@
         for (y=0; y < (long) image->rows; y++)
         {
           register const IndexPacket
-            *__restrict indexes;
+            *restrict indexes;
 
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register long
             x;
@@ -2209,7 +2209,7 @@
         for (y=(long) image->rows-1; y >= 0; y--)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
           if (p == (const PixelPacket *) NULL)
diff --git a/coders/raw.c b/coders/raw.c
index dfa92f4..c6b223d 100644
--- a/coders/raw.c
+++ b/coders/raw.c
@@ -198,13 +198,13 @@
     for (y=0; y < (long) image->extract_info.height; y++)
     {
       register const PixelPacket
-        *__restrict p;
+        *restrict p;
 
       register long
         x;
 
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       if (count != (ssize_t) length)
         {
diff --git a/coders/rgb.c b/coders/rgb.c
index 47b1a52..519b2f5 100644
--- a/coders/rgb.c
+++ b/coders/rgb.c
@@ -247,13 +247,13 @@
         for (y=0; y < (long) image->extract_info.height; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register long
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           if (count != (ssize_t) length)
             {
@@ -324,13 +324,13 @@
         for (y=0; y < (long) image->extract_info.height; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register long
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           if (count != (ssize_t) length)
             {
@@ -397,13 +397,13 @@
           for (y=0; y < (long) image->extract_info.height; y++)
           {
             register const PixelPacket
-              *__restrict p;
+              *restrict p;
 
             register long
               x;
 
             register PixelPacket
-              *__restrict q;
+              *restrict q;
 
             if (count != (ssize_t) length)
               {
@@ -500,13 +500,13 @@
           for (y=0; y < (long) image->extract_info.height; y++)
           {
             register const PixelPacket
-              *__restrict p;
+              *restrict p;
 
             register long
               x;
 
             register PixelPacket
-              *__restrict q;
+              *restrict q;
 
             if (count != (ssize_t) length)
               {
@@ -877,7 +877,7 @@
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
             &image->exception);
@@ -922,7 +922,7 @@
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
           if (p == (const PixelPacket *) NULL)
@@ -954,7 +954,7 @@
           for (y=0; y < (long) image->rows; y++)
           {
             register const PixelPacket
-              *__restrict p;
+              *restrict p;
 
             p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
             if (p == (const PixelPacket *) NULL)
@@ -999,7 +999,7 @@
           for (y=0; y < (long) image->rows; y++)
           {
             register const PixelPacket
-              *__restrict p;
+              *restrict p;
 
             p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
             if (p == (const PixelPacket *) NULL)
diff --git a/coders/tiff.c b/coders/tiff.c
index 4acc425..a8871b0 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -1221,7 +1221,7 @@
             status;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           status=TIFFReadPixels(tiff,bits_per_sample,0,y,(char *) pixels);
           if (status == -1)
@@ -1274,7 +1274,7 @@
             status;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           status=TIFFReadPixels(tiff,bits_per_sample,0,y,(char *) pixels);
           if (status == -1)
@@ -1305,7 +1305,7 @@
           for (y=0; y < (long) image->rows; y++)
           {
             register PixelPacket
-              *__restrict q;
+              *restrict q;
 
             int
               status;
@@ -1366,7 +1366,7 @@
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
           if (q == (PixelPacket *) NULL)
@@ -1440,7 +1440,7 @@
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           unsigned long
             columns_remaining,
@@ -1542,7 +1542,7 @@
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
           if (q == (PixelPacket *) NULL)
@@ -2948,7 +2948,7 @@
             for (y=0; y < (long) image->rows; y++)
             {
               register const PixelPacket
-                *__restrict p;
+                *restrict p;
 
               p=GetVirtualPixels(image,0,y,image->columns,1,
                 &image->exception);
@@ -2976,7 +2976,7 @@
             for (y=0; y < (long) image->rows; y++)
             {
               register const PixelPacket
-                *__restrict p;
+                *restrict p;
 
               p=GetVirtualPixels(image,0,y,image->columns,1,
                 &image->exception);
@@ -2996,7 +2996,7 @@
             for (y=0; y < (long) image->rows; y++)
             {
               register const PixelPacket
-                *__restrict p;
+                *restrict p;
 
               p=GetVirtualPixels(image,0,y,image->columns,1,
                 &image->exception);
@@ -3016,7 +3016,7 @@
             for (y=0; y < (long) image->rows; y++)
             {
               register const PixelPacket
-                *__restrict p;
+                *restrict p;
 
               p=GetVirtualPixels(image,0,y,image->columns,1,
                 &image->exception);
@@ -3037,7 +3037,7 @@
               for (y=0; y < (long) image->rows; y++)
               {
                 register const PixelPacket
-                  *__restrict p;
+                  *restrict p;
 
                 p=GetVirtualPixels(image,0,y,image->columns,1,
                   &image->exception);
@@ -3072,7 +3072,7 @@
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
           if (p == (const PixelPacket *) NULL)
@@ -3142,7 +3142,7 @@
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
           if (p == (const PixelPacket *) NULL)