Index: /main/waeup.uniben/branches/uli-autoinclude-less/src/waeup/uniben/configure.zcml
===================================================================
--- /main/waeup.uniben/branches/uli-autoinclude-less/src/waeup/uniben/configure.zcml	(revision 8879)
+++ /main/waeup.uniben/branches/uli-autoinclude-less/src/waeup/uniben/configure.zcml	(revision 8880)
@@ -1,7 +1,20 @@
-<configure xmlns="http://namespaces.zope.org/zope">
+<configure xmlns="http://namespaces.zope.org/zope"
+           xmlns:grok="http://namespaces.zope.org/grok">
+  <include package="waeup.uniben" file="locales.zcml" />
 
-  <include package="waeup.uniben" file="locales.zcml" />
-  <include package="grok" />
-  <includeOverrides package="waeup.uniben" file="overrides.zcml" />
+  <!-- kofacustom.nigeria configures everything we basically need.
+  -->
+  <include package="kofacustom.nigeria" />
+
+  <grok:grok package="." />
+
+  <!-- Register edit widget for PhoneNumbers -->
+  <adapter
+      for="waeup.kofa.schema.interfaces.IPhoneNumber
+           zope.publisher.interfaces.browser.IBrowserRequest"
+      provides="zope.formlib.interfaces.ISimpleInputWidget"
+      factory="waeup.uniben.widgets.phonewidget.CustomPhoneWidget"
+      permission="zope.Public"
+      />
 
 </configure>
Index: in/waeup.uniben/branches/uli-autoinclude-less/src/waeup/uniben/overrides.zcml
===================================================================
--- /main/waeup.uniben/branches/uli-autoinclude-less/src/waeup/uniben/overrides.zcml	(revision 8879)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<configure xmlns="http://namespaces.zope.org/zope"
-           xmlns:grok="http://namespaces.zope.org/grok">
-  <includeDependencies package="." />
-  <grok:grok package="." />
-
-  <!-- Register edit widget for PhoneNumbers -->
-  <adapter
-      for="waeup.kofa.schema.interfaces.IPhoneNumber
-           zope.publisher.interfaces.browser.IBrowserRequest"
-      provides="zope.formlib.interfaces.ISimpleInputWidget"
-      factory="waeup.uniben.widgets.phonewidget.CustomPhoneWidget"
-      permission="zope.Public"
-      />
-
-</configure>
