diff --git a/src/type/definition.js b/src/type/definition.js
index e1dcac1868..f6bfcc53a1 100644
--- a/src/type/definition.js
+++ b/src/type/definition.js
@@ -22,25 +22,25 @@ import { GraphQLError } from '../error/GraphQLError';
 import { Kind } from '../language/kinds';
 import { print } from '../language/printer';
 import type {
+  FieldNode,
+  ValueNode,
+  OperationDefinitionNode,
+  FragmentDefinitionNode,
   ScalarTypeDefinitionNode,
+  ScalarTypeExtensionNode,
   ObjectTypeDefinitionNode,
+  ObjectTypeExtensionNode,
   FieldDefinitionNode,
   InputValueDefinitionNode,
   InterfaceTypeDefinitionNode,
+  InterfaceTypeExtensionNode,
   UnionTypeDefinitionNode,
+  UnionTypeExtensionNode,
   EnumTypeDefinitionNode,
   EnumValueDefinitionNode,
-  InputObjectTypeDefinitionNode,
-  ScalarTypeExtensionNode,
-  ObjectTypeExtensionNode,
-  InterfaceTypeExtensionNode,
-  UnionTypeExtensionNode,
   EnumTypeExtensionNode,
+  InputObjectTypeDefinitionNode,
   InputObjectTypeExtensionNode,
-  OperationDefinitionNode,
-  FieldNode,
-  FragmentDefinitionNode,
-  ValueNode,
 } from '../language/ast';
 
 import { valueFromASTUntyped } from '../utilities/valueFromASTUntyped';
diff --git a/src/type/index.js b/src/type/index.js
index 204d8740dd..0befc307c0 100644
--- a/src/type/index.js
+++ b/src/type/index.js
@@ -64,6 +64,49 @@ export {
   GraphQLNonNull,
 } from './definition';
 
+export type {
+  GraphQLType,
+  GraphQLInputType,
+  GraphQLOutputType,
+  GraphQLLeafType,
+  GraphQLCompositeType,
+  GraphQLAbstractType,
+  GraphQLWrappingType,
+  GraphQLNullableType,
+  GraphQLNamedType,
+  GraphQLNamedInputType,
+  GraphQLNamedOutputType,
+  ThunkArray,
+  ThunkObjMap,
+  GraphQLArgument,
+  GraphQLArgumentConfig,
+  GraphQLEnumTypeConfig,
+  GraphQLEnumValue,
+  GraphQLEnumValueConfig,
+  GraphQLEnumValueConfigMap,
+  GraphQLField,
+  GraphQLFieldConfig,
+  GraphQLFieldConfigArgumentMap,
+  GraphQLFieldConfigMap,
+  GraphQLFieldMap,
+  GraphQLFieldResolver,
+  GraphQLInputField,
+  GraphQLInputFieldConfig,
+  GraphQLInputFieldConfigMap,
+  GraphQLInputFieldMap,
+  GraphQLInputObjectTypeConfig,
+  GraphQLInterfaceTypeConfig,
+  GraphQLIsTypeOfFn,
+  GraphQLObjectTypeConfig,
+  GraphQLResolveInfo,
+  GraphQLScalarTypeConfig,
+  GraphQLTypeResolver,
+  GraphQLUnionTypeConfig,
+  GraphQLScalarSerializer,
+  GraphQLScalarValueParser,
+  GraphQLScalarLiteralParser,
+} from './definition';
+
 export {
   /** Predicate */
   isDirective,
@@ -110,8 +153,6 @@ export {
   __InputValue,
   __EnumValue,
   __TypeKind,
-  /** "Enum" of Type Kinds */
-  TypeKind,
   /** Meta-field definitions. */
   SchemaMetaFieldDef,
   TypeMetaFieldDef,
@@ -119,47 +160,9 @@ export {
 } from './introspection';
 
 export type {
-  GraphQLType,
-  GraphQLInputType,
-  GraphQLOutputType,
-  GraphQLLeafType,
-  GraphQLCompositeType,
-  GraphQLAbstractType,
-  GraphQLWrappingType,
-  GraphQLNullableType,
-  GraphQLNamedType,
-  GraphQLNamedInputType,
-  GraphQLNamedOutputType,
-  ThunkArray,
-  ThunkObjMap,
-  GraphQLArgument,
-  GraphQLArgumentConfig,
-  GraphQLEnumTypeConfig,
-  GraphQLEnumValue,
-  GraphQLEnumValueConfig,
-  GraphQLEnumValueConfigMap,
-  GraphQLField,
-  GraphQLFieldConfig,
-  GraphQLFieldConfigArgumentMap,
-  GraphQLFieldConfigMap,
-  GraphQLFieldMap,
-  GraphQLFieldResolver,
-  GraphQLInputField,
-  GraphQLInputFieldConfig,
-  GraphQLInputFieldConfigMap,
-  GraphQLInputFieldMap,
-  GraphQLInputObjectTypeConfig,
-  GraphQLInterfaceTypeConfig,
-  GraphQLIsTypeOfFn,
-  GraphQLObjectTypeConfig,
-  GraphQLResolveInfo,
-  GraphQLScalarTypeConfig,
-  GraphQLTypeResolver,
-  GraphQLUnionTypeConfig,
-  GraphQLScalarSerializer,
-  GraphQLScalarValueParser,
-  GraphQLScalarLiteralParser,
-} from './definition';
+  /** "Enum" of Type Kinds */
+  TypeKind,
+} from './introspection';
 
 /** Validate GraphQL schema. */
 export { validateSchema, assertValidSchema } from './validate';