3 files changed, 8 insertions, 9 deletions
diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk
index 2d8abc63a9db..262ad55d8154 100644
--- a/udkapi/UnoApi_udkapi.mk
+++ b/udkapi/UnoApi_udkapi.mk
@@ -95,8 +95,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/script,
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/util,\
 	BootstrapMacroExpander \
-	MacroExpander \
-	theMacroExpander \
 ))
 
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/beans,\
@@ -149,6 +147,10 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/uri,\
 	UriSchemeParser_vndDOTsunDOTstarDOTscript \
 	VndSunStarPkgUrlReferenceFactory \
 ))
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/util,\
+	MacroExpander \
+	theMacroExpander \
+))
 
 
 $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/beans,\
diff --git a/udkapi/com/sun/star/util/MacroExpander.idl b/udkapi/com/sun/star/util/MacroExpander.idl
index 9c656452d0f2..40195f38b165 100644
--- a/udkapi/com/sun/star/util/MacroExpander.idl
+++ b/udkapi/com/sun/star/util/MacroExpander.idl
@@ -19,9 +19,8 @@
 #ifndef __com_sun_star_util_MacroExpander_idl__
 #define __com_sun_star_util_MacroExpander_idl__
 
-#include <com/sun/star/util/XMacroExpander.idl>
 #include <com/sun/star/lang/XComponent.idl>
-
+#include <com/sun/star/util/XMacroExpander.idl>
 
 
 module com {  module sun {  module star {  module util {
@@ -36,6 +35,7 @@ module com {  module sun {  module star {  module util {
     @see theMacroExpander
 
     @since OOo 1.1.2
+    @deprecated rather use the util::theMacroExpander singleton
 */
 published service MacroExpander
 {
diff --git a/udkapi/com/sun/star/util/theMacroExpander.idl b/udkapi/com/sun/star/util/theMacroExpander.idl
index 998b498f22ed..c2de31268ad3 100644
--- a/udkapi/com/sun/star/util/theMacroExpander.idl
+++ b/udkapi/com/sun/star/util/theMacroExpander.idl
@@ -20,7 +20,7 @@
 #ifndef __com_sun_star_util_theMacroExpander_idl__
 #define __com_sun_star_util_theMacroExpander_idl__
 
-#include <com/sun/star/util/MacroExpander.idl>
+#include <com/sun/star/util/XMacroExpander.idl>
 
 module com {  module sun {  module star {  module util {
 
@@ -35,10 +35,7 @@ module com {  module sun {  module star {  module util {
 
     @see MacroExpander
 */
-published singleton theMacroExpander
-{
-    service MacroExpander;
-};
+published singleton theMacroExpander : XMacroExpander;
 
 }; }; }; };