diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am
index f0f9fee47..c9ac35e9d 100644
--- a/hw/vfb/Makefile.am
+++ b/hw/vfb/Makefile.am
@@ -21,7 +21,6 @@ XVFB_LIBS = \
 
 Xvfb_LDADD = $(XVFB_LIBS) $(XVFB_SYS_LIBS) $(XSERVER_SYS_LIBS)
 Xvfb_DEPENDENCIES = $(XVFB_LIBS)
-Xvfb_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
 
 relink:
 	$(AM_V_at)rm -f Xvfb$(EXEEXT) && $(MAKE) Xvfb$(EXEEXT)
diff --git a/xfixes/Makefile.am b/xfixes/Makefile.am
index a8425e8ea..2a95c065b 100644
--- a/xfixes/Makefile.am
+++ b/xfixes/Makefile.am
@@ -2,10 +2,6 @@ noinst_LTLIBRARIES = libxfixes.la
 
 AM_CFLAGS = $(DIX_CFLAGS)
 
-if XORG
-sdk_HEADERS = xfixes.h
-endif
-
 libxfixes_la_SOURCES = 	\
 	cursor.c	\
 	region.c	\
diff --git a/xfixes/xfixes.h b/xfixes/xfixes.h
index fdcf44f3f..23f31cde4 100644
--- a/xfixes/xfixes.h
+++ b/xfixes/xfixes.h
@@ -29,8 +29,8 @@
 
 #include "resource.h"
 
-extern _X_EXPORT RESTYPE RegionResType;
-extern _X_EXPORT int XFixesErrorBase;
+extern RESTYPE RegionResType;
+extern int XFixesErrorBase;
 
 #define VERIFY_REGION(pRegion, rid, client, mode)			\
     do {								\
@@ -48,7 +48,7 @@ extern _X_EXPORT int XFixesErrorBase;
     if (rid) VERIFY_REGION(pRegion, rid, client, mode); \
 }
 
-extern _X_EXPORT RegionPtr
+extern RegionPtr
  XFixesRegionCopy(RegionPtr pRegion);
 
 #include "xibarriers.h"