diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java
index da31e9a43f..9a3b19dd1c 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java
@@ -15,9 +15,7 @@ package org.adempiere.webui.theme;
 
 import java.io.IOException;
 
-import org.adempiere.webui.AdempiereWebUI;
 import org.adempiere.webui.apps.AEnv;
-import org.adempiere.webui.session.SessionManager;
 import org.compiere.model.MClientInfo;
 import org.compiere.model.MImage;
 import org.compiere.model.MSysConfig;
diff --git a/org.idempiere.webservices/build.properties b/org.idempiere.webservices/build.properties
index b5865d5ec4..065af45c6f 100644
--- a/org.idempiere.webservices/build.properties
+++ b/org.idempiere.webservices/build.properties
@@ -25,7 +25,8 @@ bin.includes = META-INF/,\
                plugin.xml,\
                WEB-INF/lib/axis.jar,\
                WEB-INF/lib/commons-discovery-0.5.jar,\
-               WEB-INF/lib/jsr311-api-1.1.jar
+               WEB-INF/lib/jsr311-api-1.1.jar,\
+               OSGI-INF/
 src.includes = WEB-INF/classes/,\
                WEB-INF/lib/,\
                WEB-INF/web.xml,\