Index: src/main/java/org/fluidproject/kettle/KettleServlet.java
===================================================================
--- src/main/java/org/fluidproject/kettle/KettleServlet.java	(revision 8784)
+++ src/main/java/org/fluidproject/kettle/KettleServlet.java	(working copy)
@@ -79,11 +79,15 @@
         String contextPath = context.getRealPath("/") + "/";
         kettleConfig.put("baseDir", contextPath);
         loader = new RhinoLoader(ResourceUtil.booleanValue(kettleConfig.get("debugMode")));
-        String includes = (String) kettleConfig.get("includes");
+        
+        String[] allIncludes = (String[]) kettleConfig.get("includes");
         String includesPrefix = (String) kettleConfig.get("includesPrefix");
         if (includesPrefix == null) includesPrefix = "";
         loader.setDocument(ResourceUtil.pathToFileUrl(contextPath + "kettle/root.xml"));
-        loader.loadJSONFiles(contextPath, includes, includesPrefix, (Map) kettleConfig.get("mount"));
+        for (int i = 0; i < allIncludes.length; i++) {
+            String includes = allIncludes[i];
+            loader.loadJSONFiles(contextPath, includes, includesPrefix, (Map) kettleConfig.get("mount"));            
+        }
 
         // load Servlet handler "process" method
         handler = loader.getFunction(kettleConfig.get("handlerFunction"));
Index: src/main/webapp/application/engageConfig.json
===================================================================
--- src/main/webapp/application/engageConfig.json	(revision 8784)
+++ src/main/webapp/application/engageConfig.json	(working copy)
@@ -1,7 +1,7 @@
 {
 initFunction: "fluid.engage.initEngageApp",
 handlerFunction: "fluid.kettle.servlet.process",
-includes: "kettle/KettleIncludes.json",
+includes: ["kettle/KettleIncludes.json", "application/includes.json"],
 includesPrefix: "kettle/",
 loaderFunction: "fluid.engage.initEngageApp",
 queryURLTemplate: "http://titan.atrc.utoronto.ca:5984/%dbName/_fti/lucene/%view?include_docs=true&q=%query",
Index: src/main/webapp/kettle/KettleIncludes.json
===================================================================
--- src/main/webapp/kettle/KettleIncludes.json	(revision 8784)
+++ src/main/webapp/kettle/KettleIncludes.json	(working copy)
@@ -13,10 +13,6 @@
    "js/kettle.js",
    "js/servletJSGI.js",
    "../application/js/EngageApp.js",
-   "../services/artifactView/js/artifactView.js",
-   "../services/browse/js/browse.js",
-   "../services/engageDemo/js/engageDemo.js",
-   "$engage/framework/js/Engage.js",
    "../services/kettleDemo/js/kettleCherryDemo.js",
    "../services/kettleDemo/js/kettleJSGIDemo.js"
   ]