6 files changed, 2 insertions, 10 deletions
diff --git a/render/filter.c b/render/filter.c
index 71375dae9..092313f6e 100644
--- a/render/filter.c
+++ b/render/filter.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright © 2002 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/render/picture.c b/render/picture.c
index d0ae326cb..5ddd68ce3 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -1641,7 +1641,7 @@ FreePictFormat (pointer	pPictFormat,
  * unnecessary.  It may also avoid destination reads sometimes if apps aren't
  * being careful to avoid these cases.
  */
-static Bool
+static CARD8
 ReduceCompositeOp (CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst)
 {
     Bool no_src_alpha, no_dst_alpha;
diff --git a/render/picture.h b/render/picture.h
index 1719587a5..563a81b43 100644
--- a/render/picture.h
+++ b/render/picture.h
@@ -25,7 +25,7 @@
 #ifndef _PICTURE_H_
 #define _PICTURE_H_
 
-#include <pixman/pixman.h>
+#include <pixman.h>
 
 typedef struct _DirectFormat	*DirectFormatPtr;
 typedef struct _PictFormat	*PictFormatPtr;
diff --git a/render/picturestr.h b/render/picturestr.h
index 06530e260..01572ec48 100644
--- a/render/picturestr.h
+++ b/render/picturestr.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright © 2000 SuSE, Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/render/renderedge.c b/render/renderedge.c
index e92174f90..d0ee30716 100644
--- a/render/renderedge.c
+++ b/render/renderedge.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright © 2004 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/render/renderedge.h b/render/renderedge.h
index 38f9f0914..644d9d9e5 100644
--- a/render/renderedge.h
+++ b/render/renderedge.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright © 2004 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its