diff --git a/.gitattributes b/.gitattributes
index 415b9590f0facdfebabbf26c5970f50cfe3f5f2d..b668e8ded7f890f026c1f261b7cf9227cb220716 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -415,7 +415,6 @@ testfont binary
 /src/modules/Image/encodings/iff.c foreign_ident
 /src/modules/Image/encodings/ilbm.c foreign_ident
 /src/modules/Image/encodings/neo.c foreign_ident
-/src/modules/Image/encodings/pcx.c foreign_ident
 /src/modules/Image/encodings/pnm.c foreign_ident
 /src/modules/Image/encodings/psd.c foreign_ident
 /src/modules/Image/encodings/psd_constant_strings.h foreign_ident
diff --git a/src/encode.c b/src/encode.c
index 24d5efd73f3836a9f67838638883c553dbf7cb82..dce373edfa3661ac0ac648ae4ed905aea6af14cb 100644
--- a/src/encode.c
+++ b/src/encode.c
@@ -148,7 +148,7 @@ static void encode_value2(struct svalue *val, struct encode_data *data, int forc
 
 /* Code a pike string */
 
-#if BYTEORDER == 4321
+#if PIKE_BYTEORDER == 4321
 #define ENCODE_DATA(S) \
    addstr( (S)->str, (S)->len << (S)->size_shift );
 #else
@@ -2127,7 +2127,7 @@ static int my_extract_char(struct decode_data *data)
       data->ptr+=sizeof(S[0])*(L);					\
   }while(0)
 
-#if BYTEORDER == 4321
+#if PIKE_BYTEORDER == 4321
 #define BITFLIP(S)
 #else
 #define BITFLIP(S)						\
diff --git a/src/modules/Image/encodings/pcx.c b/src/modules/Image/encodings/pcx.c
index 5400fcdadfc0fd8a79c772640b8b71038013b38c..97764b8cd01d26f101bb982ea0509a8650dbea31 100644
--- a/src/modules/Image/encodings/pcx.c
+++ b/src/modules/Image/encodings/pcx.c
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: pcx.c,v 1.25 2008/01/15 14:10:02 grubba Exp $
+|| $Id$
 */
 
 #include "global.h"
@@ -252,7 +252,7 @@ static struct object *low_pcx_decode( struct pike_string *data )
   if(b.len < sizeof(struct pcx_header))
     Pike_error("There is not enough data available for this to be a PCX image\n");
   pcx_header = *((struct pcx_header *)get_chunk(&b,sizeof(struct pcx_header)));
-#if BYTEORDER == 1234
+#if PIKE_BYTEORDER == 1234
   SWAP_S(pcx_header.x1);
   SWAP_S(pcx_header.x2);
   SWAP_S(pcx_header.y1);
@@ -525,7 +525,7 @@ static struct pike_string *low_pcx_encode(struct image *data,struct options *opt
   MEMSET(pcx_header.palette, 0, 48);
   MEMSET(pcx_header.filler, 0, 58);
   pcx_header.color = 1;
-#if BYTEORDER == 1234
+#if PIKE_BYTEORDER == 1234
   SWAP_S(pcx_header.hdpi);
   SWAP_S(pcx_header.vdpi);
   SWAP_S(pcx_header.x1);