diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 17025a4f31..6ff99976f8 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -194,7 +194,7 @@ STAGE2_LIB_SRC       = stage2.c clog2.c mem.c tables.c delay.c \
 		       compute_ip_checksum.c string.c
 
 STAGE2_ARCH_X86_SRC  = archtables.c coreboot_table.c multiboot.c udelay_io.c
-STAGE2_ARCH_X86_SRC += pci_ops_auto.c
+STAGE2_ARCH_X86_SRC += pci_ops_auto.c pci_ops_conf1.c 
 STAGE2_ARCH_X86_SRC += keyboard.c i8259.c isa-dma.c
 
 ifeq ($(CONFIG_PIRQ_TABLE),y)
diff --git a/include/device/pci_ops.h b/include/device/pci_ops.h
index 5e7cab61cc..d780fdc67b 100644
--- a/include/device/pci_ops.h
+++ b/include/device/pci_ops.h
@@ -24,33 +24,19 @@
 #include <shared.h>
 
 u8 pci_read_config8(struct device * dev, unsigned where);
-EXPORT_SYMBOL(pci_read_config8);
 u16 pci_read_config16(struct device * dev, unsigned where);
-EXPORT_SYMBOL(pci_read_config16);
 u32 pci_read_config32(struct device * dev, unsigned where);
-EXPORT_SYMBOL(pci_read_config32);
 void pci_write_config8(struct device * dev, unsigned where, u8 val);
-EXPORT_SYMBOL(pci_write_config8);
 void pci_write_config16(struct device * dev, unsigned where, u16 val);
-EXPORT_SYMBOL(pci_write_config16);
 void pci_write_config32(struct device * dev, unsigned where, u32 val);
-EXPORT_SYMBOL(pci_write_config32);
 
 u8 pci_conf1_read_config8(u32 bdf, int where);
-EXPORT_SYMBOL(pci_conf1_read_config8);
 u16 pci_conf1_read_config16(u32 bdf, int where);
-EXPORT_SYMBOL(pci_conf1_read_config16);
 u32 pci_conf1_read_config32(u32 bdf, int where);
-EXPORT_SYMBOL(pci_conf1_read_config32);
 void pci_conf1_write_config8(u32 bdf, int where, u8 value);
-EXPORT_SYMBOL(pci_conf1_write_config8);
 void pci_conf1_write_config16(u32 bdf, int where, u16 value);
-EXPORT_SYMBOL(pci_conf1_write_config16);
 void pci_conf1_write_config32(u32 bdf, int where, u32 value);
-EXPORT_SYMBOL(pci_conf1_write_config32);
 int pci_conf1_find_on_bus(u16 bus, u16 vid, u16 did, u32 *busdevfn);
-EXPORT_SYMBOL(pci_conf1_find_on_bus);
 int pci_conf1_find_device(u16 vid, u16 did, u32 * dev);
-EXPORT_SYMBOL(pci_conf1_find_device);
 
 #endif /* DEVICE_PCI_OPS_H */