Index: src/Makefile.am
===================================================================
RCS file: /cvsroot/xsrc/external/mit/xf86-video-sunffb/dist/src/Makefile.am,v
retrieving revision 1.1.1.3
diff -u -r1.1.1.3 Makefile.am
--- src/Makefile.am	4 Jun 2013 21:46:23 -0000	1.1.1.3
+++ src/Makefile.am	5 Mar 2016 13:55:20 -0000
@@ -35,6 +35,7 @@
 sunffb_drv_la_SOURCES = \
          compat-api.h \
          ffb_accel.c \
+	 ffb_accel_common.c \
          ffb_attr.c \
          ffb_cursor.c \
          ffb_dac.c \
@@ -48,4 +49,5 @@
          ffb_rcache.h \
          ffb_regs.h \
          ffb_wid.c \
+	 ffb_exa.c \
          $(SPARC_ASM_SRC)
Index: src/Makefile.in
===================================================================
RCS file: /cvsroot/xsrc/external/mit/xf86-video-sunffb/dist/src/Makefile.in,v
retrieving revision 1.1.1.3
diff -u -r1.1.1.3 Makefile.in
--- src/Makefile.in	4 Jun 2013 21:46:23 -0000	1.1.1.3
+++ src/Makefile.in	5 Mar 2016 13:55:20 -0000
@@ -111,13 +111,13 @@
 am__installdirs = "$(DESTDIR)$(sunffb_drv_ladir)"
 LTLIBRARIES = $(sunffb_drv_la_LTLIBRARIES)
 sunffb_drv_la_LIBADD =
-am__sunffb_drv_la_SOURCES_DIST = compat-api.h ffb_accel.c ffb_attr.c \
+am__sunffb_drv_la_SOURCES_DIST = compat-api.h ffb_accel.c ffb_accel_common.c ffb_attr.c \
 	ffb_cursor.c ffb_dac.c ffb_dac.h ffb_ddc.c ffb_dga.c \
 	ffb_driver.c ffb_fifo.h ffb.h ffb_loops.h ffb_rcache.h \
-	ffb_regs.h ffb_wid.c ffb_asm.s VISmoveImage.s
+	ffb_regs.h ffb_wid.c ffb_exa.c ffb_asm.s VISmoveImage.s
 @SPARC_TRUE@am__objects_1 = ffb_asm.lo VISmoveImage.lo
-am_sunffb_drv_la_OBJECTS = ffb_accel.lo ffb_attr.lo ffb_cursor.lo \
-	ffb_dac.lo ffb_ddc.lo ffb_dga.lo ffb_driver.lo ffb_wid.lo \
+am_sunffb_drv_la_OBJECTS = ffb_accel.lo ffb_accel_common.lo ffb_attr.lo ffb_cursor.lo \
+	ffb_dac.lo ffb_ddc.lo ffb_dga.lo ffb_driver.lo ffb_wid.lo ffb_exa.lo \
 	$(am__objects_1)
 sunffb_drv_la_OBJECTS = $(am_sunffb_drv_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
@@ -339,6 +339,7 @@
 sunffb_drv_la_SOURCES = \
          compat-api.h \
          ffb_accel.c \
+	 ffb_accel_common.c \
          ffb_attr.c \
          ffb_cursor.c \
          ffb_dac.c \
@@ -352,6 +353,7 @@
          ffb_rcache.h \
          ffb_regs.h \
          ffb_wid.c \
+	 ffb_exa.c \
          $(SPARC_ASM_SRC)
 
 all: all-am
@@ -432,6 +434,7 @@
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ffb_accel.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ffb_accel_common.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ffb_attr.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ffb_cursor.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ffb_dac.Plo@am__quote@
@@ -439,6 +442,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ffb_dga.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ffb_driver.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ffb_wid.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ffb_exa.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
Index: src/ffb_accel.c
===================================================================
RCS file: /cvsroot/xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel.c,v
retrieving revision 1.5
diff -u -r1.5 ffb_accel.c
--- src/ffb_accel.c	16 Aug 2015 17:47:39 -0000	1.5
+++ src/ffb_accel.c	5 Mar 2016 13:55:21 -0000
@@ -46,6 +46,7 @@
 /* VISmoveImage.s */
 extern void VISmoveImageRL(unsigned char *src, unsigned char *dst, long w, long h, long skind, long dkind);
 extern void VISmoveImageLR(unsigned char *src, unsigned char *dst, long w, long h, long skind, long dkind);
+#endif
 
 /* Indexed by ffb resolution enum. */
 struct fastfill_parms ffb_fastfill_parms[] = {
@@ -56,6 +57,7 @@
 /*XXX*/	{  0x00c0, 0x0a00, 0x04, 0x08, 0x08, 0x50 },	/* Portrait: 1280 x 2048 XXX */
 };
 
+#ifdef HAVE_XAA_H
 void
 CreatorVtChange (ScreenPtr pScreen, int enter)
 {
Index: src/ffb_accel_common.c
===================================================================
RCS file: /cvsroot/xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel_common.c,v
retrieving revision 1.1
diff -u -r1.1 ffb_accel_common.c
--- src/ffb_accel_common.c	16 Aug 2015 17:47:39 -0000	1.1
+++ src/ffb_accel_common.c	5 Mar 2016 13:55:21 -0000
@@ -29,6 +29,7 @@
 #include <sys/types.h>
 
 /* all driver need this */
+#include "xorg-server.h"
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "compiler.h"
Index: src/ffb_exa.c
===================================================================
RCS file: /cvsroot/xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_exa.c,v
retrieving revision 1.2
diff -u -r1.2 ffb_exa.c
--- src/ffb_exa.c	16 Aug 2015 17:47:39 -0000	1.2
+++ src/ffb_exa.c	5 Mar 2016 13:55:21 -0000
@@ -32,6 +32,7 @@
 #include <sys/types.h>
 
 /* all driver need this */
+#include "xorg-server.h"
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "compiler.h"