Ensure all *ModuleData symbols are marked _X_EXPORT. Start removing

    XFree86LOADER ifdefs, non-loadable hasn't been supported for a while
    now. Remove completely gratuitious REMOVE_LOADER_CHECK_MODULE_INFO
    ifdefs surrounding a call to a function added in XFree86 4.1 (!).
    Miscellaneous static markings.

39 files changed, 61 insertions, 201 deletions

diff --git a/hw/xfree86/ddc/xf86DDC.c b/hw/xfree86/ddc/xf86DDC.c
index c5b070dc7..c989cd232 100644
--- a/hw/xfree86/ddc/xf86DDC.c
+++ b/hw/xfree86/ddc/xf86DDC.c
@@ -1,5 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.c,v 1.26 2003/08/22 17:56:24 dawes Exp $ */
-
 /* xf86DDC.c 
  * 
  * Copyright 1998,1999 by Egbert Eich <Egbert.Eich@Physik.TU-Darmstadt.DE>
@@ -15,9 +13,7 @@
 #include "ddcPriv.h"
 #include <string.h>
 
-#ifdef XFree86LOADER
 static const OptionInfoRec *DDCAvailableOptions(void *unused);
-#endif
 
 const char *i2cSymbols[] = {
     "xf86CreateI2CDevRec",
@@ -28,8 +24,6 @@ const char *i2cSymbols[] = {
     NULL
 };
 
-#ifdef XFree86LOADER
-
 static MODULESETUPPROTO(ddcSetup);
 
 static XF86ModuleVersionInfo ddcVersRec =
@@ -46,7 +40,7 @@ static XF86ModuleVersionInfo ddcVersRec =
     {0,0,0,0}
 };
 
-XF86ModuleData ddcModuleData = { &ddcVersRec, ddcSetup, NULL };
+_X_EXPORT XF86ModuleData ddcModuleData = { &ddcVersRec, ddcSetup, NULL };
 
 ModuleInfoRec DDC = {
     1,
@@ -63,9 +57,6 @@ ddcSetup(pointer module, pointer opts, int *errmaj, int *errmin)
 
     if (!setupDone) {
 	setupDone = TRUE;
-#ifndef REMOVE_LOADER_CHECK_MODULE_INFO
-	if (xf86LoaderCheckSymbol("xf86AddModuleInfo"))
-#endif
 	xf86AddModuleInfo(&DDC, module);
 	/*
 	 * Tell the loader about symbols from other modules that this module
@@ -81,8 +72,6 @@ ddcSetup(pointer module, pointer opts, int *errmaj, int *errmin)
     return (pointer)1;
 }
 
-#endif
-
 #define RETRIES 4
 
 static unsigned char *EDIDRead_DDC1(
diff --git a/hw/xfree86/dixmods/GLcoremodule.c b/hw/xfree86/dixmods/GLcoremodule.c
index 4e03b59fe..d55cb78a7 100644
--- a/hw/xfree86/dixmods/GLcoremodule.c
+++ b/hw/xfree86/dixmods/GLcoremodule.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/GL/mesa/src/GLcoremodule.c,v 1.5 2000/02/23 04:46:55 martin Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -54,7 +53,7 @@ static XF86ModuleVersionInfo VersRec =
         {0,0,0,0}
 };
 
-XF86ModuleData GLcoreModuleData = { &VersRec, GLcoreSetup, NULL };
+_X_EXPORT XF86ModuleData GLcoreModuleData = { &VersRec, GLcoreSetup, NULL };
 
 static pointer
 GLcoreSetup(pointer module, pointer opts, int *errmaj, int *errmin)
diff --git a/hw/xfree86/dixmods/afbmodule.c b/hw/xfree86/dixmods/afbmodule.c
index d9cdbf9c3..ee8cf2037 100644
--- a/hw/xfree86/dixmods/afbmodule.c
+++ b/hw/xfree86/dixmods/afbmodule.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/afb/afbmodule.c,v 1.1 1999/06/13 13:47:38 dawes Exp $ */
 /*
  * Copyright (C) 1998 The XFree86 Project, Inc.  All Rights Reserved.
  *
@@ -29,8 +28,6 @@
 #include <xorg-config.h>
 #endif
 
-#ifdef XFree86LOADER
-
 #include "xf86Module.h"
 #include "afb.h"
 
@@ -50,7 +47,7 @@ static XF86ModuleVersionInfo VersRec =
 	{0,0,0,0}       /* signature, to be patched into the file by a tool */
 };
 
-XF86ModuleData afbModuleData = { &VersRec, afbSetup, NULL };
+_X_EXPORT XF86ModuleData afbModuleData = { &VersRec, afbSetup, NULL };
 
 static pointer
 afbSetup(pointer module, pointer opts, int *errmaj, int *errmin)
@@ -59,5 +56,3 @@ afbSetup(pointer module, pointer opts, int *errmaj, int *errmin)
     return LoadSubModule(module, "mfb", NULL, NULL, NULL, NULL,
                          errmaj, errmin);
 }
-
-#endif
diff --git a/hw/xfree86/dixmods/cfb32module.c b/hw/xfree86/dixmods/cfb32module.c
index 0ead3ef93..1451594e5 100644
--- a/hw/xfree86/dixmods/cfb32module.c
+++ b/hw/xfree86/dixmods/cfb32module.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/cfb32/cfbmodule.c,v 1.8 1999/01/26 05:53:49 dawes Exp $ */
 /*
  * Copyright (C) 1998 The XFree86 Project, Inc.  All Rights Reserved.
  *
@@ -31,8 +30,6 @@
 
 #define PSZ 32
 
-#ifdef XFree86LOADER
-
 #include "xf86Module.h"
 #include "cfb.h"
 
@@ -52,7 +49,7 @@ static XF86ModuleVersionInfo VersRec =
 	{0,0,0,0}       /* signature, to be patched into the file by a tool */
 };
 
-XF86ModuleData cfb32ModuleData = { &VersRec, cfb32Setup, NULL };
+_X_EXPORT XF86ModuleData cfb32ModuleData = { &VersRec, cfb32Setup, NULL };
 
 static pointer
 cfb32Setup(pointer module, pointer opts, int *errmaj, int *errmin)
@@ -61,5 +58,3 @@ cfb32Setup(pointer module, pointer opts, int *errmaj, int *errmin)
     return LoadSubModule(module, "cfb", NULL, NULL, NULL, NULL,
 			 errmaj, errmin);
 }
-
-#endif
diff --git a/hw/xfree86/dixmods/cfbmodule.c b/hw/xfree86/dixmods/cfbmodule.c
index 095bc8416..693fd6177 100644
--- a/hw/xfree86/dixmods/cfbmodule.c
+++ b/hw/xfree86/dixmods/cfbmodule.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbmodule.c,v 1.8 1999/01/26 05:53:48 dawes Exp $ */
 /*
  * Copyright (C) 1998 The XFree86 Project, Inc.  All Rights Reserved.
  *
@@ -31,8 +30,6 @@
 
 #define PSZ 8
 
-#ifdef XFree86LOADER
-
 #include "xf86Module.h"
 #include "cfb.h"
 
@@ -52,7 +49,7 @@ static XF86ModuleVersionInfo VersRec =
 	{0,0,0,0}       /* signature, to be patched into the file by a tool */
 };
 
-XF86ModuleData cfbModuleData = { &VersRec, cfbSetup, NULL };
+_X_EXPORT XF86ModuleData cfbModuleData = { &VersRec, cfbSetup, NULL };
 
 static pointer
 cfbSetup(pointer module, pointer opts, int *errmaj, int *errmin)
@@ -61,5 +58,3 @@ cfbSetup(pointer module, pointer opts, int *errmaj, int *errmin)
     return LoadSubModule(module, "mfb", NULL, NULL, NULL, NULL,
 			 errmaj, errmin);
 }
-
-#endif
diff --git a/hw/xfree86/dixmods/dbemodule.c b/hw/xfree86/dixmods/dbemodule.c
index 62fbcfd21..73639886f 100644
--- a/hw/xfree86/dixmods/dbemodule.c
+++ b/hw/xfree86/dixmods/dbemodule.c
@@ -1,5 +1,3 @@
-/* $XFree86: xc/programs/Xserver/dbe/dbemodule.c,v 1.6 1999/01/26 05:53:50 dawes Exp $ */
-
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
@@ -11,7 +9,7 @@ static MODULESETUPPROTO(dbeSetup);
 
 extern void DbeExtensionInit(INITARGS);
 
-ExtensionModule dbeExt = {
+static ExtensionModule dbeExt = {
     DbeExtensionInit,
     "DOUBLE-BUFFER",
     &noDbeExtension,
@@ -36,7 +34,7 @@ static XF86ModuleVersionInfo VersRec =
 /*
  * Data for the loader
  */
-XF86ModuleData dbeModuleData = { &VersRec, dbeSetup, NULL };
+_X_EXPORT XF86ModuleData dbeModuleData = { &VersRec, dbeSetup, NULL };
 
 static pointer
 dbeSetup(pointer module, pointer opts, int *errmaj, int *errmin)
diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c
index f71ce6168..acd700694 100644
--- a/hw/xfree86/dixmods/extmod/modinit.c
+++ b/hw/xfree86/dixmods/extmod/modinit.c
@@ -1,7 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/extmod/modinit.c,v 1.16 2002/03/06 21:12:33 mvojkovi Exp $ */
-
 /*
- *
  * Copyright (c) 1997 Matthieu Herrb
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -27,8 +24,6 @@
 #include <xorg-config.h>
 #endif
 
-#ifdef XFree86LOADER
-
 #include "xf86Module.h"
 #include "xf86Opt.h"
 
@@ -42,7 +37,7 @@ static MODULESETUPPROTO(extmodSetup);
 /*
  * Array describing extensions to be initialized
  */
-ExtensionModule extensionModules[] = {
+static ExtensionModule extensionModules[] = {
 #ifdef SHAPE
     {
 	ShapeExtensionInit,
@@ -229,7 +224,7 @@ static XF86ModuleVersionInfo VersRec =
 /*
  * Data for the loader
  */
-XF86ModuleData extmodModuleData = { &VersRec, extmodSetup, NULL };
+_X_EXPORT XF86ModuleData extmodModuleData = { &VersRec, extmodSetup, NULL };
 
 static pointer
 extmodSetup(pointer module, pointer opts, int *errmaj, int *errmin)
@@ -259,5 +254,3 @@ extmodSetup(pointer module, pointer opts, int *errmaj, int *errmin)
     /* Need a non-NULL return */
     return (pointer)1;
 }
-
-#endif /* XFree86LOADER */
diff --git a/hw/xfree86/dixmods/fbmodule.c b/hw/xfree86/dixmods/fbmodule.c
index 80d99933a..e8e6cd7c6 100644
--- a/hw/xfree86/dixmods/fbmodule.c
+++ b/hw/xfree86/dixmods/fbmodule.c
@@ -23,14 +23,11 @@
  * dealings in this Software without prior written authorization from the
  * XFree86 Project.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbmodule.c,v 1.3 2000/02/14 19:20:29 dawes Exp $ */
 
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
 
-#ifdef XFree86LOADER
-
 #include "xf86Module.h"
 #include "fb.h"
 
@@ -48,6 +45,4 @@ static XF86ModuleVersionInfo VersRec =
 	{0,0,0,0}       /* signature, to be patched into the file by a tool */
 };
 
-XF86ModuleData fbModuleData = { &VersRec, NULL, NULL };
-
-#endif
+_X_EXPORT XF86ModuleData fbModuleData = { &VersRec, NULL, NULL };
diff --git a/hw/xfree86/dixmods/ftmodule.c b/hw/xfree86/dixmods/ftmodule.c
index c2fe79089..382c0b3b7 100644
--- a/hw/xfree86/dixmods/ftmodule.c
+++ b/hw/xfree86/dixmods/ftmodule.c
@@ -23,17 +23,16 @@
  * dealings in this Software without prior written authorization from the
  * XFree86 Project.
  */
-/* $XFree86: xc/lib/font/FreeType/module/ftmodule.c,v 1.18 2003/11/02 04:30:57 dawes Exp $ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
 
 #include "misc.h"
 
 #include <X11/fonts/fontmod.h>
 #include "xf86Module.h"
 
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
 static MODULESETUPPROTO(freetypeSetup);
 
     /*
@@ -55,11 +54,11 @@ static XF86ModuleVersionInfo VersRec =
 	{0,0,0,0}       /* signature, to be patched into the file by a tool */
 };
 
-XF86ModuleData freetypeModuleData = { &VersRec, freetypeSetup, NULL };
+_X_EXPORT XF86ModuleData freetypeModuleData = { &VersRec, freetypeSetup, NULL };
 
 extern void FreeTypeRegisterFontFileFunctions(void);
 
-FontModule freetypeModule = {
+static FontModule freetypeModule = {
     FreeTypeRegisterFontFileFunctions,
     "FreeType",
     NULL
diff --git a/hw/xfree86/dixmods/glxmodule.c b/hw/xfree86/dixmods/glxmodule.c
index 9869b0295..401707abc 100644
--- a/hw/xfree86/dixmods/glxmodule.c
+++ b/hw/xfree86/dixmods/glxmodule.c
@@ -24,7 +24,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/GL/glxmodule.c,v 1.11 2001/06/15 21:22:38 dawes Exp $ */
 
 /*
  * Authors:
@@ -59,7 +58,7 @@ static MODULESETUPPROTO(glxSetup);
 
 static const char *initdeps[] = { "DOUBLE-BUFFER", NULL };
 
-ExtensionModule GLXExt =
+static ExtensionModule GLXExt =
 {
     GlxExtensionInit,
     "GLX",
@@ -82,7 +81,7 @@ static XF86ModuleVersionInfo VersRec =
         {0,0,0,0}
 };
 
-XF86ModuleData glxModuleData = { &VersRec, glxSetup, NULL };
+_X_EXPORT XF86ModuleData glxModuleData = { &VersRec, glxSetup, NULL };
 
 /* We do a little proxy dance here, so we can avoid loading GLcore
  * unless we really need to.*/
diff --git a/hw/xfree86/dixmods/mfbmodule.c b/hw/xfree86/dixmods/mfbmodule.c
index be3b9eed0..91539d709 100644
--- a/hw/xfree86/dixmods/mfbmodule.c
+++ b/hw/xfree86/dixmods/mfbmodule.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbmodule.c,v 1.7 1999/01/26 05:54:21 dawes Exp $ */
 /*
  * Copyright (C) 1998 The XFree86 Project, Inc.  All Rights Reserved.
  *
@@ -29,10 +28,8 @@
 #include <xorg-config.h>
 #endif
 
-#ifdef XFree86LOADER
 #include "xf86Module.h"
 
-
 static XF86ModuleVersionInfo VersRec =
 {
 	"mfb",
@@ -47,6 +44,4 @@ static XF86ModuleVersionInfo VersRec =
 	{0,0,0,0}       /* signature, to be patched into the file by a tool */
 };
 
-XF86ModuleData mfbModuleData = { &VersRec, NULL, NULL };
-
-#endif
+_X_EXPORT XF86ModuleData mfbModuleData = { &VersRec, NULL, NULL };
diff --git a/hw/xfree86/dixmods/recordmod.c b/hw/xfree86/dixmods/recordmod.c
index 5afb1d379..63d340e75 100644
--- a/hw/xfree86/dixmods/recordmod.c
+++ b/hw/xfree86/dixmods/recordmod.c
@@ -1,5 +1,3 @@
-/* $XFree86: xc/programs/Xserver/record/recordmod.c,v 1.5 1999/01/26 05:54:21 dawes Exp $ */
-
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
@@ -12,7 +10,7 @@ static MODULESETUPPROTO(recordSetup);
 
 extern void RecordExtensionInit(INITARGS);
 
-ExtensionModule recordExt = {
+static ExtensionModule recordExt = {
     RecordExtensionInit,
     "RECORD",
     &noTestExtensions,
@@ -33,7 +31,7 @@ static XF86ModuleVersionInfo VersRec = {
 	{0,0,0,0}
 };
 
-XF86ModuleData recordModuleData = { &VersRec, recordSetup, NULL };
+_X_EXPORT XF86ModuleData recordModuleData = { &VersRec, recordSetup, NULL };
 
 static pointer
 recordSetup(pointer module, pointer opts, int *errmaj, int *errmin)
diff --git a/hw/xfree86/dixmods/shmodule.c b/hw/xfree86/dixmods/shmodule.c
index 98021e740..3136c0c05 100644
--- a/hw/xfree86/dixmods/shmodule.c
+++ b/hw/xfree86/dixmods/shmodule.c
@@ -1,6 +1,4 @@
 /*
- * $XFree86$
- *
  * Copyright © 2000 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -26,8 +24,6 @@
 #include <xorg-config.h>
 #endif
 
-#ifdef XFree86LOADER
-
 #include "xf86Module.h"
 #include    <X11/X.h>
 #include    "scrnintstr.h"
@@ -55,6 +51,4 @@ static XF86ModuleVersionInfo VersRec =
 	{0,0,0,0}       /* signature, to be patched into the file by a tool */
 };
 
-XF86ModuleData shadowModuleData = { &VersRec, NULL, NULL };
-
-#endif
+_X_EXPORT XF86ModuleData shadowModuleData = { &VersRec, NULL, NULL };
diff --git a/hw/xfree86/dixmods/type1mod.c b/hw/xfree86/dixmods/type1mod.c
index e652591a2..48c1d0421 100644
--- a/hw/xfree86/dixmods/type1mod.c
+++ b/hw/xfree86/dixmods/type1mod.c
@@ -23,17 +23,16 @@
  * dealings in this Software without prior written authorization from the
  * XFree86 Project.
  */
-/* $XFree86: xc/lib/font/Type1/module/type1mod.c,v 1.10 2002/12/09 17:29:59 dawes Exp $ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
 
 #include "misc.h"
 
 #include <X11/fonts/fontmod.h>
 #include "xf86Module.h"
 
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
 static MODULESETUPPROTO(type1Setup);
 
     /*
@@ -55,7 +54,7 @@ static XF86ModuleVersionInfo VersRec =
 	{0,0,0,0}       /* signature, to be patched into the file by a tool */
 };
 
-XF86ModuleData type1ModuleData = { &VersRec, type1Setup, NULL };
+_X_EXPORT XF86ModuleData type1ModuleData = { &VersRec, type1Setup, NULL };
 
 extern void Type1RegisterFontFileFunctions(void);
 #ifdef BUILDCID
diff --git a/hw/xfree86/dixmods/xf86XTrapModule.c b/hw/xfree86/dixmods/xf86XTrapModule.c
index 1783d577a..e89d7751d 100644
--- a/hw/xfree86/dixmods/xf86XTrapModule.c
+++ b/hw/xfree86/dixmods/xf86XTrapModule.c
@@ -1,6 +1,4 @@
-/* $XFree86$ */
-/*  This is the xf86 module code for the DEC_XTRAP extension.
- */
+/*  This is the xf86 module code for the DEC_XTRAP extension. */
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
@@ -12,11 +10,9 @@
 
 extern void DEC_XTRAPInit(INITARGS);
 
-#ifdef XFree86LOADER
-
 static MODULESETUPPROTO(xtrapSetup);
 
-ExtensionModule xtrapExt =
+static ExtensionModule xtrapExt =
 {
     DEC_XTRAPInit,
     XTrapExtName,
@@ -39,7 +35,7 @@ static XF86ModuleVersionInfo xtrapVersRec =
     {0,0,0,0}
 };
 
-XF86ModuleData xtrapModuleData = { &xtrapVersRec, xtrapSetup, NULL };
+_X_EXPORT XF86ModuleData xtrapModuleData = { &xtrapVersRec, xtrapSetup, NULL };
 
 static pointer
 xtrapSetup(pointer module, pointer opts, int *errmaj, int *errmin) {
@@ -47,5 +43,3 @@ xtrapSetup(pointer module, pointer opts, int *errmaj, int *errmin) {
     /* Need a non-NULL return value to indicate success */
     return (pointer)1;
 }
-
-#endif /* XFree86LOADER */
diff --git a/hw/xfree86/dri/drimodule.c b/hw/xfree86/dri/drimodule.c
index de535d016..427065d91 100644
--- a/hw/xfree86/dri/drimodule.c
+++ b/hw/xfree86/dri/drimodule.c
@@ -1,4 +1,3 @@
-/* $XdotOrg: xc/programs/Xserver/GL/dri/drimodule.c,v 1.2 2004/04/23 18:44:36 eich Exp $ */
 /**************************************************************************
 
 Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -25,7 +24,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/GL/dri/drimodule.c,v 1.5 2001/06/15 21:22:39 dawes Exp $ */
 
 /*
  * Authors:
@@ -61,7 +59,7 @@ extern void XFree86DRIExtensionInit(INITARGS);
 #define _XF86DRI_SERVER_
 #include "xf86dristr.h"
 
-ExtensionModule XF86DRIExt =
+static ExtensionModule XF86DRIExt =
 {
     XFree86DRIExtensionInit,
     XF86DRINAME,
@@ -96,7 +94,7 @@ static const char *drmSymbols[] = {
     NULL
 };
 
-XF86ModuleData driModuleData = { &VersRec, driSetup, NULL };
+_X_EXPORT XF86ModuleData driModuleData = { &VersRec, driSetup, NULL };
 
 static pointer
 driSetup(pointer module, pointer opts, int *errmaj, int *errmin)
diff --git a/hw/xfree86/exa/examodule.c b/hw/xfree86/exa/examodule.c
index cc3a9d4f2..0a7b361c8 100644
--- a/hw/xfree86/exa/examodule.c
+++ b/hw/xfree86/exa/examodule.c
@@ -168,9 +168,9 @@ static XF86ModuleVersionInfo exaVersRec =
 	{0,0,0,0}
 };
 
-XF86ModuleData exaModuleData = { &exaVersRec, exaSetup, NULL };
+_X_EXPORT XF86ModuleData exaModuleData = { &exaVersRec, exaSetup, NULL };
 
-ModuleInfoRec EXA = {
+static ModuleInfoRec EXA = {
     1,
     "EXA",
     NULL,
@@ -186,9 +186,6 @@ exaSetup(pointer Module, pointer Options, int *ErrorMajor, int *ErrorMinor)
 
     if (!Initialised) {
 	Initialised = TRUE;
-#ifndef REMOVE_LOADER_CHECK_MODULE_INFO
-	if (xf86LoaderCheckSymbol("xf86AddModuleInfo"))
-#endif
 	xf86AddModuleInfo(&EXA, Module);
     }
 
diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c
index e35bc8c2e..70bed620b 100644
--- a/hw/xfree86/fbdevhw/fbdevhw.c
+++ b/hw/xfree86/fbdevhw/fbdevhw.c
@@ -1,5 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c,v 1.32 2003/08/26 10:57:03 daenzer Exp $ */
-
 /* all driver need this */
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
@@ -42,8 +40,6 @@
 
 /* -------------------------------------------------------------------- */
 
-#ifdef XFree86LOADER
-
 static MODULESETUPPROTO(fbdevhwSetup);
 
 static XF86ModuleVersionInfo fbdevHWVersRec =
@@ -60,7 +56,11 @@ static XF86ModuleVersionInfo fbdevHWVersRec =
 	{0,0,0,0}
 };
 
-XF86ModuleData fbdevhwModuleData = { &fbdevHWVersRec, fbdevhwSetup, NULL };
+_X_EXPORT XF86ModuleData fbdevhwModuleData = {
+    &fbdevHWVersRec,
+    fbdevhwSetup,
+    NULL
+};
 
 static pointer
 fbdevhwSetup(pointer module, pointer opts, int *errmaj, int *errmin)
@@ -80,7 +80,6 @@ fbdevhwSetup(pointer module, pointer opts, int *errmaj, int *errmin)
 		return (pointer)1;
 	}
 }
-#endif /* XFree86LOADER */
 
 #include <fcntl.h>
 #include <errno.h>
diff --git a/hw/xfree86/i2c/bt829_module.c b/hw/xfree86/i2c/bt829_module.c
index a3a2538d2..c885b8e10 100644
--- a/hw/xfree86/i2c/bt829_module.c
+++ b/hw/xfree86/i2c/bt829_module.c
@@ -6,7 +6,6 @@
 
 static MODULESETUPPROTO(bt829Setup);
 
-
 static XF86ModuleVersionInfo bt829VersRec =
 {
         "bt829",
diff --git a/hw/xfree86/i2c/fi1236_module.c b/hw/xfree86/i2c/fi1236_module.c
index f270952f2..4016ad0d4 100644
--- a/hw/xfree86/i2c/fi1236_module.c
+++ b/hw/xfree86/i2c/fi1236_module.c
@@ -6,7 +6,6 @@
 
 static MODULESETUPPROTO(fi1236Setup);
 
-
 static XF86ModuleVersionInfo fi1236VersRec =
 {
         "fi1236",
diff --git a/hw/xfree86/i2c/msp3430_module.c b/hw/xfree86/i2c/msp3430_module.c
index d31692445..66b14a277 100644
--- a/hw/xfree86/i2c/msp3430_module.c
+++ b/hw/xfree86/i2c/msp3430_module.c
@@ -6,7 +6,6 @@
 
 static MODULESETUPPROTO(msp3430Setup);
 
-
 static XF86ModuleVersionInfo msp3430VersRec =
 {
         "msp3430",
diff --git a/hw/xfree86/i2c/tda8425_module.c b/hw/xfree86/i2c/tda8425_module.c
index 83936998d..7906e5ea5 100644
--- a/hw/xfree86/i2c/tda8425_module.c
+++ b/hw/xfree86/i2c/tda8425_module.c
@@ -6,7 +6,6 @@
 
 static MODULESETUPPROTO(tda8425Setup);
 
-
 static XF86ModuleVersionInfo tda8425VersRec =
 {
         "tda8425",
diff --git a/hw/xfree86/i2c/tda9850_module.c b/hw/xfree86/i2c/tda9850_module.c
index c437236f2..84f7e861e 100644
--- a/hw/xfree86/i2c/tda9850_module.c
+++ b/hw/xfree86/i2c/tda9850_module.c
@@ -6,7 +6,6 @@
 
 static MODULESETUPPROTO(tda9850Setup);
 
-
 static XF86ModuleVersionInfo tda9850VersRec =
 {
         "tda9850",
diff --git a/hw/xfree86/i2c/tda9885_module.c b/hw/xfree86/i2c/tda9885_module.c
index ef34027ea..0ce85bba3 100644
--- a/hw/xfree86/i2c/tda9885_module.c
+++ b/hw/xfree86/i2c/tda9885_module.c
@@ -6,7 +6,6 @@
 
 static MODULESETUPPROTO(tda9885Setup);
 
-
 static XF86ModuleVersionInfo tda9885VersRec =
 {
         "tda9885",
diff --git a/hw/xfree86/i2c/uda1380_module.c b/hw/xfree86/i2c/uda1380_module.c
index 27639aa4e..384458326 100644
--- a/hw/xfree86/i2c/uda1380_module.c
+++ b/hw/xfree86/i2c/uda1380_module.c
@@ -6,7 +6,6 @@
 
 static MODULESETUPPROTO(uda1380Setup);
 
-
 static XF86ModuleVersionInfo uda1380VersRec =
 {
         "uda1380",
diff --git a/hw/xfree86/i2c/xf86i2cmodule.c b/hw/xfree86/i2c/xf86i2cmodule.c
index 7569af30e..3c6d313c7 100644
--- a/hw/xfree86/i2c/xf86i2cmodule.c
+++ b/hw/xfree86/i2c/xf86i2cmodule.c
@@ -5,8 +5,6 @@
  *      (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de>
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2cmodule.c,v 1.6 1999/01/26 05:54:10 dawes Exp $ */
-
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
@@ -29,7 +27,7 @@ static XF86ModuleVersionInfo i2cVersRec =
         {0,0,0,0}
 };
 
-XF86ModuleData i2cModuleData = { &i2cVersRec, i2cSetup, NULL };
+_X_EXPORT XF86ModuleData i2cModuleData = { &i2cVersRec, i2cSetup, NULL };
 
 static pointer
 i2cSetup(pointer module, pointer opts, int *errmaj, int *errmin) {
diff --git a/hw/xfree86/int10/xf86int10module.c b/hw/xfree86/int10/xf86int10module.c
index 391c18374..b4e5865da 100644
--- a/hw/xfree86/int10/xf86int10module.c
+++ b/hw/xfree86/int10/xf86int10module.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/int10/xf86int10module.c,v 1.3 1999/12/03 19:17:41 eich Exp $ */
 /*
  *                   XFree86 int10 module
  *   execute BIOS int 10h calls in x86 real mode environment
@@ -13,10 +12,6 @@
 #include "xf86Pci.h"
 #include "xf86int10.h"
 
-
-#ifdef XFree86LOADER
-
-
 #ifndef MOD_NAME
 # define MOD_NAME int10
 #endif
@@ -43,7 +38,11 @@ static XF86ModuleVersionInfo NAME(VersRec) =
     {0,0,0,0}
 };
 
-XF86ModuleData NAME(ModuleData) = { &NAME(VersRec), NAME(Setup), NULL };
+_X_EXPORT XF86ModuleData NAME(ModuleData) = {
+    &NAME(VersRec),
+    NAME(Setup),
+    NULL
+};
 
 static pointer
 NAME(Setup)(pointer module, pointer opts, int *errmaj, int *errmin)
@@ -63,5 +62,3 @@ NAME(Setup)(pointer module, pointer opts, int *errmaj, int *errmin)
      */
     return (pointer)1;
 }
-
-#endif
diff --git a/hw/xfree86/os-support/drm/drmmodule.c b/hw/xfree86/os-support/drm/drmmodule.c
index fd751e756..8d2b4bc12 100644
--- a/hw/xfree86/os-support/drm/drmmodule.c
+++ b/hw/xfree86/os-support/drm/drmmodule.c
@@ -24,9 +24,6 @@
  * DEALINGS IN THE SOFTWARE.
  * 
  * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
- *
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/drmmodule.c,v 1.2 2000/02/23 04:47:22 martin Exp $
- * 
  */
 
 #ifdef HAVE_XORG_CONFIG_H
@@ -51,7 +48,7 @@ static XF86ModuleVersionInfo VersRec =
         {0,0,0,0}
 };
 
-XF86ModuleData drmModuleData = { &VersRec, drmSetup, NULL };
+_X_EXPORT XF86ModuleData drmModuleData = { &VersRec, drmSetup, NULL };
 
 static pointer
 drmSetup(pointer module, pointer opts, int *errmaj, int *errmin)
diff --git a/hw/xfree86/rac/xf86RACmodule.c b/hw/xfree86/rac/xf86RACmodule.c
index 7221b9dac..7b1bdac98 100644
--- a/hw/xfree86/rac/xf86RACmodule.c
+++ b/hw/xfree86/rac/xf86RACmodule.c
@@ -1,5 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RACmodule.c,v 1.3 1999/01/17 10:54:12 dawes Exp $ */
-
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
@@ -20,6 +18,4 @@ static XF86ModuleVersionInfo racVersRec =
     {0,0,0,0}
 };
 
-
-XF86ModuleData racModuleData = { &racVersRec, NULL, NULL };
-
+_X_EXPORT XF86ModuleData racModuleData = { &racVersRec, NULL, NULL };
diff --git a/hw/xfree86/ramdac/xf86RamDacMod.c b/hw/xfree86/ramdac/xf86RamDacMod.c
index d87defc16..b4187a953 100644
--- a/hw/xfree86/ramdac/xf86RamDacMod.c
+++ b/hw/xfree86/ramdac/xf86RamDacMod.c
@@ -23,7 +23,6 @@
  *
  * Generic RAMDAC module.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacMod.c,v 1.5 1999/01/17 10:54:13 dawes Exp $ */
 
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
@@ -31,7 +30,6 @@
 
 #include "xf86Module.h"
 
-
 static XF86ModuleVersionInfo VersRec = {
 	"ramdac",
 	MODULEVENDORSTRING,
@@ -45,5 +43,4 @@ static XF86ModuleVersionInfo VersRec = {
 	{0, 0, 0, 0}
 };
 
-XF86ModuleData ramdacModuleData = { &VersRec, NULL, NULL };
-
+_X_EXPORT XF86ModuleData ramdacModuleData = { &VersRec, NULL, NULL };
diff --git a/hw/xfree86/scanpci/xf86ScanPci.c b/hw/xfree86/scanpci/xf86ScanPci.c
index 8c897bd20..2343f001b 100644
--- a/hw/xfree86/scanpci/xf86ScanPci.c
+++ b/hw/xfree86/scanpci/xf86ScanPci.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/xf86ScanPci.c,v 1.13 2003/08/24 17:37:10 dawes Exp $ */
 /*
  * Display the Subsystem Vendor Id and Subsystem Id in order to identify
  * the cards installed in this computer
@@ -75,8 +74,6 @@
 #include "xf86PciIds.h"
 #include "xf86ScanPci.h"
 
-#ifdef XFree86LOADER
-
 #include "xf86Module.h"
 
 #ifdef PCIDATA
@@ -94,7 +91,7 @@ static XF86ModuleVersionInfo pciDataVersRec = {
 	{0, 0, 0, 0}
 };
 
-XF86ModuleData pcidataModuleData = { &pciDataVersRec, NULL, NULL };
+_X_EXPORT XF86ModuleData pcidataModuleData = { &pciDataVersRec, NULL, NULL };
 
 #else 
 
@@ -111,12 +108,10 @@ static XF86ModuleVersionInfo scanPciVersRec = {
 	{0, 0, 0, 0}
 };
 
-XF86ModuleData scanpciModuleData = { &scanPciVersRec, NULL, NULL };
+_X_EXPORT XF86ModuleData scanpciModuleData = { &scanPciVersRec, NULL, NULL };
 
 #endif /* PCIDATA */
 
-#endif /* XFree86LOADER */
-
 /* Initialisation/Close hooks, in case they're ever needed. */
 Bool
 ScanPciSetupPciIds(void)
diff --git a/hw/xfree86/shadowfb/sfbmodule.c b/hw/xfree86/shadowfb/sfbmodule.c
index 663f587c4..ec37a1f8f 100644
--- a/hw/xfree86/shadowfb/sfbmodule.c
+++ b/hw/xfree86/shadowfb/sfbmodule.c
@@ -1,12 +1,7 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/sfbmodule.c,v 1.1 1999/01/31 12:38:06 dawes Exp $ */
-
-
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
 
-#ifdef XFree86LOADER
-
 #include "xf86Module.h"
 
 static XF86ModuleVersionInfo VersRec =
@@ -23,6 +18,4 @@ static XF86ModuleVersionInfo VersRec =
         {0,0,0,0}       /* signature, to be patched into the file by a tool */
 };
 
-XF86ModuleData shadowfbModuleData = { &VersRec, NULL, NULL };
-
-#endif
+_X_EXPORT XF86ModuleData shadowfbModuleData = { &VersRec, NULL, NULL };
diff --git a/hw/xfree86/vbe/vbe_module.c b/hw/xfree86/vbe/vbe_module.c
index 5e3a193b1..7c7d87660 100644
--- a/hw/xfree86/vbe/vbe_module.c
+++ b/hw/xfree86/vbe/vbe_module.c
@@ -1,5 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/vbe/vbe_module.c,v 1.4 2002/09/16 18:06:15 eich Exp $ */
-
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
@@ -10,8 +8,6 @@
 
 extern const char *vbe_ddcSymbols[];
 
-#ifdef XFree86LOADER
-
 static MODULESETUPPROTO(vbeSetup);
 
 static XF86ModuleVersionInfo vbeVersRec =
@@ -28,7 +24,7 @@ static XF86ModuleVersionInfo vbeVersRec =
     {0,0,0,0}
 };
 
-XF86ModuleData vbeModuleData = { &vbeVersRec, vbeSetup, NULL };
+_X_EXPORT XF86ModuleData vbeModuleData = { &vbeVersRec, vbeSetup, NULL };
 
 static pointer
 vbeSetup(pointer module, pointer opts, int *errmaj, int *errmin)
@@ -49,6 +45,3 @@ vbeSetup(pointer module, pointer opts, int *errmaj, int *errmin)
      */
     return (pointer)1;
 }
-
-#endif
-
diff --git a/hw/xfree86/vgahw/vgaHWmodule.c b/hw/xfree86/vgahw/vgaHWmodule.c
index 9f5a5a9c2..d5c50d9ca 100644
--- a/hw/xfree86/vgahw/vgaHWmodule.c
+++ b/hw/xfree86/vgahw/vgaHWmodule.c
@@ -1,5 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/vgahw/vgaHWmodule.c,v 1.6 1999/01/26 05:54:18 dawes Exp $ */
-
 /*
  * Copyright 1998 by The XFree86 Project, Inc
  */
@@ -8,11 +6,8 @@
 #include <xorg-config.h>
 #endif
 
-#ifdef XFree86LOADER
-
 #include "xf86Module.h"
 
-
 static XF86ModuleVersionInfo VersRec = {
 	"vgahw",
 	MODULEVENDORSTRING,
@@ -26,6 +21,4 @@ static XF86ModuleVersionInfo VersRec = {
 	{0, 0, 0, 0}
 };
 
-XF86ModuleData vgahwModuleData = { &VersRec, NULL, NULL };
-
-#endif
+_X_EXPORT XF86ModuleData vgahwModuleData = { &VersRec, NULL, NULL };
diff --git a/hw/xfree86/xaa/xaaInitAccel.c b/hw/xfree86/xaa/xaaInitAccel.c
index 861410b6d..fe0b70a14 100644
--- a/hw/xfree86/xaa/xaaInitAccel.c
+++ b/hw/xfree86/xaa/xaaInitAccel.c
@@ -1,5 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInitAccel.c,v 1.35tsi Exp $ */
-
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
@@ -18,9 +16,7 @@
 #include "xf86fbman.h"
 #include "servermd.h"
 
-#ifdef XFree86LOADER
 static const OptionInfoRec *XAAAvailableOptions(void *unused);
-#endif
 
 /*
  * XAA Config options
@@ -97,7 +93,6 @@ static const OptionInfoRec XAAOptions[] = {
 				OPTV_NONE,	{0}, FALSE }
 };
 
-#ifdef XFree86LOADER
 static MODULESETUPPROTO(xaaSetup);
 
 static XF86ModuleVersionInfo xaaVersRec =
@@ -114,7 +109,7 @@ static XF86ModuleVersionInfo xaaVersRec =
 	{0,0,0,0}
 };
 
-XF86ModuleData xaaModuleData = { &xaaVersRec, xaaSetup, NULL };
+_X_EXPORT XF86ModuleData xaaModuleData = { &xaaVersRec, xaaSetup, NULL };
 
 ModuleInfoRec XAA = {
     1,
@@ -132,9 +127,6 @@ xaaSetup(pointer Module, pointer Options, int *ErrorMajor, int *ErrorMinor)
 
     if (!Initialised) {
 	Initialised = TRUE;
-#ifndef REMOVE_LOADER_CHECK_MODULE_INFO
-	if (xf86LoaderCheckSymbol("xf86AddModuleInfo"))
-#endif
 	xf86AddModuleInfo(&XAA, Module);
     }
 
@@ -147,7 +139,6 @@ XAAAvailableOptions(void *unused)
 {
     return (XAAOptions);
 }
-#endif
 
 Bool
 XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
diff --git a/hw/xfree86/xf1bpp/mfbmodule.c b/hw/xfree86/xf1bpp/mfbmodule.c
index 50715ccc1..ccd3572e5 100644
--- a/hw/xfree86/xf1bpp/mfbmodule.c
+++ b/hw/xfree86/xf1bpp/mfbmodule.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmodule.c,v 1.6 1999/01/26 05:54:19 dawes Exp $ */
 /*
  * Copyright (C) 1997 The XFree86 Project, Inc.  All Rights Reserved.
  *
@@ -29,10 +28,8 @@
 #include <xorg-config.h>
 #endif
 
-#ifdef XFree86LOADER
 #include "xf86Module.h"
 
-
 static XF86ModuleVersionInfo VersRec =
 {
         "xf1bpp",
@@ -47,6 +44,4 @@ static XF86ModuleVersionInfo VersRec =
         {0,0,0,0}       /* signature, to be patched into the file by a tool */
 };
 
-XF86ModuleData xf1bppModuleData = { &VersRec, NULL, NULL };
-
-#endif
+_X_EXPORT XF86ModuleData xf1bppModuleData = { &VersRec, NULL, NULL };
diff --git a/hw/xfree86/xf4bpp/vgamodule.c b/hw/xfree86/xf4bpp/vgamodule.c
index 932a856c2..e7324914b 100644
--- a/hw/xfree86/xf4bpp/vgamodule.c
+++ b/hw/xfree86/xf4bpp/vgamodule.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgamodule.c,v 1.8 1999/01/26 05:54:20 dawes Exp $ */
 /*
  * Copyright (C) 1998 The XFree86 Project, Inc.  All Rights Reserved.
  *
@@ -29,7 +28,6 @@
 #include <xorg-config.h>
 #endif
 
-#ifdef XFree86LOADER
 #include "xf86Module.h"
 
 static MODULESETUPPROTO(xf4bppSetup);
@@ -48,7 +46,7 @@ static XF86ModuleVersionInfo VersRec =
         {0,0,0,0}       /* signature, to be patched into the file by a tool */
 };
 
-XF86ModuleData xf4bppModuleData = { &VersRec, xf4bppSetup, NULL };
+_X_EXPORT XF86ModuleData xf4bppModuleData = { &VersRec, xf4bppSetup, NULL };
 
 static pointer
 xf4bppSetup(pointer module, pointer opts, int *errmaj, int *errmin)
@@ -57,5 +55,3 @@ xf4bppSetup(pointer module, pointer opts, int *errmaj, int *errmin)
     return LoadSubModule(module, "xf1bpp", NULL, NULL, NULL, NULL,
 			 errmaj, errmin);
 }
-
-#endif
diff --git a/hw/xfree86/xf8_16bpp/xf8_16module.c b/hw/xfree86/xf8_16bpp/xf8_16module.c
index d8bfbdedd..1a739b040 100644
--- a/hw/xfree86/xf8_16bpp/xf8_16module.c
+++ b/hw/xfree86/xf8_16bpp/xf8_16module.c
@@ -46,7 +46,6 @@ cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8,
                                    dpix, dpiy, width16, width8, 16, 8, 16, 8));
 }
 
-#ifdef XFree86LOADER
 #include "xf86Module.h"
 
 static MODULESETUPPROTO(xf8_16bppSetup);
@@ -76,4 +75,3 @@ xf8_16bppSetup(pointer module, pointer opts, int *errmaj, int *errmin)
     return (pointer)LoadSubModule(module, "fb", NULL, NULL, NULL, NULL,
 			          errmaj, errmin);
 }
-#endif
diff --git a/hw/xfree86/xf8_32bpp/cfb8_32module.c b/hw/xfree86/xf8_32bpp/cfb8_32module.c
index 6739b60fc..5afabe52d 100644
--- a/hw/xfree86/xf8_32bpp/cfb8_32module.c
+++ b/hw/xfree86/xf8_32bpp/cfb8_32module.c
@@ -1,12 +1,7 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32module.c,v 1.5 1999/01/24 13:32:42 dawes Exp $ */
-
-
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
 
-#ifdef XFree86LOADER
-
 #include "xf86Module.h"
 
 static MODULESETUPPROTO(xf8_32bppSetup);
@@ -25,7 +20,11 @@ static XF86ModuleVersionInfo VersRec =
         {0,0,0,0}       /* signature, to be patched into the file by a tool */
 };
 
-XF86ModuleData xf8_32bppModuleData = { &VersRec, xf8_32bppSetup, NULL };
+_X_EXPORT XF86ModuleData xf8_32bppModuleData = {
+    &VersRec,
+    xf8_32bppSetup,
+    NULL
+};
 
 static pointer
 xf8_32bppSetup(pointer module, pointer opts, int *errmaj, int *errmin)
@@ -38,5 +37,3 @@ xf8_32bppSetup(pointer module, pointer opts, int *errmaj, int *errmin)
         return NULL;
     return (pointer)1;  /* non-NULL required to indicate success */
 }
-
-#endif