$ git diff
diff --git a/src/python/pants/engine/graph.py b/src/python/pants/engine/graph.py
index 72ef4f2..932a617 100644
--- a/src/python/pants/engine/graph.py
+++ b/src/python/pants/engine/graph.py
@@ -11,11 +11,11 @@ from os.path import basename, dirname, join

 import six

-from pants.base.project_tree import Dir
+from pants.base.project_tree import Dir, File
 from pants.base.specs import DescendantAddresses, SiblingAddresses, SingleAddress
 from pants.build_graph.address import Address
 from pants.engine.addressable import AddressableDescriptor, Addresses, TypeConstraintError
-from pants.engine.fs import DirectoryListing, File, Files, FilesContent, Path, PathGlobs
+from pants.engine.fs import DirectoryListing, Files, FilesContent, Path, PathGlobs
 from pants.engine.mapper import AddressFamily, AddressMap, AddressMapper, ResolveError
 from pants.engine.objects import Locatable, SerializableFactory, Validatable
 from pants.engine.selectors import Select, SelectDependencies, SelectLiteral, SelectProjection
diff --git a/tests/python/pants_test/engine/BUILD b/tests/python/pants_test/engine/BUILD
index 8313eae..ff4186f 100644
--- a/tests/python/pants_test/engine/BUILD
+++ b/tests/python/pants_test/engine/BUILD
@@ -65,6 +65,7 @@ python_tests(
   name='struct',
   sources=['test_struct.py'],
   dependencies=[
+    'src/python/pants/base:project_tree',
     'src/python/pants/build_graph',
     'src/python/pants/engine:objects',
     'src/python/pants/engine:struct',
diff --git a/tests/python/pants_test/engine/test_storage.py b/tests/python/pants_test/engine/test_storage.py
index da2cb6c..06119bc 100644
--- a/tests/python/pants_test/engine/test_storage.py
+++ b/tests/python/pants_test/engine/test_storage.py
@@ -8,7 +8,7 @@ from __future__ import (absolute_import, division, generators, nested_scopes, pr
 import unittest
 from contextlib import closing

-from pants.engine.fs import Dir, File
+from pants.engine.project_tree import Dir, File
 from pants.engine.scheduler import StepRequest, StepResult
 from pants.engine.storage import Cache, InvalidKeyError, Key, Lmdb, Storage