filter: convert some more libraries to gbuild

98 files changed, 1268 insertions, 1881 deletions

diff --git a/Repository.mk b/Repository.mk
index c3d0b251e2c2..75feaa033204 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -81,6 +81,17 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     doctok \
     drawinglayer \
     editeng \
+	egi \
+	eme \
+	epb \
+	epg \
+	epp \
+	eps \
+	ept \
+	era \
+	eti \
+	exp \
+	filterconfig \
 	filtertracer \
 	flash \
     for \
@@ -93,6 +104,18 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     hwp \
     i18npaper \
     i18nregexp \
+	icd \
+	icg \
+	idx \
+	ime \
+	ipb \
+	ipd \
+	ips \
+	ipt \
+	ipx \
+	ira \
+	itg \
+	iti \
     lng \
     lwpft \
     merged \
@@ -159,6 +182,8 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 	xmlfd \
     xo \
     xof \
+	xsltdlg \
+	xsltfilter \
 ))
 
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
diff --git a/filter/Library_egi.mk b/filter/Library_egi.mk
new file mode 100644
index 000000000000..89b13fe3a700
--- /dev/null
+++ b/filter/Library_egi.mk
@@ -0,0 +1,46 @@
+#***************************************************************
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+$(eval $(call gb_Library_Library,egi))
+
+$(eval $(call gb_Library_add_api,egi,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,egi,\
+	-I$(SRCDIR)/filter/inc/pch \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,egi,\
+	svt \
+	vcl \
+	tl \
+	cppu \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,egi,\
+	filter/source/graphicfilter/egif/egif \
+	filter/source/graphicfilter/egif/giflzwc \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_eme.mk b/filter/Library_eme.mk
new file mode 100644
index 000000000000..6988dd504203
--- /dev/null
+++ b/filter/Library_eme.mk
@@ -0,0 +1,45 @@
+#***************************************************************
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+$(eval $(call gb_Library_Library,eme))
+
+$(eval $(call gb_Library_add_api,eme,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,eme,\
+	-I$(SRCDIR)/filter/inc/pch \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,eme,\
+	svt \
+	vcl \
+	tl \
+	cppu \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,eme,\
+	filter/source/graphicfilter/eos2met/eos2met \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_epb.mk b/filter/Library_epb.mk
new file mode 100644
index 000000000000..990c181b5319
--- /dev/null
+++ b/filter/Library_epb.mk
@@ -0,0 +1,45 @@
+#***************************************************************
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+$(eval $(call gb_Library_Library,epb))
+
+$(eval $(call gb_Library_add_api,epb,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,epb,\
+	-I$(SRCDIR)/filter/inc/pch \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,epb,\
+	svt \
+	vcl \
+	tl \
+	cppu \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,epb,\
+	filter/source/graphicfilter/epbm/epbm \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_epg.mk b/filter/Library_epg.mk
new file mode 100644
index 000000000000..b23d282cacaf
--- /dev/null
+++ b/filter/Library_epg.mk
@@ -0,0 +1,45 @@
+#***************************************************************
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+$(eval $(call gb_Library_Library,epg))
+
+$(eval $(call gb_Library_add_api,epg,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,epg,\
+	-I$(SRCDIR)/filter/inc/pch \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,epg,\
+	svt \
+	vcl \
+	tl \
+	cppu \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,epg,\
+	filter/source/graphicfilter/epgm/epgm \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_epp.mk b/filter/Library_epp.mk
new file mode 100644
index 000000000000..0f1871009490
--- /dev/null
+++ b/filter/Library_epp.mk
@@ -0,0 +1,45 @@
+#***************************************************************
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+$(eval $(call gb_Library_Library,epp))
+
+$(eval $(call gb_Library_add_api,epp,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,epp,\
+	-I$(SRCDIR)/filter/inc/pch \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,epp,\
+	svt \
+	vcl \
+	tl \
+	cppu \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,epp,\
+	filter/source/graphicfilter/eppm/eppm \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_eps.mk b/filter/Library_eps.mk
new file mode 100644
index 000000000000..dde91657ef0b
--- /dev/null
+++ b/filter/Library_eps.mk
@@ -0,0 +1,45 @@
+#***************************************************************
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+$(eval $(call gb_Library_Library,eps))
+
+$(eval $(call gb_Library_add_api,eps,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,eps,\
+	-I$(SRCDIR)/filter/inc/pch \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,eps,\
+	svt \
+	vcl \
+	tl \
+	cppu \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,eps,\
+	filter/source/graphicfilter/eps/eps \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_ept.mk b/filter/Library_ept.mk
new file mode 100644
index 000000000000..5ec38fef2c7e
--- /dev/null
+++ b/filter/Library_ept.mk
@@ -0,0 +1,46 @@
+#***************************************************************
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+$(eval $(call gb_Library_Library,ept))
+
+$(eval $(call gb_Library_add_api,ept,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,ept,\
+	-I$(SRCDIR)/filter/inc/pch \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ept,\
+	svt \
+	vcl \
+	tl \
+	basegfx \
+	cppu \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ept,\
+	filter/source/graphicfilter/epict/epict \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_era.mk b/filter/Library_era.mk
new file mode 100644
index 000000000000..90a3b00f1013
--- /dev/null
+++ b/filter/Library_era.mk
@@ -0,0 +1,45 @@
+#***************************************************************
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+$(eval $(call gb_Library_Library,era))
+
+$(eval $(call gb_Library_add_api,era,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,era,\
+	-I$(SRCDIR)/filter/inc/pch \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,era,\
+	svt \
+	vcl \
+	tl \
+	cppu \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,era,\
+	filter/source/graphicfilter/eras/eras \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_eti.mk b/filter/Library_eti.mk
new file mode 100644
index 000000000000..0ef7b2424e70
--- /dev/null
+++ b/filter/Library_eti.mk
@@ -0,0 +1,45 @@
+#***************************************************************
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+$(eval $(call gb_Library_Library,eti))
+
+$(eval $(call gb_Library_add_api,eti,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,eti,\
+	-I$(SRCDIR)/filter/inc/pch \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,eti,\
+	svt \
+	vcl \
+	tl \
+	cppu \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,eti,\
+	filter/source/graphicfilter/etiff/etiff \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_exp.mk b/filter/Library_exp.mk
new file mode 100644
index 000000000000..41b38e1c5aae
--- /dev/null
+++ b/filter/Library_exp.mk
@@ -0,0 +1,45 @@
+#***************************************************************
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+$(eval $(call gb_Library_Library,exp))
+
+$(eval $(call gb_Library_add_api,exp,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,exp,\
+	-I$(SRCDIR)/filter/inc/pch \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,exp,\
+	svt \
+	vcl \
+	tl \
+	cppu \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,exp,\
+	filter/source/graphicfilter/expm/expm \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_filterconfig.mk b/filter/Library_filterconfig.mk
new file mode 100644
index 000000000000..20159f325042
--- /dev/null
+++ b/filter/Library_filterconfig.mk
@@ -0,0 +1,62 @@
+#***************************************************************
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+$(eval $(call gb_Library_Library,filterconfig))
+
+$(eval $(call gb_Library_set_componentfile,filterconfig,filter/source/config/cache/filterconfig1))
+
+$(eval $(call gb_Library_add_api,filterconfig,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,filterconfig,\
+	-I$(SRCDIR)/filter/inc/pch \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,filterconfig,\
+	fwe \
+	utl \
+	tl \
+	comphelper \
+	cppuhelper \
+	cppu \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,filterconfig,\
+	filter/source/config/cache/basecontainer \
+	filter/source/config/cache/cacheitem \
+	filter/source/config/cache/cacheupdatelistener \
+	filter/source/config/cache/configflush \
+	filter/source/config/cache/contenthandlerfactory \
+	filter/source/config/cache/filtercache \
+	filter/source/config/cache/filterfactory \
+	filter/source/config/cache/frameloaderfactory \
+	filter/source/config/cache/lateinitlistener \
+	filter/source/config/cache/lateinitthread \
+	filter/source/config/cache/querytokenizer \
+	filter/source/config/cache/registration \
+	filter/source/config/cache/typedetection \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_icd.mk b/filter/Library_icd.mk
new file mode 100644
index 000000000000..556022f0783d
--- /dev/null
+++ b/filter/Library_icd.mk
@@ -0,0 +1,44 @@
+#***************************************************************
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+$(eval $(call gb_Library_Library,icd))
+
+$(eval $(call gb_Library_add_api,icd,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,icd,\
+	-I$(SRCDIR)/filter/inc/pch \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,icd,\
+	svt \
+	vcl \
+	tl \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,icd,\
+	filter/source/graphicfilter/ipcd/ipcd \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_icg.mk b/filter/Library_icg.mk
new file mode 100644
index 000000000000..e759bc23d818
--- /dev/null
+++ b/filter/Library_icg.mk
@@ -0,0 +1,60 @@
+#***************************************************************
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+$(eval $(call gb_Library_Library,icg))
+
+$(eval $(call gb_Library_add_api,icg,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,icg,\
+	-I$(SRCDIR)/filter/inc/pch \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,icg,\
+	tk \
+	vcl \
+	utl \
+	tl \
+	cppu \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,icg,\
+	filter/source/graphicfilter/icgm/actimpr \
+	filter/source/graphicfilter/icgm/bitmap \
+	filter/source/graphicfilter/icgm/bundles \
+	filter/source/graphicfilter/icgm/cgm \
+	filter/source/graphicfilter/icgm/chart \
+	filter/source/graphicfilter/icgm/class0 \
+	filter/source/graphicfilter/icgm/class1 \
+	filter/source/graphicfilter/icgm/class2 \
+	filter/source/graphicfilter/icgm/class3 \
+	filter/source/graphicfilter/icgm/class4 \
+	filter/source/graphicfilter/icgm/class5 \
+	filter/source/graphicfilter/icgm/class7 \
+	filter/source/graphicfilter/icgm/classx \
+	filter/source/graphicfilter/icgm/elements \
+	filter/source/graphicfilter/icgm/outact \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_idx.mk b/filter/Library_idx.mk
new file mode 100644
index 000000000000..ff28e4a3ec9e
--- /dev/null
+++ b/filter/Library_idx.mk
@@ -0,0 +1,50 @@
+#***************************************************************
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+$(eval $(call gb_Library_Library,idx))
+
+$(eval $(call gb_Library_add_api,idx,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,idx,\
+	-I$(SRCDIR)/filter/inc/pch \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,idx,\
+	vcl \
+	tl \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,idx,\
+	filter/source/graphicfilter/idxf/dxf2mtf \
+	filter/source/graphicfilter/idxf/dxfblkrd \
+	filter/source/graphicfilter/idxf/dxfentrd \
+	filter/source/graphicfilter/idxf/dxfgrprd \
+	filter/source/graphicfilter/idxf/dxfreprd \
+	filter/source/graphicfilter/idxf/dxftblrd \
+	filter/source/graphicfilter/idxf/dxfvec \
+	filter/source/graphicfilter/idxf/idxf \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_ime.mk b/filter/Library_ime.mk
new file mode 100644
index 000000000000..8440d9fb0e9f
--- /dev/null
+++ b/filter/Library_ime.mk
@@ -0,0 +1,43 @@
+#***************************************************************
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+$(eval $(call gb_Library_Library,ime))
+
+$(eval $(call gb_Library_add_api,ime,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,ime,\
+	-I$(SRCDIR)/filter/inc/pch \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ime,\
+	vcl \
+	tl \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ime,\
+	filter/source/graphicfilter/ios2met/ios2met \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_ipb.mk b/filter/Library_ipb.mk
new file mode 100644
index 000000000000..20290ca5c1c5
--- /dev/null
+++ b/filter/Library_ipb.mk
@@ -0,0 +1,43 @@
+#***************************************************************
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+$(eval $(call gb_Library_Library,ipb))
+
+$(eval $(call gb_Library_add_api,ipb,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,ipb,\
+	-I$(SRCDIR)/filter/inc/pch \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ipb,\
+	vcl \
+	tl \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ipb,\
+	filter/source/graphicfilter/ipbm/ipbm \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_ipd.mk b/filter/Library_ipd.mk
new file mode 100644
index 000000000000..adba684194d0
--- /dev/null
+++ b/filter/Library_ipd.mk
@@ -0,0 +1,43 @@
+#***************************************************************
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+$(eval $(call gb_Library_Library,ipd))
+
+$(eval $(call gb_Library_add_api,ipd,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,ipd,\
+	-I$(SRCDIR)/filter/inc/pch \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ipd,\
+	vcl \
+	tl \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ipd,\
+	filter/source/graphicfilter/ipsd/ipsd \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_ips.mk b/filter/Library_ips.mk
new file mode 100644
index 000000000000..62ca72e35cab
--- /dev/null
+++ b/filter/Library_ips.mk
@@ -0,0 +1,43 @@
+#***************************************************************
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+$(eval $(call gb_Library_Library,ips))
+
+$(eval $(call gb_Library_add_api,ips,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,ips,\
+	-I$(SRCDIR)/filter/inc/pch \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ips,\
+	vcl \
+	tl \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ips,\
+	filter/source/graphicfilter/ieps/ieps \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_ipt.mk b/filter/Library_ipt.mk
new file mode 100644
index 000000000000..db61a5e09d5d
--- /dev/null
+++ b/filter/Library_ipt.mk
@@ -0,0 +1,45 @@
+#***************************************************************
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+$(eval $(call gb_Library_Library,ipt))
+
+$(eval $(call gb_Library_add_api,ipt,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,ipt,\
+	-I$(SRCDIR)/filter/inc/pch \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ipt,\
+	vcl \
+	tl \
+	basegfx \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ipt,\
+	filter/source/graphicfilter/ipict/ipict \
+	filter/source/graphicfilter/ipict/shape \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_ipx.mk b/filter/Library_ipx.mk
new file mode 100644
index 000000000000..a709c5f7f06f
--- /dev/null
+++ b/filter/Library_ipx.mk
@@ -0,0 +1,43 @@
+#***************************************************************
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+$(eval $(call gb_Library_Library,ipx))
+
+$(eval $(call gb_Library_add_api,ipx,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,ipx,\
+	-I$(SRCDIR)/filter/inc/pch \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ipx,\
+	vcl \
+	tl \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ipx,\
+	filter/source/graphicfilter/ipcx/ipcx \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_ira.mk b/filter/Library_ira.mk
new file mode 100644
index 000000000000..90a9b9ac0d91
--- /dev/null
+++ b/filter/Library_ira.mk
@@ -0,0 +1,43 @@
+#***************************************************************
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+$(eval $(call gb_Library_Library,ira))
+
+$(eval $(call gb_Library_add_api,ira,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,ira,\
+	-I$(SRCDIR)/filter/inc/pch \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ira,\
+	vcl \
+	tl \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ira,\
+	filter/source/graphicfilter/iras/iras \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_itg.mk b/filter/Library_itg.mk
new file mode 100644
index 000000000000..ff82b7e07343
--- /dev/null
+++ b/filter/Library_itg.mk
@@ -0,0 +1,43 @@
+#***************************************************************
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+$(eval $(call gb_Library_Library,itg))
+
+$(eval $(call gb_Library_add_api,itg,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,itg,\
+	-I$(SRCDIR)/filter/inc/pch \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,itg,\
+	vcl \
+	tl \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,itg,\
+	filter/source/graphicfilter/itga/itga \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_iti.mk b/filter/Library_iti.mk
new file mode 100644
index 000000000000..0d158303119a
--- /dev/null
+++ b/filter/Library_iti.mk
@@ -0,0 +1,45 @@
+#***************************************************************
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+$(eval $(call gb_Library_Library,iti))
+
+$(eval $(call gb_Library_add_api,iti,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,iti,\
+	-I$(SRCDIR)/filter/inc/pch \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,iti,\
+	vcl \
+	tl \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,iti,\
+	filter/source/graphicfilter/itiff/ccidecom \
+	filter/source/graphicfilter/itiff/itiff \
+	filter/source/graphicfilter/itiff/lzwdecom \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_xsltdlg.mk b/filter/Library_xsltdlg.mk
new file mode 100644
index 000000000000..3c609036cb32
--- /dev/null
+++ b/filter/Library_xsltdlg.mk
@@ -0,0 +1,63 @@
+#***************************************************************
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+$(eval $(call gb_Library_Library,xsltdlg))
+
+$(eval $(call gb_Library_set_componentfile,xsltdlg,filter/source/xsltdialog/xsltdlg))
+
+$(eval $(call gb_Library_add_api,xsltdlg,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,xsltdlg,\
+	-I$(SRCDIR)/filter/inc/pch \
+	$$(INCLUDE) \
+	-I$(SRCDIR)/filter/inc \
+))
+
+$(eval $(call gb_Library_add_linked_libs,xsltdlg,\
+	sfx \
+	svt \
+	tk \
+	vcl \
+	svl \
+	utl \
+	tl \
+	comphelper \
+	cppuhelper \
+	cppu \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,xsltdlg,\
+	filter/source/xsltdialog/typedetectionexport \
+	filter/source/xsltdialog/typedetectionimport \
+	filter/source/xsltdialog/xmlfileview \
+	filter/source/xsltdialog/xmlfilterdialogcomponent \
+	filter/source/xsltdialog/xmlfilterjar \
+	filter/source/xsltdialog/xmlfiltersettingsdialog \
+	filter/source/xsltdialog/xmlfiltertabdialog \
+	filter/source/xsltdialog/xmlfiltertabpagebasic \
+	filter/source/xsltdialog/xmlfiltertabpagexslt \
+	filter/source/xsltdialog/xmlfiltertestdialog \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_xsltfilter.mk b/filter/Library_xsltfilter.mk
new file mode 100644
index 000000000000..bc99b82a3074
--- /dev/null
+++ b/filter/Library_xsltfilter.mk
@@ -0,0 +1,48 @@
+#***************************************************************
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+$(eval $(call gb_Library_Library,xsltfilter))
+
+$(eval $(call gb_Library_set_componentfile,xsltfilter,filter/source/xsltfilter/xsltfilter))
+
+$(eval $(call gb_Library_add_api,xsltfilter,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,xsltfilter,\
+	-I$(SRCDIR)/filter/inc/pch \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,xsltfilter,\
+	xo \
+	tl \
+	cppuhelper \
+	cppu \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,xsltfilter,\
+	filter/source/xsltfilter/XSLTFilter \
+	filter/source/xsltfilter/fla \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index 7d0f7235ee09..0567f86099ac 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -24,8 +24,31 @@ $(eval $(call gb_Module_add_targets,filter,\
 	Jar_XSLTFilter \
 	Jar_XSLTValidate \
 	Library_PptImporter \
+	Library_egi \
+	Library_eme \
+	Library_epb \
+	Library_epg \
+	Library_epp \
+	Library_eps \
+	Library_ept \
+	Library_era \
+	Library_eti \
+	Library_exp \
+	Library_filterconfig \
 	Library_filtertracer \
 	Library_flash \
+	Library_icd \
+	Library_icg \
+	Library_idx \
+	Library_ime \
+	Library_ipb \
+	Library_ipd \
+	Library_ips \
+	Library_ipt \
+	Library_ipx \
+	Library_ira \
+	Library_itg \
+	Library_iti \
 	Library_msfilter \
 	Library_pdffilter \
 	Library_placeware \
@@ -33,6 +56,8 @@ $(eval $(call gb_Module_add_targets,filter,\
 	Library_t602filter \
 	Library_xmlfa \
 	Library_xmlfd \
+	Library_xsltdlg \
+	Library_xsltfilter \
 	Package_inc \
 	Package_docbook \
 	Package_xslt \
diff --git a/filter/prj/build.lst b/filter/prj/build.lst
index cd074b93bc60..33b630909842 100644
--- a/filter/prj/build.lst
+++ b/filter/prj/build.lst
@@ -1,30 +1,3 @@
 fl      filter  :    TRANSLATIONS:translations svtools unotools xmloff cppu tools cppuhelper sal svx javaunohelper XPDF:xpdf jvmaccess canvas SAXON:saxon LIBXSLT:libxslt basegfx package PYTHON:python NULL
 fl  filter\prj nmake - all fl_prj   NULL
-fl	filter									usr1	-	all	fl_mkout			NULL
-fl	filter\prj								get		-	all	fl_prj				NULL
-fl	filter\inc								nmake	-	all	fl_inc				NULL
 fl  filter\source\odfflatxml                nmake   -   all fl_odfflatxml       fl_inc NULL
-fl	filter\source\xsltdialog				nmake	-	all fl_xsltdialog fl_flash  fl_inc NULL
-fl	filter\source\graphicfilter\eos2met		nmake	-	all	g_vfeom fl_inc NULL
-fl	filter\source\graphicfilter\ios2met		nmake	-	all	g_vfiom fl_inc NULL
-fl	filter\source\graphicfilter\epict			nmake	-	all	g_vfept fl_inc NULL
-fl	filter\source\graphicfilter\egif			nmake	-	all	g_vfegf fl_inc NULL
-fl	filter\source\graphicfilter\ipcd			nmake	-	all	g_vfipc fl_inc NULL
-fl	filter\source\graphicfilter\ipcx			nmake	-	all	g_vfipx fl_inc NULL
-fl	filter\source\graphicfilter\ipict			nmake	-	all	g_vfipt fl_inc NULL
-fl	filter\source\graphicfilter\idxf			nmake	-	all	g_vfidx fl_inc NULL
-fl	filter\source\graphicfilter\itiff			nmake	-	all	g_vfitf fl_inc NULL
-fl	filter\source\graphicfilter\ipbm			nmake	-	all	g_vfpbm fl_inc NULL
-fl	filter\source\graphicfilter\epbm			nmake	-	all	g_epbm fl_inc NULL
-fl	filter\source\graphicfilter\epgm			nmake	-	all	g_epgm fl_inc NULL
-fl	filter\source\graphicfilter\eppm			nmake	-	all	g_eppm fl_inc NULL
-fl	filter\source\graphicfilter\iras			nmake	-	all	g_iras fl_inc NULL
-fl	filter\source\graphicfilter\expm			nmake	-	all	g_expm fl_inc NULL
-fl	filter\source\graphicfilter\eras			nmake	-	all	g_eras fl_inc NULL
-fl	filter\source\graphicfilter\etiff			nmake	-	all	g_etiff fl_inc NULL
-fl	filter\source\graphicfilter\eps			nmake	-	all	g_eps fl_inc NULL
-fl	filter\source\graphicfilter\itga			nmake	-	all	g_itga fl_inc NULL
-fl	filter\source\graphicfilter\ipsd			nmake	-	all	g_ipsd fl_inc NULL
-fl	filter\source\graphicfilter\ieps			nmake	-	all	g_ieps fl_inc NULL
-fl	filter\source\graphicfilter\icgm			nmake	-	all	g_icgm fl_inc NULL
-fl  filter\source\config\cache              nmake   -   all fl_config           fl_inc NULL
diff --git a/filter/source/config/cache/makefile.mk b/filter/source/config/cache/makefile.mk
deleted file mode 100644
index d94c81e35010..000000000000
--- a/filter/source/config/cache/makefile.mk
+++ /dev/null
@@ -1,87 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ                 = ..$/..$/..
-
-PRJNAME             = filter
-TARGET              = filterconfig
-ENABLE_EXCEPTIONS   = TRUE
-VERSION             = 1
-USE_DEFFILE         = TRUE
-LIBTARGET           = NO
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Library -----------------------------------
-
-SHL1TARGET=     $(TARGET)$(VERSION)
-
-SLOFILES=       \
-                $(SLO)$/configflush.obj             \
-                $(SLO)$/basecontainer.obj           \
-                $(SLO)$/cacheitem.obj               \
-                $(SLO)$/contenthandlerfactory.obj   \
-                $(SLO)$/filtercache.obj             \
-                $(SLO)$/filterfactory.obj           \
-                $(SLO)$/frameloaderfactory.obj      \
-                $(SLO)$/lateinitlistener.obj        \
-                $(SLO)$/lateinitthread.obj          \
-                $(SLO)$/querytokenizer.obj          \
-                $(SLO)$/registration.obj            \
-                $(SLO)$/typedetection.obj           \
-                $(SLO)$/cacheupdatelistener.obj
-
-SHL1OBJS=       $(SLOFILES)
-
-SHL1STDLIBS=    \
-                $(COMPHELPERLIB)    \
-                $(CPPUHELPERLIB)    \
-                $(CPPULIB)          \
-                $(SALLIB)           \
-                $(TOOLSLIB)         \
-                $(UNOTOOLSLIB)      \
-                $(FWELIB)
-
-DEF1NAME=       $(SHL1TARGET)
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-SHL1DEPN=
-SHL1IMPLIB=     i$(SHL1TARGET)
-SHL1VERSIONMAP= $(SOLARENV)/src/component.map
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/filterconfig1.component
-
-$(MISC)/filterconfig1.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt filterconfig1.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt filterconfig1.component
diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx
index efb0bf2b8b4c..6167a25ea5b2 100644
--- a/filter/source/graphicfilter/egif/egif.cxx
+++ b/filter/source/graphicfilter/egif/egif.cxx
@@ -569,7 +569,8 @@ void GIFWriter::WriteTerminator()
 
 // ------------------------------------------------------------------------
 
-extern "C" sal_Bool __LOADONCALLAPI GraphicExport( SvStream& rStream, Graphic& rGraphic,
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI
+GraphicExport( SvStream& rStream, Graphic& rGraphic,
                                                FilterConfigItem* pConfigItem, sal_Bool )
 {
     GIFWriter aWriter(rStream);
diff --git a/filter/source/graphicfilter/egif/exports.map b/filter/source/graphicfilter/egif/exports.map
deleted file mode 100644
index d4e28c44700c..000000000000
--- a/filter/source/graphicfilter/egif/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
-        global:
-                GraphicExport;
-
-        local:
-                *;
-};
diff --git a/filter/source/graphicfilter/egif/makefile.mk b/filter/source/graphicfilter/egif/makefile.mk
deleted file mode 100644
index ad684231e82c..000000000000
--- a/filter/source/graphicfilter/egif/makefile.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=filter
-TARGET=egif
-TARGET2=egi
-DEPTARGET=vegif
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(L10N_framework)"==""
-SLOFILES= \
-        $(EXCEPTIONSFILES)	\
-            $(SLO)$/giflzwc.obj
-
-EXCEPTIONSFILES= \
-        $(SLO)$/egif.obj
-
-.ENDIF
-
-# ==========================================================================
-
-.IF "$(L10N_framework)"==""
-SHL1TARGET=     egi$(DLLPOSTFIX)
-SHL1IMPLIB=     egif
-SHL1STDLIBS=	$(TOOLSLIB) $(VCLLIB) $(CPPULIB) $(SVTOOLLIB) $(SALLIB)
-
-SHL1LIBS=       $(SLB)$/egif.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=       $(SLO)$/egif.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-# ==========================================================================
-
-.INCLUDE :  target.mk
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx
index 6a444cb455f3..8d874303b56f 100644
--- a/filter/source/graphicfilter/eos2met/eos2met.cxx
+++ b/filter/source/graphicfilter/eos2met/eos2met.cxx
@@ -2587,7 +2587,8 @@ sal_Bool METWriter::WriteMET( const GDIMetaFile& rMTF, SvStream& rTargetStream,
 
 //================== GraphicExport - die exportierte Funktion ================
 
-extern "C" sal_Bool __LOADONCALLAPI GraphicExport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool )
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI
+GraphicExport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool )
 {   METWriter aMETWriter;
 
     if ( rGraphic.GetType() == GRAPHIC_GDIMETAFILE )
diff --git a/filter/source/graphicfilter/eos2met/exports.map b/filter/source/graphicfilter/eos2met/exports.map
deleted file mode 100644
index d4e28c44700c..000000000000
--- a/filter/source/graphicfilter/eos2met/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
-        global:
-                GraphicExport;
-
-        local:
-                *;
-};
diff --git a/filter/source/graphicfilter/eos2met/makefile.mk b/filter/source/graphicfilter/eos2met/makefile.mk
deleted file mode 100644
index f6ce5b34b9f0..000000000000
--- a/filter/source/graphicfilter/eos2met/makefile.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=filter
-TARGET=eos2met
-TARGET2=eme
-DEPTARGET=veos2met
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(L10N_framework)"==""
-SLOFILES =  $(SLO)$/eos2met.obj
-
-
-.ENDIF
-# ==========================================================================
-
-.IF "$(L10N_framework)"==""
-SHL1TARGET=     eme$(DLLPOSTFIX)
-SHL1IMPLIB=     eos2met
-SHL1STDLIBS=    $(TOOLSLIB) $(VCLLIB) $(SVTOOLLIB) $(CPPULIB) $(SALLIB)
-
-SHL1LIBS=       $(SLB)$/eos2met.lib
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=       $(SLO)$/eos2met.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-# ==========================================================================
-
-.INCLUDE :  target.mk
diff --git a/filter/source/graphicfilter/epbm/epbm.cxx b/filter/source/graphicfilter/epbm/epbm.cxx
index f94ab01d7f85..612873f21787 100644
--- a/filter/source/graphicfilter/epbm/epbm.cxx
+++ b/filter/source/graphicfilter/epbm/epbm.cxx
@@ -200,7 +200,8 @@ void PBMWriter::ImplWriteNumber(sal_Int32 nNumber)
 // - exported function -
 // ---------------------
 
-extern "C" sal_Bool __LOADONCALLAPI GraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool )
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI
+GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool)
 {
     PBMWriter aPBMWriter(rStream);
 
diff --git a/filter/source/graphicfilter/epbm/exports.map b/filter/source/graphicfilter/epbm/exports.map
deleted file mode 100644
index d4e28c44700c..000000000000
--- a/filter/source/graphicfilter/epbm/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
-        global:
-                GraphicExport;
-
-        local:
-                *;
-};
diff --git a/filter/source/graphicfilter/epbm/makefile.mk b/filter/source/graphicfilter/epbm/makefile.mk
deleted file mode 100644
index 778c9512e14f..000000000000
--- a/filter/source/graphicfilter/epbm/makefile.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=filter
-TARGET=epbm
-TARGET2=epb
-DEPTARGET=vepbm
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(L10N_framework)"==""
-SLOFILES = \
-	$(EXCEPTIONSFILES)
-EXCEPTIONSFILES =	\
-	$(SLO)$/epbm.obj
-.ENDIF
-# ==========================================================================
-
-.IF "$(L10N_framework)"==""
-SHL1TARGET= 	epb$(DLLPOSTFIX)
-SHL1IMPLIB= 	epbm
-SHL1STDLIBS=	$(TOOLSLIB) $(VCLLIB) $(CPPULIB)	$(SVTOOLLIB) $(SALLIB)
-
-SHL1LIBS=		$(SLB)$/epbm.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=		$(SLO)$/epbm.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-# ==========================================================================
-
-.INCLUDE :	target.mk
diff --git a/filter/source/graphicfilter/epgm/epgm.cxx b/filter/source/graphicfilter/epgm/epgm.cxx
index 747f0528813d..6e4b7460f289 100644
--- a/filter/source/graphicfilter/epgm/epgm.cxx
+++ b/filter/source/graphicfilter/epgm/epgm.cxx
@@ -225,7 +225,8 @@ void PGMWriter::ImplWriteNumber(sal_Int32 nNumber)
 // - exported function -
 // ---------------------
 
-extern "C" sal_Bool __LOADONCALLAPI GraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool )
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI
+GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool)
 {
     PGMWriter aPGMWriter(rStream);
 
diff --git a/filter/source/graphicfilter/epgm/exports.map b/filter/source/graphicfilter/epgm/exports.map
deleted file mode 100644
index d4e28c44700c..000000000000
--- a/filter/source/graphicfilter/epgm/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
-        global:
-                GraphicExport;
-
-        local:
-                *;
-};
diff --git a/filter/source/graphicfilter/epgm/makefile.mk b/filter/source/graphicfilter/epgm/makefile.mk
deleted file mode 100644
index 244ab48414ec..000000000000
--- a/filter/source/graphicfilter/epgm/makefile.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=filter
-TARGET=epgm
-TARGET2=epg
-DEPTARGET=vepgm
-
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(L10N_framework)"==""
-SLOFILES = \
-	$(EXCEPTIONSFILES)
-EXCEPTIONSFILES = \
-	$(SLO)$/epgm.obj
-.ENDIF
-# ==========================================================================
-
-.IF "$(L10N_framework)"==""
-SHL1TARGET= 	epg$(DLLPOSTFIX)
-SHL1IMPLIB= 	epgm
-SHL1STDLIBS=	$(TOOLSLIB) $(VCLLIB) $(CPPULIB) $(SVTOOLLIB) $(SALLIB)
-
-SHL1LIBS=		$(SLB)$/epgm.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=		$(SLO)$/epgm.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-# ==========================================================================
-
-.INCLUDE :	target.mk
diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx
index 49d14de0045a..aa00f1f02898 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -2305,7 +2305,8 @@ sal_Bool PictWriter::WritePict(const GDIMetaFile & rMTF, SvStream & rTargetStrea
 
 //================== GraphicExport - die exportierte Funktion ================
 
-extern "C" sal_Bool __LOADONCALLAPI GraphicExport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool)
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI
+GraphicExport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool)
 {
     PictWriter      aPictWriter;
 
diff --git a/filter/source/graphicfilter/epict/exports.map b/filter/source/graphicfilter/epict/exports.map
deleted file mode 100644
index d4e28c44700c..000000000000
--- a/filter/source/graphicfilter/epict/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
-        global:
-                GraphicExport;
-
-        local:
-                *;
-};
diff --git a/filter/source/graphicfilter/epict/makefile.mk b/filter/source/graphicfilter/epict/makefile.mk
deleted file mode 100644
index 38ed352cfe15..000000000000
--- a/filter/source/graphicfilter/epict/makefile.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=filter
-TARGET=epict
-TARGET2=ept
-DEPTARGET=vepict
-
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(L10N_framework)"==""
-SLOFILES =  $(SLO)$/epict.obj
-EXCEPTIONSFILES =  $(SLO)$/epict.obj \
-            $(SLO)$/dlgepct.obj
-.ENDIF
-# ==========================================================================
-
-.IF "$(L10N_framework)"==""
-SHL1TARGET=     ept$(DLLPOSTFIX)
-SHL1IMPLIB=     epict
-SHL1STDLIBS=    $(TOOLSLIB) $(VCLLIB) $(SVTOOLLIB) $(CPPULIB) $(SALLIB) $(BASEGFXLIB)
-
-SHL1LIBS=       $(SLB)$/epict.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=       $(SLO)$/epict.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-# ==========================================================================
-
-.INCLUDE :  target.mk
diff --git a/filter/source/graphicfilter/eppm/eppm.cxx b/filter/source/graphicfilter/eppm/eppm.cxx
index 80a0b25980b8..0188326b2fa4 100644
--- a/filter/source/graphicfilter/eppm/eppm.cxx
+++ b/filter/source/graphicfilter/eppm/eppm.cxx
@@ -233,7 +233,8 @@ void PPMWriter::ImplWriteNumber(sal_Int32 nNumber)
 // - exported function -
 // ---------------------
 
-extern "C" sal_Bool __LOADONCALLAPI GraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool )
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI
+GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool)
 {
     PPMWriter aPPMWriter(rStream);
     return aPPMWriter.WritePPM( rGraphic, pFilterConfigItem );
diff --git a/filter/source/graphicfilter/eppm/exports.map b/filter/source/graphicfilter/eppm/exports.map
deleted file mode 100644
index d4e28c44700c..000000000000
--- a/filter/source/graphicfilter/eppm/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
-        global:
-                GraphicExport;
-
-        local:
-                *;
-};
diff --git a/filter/source/graphicfilter/eppm/makefile.mk b/filter/source/graphicfilter/eppm/makefile.mk
deleted file mode 100644
index 97d37b7edff3..000000000000
--- a/filter/source/graphicfilter/eppm/makefile.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=filter
-TARGET=eppm
-TARGET2=epp
-DEPTARGET=veppm
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(L10N_framework)"==""
-SLOFILES =	$(SLO)$/eppm.obj
-.ENDIF
-# ==========================================================================
-
-.IF "$(L10N_framework)"==""
-SHL1TARGET= 	epp$(DLLPOSTFIX)
-SHL1IMPLIB= 	eppm
-SHL1STDLIBS=	$(TOOLSLIB) $(VCLLIB) $(CPPULIB) $(SVTOOLLIB) $(SALLIB)
-
-SHL1LIBS=		$(SLB)$/eppm.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=		$(SLO)$/eppm.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-
-# ==========================================================================
-
-.INCLUDE :	target.mk
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index 4dcb8ef3d775..e385a4a8f0ad 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -2782,7 +2782,8 @@ sal_Bool PSWriter::ImplGetBoundingBox( double* nNumb, sal_uInt8* pSource, sal_uL
 
 //================== GraphicExport - die exportierte Funktion ================
 
-extern "C" sal_Bool __LOADONCALLAPI GraphicExport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool)
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI
+GraphicExport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool)
 {
     PSWriter aPSWriter;
     return aPSWriter.WritePS( rGraphic, rStream, pFilterConfigItem );
diff --git a/filter/source/graphicfilter/eps/exports.map b/filter/source/graphicfilter/eps/exports.map
deleted file mode 100644
index d4e28c44700c..000000000000
--- a/filter/source/graphicfilter/eps/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
-        global:
-                GraphicExport;
-
-        local:
-                *;
-};
diff --git a/filter/source/graphicfilter/eps/makefile.mk b/filter/source/graphicfilter/eps/makefile.mk
deleted file mode 100644
index 2fd0e052d1a0..000000000000
--- a/filter/source/graphicfilter/eps/makefile.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=filter
-TARGET=eps
-DEPTARGET=veps
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =	epsstr.src
-.IF "$(L10N_framework)"==""
-EXCEPTIONSFILES=$(SLO)$/eps.obj
-SLOFILES =	$(SLO)$/eps.obj
-.ENDIF
-
-# ==========================================================================
-
-RESLIB1NAME=$(TARGET)
-RESLIB1SRSFILES=$(SRS)$/$(TARGET).srs
-.IF "$(L10N_framework)"==""
-SHL1TARGET= 	eps$(DLLPOSTFIX)
-SHL1IMPLIB= 	eps
-SHL1STDLIBS=	$(TOOLSLIB) $(VCLLIB) $(VCLLIB) $(SVTOOLLIB) $(CPPULIB) $(SALLIB) $(UNOTOOLSLIB)
-
-SHL1LIBS=		$(SLB)$/eps.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=		$(SLO)$/eps.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-
-# ==========================================================================
-
-.INCLUDE :	target.mk
diff --git a/filter/source/graphicfilter/eras/eras.cxx b/filter/source/graphicfilter/eras/eras.cxx
index 938ad3ef2ab5..a50b48deff39 100644
--- a/filter/source/graphicfilter/eras/eras.cxx
+++ b/filter/source/graphicfilter/eras/eras.cxx
@@ -280,7 +280,8 @@ void RASWriter::ImplPutByte( sal_uInt8 nPutThis )
 // - exported function -
 // ---------------------
 
-extern "C" sal_Bool __LOADONCALLAPI GraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool )
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI
+GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool)
 {
     RASWriter aRASWriter(rStream);
 
diff --git a/filter/source/graphicfilter/eras/exports.map b/filter/source/graphicfilter/eras/exports.map
deleted file mode 100644
index d4e28c44700c..000000000000
--- a/filter/source/graphicfilter/eras/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
-        global:
-                GraphicExport;
-
-        local:
-                *;
-};
diff --git a/filter/source/graphicfilter/eras/makefile.mk b/filter/source/graphicfilter/eras/makefile.mk
deleted file mode 100644
index b13365fad1ca..000000000000
--- a/filter/source/graphicfilter/eras/makefile.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=filter
-TARGET=eras
-DEPTARGET=veras
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-.IF "$(L10N_framework)"==""
-SLOFILES =	$(SLO)$/eras.obj
-EXCEPTIONSFILES =	$(SLO)$/eras.obj
-
-# ==========================================================================
-
-SHL1TARGET= 	era$(DLLPOSTFIX)
-SHL1IMPLIB= 	eras
-SHL1STDLIBS=	$(VCLLIB) $(TOOLSLIB) $(SALLIB) $(SVTOOLLIB)
-SHL1LIBS=		$(SLB)$/eras.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=		$(SLO)$/eras.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-
-# ==========================================================================
-
-.INCLUDE :	target.mk
-
diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx
index ba7c412fb245..a6781b70e8be 100644
--- a/filter/source/graphicfilter/etiff/etiff.cxx
+++ b/filter/source/graphicfilter/etiff/etiff.cxx
@@ -610,7 +610,8 @@ void TIFFWriter::EndCompression()
 // - exported function -
 // ---------------------
 
-extern "C" sal_Bool __LOADONCALLAPI GraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool )
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI
+GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool)
 {
     TIFFWriter aWriter(rStream);
     return aWriter.WriteTIFF( rGraphic, pFilterConfigItem );
diff --git a/filter/source/graphicfilter/etiff/exports.map b/filter/source/graphicfilter/etiff/exports.map
deleted file mode 100644
index d4e28c44700c..000000000000
--- a/filter/source/graphicfilter/etiff/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
-        global:
-                GraphicExport;
-
-        local:
-                *;
-};
diff --git a/filter/source/graphicfilter/etiff/makefile.mk b/filter/source/graphicfilter/etiff/makefile.mk
deleted file mode 100644
index e571cd0babc1..000000000000
--- a/filter/source/graphicfilter/etiff/makefile.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=filter
-TARGET=etiff
-DEPTARGET=vetiff
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(L10N_framework)"==""
-SLOFILES =	$(SLO)$/etiff.obj
-EXCEPTIONSFILES =	$(SLO)$/etiff.obj
-
-# ==========================================================================
-
-SHL1TARGET= 	eti$(DLLPOSTFIX)
-SHL1IMPLIB= 	etiff
-SHL1STDLIBS=	$(VCLLIB) $(TOOLSLIB) $(SALLIB) $(SVTOOLLIB)
-SHL1LIBS=		$(SLB)$/etiff.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=		$(SLO)$/etiff.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-# ==========================================================================
-
-.INCLUDE :	target.mk
diff --git a/filter/source/graphicfilter/expm/expm.cxx b/filter/source/graphicfilter/expm/expm.cxx
index 2cd5fbf035b0..9682a3eb82fc 100644
--- a/filter/source/graphicfilter/expm/expm.cxx
+++ b/filter/source/graphicfilter/expm/expm.cxx
@@ -261,7 +261,8 @@ void XPMWriter::ImplWriteColor( sal_uInt16 nNumber )
 // - exported function -
 // ---------------------
 
-extern "C" sal_Bool __LOADONCALLAPI GraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool )
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI
+GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool)
 {
     XPMWriter aXPMWriter(rStream);
 
diff --git a/filter/source/graphicfilter/expm/exports.map b/filter/source/graphicfilter/expm/exports.map
deleted file mode 100644
index d4e28c44700c..000000000000
--- a/filter/source/graphicfilter/expm/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
-        global:
-                GraphicExport;
-
-        local:
-                *;
-};
diff --git a/filter/source/graphicfilter/expm/makefile.mk b/filter/source/graphicfilter/expm/makefile.mk
deleted file mode 100644
index 8e2dd5a146b9..000000000000
--- a/filter/source/graphicfilter/expm/makefile.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=filter
-TARGET=expm
-DEPTARGET=vexpm
-
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(L10N_framework)"==""
-SLOFILES =	$(SLO)$/expm.obj
-EXCEPTIONSFILES =	$(SLO)$/expm.obj
-
-# ==========================================================================
-
-SHL1TARGET= 	exp$(DLLPOSTFIX)
-SHL1IMPLIB= 	expm
-SHL1STDLIBS=	$(VCLLIB) $(TOOLSLIB) $(SALLIB) $(SVTOOLLIB)
-SHL1LIBS=		$(SLB)$/expm.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=		$(SLO)$/expm.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-# ==========================================================================
-
-.INCLUDE :	target.mk
diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx
index 079e46bc1ac5..dbc2941a9880 100644
--- a/filter/source/graphicfilter/icgm/cgm.cxx
+++ b/filter/source/graphicfilter/icgm/cgm.cxx
@@ -773,7 +773,8 @@ SvStream& operator>>( SvStream& rOStm, CGM& /*rCGM*/ )
 
 //================== GraphicImport - die exportierte Funktion ================
 
-extern "C" sal_uInt32 __LOADONCALLAPI ImportCGM( String& rFileName, uno::Reference< frame::XModel > & rXModel, sal_uInt32 nMode, void* pProgressBar )
+extern "C" SAL_DLLPUBLIC_EXPORT sal_uInt32 __LOADONCALLAPI
+ImportCGM( String& rFileName, uno::Reference< frame::XModel > & rXModel, sal_uInt32 nMode, void* pProgressBar )
 {
 
     sal_uInt32  nStatus = 0;            // retvalue == 0 -> ERROR
diff --git a/filter/source/graphicfilter/icgm/exports.map b/filter/source/graphicfilter/icgm/exports.map
deleted file mode 100644
index cc7f07dd1112..000000000000
--- a/filter/source/graphicfilter/icgm/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
-        global:
-                ImportCGM;
-
-        local:
-                *;
-};
diff --git a/filter/source/graphicfilter/icgm/makefile.mk b/filter/source/graphicfilter/icgm/makefile.mk
deleted file mode 100644
index a9591fe49d0c..000000000000
--- a/filter/source/graphicfilter/icgm/makefile.mk
+++ /dev/null
@@ -1,76 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-PRJNAME=filter
-TARGET=icgm
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-.IF "$(L10N_framework)"==""
-SLOFILES =	$(SLO)$/cgm.obj		\
-            $(SLO)$/chart.obj	\
-            $(SLO)$/class0.obj	\
-            $(SLO)$/class1.obj	\
-            $(SLO)$/class2.obj	\
-            $(SLO)$/class3.obj	\
-            $(SLO)$/class4.obj	\
-            $(SLO)$/class5.obj	\
-            $(SLO)$/class7.obj	\
-            $(SLO)$/classx.obj	\
-            $(SLO)$/outact.obj	\
-            $(SLO)$/actimpr.obj	\
-            $(SLO)$/bundles.obj	\
-            $(SLO)$/bitmap.obj	\
-            $(SLO)$/elements.obj
-#			$(SLO)$/svdem.obj
-
-SHL1TARGET	=	icg$(DLLPOSTFIX)
-SHL1IMPLIB	=	icgm
-SHL1VERSIONMAP=exports.map
-SHL1DEF		=	$(MISC)$/$(SHL1TARGET).def
-SHL1LIBS	=	$(SLB)$/icgm.lib
-
-DEF1NAME=$(SHL1TARGET)
-
-SHL1STDLIBS = \
-            $(TKLIB)		\
-            $(VCLLIB)		\
-            $(UNOTOOLSLIB)	\
-            $(TOOLSLIB)		\
-            $(CPPULIB)		\
-            $(SALLIB)
-.ENDIF
-
-# --- Targets --------------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/filter/source/graphicfilter/idxf/exports.map b/filter/source/graphicfilter/idxf/exports.map
deleted file mode 100644
index 941e4ab9bde8..000000000000
--- a/filter/source/graphicfilter/idxf/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
-        global:
-                GraphicImport;
-
-        local:
-                *;
-};
diff --git a/filter/source/graphicfilter/idxf/idxf.cxx b/filter/source/graphicfilter/idxf/idxf.cxx
index 66af96dad001..1d22c71cf1a6 100644
--- a/filter/source/graphicfilter/idxf/idxf.cxx
+++ b/filter/source/graphicfilter/idxf/idxf.cxx
@@ -38,7 +38,8 @@
 
 //================== GraphicImport - die exportierte Funktion ================
 
-extern "C" sal_Bool __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool )
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI
+GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool)
 {
     DXFRepresentation aDXF;
     DXF2GDIMetaFile aConverter;
diff --git a/filter/source/graphicfilter/idxf/makefile.mk b/filter/source/graphicfilter/idxf/makefile.mk
deleted file mode 100644
index d447b20c5c17..000000000000
--- a/filter/source/graphicfilter/idxf/makefile.mk
+++ /dev/null
@@ -1,76 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=filter
-TARGET=idxf
-DEPTARGET=vidxf
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(L10N_framework)"==""
-EXCEPTIONSFILES=\
-            $(SLO)$/dxf2mtf.obj  \
-            $(SLO)$/dxfblkrd.obj \
-            $(SLO)$/dxfentrd.obj \
-            $(SLO)$/dxfgrprd.obj \
-            $(SLO)$/dxfreprd.obj \
-            $(SLO)$/dxftblrd.obj \
-            $(SLO)$/idxf.obj
-
-SLOFILES =  \
-            $(EXCEPTIONSFILES)   \
-            $(SLO)$/dxfvec.obj
-
-# ==========================================================================
-
-SHL1TARGET=     idx$(DLLPOSTFIX)
-SHL1IMPLIB=     idxf
-SHL1STDLIBS=    $(VCLLIB) $(TOOLSLIB) $(SALLIB)
-
-SHL1LIBS=       $(SLB)$/idxf.lib # $(LB)$/rtftoken.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=       $(SLO)$/idxf.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-
-# ==========================================================================
-
-.INCLUDE :  target.mk
diff --git a/filter/source/graphicfilter/ieps/exports.map b/filter/source/graphicfilter/ieps/exports.map
deleted file mode 100644
index 941e4ab9bde8..000000000000
--- a/filter/source/graphicfilter/ieps/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
-        global:
-                GraphicImport;
-
-        local:
-                *;
-};
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index 458bb147d5c1..4ecb41590997 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -507,11 +507,8 @@ void MakePreview(sal_uInt8* pBuf, sal_uInt32 nBytesRead,
 
 //================== GraphicImport - die exportierte Funktion ================
 
-#ifdef WNT
-extern "C" sal_Bool _cdecl GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool)
-#else
-extern "C" sal_Bool GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool)
-#endif
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI
+GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool)
 {
     if ( rStream.GetError() )
         return sal_False;
diff --git a/filter/source/graphicfilter/ieps/makefile.mk b/filter/source/graphicfilter/ieps/makefile.mk
deleted file mode 100644
index f8787dd94837..000000000000
--- a/filter/source/graphicfilter/ieps/makefile.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=filter
-TARGET=ieps
-DEPTARGET=vieps
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(L10N_framework)"==""
-SLOFILES =  $(SLO)$/ieps.obj
-EXCEPTIONSFILES =  $(SLO)$/ieps.obj
-
-# ==========================================================================
-
-SHL1TARGET=     ips$(DLLPOSTFIX)
-SHL1IMPLIB=     ieps
-SHL1STDLIBS=    $(VCLLIB) $(TOOLSLIB) $(SALLIB)
-SHL1LIBS=       $(SLB)$/ieps.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=       $(SLO)$/ieps.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-# ==========================================================================
-
-.INCLUDE :  target.mk
diff --git a/filter/source/graphicfilter/ios2met/exports.map b/filter/source/graphicfilter/ios2met/exports.map
deleted file mode 100644
index 941e4ab9bde8..000000000000
--- a/filter/source/graphicfilter/ios2met/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
-        global:
-                GraphicImport;
-
-        local:
-                *;
-};
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index c9accd68a344..72e071665758 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -2737,7 +2737,8 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaF
 
 //================== GraphicImport - die exportierte Funktion ================
 
-extern "C" sal_Bool __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool )
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI
+GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool)
 {
     OS2METReader    aOS2METReader;
     GDIMetaFile     aMTF;
diff --git a/filter/source/graphicfilter/ios2met/makefile.mk b/filter/source/graphicfilter/ios2met/makefile.mk
deleted file mode 100644
index 82bcb6edbc97..000000000000
--- a/filter/source/graphicfilter/ios2met/makefile.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=filter
-TARGET=ios2met
-DEPTARGET=vios2met
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(L10N_framework)"==""
-SLOFILES =  $(EXCEPTIONSFILES)
-EXCEPTIONSFILES = $(SLO)$/ios2met.obj
-
-# ==========================================================================
-
-SHL1TARGET=     ime$(DLLPOSTFIX)
-SHL1IMPLIB=     ios2met
-SHL1STDLIBS=    $(VCLLIB) $(TOOLSLIB) $(SALLIB)
-
-SHL1LIBS=       $(SLB)$/ios2met.lib # $(LB)$/rtftoken.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=       $(SLO)$/ios2met.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-# ==========================================================================
-
-.INCLUDE :  target.mk
-
diff --git a/filter/source/graphicfilter/ipbm/exports.map b/filter/source/graphicfilter/ipbm/exports.map
deleted file mode 100644
index 941e4ab9bde8..000000000000
--- a/filter/source/graphicfilter/ipbm/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
-        global:
-                GraphicImport;
-
-        local:
-                *;
-};
diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx
index 6f6fd876d583..cbfaa1d4cdbd 100644
--- a/filter/source/graphicfilter/ipbm/ipbm.cxx
+++ b/filter/source/graphicfilter/ipbm/ipbm.cxx
@@ -530,7 +530,8 @@ sal_Bool PBMReader::ImplReadBody()
 
 //================== GraphicImport - die exportierte Funktion ================
 
-extern "C" sal_Bool __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool )
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI
+GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool)
 {
     PBMReader aPBMReader(rStream);
 
diff --git a/filter/source/graphicfilter/ipbm/makefile.mk b/filter/source/graphicfilter/ipbm/makefile.mk
deleted file mode 100644
index accd27f47b18..000000000000
--- a/filter/source/graphicfilter/ipbm/makefile.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=filter
-TARGET=ipbm
-DEPTARGET=vipbm
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(L10N_framework)"==""
-SLOFILES =	$(SLO)$/ipbm.obj
-EXCEPTIONSFILES =	$(SLO)$/ipbm.obj
-
-# ==========================================================================
-
-SHL1TARGET= 	ipb$(DLLPOSTFIX)
-SHL1IMPLIB= 	ipbm
-SHL1STDLIBS=	$(VCLLIB) $(TOOLSLIB) $(SALLIB)
-SHL1LIBS=		$(SLB)$/ipbm.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=		$(SLO)$/ipbm.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-
-# ==========================================================================
-
-.INCLUDE :	target.mk
-
diff --git a/filter/source/graphicfilter/ipcd/exports.map b/filter/source/graphicfilter/ipcd/exports.map
deleted file mode 100644
index 941e4ab9bde8..000000000000
--- a/filter/source/graphicfilter/ipcd/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
-        global:
-                GraphicImport;
-
-        local:
-                *;
-};
diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx
index 8eae5065b250..a8b91daa12d9 100644
--- a/filter/source/graphicfilter/ipcd/ipcd.cxx
+++ b/filter/source/graphicfilter/ipcd/ipcd.cxx
@@ -389,7 +389,8 @@ void PCDReader::ReadImage(sal_uLong nMinPercent, sal_uLong nMaxPercent)
 
 //================== GraphicImport - die exportierte Funktion ================
 
-extern "C" sal_Bool __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pConfigItem, sal_Bool )
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI
+GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pConfigItem, sal_Bool)
 {
     PCDReader aPCDReader(rStream);
     return aPCDReader.ReadPCD(rGraphic, pConfigItem);
diff --git a/filter/source/graphicfilter/ipcd/makefile.mk b/filter/source/graphicfilter/ipcd/makefile.mk
deleted file mode 100644
index ef15ac4f809a..000000000000
--- a/filter/source/graphicfilter/ipcd/makefile.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=filter
-TARGET=ipcd
-DEPTARGET=vipcd
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(L10N_framework)"==""
-SLOFILES =  $(EXCEPTIONSFILES)
-EXCEPTIONSFILES = $(SLO)$/ipcd.obj
-
-# ==========================================================================
-
-SHL1TARGET=     icd$(DLLPOSTFIX)
-SHL1IMPLIB=     ipcd
-SHL1STDLIBS=    $(SVTOOLLIB) $(VCLLIB) $(TOOLSLIB) $(SALLIB)
-SHL1LIBS=       $(SLB)$/ipcd.lib # $(LB)$/rtftoken.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=       $(SLO)$/ipcd.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-
-# ==========================================================================
-
-.INCLUDE :  target.mk
diff --git a/filter/source/graphicfilter/ipcx/exports.map b/filter/source/graphicfilter/ipcx/exports.map
deleted file mode 100644
index 941e4ab9bde8..000000000000
--- a/filter/source/graphicfilter/ipcx/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
-        global:
-                GraphicImport;
-
-        local:
-                *;
-};
diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx
index e321bb2c48da..2a2125e8758b 100644
--- a/filter/source/graphicfilter/ipcx/ipcx.cxx
+++ b/filter/source/graphicfilter/ipcx/ipcx.cxx
@@ -418,7 +418,8 @@ void PCXReader::ImplReadPalette( sal_uLong nCol )
 
 //================== GraphicImport - die exportierte Funktion ================
 
-extern "C" sal_Bool __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool )
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI
+GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool)
 {
     PCXReader aPCXReader(rStream);
     sal_Bool nRetValue = aPCXReader.ReadPCX(rGraphic);
diff --git a/filter/source/graphicfilter/ipcx/makefile.mk b/filter/source/graphicfilter/ipcx/makefile.mk
deleted file mode 100644
index 01e7693fa17b..000000000000
--- a/filter/source/graphicfilter/ipcx/makefile.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=filter
-TARGET=ipcx
-DEPTARGET=vipcx
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(L10N_framework)"==""
-SLOFILES =  $(SLO)$/ipcx.obj
-EXCEPTIONSFILES =  $(SLO)$/ipcx.obj
-
-# ==========================================================================
-
-SHL1TARGET=     ipx$(DLLPOSTFIX)
-SHL1IMPLIB=     ipcx
-SHL1STDLIBS=    $(VCLLIB) $(TOOLSLIB) $(SALLIB)
-SHL1LIBS=       $(SLB)$/ipcx.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=       $(SLO)$/ipcx.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-
-# ==========================================================================
-
-.INCLUDE :  target.mk
diff --git a/filter/source/graphicfilter/ipict/exports.map b/filter/source/graphicfilter/ipict/exports.map
deleted file mode 100644
index 941e4ab9bde8..000000000000
--- a/filter/source/graphicfilter/ipict/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
-        global:
-                GraphicImport;
-
-        local:
-                *;
-};
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index b5c1e03444ea..8b94572728bb 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -1882,7 +1882,8 @@ void PictReader::ReadPict( SvStream & rStreamPict, GDIMetaFile & rGDIMetaFile )
 
 //================== GraphicImport - die exportierte Funktion ================
 
-extern "C" sal_Bool __LOADONCALLAPI GraphicImport( SvStream& rIStm, Graphic & rGraphic, FilterConfigItem*, sal_Bool )
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI
+GraphicImport( SvStream& rIStm, Graphic & rGraphic, FilterConfigItem*, sal_Bool)
 {
     GDIMetaFile aMTF;
     PictReader  aPictReader;
diff --git a/filter/source/graphicfilter/ipict/makefile.mk b/filter/source/graphicfilter/ipict/makefile.mk
deleted file mode 100644
index a05a93749cdb..000000000000
--- a/filter/source/graphicfilter/ipict/makefile.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=filter
-TARGET=ipict
-DEPTARGET=vipict
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(L10N_framework)"==""
-SLOFILES =  $(SLO)$/ipict.obj $(SLO)$/shape.obj
-
-# ==========================================================================
-
-SHL1TARGET=     ipt$(DLLPOSTFIX)
-SHL1IMPLIB=     ipict
-SHL1STDLIBS=    $(VCLLIB) $(TOOLSLIB) $(SALLIB) $(BASEGFXLIB)
-SHL1LIBS=       $(SLB)$/ipict.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=       $(SLOFILES)
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-
-# ==========================================================================
-
-.INCLUDE :  target.mk
-
diff --git a/filter/source/graphicfilter/ipsd/exports.map b/filter/source/graphicfilter/ipsd/exports.map
deleted file mode 100644
index 941e4ab9bde8..000000000000
--- a/filter/source/graphicfilter/ipsd/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
-        global:
-                GraphicImport;
-
-        local:
-                *;
-};
diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx
index 773fa79b3281..d34b3f54d576 100644
--- a/filter/source/graphicfilter/ipsd/ipsd.cxx
+++ b/filter/source/graphicfilter/ipsd/ipsd.cxx
@@ -729,7 +729,8 @@ sal_Bool PSDReader::ImplReadBody()
 
 //================== GraphicImport - die exportierte Funktion ================
 
-extern "C" sal_Bool __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool )
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI
+GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool)
 {
     PSDReader aPSDReader(rStream);
 
diff --git a/filter/source/graphicfilter/ipsd/makefile.mk b/filter/source/graphicfilter/ipsd/makefile.mk
deleted file mode 100644
index dd898fe88260..000000000000
--- a/filter/source/graphicfilter/ipsd/makefile.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=filter
-TARGET=ipsd
-DEPTARGET=vipsd
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(L10N_framework)"==""
-SLOFILES =	$(SLO)$/ipsd.obj
-EXCEPTIONSFILES =	$(SLO)$/ipsd.obj
-
-# ==========================================================================
-
-SHL1TARGET= 	ipd$(DLLPOSTFIX)
-SHL1IMPLIB= 	ipsd
-SHL1STDLIBS=	$(VCLLIB) $(TOOLSLIB) $(SALLIB)
-SHL1LIBS=		$(SLB)$/ipsd.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=		$(SLO)$/ipsd.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-
-# ==========================================================================
-
-.INCLUDE :	target.mk
diff --git a/filter/source/graphicfilter/iras/exports.map b/filter/source/graphicfilter/iras/exports.map
deleted file mode 100644
index 941e4ab9bde8..000000000000
--- a/filter/source/graphicfilter/iras/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
-        global:
-                GraphicImport;
-
-        local:
-                *;
-};
diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx
index a5f201a6ccce..8dd56417d13e 100644
--- a/filter/source/graphicfilter/iras/iras.cxx
+++ b/filter/source/graphicfilter/iras/iras.cxx
@@ -348,7 +348,8 @@ sal_uInt8 RASReader::ImplGetByte()
 
 //================== GraphicImport - die exportierte Funktion ================
 
-extern "C" sal_Bool __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool )
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI
+GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool)
 {
     RASReader aRASReader(rStream);
 
diff --git a/filter/source/graphicfilter/iras/makefile.mk b/filter/source/graphicfilter/iras/makefile.mk
deleted file mode 100644
index e9daea1a1993..000000000000
--- a/filter/source/graphicfilter/iras/makefile.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=filter
-TARGET=iras
-DEPTARGET=viras
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(L10N_framework)"==""
-SLOFILES =	$(SLO)$/iras.obj
-EXCEPTIONSFILES = $(SLO)$/iras.obj
-
-# ==========================================================================
-
-SHL1TARGET= 	ira$(DLLPOSTFIX)
-SHL1IMPLIB= 	iras
-SHL1STDLIBS=	$(VCLLIB) $(TOOLSLIB) $(SALLIB)
-SHL1LIBS=		$(SLB)$/iras.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=		$(SLO)$/iras.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-
-# ==========================================================================
-
-.INCLUDE :	target.mk
diff --git a/filter/source/graphicfilter/itga/exports.map b/filter/source/graphicfilter/itga/exports.map
deleted file mode 100644
index 941e4ab9bde8..000000000000
--- a/filter/source/graphicfilter/itga/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
-        global:
-                GraphicImport;
-
-        local:
-                *;
-};
diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx
index 590afe0efc55..431c732fe15a 100644
--- a/filter/source/graphicfilter/itga/itga.cxx
+++ b/filter/source/graphicfilter/itga/itga.cxx
@@ -753,7 +753,8 @@ sal_Bool TGAReader::ImplReadPalette()
 
 //================== GraphicImport - die exportierte Funktion ================
 
-extern "C" sal_Bool __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool )
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI
+GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool)
 {
     TGAReader aTGAReader(rStream);
 
diff --git a/filter/source/graphicfilter/itga/makefile.mk b/filter/source/graphicfilter/itga/makefile.mk
deleted file mode 100644
index 0943ae893cbe..000000000000
--- a/filter/source/graphicfilter/itga/makefile.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=filter
-TARGET=itga
-DEPTARGET=vitga
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(L10N_framework)"==""
-SLOFILES =	$(EXCEPTIONSFILES)
-EXCEPTIONSFILES = $(SLO)$/itga.obj
-
-# ==========================================================================
-
-SHL1TARGET= 	itg$(DLLPOSTFIX)
-SHL1IMPLIB= 	itga
-SHL1STDLIBS=	$(VCLLIB) $(TOOLSLIB) $(SALLIB)
-SHL1LIBS=		$(SLB)$/itga.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=		$(SLO)$/itga.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-
-# ==========================================================================
-
-.INCLUDE :	target.mk
diff --git a/filter/source/graphicfilter/itiff/exports.map b/filter/source/graphicfilter/itiff/exports.map
deleted file mode 100644
index 941e4ab9bde8..000000000000
--- a/filter/source/graphicfilter/itiff/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
-        global:
-                GraphicImport;
-
-        local:
-                *;
-};
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index 279388611340..f22be548a69b 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -1381,7 +1381,8 @@ sal_Bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
 
 //================== GraphicImport - die exportierte Funktion ================
 
-extern "C" sal_Bool __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool )
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI
+GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool)
 {
     TIFFReader aTIFFReader;
 
diff --git a/filter/source/graphicfilter/itiff/makefile.mk b/filter/source/graphicfilter/itiff/makefile.mk
deleted file mode 100644
index 6a7e66868573..000000000000
--- a/filter/source/graphicfilter/itiff/makefile.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=filter
-TARGET=itiff
-DEPTARGET=vitiff
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(L10N_framework)"==""
-SLOFILES =  $(SLO)$/itiff.obj    \
-            $(SLO)$/lzwdecom.obj \
-            $(SLO)$/ccidecom.obj
-
-EXCEPTIONSNOOPTFILES=	$(SLO)$/itiff.obj
-
-# ==========================================================================
-
-SHL1TARGET=     iti$(DLLPOSTFIX)
-SHL1IMPLIB=     itiff
-SHL1STDLIBS=    $(VCLLIB) $(TOOLSLIB) $(SALLIB)
-SHL1LIBS=       $(SLB)$/itiff.lib # $(LB)$/rtftoken.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=       $(SLO)$/itiff.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-
-# ==========================================================================
-
-.INCLUDE :  target.mk
diff --git a/filter/source/xsltdialog/makefile.mk b/filter/source/xsltdialog/makefile.mk
deleted file mode 100644
index 9b7a3225db42..000000000000
--- a/filter/source/xsltdialog/makefile.mk
+++ /dev/null
@@ -1,101 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=filter
-TARGET=xsltdlg
-
-ENABLE_EXCEPTIONS=TRUE
-USE_DEFFILE=TRUE
-GEN_HID_OTHER=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE :  	settings.mk
-
-# --- Files -------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =	xmlfiltersettingsdialog.src							\
-            xmlfiltertabdialog.src								\
-            xmlfiltertabpagebasic.src							\
-            xmlfiltertabpagexslt.src							\
-            xmlfiltertestdialog.src								\
-            xmlfileview.src										\
-            xmlfilterdialogstrings.src
-
-SLOFILES=	$(SLO)$/typedetectionimport.obj						\
-            $(SLO)$/typedetectionexport.obj						\
-            $(SLO)$/xmlfilterjar.obj							\
-            $(SLO)$/xmlfilterdialogcomponent.obj				\
-            $(SLO)$/xmlfiltersettingsdialog.obj					\
-            $(SLO)$/xmlfiltertabdialog.obj						\
-            $(SLO)$/xmlfiltertabpagebasic.obj					\
-            $(SLO)$/xmlfiltertabpagexslt.obj					\
-            $(SLO)$/xmlfiltertestdialog.obj						\
-            $(SLO)$/xmlfileview.obj
-
-# --- Library -----------------------------------
-
-RESLIB1NAME=$(TARGET)
-RESLIB1SRSFILES= $(SRS)$/$(TARGET).srs
-
-SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-    
-SHL1STDLIBS=\
-    $(SFX2LIB)			\
-    $(SVTOOLLIB)		\
-    $(SVLLIB)			\
-    $(TKLIB)			\
-    $(CPPULIB)			\
-    $(CPPUHELPERLIB)	\
-    $(COMPHELPERLIB)	\
-    $(SALLIB)			\
-    $(TOOLSLIB)			\
-    $(VCLLIB)			\
-    $(UNOTOOLSLIB)		\
-    $(ONELIB)
-
-SHL1DEPN=
-SHL1IMPLIB=	i$(SHL1TARGET)
-SHL1LIBS=	$(SLB)$/$(TARGET).lib
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=exports.dxp
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/xsltdlg.component
-
-$(MISC)/xsltdlg.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        xsltdlg.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt xsltdlg.component
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 6f41ae9005c5..fc2d249b493d 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -63,6 +63,7 @@ my_components = \
     component/dbaccess/util/sdbt \
     component/dtrans/util/mcnttype \
     component/fileaccess/source/fileacc \
+    component/filter/source/config/cache/filterconfig1 \
     component/filter/source/flash/flash \
     component/filter/source/msfilter/msfilter \
     component/filter/source/pdf/pdffilter \
@@ -71,6 +72,8 @@ my_components = \
     component/filter/source/t602/t602filter \
     component/filter/source/xmlfilteradaptor/xmlfa \
     component/filter/source/xmlfilterdetect/xmlfd \
+    component/filter/source/xsltdialog/xsltdlg \
+    component/filter/source/xsltfilter/xsltfilter \
     component/forms/util/frm \
     component/formula/util/for \
     component/framework/util/fwk \
@@ -139,7 +142,6 @@ my_components = \
     dlgprov \
     embobj \
     evtatt \
-    filterconfig1 \
     flat \
     fpicker \
     fps_office \
@@ -166,8 +168,6 @@ my_components = \
     ucppkg1 \
     ucptdoc1 \
     vbaevents \
-    xsltdlg \
-    xsltfilter \
 
 .IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DESKTOP//)"
 my_components += \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 82dc5f36cf05..65b53566e07f 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -463,12 +463,7 @@ End
 
 SPECIAL_LIB_FILE(gid_File_Lib_Fileacc,fileacc)
 
-File gid_File_Lib_Filterconfig1
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = SPECIAL_NAME(filterconfig1);
-End
+STD_LIB_FILE(gid_File_Lib_Filterconfig1, filterconfig)
 
 STD_LIB_FILE( gid_File_Lib_Flat, flat)