diff --git a/src/applications/auth/controller/facebookauth/PhabricatorFacebookAuthController.php b/src/applications/auth/controller/facebookauth/PhabricatorFacebookAuthController.php
index 818e291d21..ab23fefbb7 100644
--- a/src/applications/auth/controller/facebookauth/PhabricatorFacebookAuthController.php
+++ b/src/applications/auth/controller/facebookauth/PhabricatorFacebookAuthController.php
@@ -131,7 +131,7 @@ class PhabricatorFacebookAuthController extends PhabricatorAuthController {
       return id(new AphrontRedirectResponse())
         ->setURI('/');
     }
-    
+
     $known_email = id(new PhabricatorUser())
       ->loadOneWhere('email = %s', $user_data['email']);
     if ($known_email) {
diff --git a/src/applications/base/storage/lisk/__init__.php b/src/applications/base/storage/lisk/__init__.php
index 8b349ea6d1..0177e6f7fd 100644
--- a/src/applications/base/storage/lisk/__init__.php
+++ b/src/applications/base/storage/lisk/__init__.php
@@ -6,6 +6,7 @@
 
 
 
+phutil_require_module('phabricator', 'infrastructure/env');
 phutil_require_module('phabricator', 'storage/connection/mysql');
 phutil_require_module('phabricator', 'storage/lisk/dao');
 
diff --git a/src/applications/people/storage/user/PhabricatorUser.php b/src/applications/people/storage/user/PhabricatorUser.php
index a8180333c1..ccf118a050 100644
--- a/src/applications/people/storage/user/PhabricatorUser.php
+++ b/src/applications/people/storage/user/PhabricatorUser.php
@@ -30,7 +30,7 @@ class PhabricatorUser extends PhabricatorUserDAO {
   protected $profileImagePHID;
 
   private $sessionKey;
-  
+
   public function getProfileImagePHID() {
     return nonempty(
       $this->profileImagePHID,
diff --git a/src/applications/people/storage/user/__init__.php b/src/applications/people/storage/user/__init__.php
index ff97486c50..09bebc3ee3 100644
--- a/src/applications/people/storage/user/__init__.php
+++ b/src/applications/people/storage/user/__init__.php
@@ -11,5 +11,7 @@ phutil_require_module('phabricator', 'applications/phid/storage/phid');
 phutil_require_module('phabricator', 'infrastructure/env');
 phutil_require_module('phabricator', 'storage/queryfx');
 
+phutil_require_module('phutil', 'utils');
+
 
 phutil_require_source('PhabricatorUser.php');
diff --git a/src/applications/phid/handle/PhabricatorObjectHandle.php b/src/applications/phid/handle/PhabricatorObjectHandle.php
index bd50f48a4a..f7f5428ce2 100644
--- a/src/applications/phid/handle/PhabricatorObjectHandle.php
+++ b/src/applications/phid/handle/PhabricatorObjectHandle.php
@@ -69,12 +69,12 @@ class PhabricatorObjectHandle {
   public function getEmail() {
     return $this->email;
   }
-  
+
   public function setImageURI($uri) {
     $this->imageURI = $uri;
     return $this;
   }
-  
+
   public function getImageURI() {
     return $this->imageURI;
   }
diff --git a/src/applications/phid/handle/data/PhabricatorObjectHandleData.php b/src/applications/phid/handle/data/PhabricatorObjectHandleData.php
index 411c93ea9d..8f99dbfff1 100644
--- a/src/applications/phid/handle/data/PhabricatorObjectHandleData.php
+++ b/src/applications/phid/handle/data/PhabricatorObjectHandleData.php
@@ -58,7 +58,7 @@ class PhabricatorObjectHandleData {
               $handle->setName($user->getUsername());
               $handle->setURI('/p/'.$user->getUsername().'/');
               $handle->setEmail($user->getEmail());
-              
+
               $img_phid = $user->getProfileImagePHID();
               if ($img_phid) {
                 $handle->setImageURI(
diff --git a/src/applications/phid/handle/data/__init__.php b/src/applications/phid/handle/data/__init__.php
index b6578834e2..a80c17a0cb 100644
--- a/src/applications/phid/handle/data/__init__.php
+++ b/src/applications/phid/handle/data/__init__.php
@@ -6,6 +6,7 @@
 
 
 
+phutil_require_module('phabricator', 'applications/files/uri');
 phutil_require_module('phabricator', 'applications/phid/handle');
 
 phutil_require_module('phutil', 'symbols');