diff --git a/java/google/registry/ui/js/component.js b/java/google/registry/ui/js/component.js
index 8383cbc98..5a2c42174 100644
--- a/java/google/registry/ui/js/component.js
+++ b/java/google/registry/ui/js/component.js
@@ -23,6 +23,8 @@ goog.require('goog.events.EventType');
 goog.require('registry.soy.forms');
 goog.require('registry.util');
 
+goog.forwardDeclare('registry.Console');
+
 
 
 /**
diff --git a/java/google/registry/ui/js/console.js b/java/google/registry/ui/js/console.js
index f2f020744..41e03e064 100644
--- a/java/google/registry/ui/js/console.js
+++ b/java/google/registry/ui/js/console.js
@@ -23,6 +23,9 @@ goog.require('goog.events.KeyCodes');
 goog.require('goog.history.EventType');
 goog.require('registry.util');
 
+goog.forwardDeclare('goog.events.KeyEvent');
+goog.forwardDeclare('registry.Session');
+
 
 
 /**
diff --git a/java/google/registry/ui/js/edit_item.js b/java/google/registry/ui/js/edit_item.js
index f5a755ffd..36b2b4433 100644
--- a/java/google/registry/ui/js/edit_item.js
+++ b/java/google/registry/ui/js/edit_item.js
@@ -23,6 +23,8 @@ goog.require('registry.Component');
 goog.require('registry.soy.console');
 goog.require('registry.util');
 
+goog.forwardDeclare('registry.Console');
+
 
 
 /**
diff --git a/java/google/registry/ui/js/forms.js b/java/google/registry/ui/js/forms.js
index 2f480ff92..eb88718e2 100644
--- a/java/google/registry/ui/js/forms.js
+++ b/java/google/registry/ui/js/forms.js
@@ -24,6 +24,8 @@ goog.require('goog.events.EventType');
 goog.require('goog.events.KeyCodes');
 goog.require('registry.util');
 
+goog.forwardDeclare('goog.events.KeyEvent');
+
 
 /**
  * Sets the focus on a form field (if it exists).
diff --git a/java/google/registry/ui/js/menu_button.js b/java/google/registry/ui/js/menu_button.js
index 24b1f9484..c354dd23d 100644
--- a/java/google/registry/ui/js/menu_button.js
+++ b/java/google/registry/ui/js/menu_button.js
@@ -22,6 +22,8 @@ goog.require('goog.events');
 goog.require('goog.events.EventHandler');
 goog.require('goog.events.EventType');
 
+goog.forwardDeclare('goog.events.BrowserEvent');
+
 
 
 /**
diff --git a/java/google/registry/ui/js/registrar/brainframe.js b/java/google/registry/ui/js/registrar/brainframe.js
index 127859dde..07b2771ce 100644
--- a/java/google/registry/ui/js/registrar/brainframe.js
+++ b/java/google/registry/ui/js/registrar/brainframe.js
@@ -25,6 +25,8 @@ goog.require('goog.json');
 goog.require('goog.object');
 goog.require('goog.style');
 
+goog.forwardDeclare('goog.events.BrowserEvent');
+
 
 
 /**
diff --git a/java/google/registry/ui/js/registrar/console.js b/java/google/registry/ui/js/registrar/console.js
index 5a8496daa..8d058e33b 100644
--- a/java/google/registry/ui/js/registrar/console.js
+++ b/java/google/registry/ui/js/registrar/console.js
@@ -32,6 +32,8 @@ goog.require('registry.registrar.SecuritySettings');
 goog.require('registry.registrar.WhoisSettings');
 goog.require('registry.util');
 
+goog.forwardDeclare('registry.Component');
+
 
 
 /**
diff --git a/java/google/registry/ui/js/registrar/contact.js b/java/google/registry/ui/js/registrar/contact.js
index d2b3c1345..2199c222f 100644
--- a/java/google/registry/ui/js/registrar/contact.js
+++ b/java/google/registry/ui/js/registrar/contact.js
@@ -19,6 +19,8 @@ goog.require('registry.registrar.XmlResourceComponent');
 goog.require('registry.soy.registrar.contact');
 goog.require('registry.soy.registrar.contactepp');
 
+goog.forwardDeclare('registry.registrar.Console');
+
 
 
 /**
diff --git a/java/google/registry/ui/js/registrar/contact_settings.js b/java/google/registry/ui/js/registrar/contact_settings.js
index c9007858f..3adb539b7 100644
--- a/java/google/registry/ui/js/registrar/contact_settings.js
+++ b/java/google/registry/ui/js/registrar/contact_settings.js
@@ -26,6 +26,8 @@ goog.require('registry.ResourceComponent');
 goog.require('registry.soy.registrar.contacts');
 goog.require('registry.util');
 
+goog.forwardDeclare('registry.registrar.Console');
+
 
 
 /**
diff --git a/java/google/registry/ui/js/registrar/contact_us.js b/java/google/registry/ui/js/registrar/contact_us.js
index 962935282..f159c2539 100644
--- a/java/google/registry/ui/js/registrar/contact_us.js
+++ b/java/google/registry/ui/js/registrar/contact_us.js
@@ -20,6 +20,8 @@ goog.require('registry.Resource');
 goog.require('registry.ResourceComponent');
 goog.require('registry.soy.registrar.console');
 
+goog.forwardDeclare('registry.registrar.Console');
+
 
 
 /**
diff --git a/java/google/registry/ui/js/registrar/dashboard.js b/java/google/registry/ui/js/registrar/dashboard.js
index 5ed01eb20..16d93b1bc 100644
--- a/java/google/registry/ui/js/registrar/dashboard.js
+++ b/java/google/registry/ui/js/registrar/dashboard.js
@@ -23,6 +23,8 @@ goog.require('goog.style');
 goog.require('registry.Component');
 goog.require('registry.soy.registrar.console');
 
+goog.forwardDeclare('registry.registrar.Console');
+
 
 
 /**
diff --git a/java/google/registry/ui/js/registrar/domain.js b/java/google/registry/ui/js/registrar/domain.js
index e75cfd24a..89ceac251 100644
--- a/java/google/registry/ui/js/registrar/domain.js
+++ b/java/google/registry/ui/js/registrar/domain.js
@@ -21,6 +21,8 @@ goog.require('registry.soy.registrar.domain');
 goog.require('registry.soy.registrar.domainepp');
 goog.require('registry.util');
 
+goog.forwardDeclare('registry.registrar.Console');
+
 
 
 /**
diff --git a/java/google/registry/ui/js/registrar/epp_session.js b/java/google/registry/ui/js/registrar/epp_session.js
index 013212c18..496f3c02b 100644
--- a/java/google/registry/ui/js/registrar/epp_session.js
+++ b/java/google/registry/ui/js/registrar/epp_session.js
@@ -20,6 +20,8 @@ goog.require('registry.soy.registrar.epp');
 goog.require('registry.util');
 goog.require('registry.xml');
 
+goog.forwardDeclare('registry.registrar.Console');
+
 
 
 /**
diff --git a/java/google/registry/ui/js/registrar/host.js b/java/google/registry/ui/js/registrar/host.js
index a52b6199a..bfbcd646a 100644
--- a/java/google/registry/ui/js/registrar/host.js
+++ b/java/google/registry/ui/js/registrar/host.js
@@ -18,6 +18,8 @@ goog.require('registry.registrar.XmlResourceComponent');
 goog.require('registry.soy.registrar.host');
 goog.require('registry.soy.registrar.hostepp');
 
+goog.forwardDeclare('registry.registrar.Console');
+
 
 
 /**
diff --git a/java/google/registry/ui/js/registrar/payment.js b/java/google/registry/ui/js/registrar/payment.js
index 6862fe5e2..702d7d500 100644
--- a/java/google/registry/ui/js/registrar/payment.js
+++ b/java/google/registry/ui/js/registrar/payment.js
@@ -31,6 +31,9 @@ goog.require('registry.soy.registrar.console');
 goog.require('registry.soy.registrar.payment');
 goog.require('registry.util');
 
+goog.forwardDeclare('goog.events.BrowserEvent');
+goog.forwardDeclare('registry.registrar.Console');
+
 
 
 /**
diff --git a/java/google/registry/ui/js/registrar/resources.js b/java/google/registry/ui/js/registrar/resources.js
index 669acdbb5..c02595d38 100644
--- a/java/google/registry/ui/js/registrar/resources.js
+++ b/java/google/registry/ui/js/registrar/resources.js
@@ -20,6 +20,8 @@ goog.require('registry.Resource');
 goog.require('registry.ResourceComponent');
 goog.require('registry.soy.registrar.console');
 
+goog.forwardDeclare('registry.registrar.Console');
+
 
 
 /**
diff --git a/java/google/registry/ui/js/registrar/security_settings.js b/java/google/registry/ui/js/registrar/security_settings.js
index 48a137e54..e76a0a944 100644
--- a/java/google/registry/ui/js/registrar/security_settings.js
+++ b/java/google/registry/ui/js/registrar/security_settings.js
@@ -25,6 +25,8 @@ goog.require('registry.Resource');
 goog.require('registry.ResourceComponent');
 goog.require('registry.soy.registrar.security');
 
+goog.forwardDeclare('registry.registrar.Console');
+
 
 
 /**
diff --git a/java/google/registry/ui/js/registrar/whois_settings.js b/java/google/registry/ui/js/registrar/whois_settings.js
index 0eea2bd03..39d93bae6 100644
--- a/java/google/registry/ui/js/registrar/whois_settings.js
+++ b/java/google/registry/ui/js/registrar/whois_settings.js
@@ -20,6 +20,8 @@ goog.require('registry.Resource');
 goog.require('registry.ResourceComponent');
 goog.require('registry.soy.registrar.whois');
 
+goog.forwardDeclare('registry.registrar.Console');
+
 
 
 /**
diff --git a/java/google/registry/ui/js/registrar/xml_resource_component.js b/java/google/registry/ui/js/registrar/xml_resource_component.js
index ecbcba315..2adcb1daa 100644
--- a/java/google/registry/ui/js/registrar/xml_resource_component.js
+++ b/java/google/registry/ui/js/registrar/xml_resource_component.js
@@ -20,6 +20,8 @@ goog.require('goog.dom.classlist');
 goog.require('registry.EditItem');
 goog.require('registry.util');
 
+goog.forwardDeclare('registry.registrar.Console');
+
 
 
 /**
diff --git a/java/google/registry/ui/js/resource.js b/java/google/registry/ui/js/resource.js
index f04107fc3..eb4a16b9a 100644
--- a/java/google/registry/ui/js/resource.js
+++ b/java/google/registry/ui/js/resource.js
@@ -17,6 +17,8 @@ goog.provide('registry.Resource');
 goog.require('goog.json');
 goog.require('registry.Session');
 
+goog.forwardDeclare('goog.Uri');
+
 
 
 /**
diff --git a/java/google/registry/ui/js/resource_component.js b/java/google/registry/ui/js/resource_component.js
index b0d79449c..bef1e3495 100644
--- a/java/google/registry/ui/js/resource_component.js
+++ b/java/google/registry/ui/js/resource_component.js
@@ -20,6 +20,9 @@ goog.require('registry.EditItem');
 goog.require('registry.forms');
 goog.require('registry.util');
 
+goog.forwardDeclare('registry.Resource');
+goog.forwardDeclare('registry.Console');
+
 
 
 /**
diff --git a/java/google/registry/ui/js/session.js b/java/google/registry/ui/js/session.js
index 6dc1248b2..d75339b6a 100644
--- a/java/google/registry/ui/js/session.js
+++ b/java/google/registry/ui/js/session.js
@@ -19,6 +19,8 @@ goog.require('goog.net.XhrIo');
 goog.require('goog.structs.Map');
 goog.require('registry.util');
 
+goog.forwardDeclare('goog.Uri');
+
 
 
 /**