12 files changed, 7 insertions, 48 deletions
diff --git a/animations/source/animcore/animcore.map b/animations/source/animcore/animcore.map
deleted file mode 100644
index 30c5bb729ac7..000000000000
--- a/animations/source/animcore/animcore.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-        component_canUnload;
-    local:
-    *;
-};
diff --git a/animations/source/animcore/makefile.mk b/animations/source/animcore/makefile.mk
index b68f0299a53c..2fe38c02b166 100644
--- a/animations/source/animcore/makefile.mk
+++ b/animations/source/animcore/makefile.mk
@@ -52,7 +52,7 @@ SLOFILES = 	$(SLO)$/animcore.obj\
             $(SLO)$/targetpropertiescreator.obj
 
 SHL1TARGET= $(TARGET)
-SHL1VERSIONMAP=	$(TARGET).map
+SHL1VERSIONMAP=$(SOLARENV)/src/unloadablecomponent.map
 
 SHL1STDLIBS= \
         $(SALLIB) 	 \
diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk
index d74700307291..085074ba0974 100644
--- a/sd/util/makefile.mk
+++ b/sd/util/makefile.mk
@@ -160,7 +160,7 @@ LIB6FILES=      								\
 # sdd
 SHL2TARGET= sdd$(DLLPOSTFIX)
 SHL2IMPLIB= sddimp
-SHL2VERSIONMAP= sdd.map
+SHL2VERSIONMAP=$(SOLARENV)/src/component.map
 SHL2DEF=$(MISC)$/$(SHL2TARGET).def
 DEF2NAME=		$(SHL2TARGET)
 
diff --git a/sd/util/sd.map b/sd/util/sd.map
deleted file mode 100644
index 59e1057c6daa..000000000000
--- a/sd/util/sd.map
+++ /dev/null
@@ -1,8 +0,0 @@
-SD_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/sd/util/sdd.map b/sd/util/sdd.map
deleted file mode 100644
index c7439a13948e..000000000000
--- a/sd/util/sdd.map
+++ /dev/null
@@ -1,8 +0,0 @@
-SCH_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/sd/util/sdfilt.map b/sd/util/sdfilt.map
index 62213393408d..e38cc1e8c597 100644
--- a/sd/util/sdfilt.map
+++ b/sd/util/sdfilt.map
@@ -1,4 +1,4 @@
-PPTEXPORTER_1_0 {
+UDK_3_0_0 {
         global:
                 ExportPPT;
                 ImportPPT;
diff --git a/sd/util/sdui.map b/sd/util/sdui.map
index 51f26bb81cfb..ad5e33836c7c 100644
--- a/sd/util/sdui.map
+++ b/sd/util/sdui.map
@@ -1,4 +1,4 @@
-CUI_1_0 {
+UDK_3_0_0 {
     global:
     CreateDialogFactory;
     local:
diff --git a/slideshow/source/engine/OGLTrans/exports.map b/slideshow/source/engine/OGLTrans/exports.map
deleted file mode 100644
index ebc8f13ea1bd..000000000000
--- a/slideshow/source/engine/OGLTrans/exports.map
+++ /dev/null
@@ -1,8 +0,0 @@
-SLI_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/slideshow/source/engine/OGLTrans/makefile.mk b/slideshow/source/engine/OGLTrans/makefile.mk
index 6353b2da58fb..9612d1e7da93 100644
--- a/slideshow/source/engine/OGLTrans/makefile.mk
+++ b/slideshow/source/engine/OGLTrans/makefile.mk
@@ -72,7 +72,7 @@ SHL1IMPLIB=i$(TARGET)
 SHL1LIBS=$(SLB)$/$(TARGET).lib
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 DEF1NAME=$(SHL1TARGET)
 DEF1EXPORTFILE=exports.dxp
diff --git a/slideshow/test/export.map b/slideshow/test/export.map
index 1953f105dc08..df94ae98ee5c 100644
--- a/slideshow/test/export.map
+++ b/slideshow/test/export.map
@@ -29,7 +29,7 @@
 #
 #*************************************************************************
 
-UDK_3.1 {
+UDK_3_0_0 {
     global:
         registerAllTestFunction;
 
diff --git a/slideshow/util/exports.map b/slideshow/util/exports.map
deleted file mode 100644
index 1c294f38c851..000000000000
--- a/slideshow/util/exports.map
+++ /dev/null
@@ -1,8 +0,0 @@
-SHW_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/slideshow/util/makefile.mk b/slideshow/util/makefile.mk
index aba4094b242f..adde1895f52a 100644
--- a/slideshow/util/makefile.mk
+++ b/slideshow/util/makefile.mk
@@ -74,7 +74,7 @@ SHL1IMPLIB=i$(TARGET)
 SHL1LIBS=$(SLB)$/$(TARGET).lib
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 DEF1NAME=$(SHL1TARGET)
 DEF1EXPORTFILE=exports.dxp