diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index f69a76d94f..9f85b1f934 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1485,6 +1485,7 @@ phutil_register_library_map(array(
     'PhabricatorPHDConfigOptions' => 'applications/config/option/PhabricatorPHDConfigOptions.php',
     'PhabricatorPHID' => 'applications/phid/storage/PhabricatorPHID.php',
     'PhabricatorPHIDConstants' => 'applications/phid/PhabricatorPHIDConstants.php',
+    'PhabricatorPHIDInterface' => 'applications/phid/interface/PhabricatorPHIDInterface.php',
     'PhabricatorPHIDType' => 'applications/phid/type/PhabricatorPHIDType.php',
     'PhabricatorPHPMailerConfigOptions' => 'applications/config/option/PhabricatorPHPMailerConfigOptions.php',
     'PhabricatorPagedFormExample' => 'applications/uiexample/examples/PhabricatorPagedFormExample.php',
@@ -3594,6 +3595,7 @@ phutil_register_library_map(array(
     'PhabricatorFlagQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhabricatorFlagSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'PhabricatorFlagSelectControl' => 'AphrontFormControl',
+    'PhabricatorFlaggableInterface' => 'PhabricatorPHIDInterface',
     'PhabricatorFlagsUIEventListener' => 'PhabricatorEventListener',
     'PhabricatorFormExample' => 'PhabricatorUIExample',
     'PhabricatorGarbageCollectorConfigOptions' => 'PhabricatorApplicationConfigOptions',
@@ -3844,6 +3846,7 @@ phutil_register_library_map(array(
     'PhabricatorPolicyEditController' => 'PhabricatorPolicyController',
     'PhabricatorPolicyException' => 'Exception',
     'PhabricatorPolicyExplainController' => 'PhabricatorPolicyController',
+    'PhabricatorPolicyInterface' => 'PhabricatorPHIDInterface',
     'PhabricatorPolicyManagementShowWorkflow' => 'PhabricatorPolicyManagementWorkflow',
     'PhabricatorPolicyManagementUnlockWorkflow' => 'PhabricatorPolicyManagementWorkflow',
     'PhabricatorPolicyManagementWorkflow' => 'PhutilArgumentWorkflow',
diff --git a/src/applications/flag/interface/PhabricatorFlaggableInterface.php b/src/applications/flag/interface/PhabricatorFlaggableInterface.php
index 66bd954b55..5d10ea276c 100644
--- a/src/applications/flag/interface/PhabricatorFlaggableInterface.php
+++ b/src/applications/flag/interface/PhabricatorFlaggableInterface.php
@@ -1,7 +1,5 @@
 <?php
 
-interface PhabricatorFlaggableInterface {
-
-  public function getPHID();
+interface PhabricatorFlaggableInterface extends PhabricatorPHIDInterface {
 
 }
diff --git a/src/applications/phid/interface/PhabricatorPHIDInterface.php b/src/applications/phid/interface/PhabricatorPHIDInterface.php
new file mode 100644
index 0000000000..8912bd40a4
--- /dev/null
+++ b/src/applications/phid/interface/PhabricatorPHIDInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+interface PhabricatorPHIDInterface {
+
+  public function getPHID();
+
+}
diff --git a/src/applications/policy/interface/PhabricatorPolicyInterface.php b/src/applications/policy/interface/PhabricatorPolicyInterface.php
index 1cab9c29e9..515f0d1626 100644
--- a/src/applications/policy/interface/PhabricatorPolicyInterface.php
+++ b/src/applications/policy/interface/PhabricatorPolicyInterface.php
@@ -1,8 +1,7 @@
 <?php
 
-interface PhabricatorPolicyInterface {
+interface PhabricatorPolicyInterface extends PhabricatorPHIDInterface {
 
-  public function getPHID();
   public function getCapabilities();
   public function getPolicy($capability);
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer);