diff --git a/Xext/xace.h b/Xext/xace.h
index 3b3e8785f..0f803f9df 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -56,24 +56,24 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define XACE_AUDIT_END			16
 #define XACE_NUM_HOOKS			17
 
-extern CallbackListPtr XaceHooks[XACE_NUM_HOOKS];
+extern _X_EXPORT CallbackListPtr XaceHooks[XACE_NUM_HOOKS];
 
 /* Entry point for hook functions.  Called by Xserver.
  * Required by libdbe and libextmod
  */
-_X_EXPORT int XaceHook(
+extern _X_EXPORT int XaceHook(
     int /*hook*/,
     ... /*appropriate args for hook*/
     ); 
 
 /* Special-cased hook functions
  */
-int XaceHookDispatch(ClientPtr ptr, int major);
-int XaceHookPropertyAccess(ClientPtr ptr, WindowPtr pWin,
-			   PropertyPtr *ppProp, Mask access_mode);
-int XaceHookSelectionAccess(ClientPtr ptr,
+extern _X_EXPORT int XaceHookDispatch(ClientPtr ptr, int major);
+extern _X_EXPORT int XaceHookPropertyAccess(ClientPtr ptr, WindowPtr pWin,
+				   PropertyPtr *ppProp, Mask access_mode);
+extern _X_EXPORT int XaceHookSelectionAccess(ClientPtr ptr,
 				   Selection **ppSel, Mask access_mode);
-void XaceHookAuditEnd(ClientPtr ptr, int result);
+extern _X_EXPORT void XaceHookAuditEnd(ClientPtr ptr, int result);
 
 /* Register a callback for a given hook.
  */
@@ -87,13 +87,13 @@ void XaceHookAuditEnd(ClientPtr ptr, int result);
 
 /* XTrans wrappers for use by security modules
  */
-_X_EXPORT int XaceGetConnectionNumber(ClientPtr ptr);
-_X_EXPORT int XaceIsLocal(ClientPtr ptr);
+extern _X_EXPORT int XaceGetConnectionNumber(ClientPtr ptr);
+extern _X_EXPORT int XaceIsLocal(ClientPtr ptr);
 
 /* From the original Security extension...
  */
 
-void XaceCensorImage(
+extern _X_EXPORT void XaceCensorImage(
     ClientPtr client,
     RegionPtr pVisibleRegion,
     long widthBytesLine,
diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h
index 9a1850106..6ca025426 100644
--- a/hw/xfree86/modes/xf86Crtc.h
+++ b/hw/xfree86/modes/xf86Crtc.h
@@ -734,7 +734,7 @@ xf86CrtcRotate (xf86CrtcPtr crtc);
  * Clean up any rotation data, used when a crtc is turned off
  * as well as when rotation is disabled.
  */
-void
+extern _X_EXPORT void
 xf86RotateDestroy (xf86CrtcPtr crtc);
 
 /*
@@ -924,27 +924,11 @@ xf86_unwrap_crtc_notify(ScreenPtr pScreen, xf86_crtc_notify_proc_ptr old);
 extern _X_EXPORT void
 xf86_crtc_notify(ScreenPtr pScreen);
 
-/**
- * Panning
- */
-Bool
-xf86_crtc_get_panning(ScrnInfoPtr pScrn,
-		      BoxPtr      totalArea,
-		      BoxPtr      TrackingArea,
-		      INT16      *border);
-
-Bool
-xf86_crtc_set_panning(ScrnInfoPtr pScrn,
-		      BoxPtr      totalArea,
-		      BoxPtr      TrackingArea,
-		      INT16      *border);
-
-
 /**
  * Gamma
  */
 
-Bool
+extern _X_EXPORT Bool
 xf86_crtc_supports_gamma(ScrnInfoPtr pScrn);
 
 #endif /* _XF86CRTC_H_ */
diff --git a/randr/randrstr.h b/randr/randrstr.h
index 9e7bbf3e7..93960e57e 100644
--- a/randr/randrstr.h
+++ b/randr/randrstr.h
@@ -825,10 +825,10 @@ RROutputDestroy (RROutputPtr	output);
 extern _X_EXPORT int
 ProcRRGetOutputInfo (ClientPtr client);
 
-extern int
+extern _X_EXPORT int
 ProcRRSetOutputPrimary (ClientPtr client);
 
-extern int
+extern _X_EXPORT int
 ProcRRGetOutputPrimary (ClientPtr client);
 
 /*