diff --git a/org.adempiere.ui.zk/OSGI-INF/defaultcreatefromfactory.xml b/org.adempiere.ui.zk/OSGI-INF/defaultcreatefromfactory.xml
index 61d94a4f84..7b7f7c4aa4 100644
--- a/org.adempiere.ui.zk/OSGI-INF/defaultcreatefromfactory.xml
+++ b/org.adempiere.ui.zk/OSGI-INF/defaultcreatefromfactory.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE scr:component>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.webui.apps.form.DefaultCreateFromFactory">
    <implementation class="org.adempiere.webui.apps.form.DefaultCreateFromFactory"/>
    <service>
diff --git a/org.adempiere.ui.zk/OSGI-INF/defaulteditorfactory.xml b/org.adempiere.ui.zk/OSGI-INF/defaulteditorfactory.xml
index 1b6c3ec9e8..fb43386148 100644
--- a/org.adempiere.ui.zk/OSGI-INF/defaulteditorfactory.xml
+++ b/org.adempiere.ui.zk/OSGI-INF/defaulteditorfactory.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE scr:component>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.webui.factory.DefaultEditorFactory">
    <implementation class="org.adempiere.webui.factory.DefaultEditorFactory"/>
    <service>
diff --git a/org.adempiere.ui.zk/OSGI-INF/defaultformfactory.xml b/org.adempiere.ui.zk/OSGI-INF/defaultformfactory.xml
index e281eef03d..115b169bd0 100644
--- a/org.adempiere.ui.zk/OSGI-INF/defaultformfactory.xml
+++ b/org.adempiere.ui.zk/OSGI-INF/defaultformfactory.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE scr:component>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.webui.factory.DefaultFormFactory">
    <implementation class="org.adempiere.webui.factory.DefaultFormFactory"/>
    <service>
diff --git a/org.adempiere.ui.zk/OSGI-INF/defaultinfofactory.xml b/org.adempiere.ui.zk/OSGI-INF/defaultinfofactory.xml
index a5ed5f8f73..131d1c3d16 100644
--- a/org.adempiere.ui.zk/OSGI-INF/defaultinfofactory.xml
+++ b/org.adempiere.ui.zk/OSGI-INF/defaultinfofactory.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE scr:component>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.webui.factory.DefaultInfoFactory">
    <implementation class="org.adempiere.webui.factory.DefaultInfoFactory"/>
    <service>
diff --git a/org.adempiere.ui.zk/OSGI-INF/defaultpaymentformfactory.xml b/org.adempiere.ui.zk/OSGI-INF/defaultpaymentformfactory.xml
index 91d13e16ac..6cf793d8f6 100644
--- a/org.adempiere.ui.zk/OSGI-INF/defaultpaymentformfactory.xml
+++ b/org.adempiere.ui.zk/OSGI-INF/defaultpaymentformfactory.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE scr:component>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.webui.apps.form.DefaultPaymentFormFactory">
    <implementation class="org.adempiere.webui.apps.form.DefaultPaymentFormFactory"/>
    <service>
diff --git a/org.adempiere.ui.zk/OSGI-INF/defaultprintshippinglabel.xml b/org.adempiere.ui.zk/OSGI-INF/defaultprintshippinglabel.xml
index 7907584285..d1e14645f8 100644
--- a/org.adempiere.ui.zk/OSGI-INF/defaultprintshippinglabel.xml
+++ b/org.adempiere.ui.zk/OSGI-INF/defaultprintshippinglabel.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE scr:component>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.webui.process.DefaultPrintShippingLabel">
    <implementation class="org.adempiere.webui.process.DefaultPrintShippingLabel"/>
    <service>
diff --git a/org.adempiere.ui.zk/OSGI-INF/feedbackservice.xml b/org.adempiere.ui.zk/OSGI-INF/feedbackservice.xml
index 6fcf476799..ec430cff0f 100644
--- a/org.adempiere.ui.zk/OSGI-INF/feedbackservice.xml
+++ b/org.adempiere.ui.zk/OSGI-INF/feedbackservice.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE scr:component>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.webui.factory.DefaultFeedbackService">
    <implementation class="org.adempiere.webui.factory.DefaultFeedbackService"/>
    <service>
diff --git a/org.adempiere.ui.zk/OSGI-INF/jfgchartrenderer.xml b/org.adempiere.ui.zk/OSGI-INF/jfgchartrenderer.xml
index 16a6d819ce..235c359f1e 100644
--- a/org.adempiere.ui.zk/OSGI-INF/jfgchartrenderer.xml
+++ b/org.adempiere.ui.zk/OSGI-INF/jfgchartrenderer.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE scr:component>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.webui.apps.graph.jfreegraph.ChartRendererServiceImpl">
    <implementation class="org.adempiere.webui.apps.graph.jfreegraph.ChartRendererServiceImpl"/>
    <property name="service.ranking" type="Integer" value="0"/>
diff --git a/org.adempiere.ui.zk/OSGI-INF/jrviewerprovider.xml b/org.adempiere.ui.zk/OSGI-INF/jrviewerprovider.xml
index 802836a337..64e7864653 100644
--- a/org.adempiere.ui.zk/OSGI-INF/jrviewerprovider.xml
+++ b/org.adempiere.ui.zk/OSGI-INF/jrviewerprovider.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE scr:component>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.webui.window.ZkJRViewerProvider">
    <implementation class="org.adempiere.webui.window.ZkJRViewerProvider"/>
    <service>
diff --git a/org.adempiere.ui.zk/OSGI-INF/processfactory.xml b/org.adempiere.ui.zk/OSGI-INF/processfactory.xml
index cd8d28037a..1c1cd72d08 100644
--- a/org.adempiere.ui.zk/OSGI-INF/processfactory.xml
+++ b/org.adempiere.ui.zk/OSGI-INF/processfactory.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE scr:component>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.webui.util.ProcessFactoryImpl">
    <implementation class="org.adempiere.webui.util.ProcessFactoryImpl"/>
    <property name="service.ranking" type="Integer" value="1"/>
diff --git a/org.adempiere.ui.zk/OSGI-INF/reportviewerprovider.xml b/org.adempiere.ui.zk/OSGI-INF/reportviewerprovider.xml
index 0a7f0eeff1..2e6a6ea05f 100644
--- a/org.adempiere.ui.zk/OSGI-INF/reportviewerprovider.xml
+++ b/org.adempiere.ui.zk/OSGI-INF/reportviewerprovider.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE scr:component>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.webui.window.ZkReportViewerProvider">
    <implementation class="org.adempiere.webui.window.ZkReportViewerProvider"/>
    <service>
diff --git a/org.adempiere.ui.zk/OSGI-INF/resourcefinder.xml b/org.adempiere.ui.zk/OSGI-INF/resourcefinder.xml
index bccaa1a058..0d189e9587 100644
--- a/org.adempiere.ui.zk/OSGI-INF/resourcefinder.xml
+++ b/org.adempiere.ui.zk/OSGI-INF/resourcefinder.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE scr:component>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.webui.util.WebUIResourceFinder">
    <implementation class="org.adempiere.webui.util.WebUIResourceFinder"/>
    <service>
diff --git a/org.adempiere.ui.zk/OSGI-INF/zulgadgetfactory.xml b/org.adempiere.ui.zk/OSGI-INF/zulgadgetfactory.xml
index 20636fbcbd..672b5259e7 100644
--- a/org.adempiere.ui.zk/OSGI-INF/zulgadgetfactory.xml
+++ b/org.adempiere.ui.zk/OSGI-INF/zulgadgetfactory.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE scr:component>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.webui.factory.ZulDashboardGadgetFactory">
    <implementation class="org.adempiere.webui.factory.ZulDashboardGadgetFactory"/>
    <service>
diff --git a/org.adempiere.ui.zk/WEB-INF/src/metainfo/tld/config.xml b/org.adempiere.ui.zk/WEB-INF/src/metainfo/tld/config.xml
index e94a568a19..f7305b13a9 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/metainfo/tld/config.xml
+++ b/org.adempiere.ui.zk/WEB-INF/src/metainfo/tld/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
+<!DOCTYPE config>
 <config>
 	<config-name>org.adempiere.ui.zk</config-name>
 	<version>
diff --git a/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml b/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml
index f7977f9508..fc2ce8f50c 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml
+++ b/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language>
 
 <!-- lang.xml
 	Purpose:
diff --git a/org.adempiere.ui.zk/WEB-INF/tld/web/idempiere-util.dsp.tld b/org.adempiere.ui.zk/WEB-INF/tld/web/idempiere-util.dsp.tld
index 86a6cbd8fd..6c34124d6e 100644
--- a/org.adempiere.ui.zk/WEB-INF/tld/web/idempiere-util.dsp.tld
+++ b/org.adempiere.ui.zk/WEB-INF/tld/web/idempiere-util.dsp.tld
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE taglib>
 
 <taglib>
 	<uri>http://www.idempiere.org/dsp/web/util</uri>
diff --git a/org.adempiere.ui.zk/WEB-INF/zk-selenium.xml b/org.adempiere.ui.zk/WEB-INF/zk-selenium.xml
index 3875a948dd..ef9d7f441b 100644
--- a/org.adempiere.ui.zk/WEB-INF/zk-selenium.xml
+++ b/org.adempiere.ui.zk/WEB-INF/zk-selenium.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE zk>
 
 	<!--
 		zk.xml Copyright (C) 2006 Potix Corporation. All Rights Reserved.
diff --git a/org.adempiere.ui.zk/WEB-INF/zk.xml b/org.adempiere.ui.zk/WEB-INF/zk.xml
index 6501e80620..99b769d197 100644
--- a/org.adempiere.ui.zk/WEB-INF/zk.xml
+++ b/org.adempiere.ui.zk/WEB-INF/zk.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE zk>
 
 	<!--
 		zk.xml Copyright (C) 2006 Potix Corporation. All Rights Reserved.
diff --git a/org.adempiere.ui.zk/build-labelapplet.xml b/org.adempiere.ui.zk/build-labelapplet.xml
index 78b1d8c7e7..69f05dcc48 100644
--- a/org.adempiere.ui.zk/build-labelapplet.xml
+++ b/org.adempiere.ui.zk/build-labelapplet.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project>
 <project name="labelapplet" basedir="." default="sign">
 	<target name="build">
 		<mkdir dir="bin"/>
diff --git a/org.adempiere.ui.zk/copyjars.xml b/org.adempiere.ui.zk/copyjars.xml
index 0dbe3f34d2..78db9838ca 100644
--- a/org.adempiere.ui.zk/copyjars.xml
+++ b/org.adempiere.ui.zk/copyjars.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project>
 <project name="zklibrary" basedir="." default="copy">
 	<target name="copy">
 		<mkdir dir="WEB-INF/lib" />
diff --git a/org.adempiere.ui.zk/plugin.xml b/org.adempiere.ui.zk/plugin.xml
index d4f09ef2fd..92cd671eb9 100644
--- a/org.adempiere.ui.zk/plugin.xml
+++ b/org.adempiere.ui.zk/plugin.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plugin>
 <?eclipse version="3.4"?>
 <plugin>
    <extension-point id="org.adempiere.webui.Form" name="Web Form" schema="schema/org.adempiere.webui.Form.exsd"/>