diff --git a/spacy/tokens/token.pxd b/spacy/tokens/token.pxd
index 83664d02e..8ff0e9587 100644
--- a/spacy/tokens/token.pxd
+++ b/spacy/tokens/token.pxd
@@ -1,6 +1,6 @@
 from ..vocab cimport Vocab
 from ..structs cimport TokenC
-from ..typedefs cimport attr_id_t
+from ..attrs cimport attr_id_t
 from .doc cimport Doc
 
 
diff --git a/spacy/tokens/token.pyx b/spacy/tokens/token.pyx
index 17350501c..194205cc1 100644
--- a/spacy/tokens/token.pyx
+++ b/spacy/tokens/token.pyx
@@ -11,9 +11,9 @@ import numpy
 
 from ..parts_of_speech import UNIV_POS_NAMES
 
-from ..typedefs cimport LEMMA
-from ..typedefs cimport ID, ORTH, NORM, LOWER, SHAPE, PREFIX, SUFFIX, LENGTH, CLUSTER
-from ..typedefs cimport POS, LEMMA, TAG, DEP
+from ..attrs cimport LEMMA
+from ..attrs cimport ID, ORTH, NORM, LOWER, SHAPE, PREFIX, SUFFIX, LENGTH, CLUSTER
+from ..attrs cimport POS, LEMMA, TAG, DEP
 from ..parts_of_speech cimport CONJ, PUNCT