Index: libmpcdec/branches/zorg/include/mpcdec/mpc_types.h
===================================================================
--- libmpcdec/branches/zorg/include/mpcdec/mpc_types.h	(revision 81)
+++ libmpcdec/branches/zorg/include/mpcdec/mpc_types.h	(revision 85)
@@ -89,6 +89,6 @@
 
 enum {
-    FALSE = 0,
-    TRUE  = !FALSE
+    MPC_FALSE = 0,
+    MPC_TRUE  = !MPC_FALSE
 };
 
Index: libmpcdec/branches/zorg/include/mpcdec/mpcdec.h
===================================================================
--- libmpcdec/branches/zorg/include/mpcdec/mpcdec.h	(revision 81)
+++ libmpcdec/branches/zorg/include/mpcdec/mpcdec.h	(revision 85)
@@ -57,5 +57,5 @@
 /// \param p_reader reader that will supply raw data to the decoder
 /// \param si streaminfo structure indicating format of source stream
-/// \return TRUE if decoder was initalized successfully, FALSE otherwise    
+/// \return MPC_TRUE if decoder was initalized successfully, FALSE otherwise    
 mpc_status mpc_decoder_init(mpc_decoder **p_dec, mpc_reader *p_reader, mpc_streaminfo *si);
 
Index: libmpcdec/branches/zorg/mpcdec/mpcdec.c
===================================================================
--- libmpcdec/branches/zorg/mpcdec/mpcdec.c	(revision 81)
+++ libmpcdec/branches/zorg/mpcdec/mpcdec.c	(revision 85)
@@ -97,5 +97,5 @@
 
     sum = total_samples = 0;
-    while(TRUE)
+    while(MPC_TRUE)
     {
         mpc_uint32_t samples;
Index: libmpcdec/branches/zorg/src/mpc_decoder.c
===================================================================
--- libmpcdec/branches/zorg/src/mpc_decoder.c	(revision 81)
+++ libmpcdec/branches/zorg/src/mpc_decoder.c	(revision 85)
@@ -262,5 +262,5 @@
     case 0x07:
     case 0x17:
-        mpc_decoder_read_bitstream_sv7(d, FALSE);
+        mpc_decoder_read_bitstream_sv7(d, MPC_FALSE);
         break;
     default:
@@ -297,5 +297,5 @@
     	// decode data and check for validity of frame
 		FrameBitCnt = mpc_decoder_bits_read(d);
-        mpc_decoder_read_bitstream_sv7(d, FALSE);
+        mpc_decoder_read_bitstream_sv7(d, MPC_FALSE);
 		d->FrameWasValid = mpc_decoder_bits_read(d) - FrameBitCnt == FwdJumpInfo;
         break;
@@ -315,5 +315,5 @@
 		}
 		FrameBitCnt = mpc_decoder_bits_read(d);
-		mpc_decoder_read_bitstream_sv7(d, FALSE);
+		mpc_decoder_read_bitstream_sv7(d, MPC_FALSE);
 		d->BlockBits -= mpc_decoder_bits_read(d) - FrameBitCnt;
 		d->FrameWasValid = 1;
@@ -347,5 +347,5 @@
             } else {
                 mpc_decoder_bitstream_read(d, 20);
-                mpc_decoder_read_bitstream_sv7(d, FALSE);
+                mpc_decoder_read_bitstream_sv7(d, MPC_FALSE);
                 mpc_decoder_requantisierung(d, d->Max_Band);
             }
@@ -729,5 +729,5 @@
     }
 
-    if (seeking == TRUE)
+    if (seeking == MPC_TRUE)
         return;
 
@@ -1002,7 +1002,7 @@
         if (fwd <= d->DecodedFrames + d->seeking_window) {
             if (d->StreamVersion >= 7)
-                mpc_decoder_read_bitstream_sv7(d, TRUE);
+                mpc_decoder_read_bitstream_sv7(d, MPC_TRUE);
             else
-                return FALSE;
+                return MPC_FALSE;
         }
         mpc_decoder_bitstream_jump(d, FwdJumpInfo - mpc_decoder_bits_read(d));
@@ -1012,4 +1012,4 @@
     }
 
-    return TRUE;
-}
+    return MPC_TRUE;
+}
Index: libmpcdec/branches/zorg/src/mpc_reader.c
===================================================================
--- libmpcdec/branches/zorg/src/mpc_reader.c	(revision 81)
+++ libmpcdec/branches/zorg/src/mpc_reader.c	(revision 85)
@@ -59,6 +59,6 @@
 {
     mpc_reader_stdio *p_stdio = (mpc_reader_stdio*) p_reader->data;
-    if(p_stdio->magic != STDIO_MAGIC) return FALSE;
-    return p_stdio->is_seekable ? fseek(p_stdio->p_file, offset, SEEK_SET) == 0 : FALSE;
+    if(p_stdio->magic != STDIO_MAGIC) return MPC_FALSE;
+    return p_stdio->is_seekable ? fseek(p_stdio->p_file, offset, SEEK_SET) == 0 : MPC_FALSE;
 }
 
@@ -83,5 +83,5 @@
 {
     mpc_reader_stdio *p_stdio = (mpc_reader_stdio*) p_reader->data;
-    if(p_stdio->magic != STDIO_MAGIC) return FALSE;
+    if(p_stdio->magic != STDIO_MAGIC) return MPC_FALSE;
     return p_stdio->is_seekable;
 }
@@ -101,5 +101,5 @@
     p_stdio->p_file = fopen(filename, "rb");
     if(!p_stdio->p_file) goto clean;
-    p_stdio->is_seekable = TRUE;
+    p_stdio->is_seekable = MPC_TRUE;
     err = fseek(p_stdio->p_file, 0, SEEK_END);
     if(err < 0) goto clean;