diff --git a/x-pack/plugins/siem/public/components/open_timeline/index.tsx b/x-pack/plugins/siem/public/components/open_timeline/index.tsx
index e01a116582a0b..bea433819faa3 100644
--- a/x-pack/plugins/siem/public/components/open_timeline/index.tsx
+++ b/x-pack/plugins/siem/public/components/open_timeline/index.tsx
@@ -10,7 +10,6 @@ import { getOr, assign } from 'lodash/fp';
 import * as React from 'react';
 import { connect } from 'react-redux';
 
-import { SortFieldTimeline } from '../../../server/graphql/types';
 import {
   defaultHeaders,
   defaultColumnHeaderType,
@@ -20,7 +19,12 @@ import { AllTimelinesVariables } from '../../containers/timeline/all';
 
 import { allTimelinesQuery } from '../../containers/timeline/all/index.gql_query';
 import { oneTimelineQuery } from '../../containers/timeline/one/index.gql_query';
-import { DeleteTimelineMutation, GetOneTimeline, TimelineResult } from '../../graphql/types';
+import {
+  DeleteTimelineMutation,
+  GetOneTimeline,
+  TimelineResult,
+  SortFieldTimeline,
+} from '../../graphql/types';
 import { Note } from '../../lib/note';
 import { State, timelineSelectors } from '../../store';
 import { addNotes as dispatchAddNotes } from '../../store/app/actions';
diff --git a/x-pack/plugins/siem/public/containers/domains/index.tsx b/x-pack/plugins/siem/public/containers/domains/index.tsx
index ff036cc2b1ffd..3c4d1b88e7161 100644
--- a/x-pack/plugins/siem/public/containers/domains/index.tsx
+++ b/x-pack/plugins/siem/public/containers/domains/index.tsx
@@ -11,8 +11,14 @@ import { connect } from 'react-redux';
 
 import chrome from 'ui/chrome';
 import { DEFAULT_INDEX_KEY } from '../../..';
-import { FlowDirection, FlowTarget } from '../../../server/graphql/types';
-import { DomainsEdges, DomainsSortField, GetDomainsQuery, PageInfo } from '../../graphql/types';
+import {
+  DomainsEdges,
+  DomainsSortField,
+  GetDomainsQuery,
+  FlowDirection,
+  FlowTarget,
+  PageInfo,
+} from '../../graphql/types';
 import { inputsModel, networkModel, networkSelectors, State } from '../../store';
 import { createFilter } from '../helpers';
 import { QueryTemplate, QueryTemplateProps } from '../query_template';
diff --git a/x-pack/plugins/siem/public/containers/tls/index.tsx b/x-pack/plugins/siem/public/containers/tls/index.tsx
index 45407c0009b82..6a141d5c2be1f 100644
--- a/x-pack/plugins/siem/public/containers/tls/index.tsx
+++ b/x-pack/plugins/siem/public/containers/tls/index.tsx
@@ -11,8 +11,7 @@ import { connect } from 'react-redux';
 
 import chrome from 'ui/chrome';
 import { DEFAULT_INDEX_KEY } from '../../..';
-import { FlowTarget } from '../../../server/graphql/types';
-import { TlsEdges, TlsSortField, GetTlsQuery, PageInfo } from '../../graphql/types';
+import { FlowTarget, PageInfo, TlsEdges, TlsSortField, GetTlsQuery } from '../../graphql/types';
 import { inputsModel, networkModel, networkSelectors, State } from '../../store';
 import { createFilter } from '../helpers';
 import { QueryTemplate, QueryTemplateProps } from '../query_template';
diff --git a/x-pack/plugins/siem/public/containers/users/index.tsx b/x-pack/plugins/siem/public/containers/users/index.tsx
index 644731fd6136e..51ec38cc0bf6a 100644
--- a/x-pack/plugins/siem/public/containers/users/index.tsx
+++ b/x-pack/plugins/siem/public/containers/users/index.tsx
@@ -11,8 +11,13 @@ import { connect } from 'react-redux';
 
 import chrome from 'ui/chrome';
 import { DEFAULT_INDEX_KEY } from '../../..';
-import { FlowTarget } from '../../../server/graphql/types';
-import { GetUsersQuery, PageInfo, UsersEdges, UsersSortField } from '../../graphql/types';
+import {
+  GetUsersQuery,
+  FlowTarget,
+  PageInfo,
+  UsersEdges,
+  UsersSortField,
+} from '../../graphql/types';
 import { inputsModel, networkModel, networkSelectors, State } from '../../store';
 import { createFilter } from '../helpers';
 import { QueryTemplate, QueryTemplateProps } from '../query_template';
diff --git a/x-pack/plugins/siem/public/mock/timeline_results.ts b/x-pack/plugins/siem/public/mock/timeline_results.ts
index 3448d568b782e..d6dc0ae131391 100644
--- a/x-pack/plugins/siem/public/mock/timeline_results.ts
+++ b/x-pack/plugins/siem/public/mock/timeline_results.ts
@@ -4,9 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { TimelineResult } from '../../server/graphql/types';
 import { OpenTimelineResult } from '../components/open_timeline/types';
-import { GetAllTimeline, SortFieldTimeline, Direction } from '../graphql/types';
+import { GetAllTimeline, SortFieldTimeline, TimelineResult, Direction } from '../graphql/types';
 import { allTimelinesQuery } from '../containers/timeline/all/index.gql_query';
 
 export interface MockedProvidedQuery {
diff --git a/x-pack/plugins/siem/server/lib/events/query.last_event_time.dsl.ts b/x-pack/plugins/siem/server/lib/events/query.last_event_time.dsl.ts
index dc8f3b96aa5bf..86491876673c9 100644
--- a/x-pack/plugins/siem/server/lib/events/query.last_event_time.dsl.ts
+++ b/x-pack/plugins/siem/server/lib/events/query.last_event_time.dsl.ts
@@ -6,7 +6,7 @@
 
 import { LastEventTimeRequestOptions } from './types';
 import { LastEventIndexKey } from '../../graphql/types';
-import { assertUnreachable } from '../../../public/lib/helpers';
+import { assertUnreachable } from '../../utils/build_query';
 
 interface EventIndices {
   [key: string]: string[];