--- colorspace.c	2002/11/07 10:28:15	1.3.2.2
+++ colorspace.c	2003/06/09 01:20:00	1.8.2.2
@@ -31,12 +31,12 @@
  *
  **************************************************************************/
 
-#include <string.h>				// memcpy
+#include <string.h>				/* memcpy */
 
+#include "../global.h"
 #include "colorspace.h"
-#include "../divx4.h"			// DEC_PICTURE
 
-// function pointers
+/* function pointers */
 
 /* input */
 packedFuncPtr rgb555_to_yv12;
@@ -88,9 +88,6 @@
 int32_t R_V_tab[256];
 
 
-#define MIN(A,B)	((A)<(B)?(A):(B))
-#define MAX(A,B)	((A)>(B)?(A):(B))
-
 
 /********** generic colorspace macro **********/