diff --git a/hw/xfree86/i2c/Makefile.am b/hw/xfree86/i2c/Makefile.am
index cd244a1c6..4632e7ee1 100644
--- a/hw/xfree86/i2c/Makefile.am
+++ b/hw/xfree86/i2c/Makefile.am
@@ -6,4 +6,44 @@ INCLUDES = $(XORG_INCS)
 
 AM_CFLAGS = $(XORG_CFLAGS)
 
-sdk_HEADERS = xf86i2c.h
+sdk_HEADERS = xf86i2c.h bt829.h fi1236.h msp3430.h tda8425.h tda9850.h tda9885.h uda1380.h
+
+
+
+#
+# i2c drivers
+#
+bt829_drv_la_LTLIBRARIES = bt829_drv.la
+bt829_drv_la_LDFLAGS = -module -avoid-version
+bt829_drv_ladir = @moduledir@/multimedia
+bt829_drv_la_SOURCES = bt829.c bt829.h bt829_module.c
+
+fi1236_drv_la_LTLIBRARIES = fi1236_drv.la
+fi1236_drv_la_LDFLAGS = -module -avoid-version
+fi1236_drv_ladir = @moduledir@/multimedia
+fi1236_drv_la_SOURCES = fi1236.c fi1236.h fi1236_module.c
+
+msp3430_drv_la_LTLIBRARIES = msp3430_drv.la
+msp3430_drv_la_LDFLAGS = -module -avoid-version
+msp3430_drv_ladir = @moduledir@/multimedia
+msp3430_drv_la_SOURCES = msp3430.c msp3430.h msp3430_module.c
+
+tda8425_drv_la_LTLIBRARIES = tda8425_drv.la
+tda8425_drv_la_LDFLAGS = -module -avoid-version
+tda8425_drv_ladir = @moduledir@/multimedia
+tda8425_drv_la_SOURCES = tda8425.c tda8425.h tda8425_module.c
+
+tda9850_drv_la_LTLIBRARIES = tda9850_drv.la
+tda9850_drv_la_LDFLAGS = -module -avoid-version
+tda9850_drv_ladir = @moduledir@/multimedia
+tda9850_drv_la_SOURCES = tda9850.c tda9850.h tda9850_module.c
+
+tda9885_drv_la_LTLIBRARIES = tda9885_drv.la
+tda9885_drv_la_LDFLAGS = -module -avoid-version
+tda9885_drv_ladir = @moduledir@/multimedia
+tda9885_drv_la_SOURCES = tda9885.c tda9885.h tda9885_module.c
+
+uda1380_drv_la_LTLIBRARIES = uda1380_drv.la
+uda1380_drv_la_LDFLAGS = -module -avoid-version
+uda1380_drv_ladir = @moduledir@/multimedia
+uda1380_drv_la_SOURCES = uda1380.c uda1380.h uda1380_module.c
diff --git a/hw/xfree86/i2c/bt829.c b/hw/xfree86/i2c/bt829.c
index b4d55873d..c9d144317 100644
--- a/hw/xfree86/i2c/bt829.c
+++ b/hw/xfree86/i2c/bt829.c
@@ -1,7 +1,7 @@
 /* TODO: clean up/fix CC code */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
 #endif
 
 #include "xf86.h"
diff --git a/hw/xfree86/i2c/bt829_module.c b/hw/xfree86/i2c/bt829_module.c
index 2340ef571..a3a2538d2 100644
--- a/hw/xfree86/i2c/bt829_module.c
+++ b/hw/xfree86/i2c/bt829_module.c
@@ -1,5 +1,5 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
 #endif
 
 #include "xf86Module.h"
diff --git a/hw/xfree86/i2c/fi1236.c b/hw/xfree86/i2c/fi1236.c
index a2d79df25..3a02335d5 100644
--- a/hw/xfree86/i2c/fi1236.c
+++ b/hw/xfree86/i2c/fi1236.c
@@ -1,5 +1,5 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
 #endif
 
 #include "xf86.h"
diff --git a/hw/xfree86/i2c/fi1236_module.c b/hw/xfree86/i2c/fi1236_module.c
index 2c8917741..f270952f2 100644
--- a/hw/xfree86/i2c/fi1236_module.c
+++ b/hw/xfree86/i2c/fi1236_module.c
@@ -1,5 +1,5 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
 #endif
 
 #include "xf86Module.h"
diff --git a/hw/xfree86/i2c/msp3430.c b/hw/xfree86/i2c/msp3430.c
index 0f1e89fe0..91019fc8f 100644
--- a/hw/xfree86/i2c/msp3430.c
+++ b/hw/xfree86/i2c/msp3430.c
@@ -1,5 +1,5 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
 #endif
 
 #include "xf86.h"
diff --git a/hw/xfree86/i2c/msp3430_module.c b/hw/xfree86/i2c/msp3430_module.c
index a5ca1aec9..d31692445 100644
--- a/hw/xfree86/i2c/msp3430_module.c
+++ b/hw/xfree86/i2c/msp3430_module.c
@@ -1,5 +1,5 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
 #endif
 
 #include "xf86Module.h"
diff --git a/hw/xfree86/i2c/tda8425.c b/hw/xfree86/i2c/tda8425.c
index 700a01a89..7631a0863 100644
--- a/hw/xfree86/i2c/tda8425.c
+++ b/hw/xfree86/i2c/tda8425.c
@@ -1,5 +1,5 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
 #endif
 
 #include "xf86.h"
diff --git a/hw/xfree86/i2c/tda8425_module.c b/hw/xfree86/i2c/tda8425_module.c
index d5858a3f0..83936998d 100644
--- a/hw/xfree86/i2c/tda8425_module.c
+++ b/hw/xfree86/i2c/tda8425_module.c
@@ -1,5 +1,5 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
 #endif
 
 #include "xf86Module.h"
diff --git a/hw/xfree86/i2c/tda9850.c b/hw/xfree86/i2c/tda9850.c
index d4578b2b3..e6afd8165 100644
--- a/hw/xfree86/i2c/tda9850.c
+++ b/hw/xfree86/i2c/tda9850.c
@@ -1,5 +1,5 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
 #endif
 
 #include "xf86.h"
diff --git a/hw/xfree86/i2c/tda9850_module.c b/hw/xfree86/i2c/tda9850_module.c
index ea60d600a..c437236f2 100644
--- a/hw/xfree86/i2c/tda9850_module.c
+++ b/hw/xfree86/i2c/tda9850_module.c
@@ -1,5 +1,5 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
 #endif
 
 #include "xf86Module.h"
diff --git a/hw/xfree86/i2c/tda9885.c b/hw/xfree86/i2c/tda9885.c
index b71fddf50..4147dfdd7 100644
--- a/hw/xfree86/i2c/tda9885.c
+++ b/hw/xfree86/i2c/tda9885.c
@@ -1,5 +1,5 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
 #endif
 
 #include "xf86.h"
diff --git a/hw/xfree86/i2c/tda9885_module.c b/hw/xfree86/i2c/tda9885_module.c
index 331fbe719..ef34027ea 100644
--- a/hw/xfree86/i2c/tda9885_module.c
+++ b/hw/xfree86/i2c/tda9885_module.c
@@ -1,5 +1,5 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
 #endif
 
 #include "xf86Module.h"
diff --git a/hw/xfree86/i2c/uda1380.c b/hw/xfree86/i2c/uda1380.c
index 8e36b9ae4..4b9cc4799 100644
--- a/hw/xfree86/i2c/uda1380.c
+++ b/hw/xfree86/i2c/uda1380.c
@@ -5,6 +5,11 @@
  * License: GPL
  *
  * $Log$
+ * Revision 1.4  2005/07/13 20:19:37  sandmann
+ * xc/programs/Xserver/hw/xfree86/drivers/i2c/*.c: include xorg-config.h
+ * instead of config.h
+ * xserver/xorg/hw/xfree86/i2c/Makefile.am: Add i2c drivers
+ *
  * Revision 1.3  2005/07/11 02:29:50  ajax
  * Prep for modular builds by adding guarded #include "config.h" everywhere.
  *
@@ -14,8 +19,8 @@
  *
  ************************************************************************************/
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
 #endif
 
 #include "xf86.h"
diff --git a/hw/xfree86/i2c/uda1380_module.c b/hw/xfree86/i2c/uda1380_module.c
index cfda721c7..27639aa4e 100644
--- a/hw/xfree86/i2c/uda1380_module.c
+++ b/hw/xfree86/i2c/uda1380_module.c
@@ -1,5 +1,5 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
 #endif
 
 #include "xf86Module.h"