diff --git a/source/generated/org/alfresco/repo/webservice/dictionary/deploy.wsdd b/source/generated/org/alfresco/repo/webservice/dictionary/deploy.wsdd
index 13f773c988..0233c35799 100644
--- a/source/generated/org/alfresco/repo/webservice/dictionary/deploy.wsdd
+++ b/source/generated/org/alfresco/repo/webservice/dictionary/deploy.wsdd
@@ -15,7 +15,7 @@
   <service name="DictionaryService" provider="java:RPC" style="wrapped" use="literal">
       <parameter name="wsdlTargetNamespace" value="http://www.alfresco.org/ws/service/dictionary/1.0"/>
       <parameter name="wsdlServiceElement" value="DictionaryService"/>
-      <parameter name="schemaQualified" value="http://www.alfresco.org/ws/headers/1.0,http://www.alfresco.org/ws/model/content/1.0,http://www.alfresco.org/ws/service/dictionary/1.0"/>
+      <parameter name="schemaQualified" value="http://www.alfresco.org/ws/model/content/1.0,http://www.alfresco.org/ws/service/dictionary/1.0"/>
       <parameter name="wsdlServicePort" value="DictionaryService"/>
       <parameter name="className" value="org.alfresco.repo.webservice.dictionary.DictionaryServiceSoapBindingImpl"/>
       <parameter name="wsdlPortType" value="DictionaryServiceSoapPort"/>
@@ -123,14 +123,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/headers/1.0"
-        qname="ns:NamespaceConfigurationInner"
-        type="java:org.alfresco.www.ws.headers._1_0.NamespaceConfigurationInner"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/service/dictionary/1.0"
         qname="ns:ClassPredicate"
@@ -139,13 +131,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <arrayMapping
-        xmlns:ns="http://www.alfresco.org/ws/headers/1.0"
-        qname="ns:NamespaceConfiguration"
-        type="java:org.alfresco.www.ws.headers._1_0.NamespaceConfigurationInner[]"
-        innerType="cmp-ns:NamespaceConfigurationInner" xmlns:cmp-ns="http://www.alfresco.org/ws/headers/1.0"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:NodeDefinition"
@@ -298,22 +283,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/headers/1.0"
-        qname="ns:QueryConfiguration"
-        type="java:org.alfresco.www.ws.headers._1_0.QueryConfiguration"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/headers/1.0"
-        qname="ns:LocaleConfiguration"
-        type="java:org.alfresco.www.ws.headers._1_0.LocaleConfiguration"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:VersionHistory"
diff --git a/source/web/WEB-INF/server-config.wsdd b/source/web/WEB-INF/server-config.wsdd
index 2256b93357..48a71e2bc7 100644
--- a/source/web/WEB-INF/server-config.wsdd
+++ b/source/web/WEB-INF/server-config.wsdd
@@ -3046,7 +3046,7 @@
   		</requestFlow>
       <parameter name="wsdlTargetNamespace" value="http://www.alfresco.org/ws/service/dictionary/1.0"/>
       <parameter name="wsdlServiceElement" value="DictionaryService"/>
-      <parameter name="schemaQualified" value="http://www.alfresco.org/ws/headers/1.0,http://www.alfresco.org/ws/model/content/1.0,http://www.alfresco.org/ws/service/dictionary/1.0"/>
+      <parameter name="schemaQualified" value="http://www.alfresco.org/ws/model/content/1.0,http://www.alfresco.org/ws/service/dictionary/1.0"/>
       <parameter name="wsdlServicePort" value="DictionaryService"/>
       <parameter name="className" value="org.alfresco.repo.webservice.dictionary.DictionaryServiceSoapBindingImpl"/>
       <parameter name="wsdlPortType" value="DictionaryServiceSoapPort"/>
@@ -3154,14 +3154,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/headers/1.0"
-        qname="ns:NamespaceConfigurationInner"
-        type="java:org.alfresco.www.ws.headers._1_0.NamespaceConfigurationInner"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/service/dictionary/1.0"
         qname="ns:ClassPredicate"
@@ -3170,13 +3162,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <arrayMapping
-        xmlns:ns="http://www.alfresco.org/ws/headers/1.0"
-        qname="ns:NamespaceConfiguration"
-        type="java:org.alfresco.www.ws.headers._1_0.NamespaceConfigurationInner[]"
-        innerType="cmp-ns:NamespaceConfigurationInner" xmlns:cmp-ns="http://www.alfresco.org/ws/headers/1.0"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:NodeDefinition"
@@ -3329,22 +3314,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/headers/1.0"
-        qname="ns:QueryConfiguration"
-        type="java:org.alfresco.www.ws.headers._1_0.QueryConfiguration"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/headers/1.0"
-        qname="ns:LocaleConfiguration"
-        type="java:org.alfresco.www.ws.headers._1_0.LocaleConfiguration"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:VersionHistory"
diff --git a/source/wsdl/dictionary-service.wsdl b/source/wsdl/dictionary-service.wsdl
index e53a34cbac..6789dbf843 100644
--- a/source/wsdl/dictionary-service.wsdl
+++ b/source/wsdl/dictionary-service.wsdl
@@ -7,12 +7,10 @@
    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" 
    xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-   xmlns:cms="http://www.alfresco.org/ws/model/content/1.0"
-   xmlns:headers="http://www.alfresco.org/ws/headers/1.0">
+   xmlns:cms="http://www.alfresco.org/ws/model/content/1.0">
    <!-- ************************************** -->
    <!-- Copyright Alfresco Software, Inc. 2005 -->
    <!-- ************************************** -->
-   <wsdl:import namespace="http://www.alfresco.org/ws/headers/1.0" location="headers.xsd" />
    <wsdl:import namespace="http://www.alfresco.org/model/content/1.0" location="types.xsd" />
    <wsdl:types>
       <schema elementFormDefault="qualified" targetNamespace="http://www.alfresco.org/ws/service/dictionary/1.0" xmlns="http://www.w3.org/2001/XMLSchema">