diff --git a/extra/webapps/imagebin/imagebin.factor b/extra/webapps/imagebin/imagebin.factor
index 38ef0f9459..e9fc2c742f 100644
--- a/extra/webapps/imagebin/imagebin.factor
+++ b/extra/webapps/imagebin/imagebin.factor
@@ -1,10 +1,9 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors furnace.actions furnace.redirection
-html.forms http http.server http.server.dispatchers
-io.directories io.encodings.utf8 io.files io.pathnames
-kernel math.parser multiline namespaces sequences urls
-math ;
+USING: accessors furnace.actions furnace.redirection http.server
+http.server.dispatchers io.directories io.encodings.utf8 io.files
+io.pathnames kernel math math.parser namespaces sequences
+webapps.utils ;
 IN: webapps.imagebin
 
 TUPLE: imagebin < dispatcher path n ;
@@ -43,4 +42,6 @@ M: imagebin call-responder*
         <upload-image-action> "upload-image" add-responder
         <uploaded-image-action> "uploaded-image" add-responder ;
 
-"resource:images" <imagebin> main-responder set-global
+: start-imagebin ( -- )
+    "resource:images" <imagebin> main-responder set-global
+    run-test-httpd ;
diff --git a/extra/webapps/site-watcher/site-watcher.factor b/extra/webapps/site-watcher/site-watcher.factor
index e1c1b62dab..219b990444 100644
--- a/extra/webapps/site-watcher/site-watcher.factor
+++ b/extra/webapps/site-watcher/site-watcher.factor
@@ -40,7 +40,7 @@ IN: webapps.site-watcher
     <protected>
         "update notification details" >>description ;
 
-: <site-watcher-app> ( -- dispatcher )
+: <site-watcher> ( -- dispatcher )
     site-watcher-app new-dispatcher
         <main-action> "" add-responder
         <watch-list-action> "watch-list" add-responder
@@ -63,11 +63,12 @@ IN: webapps.site-watcher
 : site-watcher-db ( -- db )
     "test.db" <temp-sqlite-db> ;
 
-<site-watcher-app>
-<login-config>
-<boilerplate> { site-watcher-app "site-watcher" } >>template
-site-watcher-db <alloy>
-main-responder set-global
+: <site-watcher-app> ( -- dispatcher )
+    <site-watcher>
+    <login-config>
+    <boilerplate>
+        { site-watcher-app "site-watcher" } >>template
+    site-watcher-db <alloy> ;
 
 M: site-watcher-app init-user-profile
     drop "username" value "email" value <account> insert-tuple ;
@@ -81,4 +82,5 @@ M: site-watcher-app init-user-profile
 : start-site-watcher ( -- )
     init-db
     site-watcher-db run-site-watcher
+    <site-watcher-app> main-responder set-global
     run-test-httpd ;