diff --git a/packages/kbn-generate-csv-types/index.ts b/packages/kbn-generate-csv-types/index.ts
index 865ac302e06b9..6c5134e1fff99 100644
--- a/packages/kbn-generate-csv-types/index.ts
+++ b/packages/kbn-generate-csv-types/index.ts
@@ -9,12 +9,20 @@
 import { ByteSizeValue } from '@kbn/config-schema';
 import type { SerializedSearchSourceFields } from '@kbn/data-plugin/public';
 
+/**
+ * @internal
+ * Needed to separate dependencies from reporting
+ */
 export interface JobParams {
   searchSource: SerializedSearchSourceFields;
   columns?: string[];
   browserTimezone?: string;
 }
 
+/**
+ * @internal
+ * Needed to separate dependencies from reporting
+ */
 export interface CsvConfig {
   checkForFormulas: boolean;
   escapeFormulaValues: boolean;
@@ -25,3 +33,29 @@ export interface CsvConfig {
     size: number;
   };
 }
+
+/**
+ * @internal
+ * Needed to separate dependencies from reporting
+ */
+export interface CancellationToken {
+  isCancelled: () => boolean;
+  cancel: () => void;
+}
+
+/**
+ * @internal
+ * Needed to separate dependencies from reporting
+ */
+export interface TaskRunResult {
+  content_type: string;
+  csv_contains_formulas: boolean;
+  max_size_reached: boolean;
+  metrics: {
+    csv: {
+      rows: number;
+    };
+  };
+  warnings: unknown;
+  error_code: unknown;
+}
diff --git a/packages/kbn-generate-csv/src/constants.ts b/packages/kbn-generate-csv/src/constants.ts
index cdaadf7451e37..01538035c9094 100644
--- a/packages/kbn-generate-csv/src/constants.ts
+++ b/packages/kbn-generate-csv/src/constants.ts
@@ -6,7 +6,12 @@
  * Side Public License, v 1.
  */
 
+/**
+ * These can not be imported from reporting-common due to potential for circular dependency
+ */
 export const CSV_BOM_CHARS = '\ufeff';
 export const CONTENT_TYPE_CSV = 'text/csv';
 export const UI_SETTINGS_CSV_SEPARATOR = 'csv:separator';
 export const UI_SETTINGS_CSV_QUOTE_VALUES = 'csv:quoteValues';
+export const UI_SETTINGS_SEARCH_INCLUDE_FROZEN = 'search:includeFrozen';
+export const UI_SETTINGS_DATEFORMAT_TZ = 'dateFormat:tz';
diff --git a/packages/kbn-generate-csv/src/generate_csv.test.ts b/packages/kbn-generate-csv/src/generate_csv.test.ts
index 52f15d6a82c49..6bfd567ea0424 100644
--- a/packages/kbn-generate-csv/src/generate_csv.test.ts
+++ b/packages/kbn-generate-csv/src/generate_csv.test.ts
@@ -24,14 +24,22 @@ import { identity, range } from 'lodash';
 import * as Rx from 'rxjs';
 import type { Writable } from 'stream';
 import { CsvGenerator } from './generate_csv';
-import { CancellationToken, UI_SETTINGS_DATEFORMAT_TZ } from '@kbn/reporting-common';
-import { CsvConfig, JobParams } from '@kbn/generate-csv-types';
-import { UI_SETTINGS_CSV_QUOTE_VALUES, UI_SETTINGS_CSV_SEPARATOR } from './constants';
+import { CancellationToken, CsvConfig, JobParams } from '@kbn/generate-csv-types';
+import {
+  UI_SETTINGS_CSV_QUOTE_VALUES,
+  UI_SETTINGS_CSV_SEPARATOR,
+  UI_SETTINGS_DATEFORMAT_TZ,
+} from './constants';
 
 const createMockJob = (baseObj: any = {}): JobParams => ({
   ...baseObj,
 });
 
+const createMockCancellationToken = (): CancellationToken => ({
+  isCancelled: () => false,
+  cancel: jest.fn(),
+});
+
 describe('CsvGenerator', () => {
   let mockEsClient: IScopedClusterClient;
   let mockDataClient: IScopedSearchClient;
@@ -146,7 +154,7 @@ describe('CsvGenerator', () => {
         searchSourceStart: mockSearchSourceService,
         fieldFormatsRegistry: mockFieldFormatsRegistry,
       },
-      new CancellationToken(),
+      createMockCancellationToken(),
       mockLogger,
       stream
     );
@@ -181,7 +189,7 @@ describe('CsvGenerator', () => {
         searchSourceStart: mockSearchSourceService,
         fieldFormatsRegistry: mockFieldFormatsRegistry,
       },
-      new CancellationToken(),
+      createMockCancellationToken(),
       mockLogger,
       stream
     );
@@ -220,7 +228,7 @@ describe('CsvGenerator', () => {
         searchSourceStart: mockSearchSourceService,
         fieldFormatsRegistry: mockFieldFormatsRegistry,
       },
-      new CancellationToken(),
+      createMockCancellationToken(),
       mockLogger,
       stream
     );
@@ -268,7 +276,7 @@ describe('CsvGenerator', () => {
         searchSourceStart: mockSearchSourceService,
         fieldFormatsRegistry: mockFieldFormatsRegistry,
       },
-      new CancellationToken(),
+      createMockCancellationToken(),
       mockLogger,
       stream
     );
@@ -327,7 +335,7 @@ describe('CsvGenerator', () => {
         searchSourceStart: mockSearchSourceService,
         fieldFormatsRegistry: mockFieldFormatsRegistry,
       },
-      new CancellationToken(),
+      createMockCancellationToken(),
       mockLogger,
       stream
     );
@@ -397,7 +405,7 @@ describe('CsvGenerator', () => {
         searchSourceStart: mockSearchSourceService,
         fieldFormatsRegistry: mockFieldFormatsRegistry,
       },
-      new CancellationToken(),
+      createMockCancellationToken(),
       mockLogger,
       stream
     );
@@ -435,7 +443,7 @@ describe('CsvGenerator', () => {
           searchSourceStart: mockSearchSourceService,
           fieldFormatsRegistry: mockFieldFormatsRegistry,
         },
-        new CancellationToken(),
+        createMockCancellationToken(),
         mockLogger,
         stream
       );
@@ -482,7 +490,7 @@ describe('CsvGenerator', () => {
           searchSourceStart: mockSearchSourceService,
           fieldFormatsRegistry: mockFieldFormatsRegistry,
         },
-        new CancellationToken(),
+        createMockCancellationToken(),
         mockLogger,
         stream
       );
@@ -536,7 +544,7 @@ describe('CsvGenerator', () => {
           searchSourceStart: mockSearchSourceService,
           fieldFormatsRegistry: mockFieldFormatsRegistry,
         },
-        new CancellationToken(),
+        createMockCancellationToken(),
         mockLogger,
         stream
       );
@@ -578,7 +586,7 @@ describe('CsvGenerator', () => {
           searchSourceStart: mockSearchSourceService,
           fieldFormatsRegistry: mockFieldFormatsRegistry,
         },
-        new CancellationToken(),
+        createMockCancellationToken(),
         mockLogger,
         stream
       );
@@ -616,7 +624,7 @@ describe('CsvGenerator', () => {
           searchSourceStart: mockSearchSourceService,
           fieldFormatsRegistry: mockFieldFormatsRegistry,
         },
-        new CancellationToken(),
+        createMockCancellationToken(),
         mockLogger,
         stream
       );
@@ -654,7 +662,7 @@ describe('CsvGenerator', () => {
           searchSourceStart: mockSearchSourceService,
           fieldFormatsRegistry: mockFieldFormatsRegistry,
         },
-        new CancellationToken(),
+        createMockCancellationToken(),
         mockLogger,
         stream
       );
@@ -694,7 +702,7 @@ describe('CsvGenerator', () => {
           searchSourceStart: mockSearchSourceService,
           fieldFormatsRegistry: mockFieldFormatsRegistry,
         },
-        new CancellationToken(),
+        createMockCancellationToken(),
         mockLogger,
         stream
       );
@@ -732,7 +740,7 @@ describe('CsvGenerator', () => {
           searchSourceStart: mockSearchSourceService,
           fieldFormatsRegistry: mockFieldFormatsRegistry,
         },
-        new CancellationToken(),
+        createMockCancellationToken(),
         mockLogger,
         stream
       );
@@ -777,7 +785,7 @@ describe('CsvGenerator', () => {
           searchSourceStart: mockSearchSourceService,
           fieldFormatsRegistry: mockFieldFormatsRegistry,
         },
-        new CancellationToken(),
+        createMockCancellationToken(),
         mockLogger,
         stream
       );
@@ -806,7 +814,7 @@ describe('CsvGenerator', () => {
         searchSourceStart: mockSearchSourceService,
         fieldFormatsRegistry: mockFieldFormatsRegistry,
       },
-      new CancellationToken(),
+      createMockCancellationToken(),
       mockLogger,
       stream
     );
@@ -864,7 +872,7 @@ describe('CsvGenerator', () => {
         searchSourceStart: mockSearchSourceService,
         fieldFormatsRegistry: mockFieldFormatsRegistry,
       },
-      new CancellationToken(),
+      createMockCancellationToken(),
       mockLogger,
       stream
     );
@@ -908,7 +916,7 @@ describe('CsvGenerator', () => {
         searchSourceStart: mockSearchSourceService,
         fieldFormatsRegistry: mockFieldFormatsRegistry,
       },
-      new CancellationToken(),
+      createMockCancellationToken(),
       mockLogger,
       stream
     );
@@ -957,7 +965,7 @@ describe('CsvGenerator', () => {
         searchSourceStart: mockSearchSourceService,
         fieldFormatsRegistry: mockFieldFormatsRegistry,
       },
-      new CancellationToken(),
+      createMockCancellationToken(),
       mockLogger,
       stream
     );
@@ -1016,7 +1024,7 @@ describe('CsvGenerator', () => {
           searchSourceStart: mockSearchSourceService,
           fieldFormatsRegistry: mockFieldFormatsRegistry,
         },
-        new CancellationToken(),
+        createMockCancellationToken(),
         mockLogger,
         stream
       );
diff --git a/packages/kbn-generate-csv/src/generate_csv.ts b/packages/kbn-generate-csv/src/generate_csv.ts
index 609844284995e..558cbd8100df5 100644
--- a/packages/kbn-generate-csv/src/generate_csv.ts
+++ b/packages/kbn-generate-csv/src/generate_csv.ts
@@ -6,10 +6,13 @@
  * Side Public License, v 1.
  */
 
+import { lastValueFrom } from 'rxjs';
+import type { Writable } from 'stream';
+
 import { errors as esErrors, estypes } from '@elastic/elasticsearch';
 import type { IScopedClusterClient, IUiSettingsClient, Logger } from '@kbn/core/server';
 import type { ISearchSource, ISearchStartSearchSource } from '@kbn/data-plugin/common';
-import { cellHasFormulas, ES_SEARCH_STRATEGY, tabifyDocs } from '@kbn/data-plugin/common';
+import { ES_SEARCH_STRATEGY, cellHasFormulas, tabifyDocs } from '@kbn/data-plugin/common';
 import type { IScopedSearchClient } from '@kbn/data-plugin/server';
 import type { Datatable } from '@kbn/expressions-plugin/server';
 import type {
@@ -17,20 +20,12 @@ import type {
   FieldFormatConfig,
   IFieldFormatsRegistry,
 } from '@kbn/field-formats-plugin/common';
-import { lastValueFrom } from 'rxjs';
-import type { Writable } from 'stream';
-import {
-  CancellationToken,
-  byteSizeValueToNumber,
-  ReportingError,
-  AuthenticationExpiredError,
-} from '@kbn/reporting-common';
-import { CsvConfig, JobParams } from '@kbn/generate-csv-types';
-import type { TaskRunResult } from '@kbn/reporting-export-types-helpers-public';
-import { MaxSizeStringBuilder } from './max_size_string_builder';
-import { i18nTexts } from './i18n_texts';
-import { CsvExportSettings, getExportSettings } from './get_export_settings';
+
+import { CancellationToken, CsvConfig, JobParams, TaskRunResult } from '@kbn/generate-csv-types';
 import { CONTENT_TYPE_CSV } from './constants';
+import { CsvExportSettings, getExportSettings } from './get_export_settings';
+import { i18nTexts } from './i18n_texts';
+import { MaxSizeStringBuilder } from './max_size_string_builder';
 
 interface Clients {
   es: IScopedClusterClient;
diff --git a/packages/kbn-generate-csv/src/get_export_settings.test.ts b/packages/kbn-generate-csv/src/get_export_settings.test.ts
index 4afbeeabcdaa5..6d1834880a2b4 100644
--- a/packages/kbn-generate-csv/src/get_export_settings.test.ts
+++ b/packages/kbn-generate-csv/src/get_export_settings.test.ts
@@ -6,10 +6,6 @@
  * Side Public License, v 1.
  */
 
-import {
-  UI_SETTINGS_SEARCH_INCLUDE_FROZEN,
-  UI_SETTINGS_DATEFORMAT_TZ,
-} from '@kbn/reporting-common';
 import { IUiSettingsClient } from '@kbn/core/server';
 import {
   loggingSystemMock,
@@ -18,7 +14,12 @@ import {
 } from '@kbn/core/server/mocks';
 import { getExportSettings } from './get_export_settings';
 import { CsvConfig } from '@kbn/generate-csv-types';
-import { UI_SETTINGS_CSV_QUOTE_VALUES, UI_SETTINGS_CSV_SEPARATOR } from './constants';
+import {
+  UI_SETTINGS_CSV_QUOTE_VALUES,
+  UI_SETTINGS_CSV_SEPARATOR,
+  UI_SETTINGS_DATEFORMAT_TZ,
+  UI_SETTINGS_SEARCH_INCLUDE_FROZEN,
+} from './constants';
 
 describe('getExportSettings', () => {
   let uiSettingsClient: IUiSettingsClient;
diff --git a/packages/kbn-generate-csv/src/get_export_settings.ts b/packages/kbn-generate-csv/src/get_export_settings.ts
index 46d31afaf9e4f..68d974b811378 100644
--- a/packages/kbn-generate-csv/src/get_export_settings.ts
+++ b/packages/kbn-generate-csv/src/get_export_settings.ts
@@ -10,14 +10,12 @@ import { ByteSizeValue } from '@kbn/config-schema';
 import type { IUiSettingsClient, Logger } from '@kbn/core/server';
 import { createEscapeValue } from '@kbn/data-plugin/common';
 import { CsvConfig } from '@kbn/generate-csv-types';
-import {
-  UI_SETTINGS_DATEFORMAT_TZ,
-  UI_SETTINGS_SEARCH_INCLUDE_FROZEN,
-} from '@kbn/reporting-common';
 import {
   CSV_BOM_CHARS,
   UI_SETTINGS_CSV_QUOTE_VALUES,
   UI_SETTINGS_CSV_SEPARATOR,
+  UI_SETTINGS_DATEFORMAT_TZ,
+  UI_SETTINGS_SEARCH_INCLUDE_FROZEN,
 } from './constants';
 
 export interface CsvExportSettings {
diff --git a/packages/kbn-generate-csv/tsconfig.json b/packages/kbn-generate-csv/tsconfig.json
index ccfeab0a04c0f..a66a8149968d0 100644
--- a/packages/kbn-generate-csv/tsconfig.json
+++ b/packages/kbn-generate-csv/tsconfig.json
@@ -21,10 +21,8 @@
     "@kbn/data-plugin",
     "@kbn/expressions-plugin",
     "@kbn/field-formats-plugin",
-    "@kbn/reporting-common",
     "@kbn/config-schema",
     "@kbn/i18n",
     "@kbn/generate-csv-types",
-    "@kbn/reporting-export-types-helpers-public",
   ]
 }
diff --git a/packages/kbn-reporting/export_types_helpers_server/get_full_redirect_app_url.test.ts b/packages/kbn-reporting/common/get_full_redirect_app_url.test.ts
similarity index 95%
rename from packages/kbn-reporting/export_types_helpers_server/get_full_redirect_app_url.test.ts
rename to packages/kbn-reporting/common/get_full_redirect_app_url.test.ts
index 5d15f373a42ec..64f2ba4452612 100644
--- a/packages/kbn-reporting/export_types_helpers_server/get_full_redirect_app_url.test.ts
+++ b/packages/kbn-reporting/common/get_full_redirect_app_url.test.ts
@@ -6,7 +6,6 @@
  * Side Public License, v 1.
  */
 
-import { ReportingConfigType } from '@kbn/reporting-common';
 import { getFullRedirectAppUrl } from './get_full_redirect_app_url';
 
 describe('getFullRedirectAppUrl', () => {
diff --git a/packages/kbn-reporting/export_types_helpers_server/get_full_redirect_app_url.ts b/packages/kbn-reporting/common/get_full_redirect_app_url.ts
similarity index 78%
rename from packages/kbn-reporting/export_types_helpers_server/get_full_redirect_app_url.ts
rename to packages/kbn-reporting/common/get_full_redirect_app_url.ts
index b0c030c88d627..1b53cee4c1e33 100644
--- a/packages/kbn-reporting/export_types_helpers_server/get_full_redirect_app_url.ts
+++ b/packages/kbn-reporting/common/get_full_redirect_app_url.ts
@@ -7,10 +7,8 @@
  */
 
 import { format } from 'url';
-import { getRedirectAppPath } from '@kbn/reporting-common/constants';
-import { ReportingConfigType } from '@kbn/reporting-common/schema';
-import { buildKibanaPath } from '@kbn/reporting-common/build_kibana_path';
-import { ReportingServerInfo } from './types';
+import { buildKibanaPath } from './build_kibana_path';
+import { getRedirectAppPath } from './constants';
 
 export function getFullRedirectAppUrl(
   config: ReportingConfigType,
diff --git a/packages/kbn-reporting/common/index.ts b/packages/kbn-reporting/common/index.ts
index 268fce26be157..4574c435fc8a1 100644
--- a/packages/kbn-reporting/common/index.ts
+++ b/packages/kbn-reporting/common/index.ts
@@ -11,7 +11,6 @@ export { buildKibanaPath } from './build_kibana_path';
 export * from './constants';
 export * from './errors';
 export * from './schema_utils';
-export * from './schema';
 export * as jobTypes from './job_types';
 export * from './report_types';
 export type {
diff --git a/packages/kbn-reporting/export_types_helpers_public/metrics.ts b/packages/kbn-reporting/common/types.ts
similarity index 51%
rename from packages/kbn-reporting/export_types_helpers_public/metrics.ts
rename to packages/kbn-reporting/common/types.ts
index a1ac55ddf6360..e102ea79ab29a 100644
--- a/packages/kbn-reporting/export_types_helpers_public/metrics.ts
+++ b/packages/kbn-reporting/common/types.ts
@@ -6,11 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { PdfScreenshotResult, PngScreenshotResult } from '@kbn/screenshotting-plugin/server';
-
-export type PngMetrics = PngScreenshotResult['metrics'];
-
-export type PdfMetrics = PdfScreenshotResult['metrics'];
+import type { LocatorParams } from '.';
 
 export interface CsvMetrics {
   rows: number;
@@ -18,8 +14,8 @@ export interface CsvMetrics {
 
 export interface TaskRunMetrics {
   csv?: CsvMetrics;
-  png?: PngMetrics;
-  pdf?: PdfMetrics;
+  png?: unknown;
+  pdf?: unknown;
 }
 
 export interface TaskRunResult {
@@ -38,3 +34,47 @@ export interface TaskRunResult {
    */
   error_code?: string;
 }
+
+export interface ReportOutput extends TaskRunResult {
+  content: string | null;
+  size: number;
+}
+
+/**
+ * @deprecated
+ */
+export interface BaseParams {
+  layout?: unknown;
+  objectType: string;
+  title: string;
+  browserTimezone: string; // to format dates in the user's time zone
+  version: string; // to handle any state migrations
+}
+
+/**
+ * Report job parameters that an application must return from its
+ * getSharingData function.
+ */
+export type BaseParamsV2 = BaseParams & {
+  locatorParams: LocatorParams[];
+};
+
+/**
+ * @deprecated
+ */
+export interface BasePayload extends BaseParams {
+  headers: string;
+  spaceId?: string;
+  isDeprecated?: boolean;
+}
+
+export type JobId = string;
+
+/**
+ * Report job parameters, after they are processed in the request handler.
+ */
+export interface BasePayloadV2 extends BaseParamsV2 {
+  headers: string;
+  spaceId?: string;
+  isDeprecated?: boolean;
+}
diff --git a/packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts b/packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts
index 05bfbf836a330..2a7a9efbf758a 100644
--- a/packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts
+++ b/packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts
@@ -28,7 +28,6 @@ import type {
   JobParamsDownloadCSV,
 } from '@kbn/reporting-export-types-helpers-server';
 import { getFieldFormats, ExportType } from '@kbn/reporting-export-types-helpers-server';
-import type { TaskRunResult } from '@kbn/reporting-export-types-helpers-public';
 
 type CsvSearchSourceImmediateExportTypeSetupDeps = BaseExportTypeSetupDeps;
 interface CsvSearchSourceImmediateExportTypeStartDeps extends BaseExportTypeStartDeps {
diff --git a/packages/kbn-reporting/export_types/deprecated/printable_pdf.ts b/packages/kbn-reporting/export_types/deprecated/printable_pdf.ts
index 3a90a8af24e1f..006cb75b90ff7 100644
--- a/packages/kbn-reporting/export_types/deprecated/printable_pdf.ts
+++ b/packages/kbn-reporting/export_types/deprecated/printable_pdf.ts
@@ -6,6 +6,11 @@
  * Side Public License, v 1.
  */
 
+import apm from 'elastic-apm-node';
+import { Observable, fromEventPattern, lastValueFrom, of, throwError } from 'rxjs';
+import { catchError, map, mergeMap, takeUntil, tap } from 'rxjs/operators';
+import { Writable } from 'stream';
+
 import type { LicenseType } from '@kbn/licensing-plugin/server';
 import {
   CancellationToken,
@@ -18,23 +23,18 @@ import {
   REPORTING_REDIRECT_LOCATOR_STORE_KEY,
   REPORTING_TRANSACTION_TYPE,
 } from '@kbn/reporting-common';
-import { Writable } from 'stream';
-import apm from 'elastic-apm-node';
-import { catchError, map, mergeMap, takeUntil, tap } from 'rxjs/operators';
-import { fromEventPattern, lastValueFrom, Observable, of, throwError } from 'rxjs';
-import type { PdfScreenshotOptions, PdfScreenshotResult } from '@kbn/screenshotting-plugin/server';
-import { LayoutParams } from '@kbn/screenshotting-plugin/common';
+import { BaseParams, TaskRunResult } from '@kbn/reporting-common/types';
 import {
-  decryptJobHeaders,
   ExportType,
+  TaskPayloadPDF,
+  decryptJobHeaders,
   generatePdfObservable,
   getCustomLogo,
   getFullUrls,
   validateUrls,
-  BaseParams,
-  TaskPayloadPDF,
 } from '@kbn/reporting-export-types-helpers-server';
-import type { TaskRunResult } from '@kbn/reporting-export-types-helpers-public';
+import { LayoutParams } from '@kbn/screenshotting-plugin/common';
+import type { PdfScreenshotOptions, PdfScreenshotResult } from '@kbn/screenshotting-plugin/server';
 
 interface BaseParamsPDF {
   layout: LayoutParams;
diff --git a/packages/kbn-reporting/export_types/png/png_v2.ts b/packages/kbn-reporting/export_types/png/png_v2.ts
index 3e5112c736327..5cb6c8d74e41f 100644
--- a/packages/kbn-reporting/export_types/png/png_v2.ts
+++ b/packages/kbn-reporting/export_types/png/png_v2.ts
@@ -44,7 +44,6 @@ import {
   JobParamsPNGV2,
   TaskPayloadPNGV2,
 } from '@kbn/reporting-export-types-helpers-server';
-import type { TaskRunResult } from '@kbn/reporting-export-types-helpers-public';
 
 export class PngExportType extends ExportType<JobParamsPNGV2, TaskPayloadPNGV2> {
   id = PNG_REPORT_TYPE_V2;
diff --git a/packages/kbn-reporting/export_types/printable_pdf_v2/printable_pdf_v2.ts b/packages/kbn-reporting/export_types/printable_pdf_v2/printable_pdf_v2.ts
index b608bee49bd6e..1dac900cf1138 100644
--- a/packages/kbn-reporting/export_types/printable_pdf_v2/printable_pdf_v2.ts
+++ b/packages/kbn-reporting/export_types/printable_pdf_v2/printable_pdf_v2.ts
@@ -43,7 +43,6 @@ import {
   JobParamsPDFV2,
   TaskPayloadPDFV2,
 } from '@kbn/reporting-export-types-helpers-server';
-import type { TaskRunResult } from '@kbn/reporting-export-types-helpers-public';
 import { UrlOrUrlWithContext } from '@kbn/screenshotting-plugin/server/screenshots';
 
 export class PdfExportType extends ExportType<JobParamsPDFV2, TaskPayloadPDFV2> {
diff --git a/packages/kbn-reporting/export_types_helpers_public/constants.ts b/packages/kbn-reporting/export_types_helpers_public/constants.ts
index 1f1afb8b2e7bb..47b078d84eb09 100644
--- a/packages/kbn-reporting/export_types_helpers_public/constants.ts
+++ b/packages/kbn-reporting/export_types_helpers_public/constants.ts
@@ -7,7 +7,6 @@
  */
 
 import { SerializableRecord } from '@kbn/utility-types';
-import type { BaseParams } from '@kbn/reporting-export-types-helpers-server';
 
 export const CSV_SEARCHSOURCE_IMMEDIATE_TYPE = 'csv_searchsource_immediate';
 // Licenses
@@ -32,36 +31,3 @@ export interface LocatorParams<P extends SerializableRecord = SerializableRecord
    */
   params: P;
 }
-
-/**
- * Report job parameters that an application must return from its
- * getSharingData function.
- */
-export type BaseParamsV2 = BaseParams & {
-  locatorParams: LocatorParams[];
-};
-
-/**
- * @deprecated
- */
-export interface BasePayload extends BaseParams {
-  headers: string;
-  spaceId?: string;
-  isDeprecated?: boolean;
-}
-
-/**
- * Report job parameters, after they are processed in the request handler.
- */
-export interface BasePayloadV2 extends BaseParamsV2 {
-  headers: string;
-  spaceId?: string;
-  isDeprecated?: boolean;
-}
-
-type JobId = string;
-type DownloadLink = string;
-export type DownloadReportFn = (jobId: JobId) => DownloadLink;
-
-type ManagementLink = string;
-export type ManagementLinkFn = () => ManagementLink;
diff --git a/packages/kbn-reporting/export_types_helpers_public/index.ts b/packages/kbn-reporting/export_types_helpers_public/index.ts
index c380f375a5622..d8989abcc3d6f 100644
--- a/packages/kbn-reporting/export_types_helpers_public/index.ts
+++ b/packages/kbn-reporting/export_types_helpers_public/index.ts
@@ -7,4 +7,3 @@
  */
 
 export * from './constants';
-export * from './metrics';
diff --git a/packages/kbn-reporting/export_types_helpers_public/tsconfig.json b/packages/kbn-reporting/export_types_helpers_public/tsconfig.json
index db8ec3225b6da..3bf28b2b7b04c 100644
--- a/packages/kbn-reporting/export_types_helpers_public/tsconfig.json
+++ b/packages/kbn-reporting/export_types_helpers_public/tsconfig.json
@@ -17,6 +17,5 @@
   "kbn_references": [
     "@kbn/screenshotting-plugin",
     "@kbn/utility-types",
-    "@kbn/reporting-export-types-helpers-server",
   ]
 }
diff --git a/packages/kbn-reporting/export_types_helpers_server/export_type.ts b/packages/kbn-reporting/export_types_helpers_server/export_type.ts
index 93934046a0562..828e7bae57cd3 100644
--- a/packages/kbn-reporting/export_types_helpers_server/export_type.ts
+++ b/packages/kbn-reporting/export_types_helpers_server/export_type.ts
@@ -25,7 +25,7 @@ import { DEFAULT_SPACE_ID } from '@kbn/spaces-plugin/common';
 import type { SpacesPluginSetup } from '@kbn/spaces-plugin/server';
 import type { IClusterClient } from '@kbn/core-elasticsearch-server';
 import { CoreKibanaRequest } from '@kbn/core-http-router-server-internal';
-import { CreateJobFn, ReportingConfigType, ReportingServerInfo, RunTaskFn } from './types';
+import { CreateJobFn, ReportingServerInfo, RunTaskFn } from './types';
 
 export interface BaseExportTypeSetupDeps {
   basePath: Pick<IBasePath, 'set'>;
diff --git a/packages/kbn-reporting/export_types_helpers_server/generate_pdf.ts b/packages/kbn-reporting/export_types_helpers_server/generate_pdf.ts
index 6659ae2ed58d8..5703e16e48abc 100644
--- a/packages/kbn-reporting/export_types_helpers_server/generate_pdf.ts
+++ b/packages/kbn-reporting/export_types_helpers_server/generate_pdf.ts
@@ -6,15 +6,15 @@
  * Side Public License, v 1.
  */
 
-import type { PdfScreenshotOptions, PdfScreenshotResult } from '@kbn/screenshotting-plugin/server';
 import { Observable } from 'rxjs';
 import { mergeMap, tap } from 'rxjs/operators';
-import type { PdfMetrics } from '@kbn/reporting-export-types-helpers-public';
+
+import type { PdfScreenshotOptions, PdfScreenshotResult } from '@kbn/screenshotting-plugin/server';
 import { getTracker } from './pdf_tracker';
 
 interface PdfResult {
   buffer: Uint8Array | null;
-  metrics?: PdfMetrics;
+  metrics?: PdfScreenshotResult['metrics'];
   warnings: string[];
 }
 
diff --git a/packages/kbn-reporting/export_types_helpers_server/generate_pdf_v2.ts b/packages/kbn-reporting/export_types_helpers_server/generate_pdf_v2.ts
index c6efac063a2fe..d6a933c29abd4 100644
--- a/packages/kbn-reporting/export_types_helpers_server/generate_pdf_v2.ts
+++ b/packages/kbn-reporting/export_types_helpers_server/generate_pdf_v2.ts
@@ -10,15 +10,14 @@ import { mergeMap, tap } from 'rxjs/operators';
 import type { PdfScreenshotOptions, PdfScreenshotResult } from '@kbn/screenshotting-plugin/server';
 import { Observable } from 'rxjs';
 import type { UrlOrUrlWithContext } from '@kbn/screenshotting-plugin/server/screenshots';
-import { LocatorParams, ReportingConfigType } from '@kbn/reporting-common';
-import type { PdfMetrics } from '@kbn/reporting-export-types-helpers-public';
+import { LocatorParams } from '@kbn/reporting-common';
 import { ReportingServerInfo, TaskPayloadPDFV2 } from './types';
 import { getTracker } from './pdf_tracker';
 import { getFullRedirectAppUrl } from '.';
 
 interface PdfResult {
   buffer: Uint8Array | null;
-  metrics?: PdfMetrics;
+  metrics?: PdfScreenshotResult['metrics'];
   warnings: string[];
 }
 
diff --git a/packages/kbn-reporting/export_types_helpers_server/generate_png.ts b/packages/kbn-reporting/export_types_helpers_server/generate_png.ts
index e629170ee0072..d0ce9b9791690 100644
--- a/packages/kbn-reporting/export_types_helpers_server/generate_png.ts
+++ b/packages/kbn-reporting/export_types_helpers_server/generate_png.ts
@@ -7,16 +7,16 @@
  */
 
 import apm from 'elastic-apm-node';
-import type { Logger } from '@kbn/logging';
-import { finalize, map, tap } from 'rxjs/operators';
-import type { PngScreenshotOptions, PngScreenshotResult } from '@kbn/screenshotting-plugin/server';
 import { Observable } from 'rxjs';
-import type { PngMetrics } from '@kbn/reporting-export-types-helpers-public';
+import { finalize, map, tap } from 'rxjs/operators';
+
+import type { Logger } from '@kbn/logging';
 import { REPORTING_TRANSACTION_TYPE } from '@kbn/reporting-common/constants';
+import type { PngScreenshotOptions, PngScreenshotResult } from '@kbn/screenshotting-plugin/server';
 
 interface PngResult {
   buffer: Buffer;
-  metrics?: PngMetrics;
+  metrics?: PngScreenshotResult['metrics'];
   warnings: string[];
 }
 
diff --git a/packages/kbn-reporting/export_types_helpers_server/get_full_urls.test.ts b/packages/kbn-reporting/export_types_helpers_server/get_full_urls.test.ts
index 96d74dcf838ac..228152016d5cb 100644
--- a/packages/kbn-reporting/export_types_helpers_server/get_full_urls.test.ts
+++ b/packages/kbn-reporting/export_types_helpers_server/get_full_urls.test.ts
@@ -6,7 +6,6 @@
  * Side Public License, v 1.
  */
 
-import { ReportingConfigType } from '@kbn/reporting-common/schema';
 import { TaskPayloadPDF, ReportingServerInfo } from './types';
 import { getFullUrls } from './get_full_urls';
 
diff --git a/packages/kbn-reporting/export_types_helpers_server/get_full_urls.ts b/packages/kbn-reporting/export_types_helpers_server/get_full_urls.ts
index bd4bd7f556b65..726377d08325c 100644
--- a/packages/kbn-reporting/export_types_helpers_server/get_full_urls.ts
+++ b/packages/kbn-reporting/export_types_helpers_server/get_full_urls.ts
@@ -12,7 +12,7 @@ import {
   UrlWithParsedQuery,
   UrlWithStringQuery,
 } from 'url';
-import { ReportingConfigType, ReportingServerInfo, TaskPayloadPDF } from './types';
+import { ReportingServerInfo, TaskPayloadPDF } from './types';
 
 import { getAbsoluteUrlFactory } from './get_absolute_url';
 import { validateUrls } from './validate_urls';
diff --git a/packages/kbn-reporting/export_types_helpers_server/tsconfig.json b/packages/kbn-reporting/export_types_helpers_server/tsconfig.json
index fd9b2076c049e..e82c46d680444 100644
--- a/packages/kbn-reporting/export_types_helpers_server/tsconfig.json
+++ b/packages/kbn-reporting/export_types_helpers_server/tsconfig.json
@@ -36,6 +36,5 @@
     "@kbn/core-http-request-handler-context-server",
     "@kbn/utility-types",
     "@kbn/config-schema",
-    "@kbn/reporting-export-types-helpers-public",
   ]
 }
diff --git a/packages/kbn-reporting/export_types_helpers_server/types.ts b/packages/kbn-reporting/export_types_helpers_server/types.ts
index b49bc13273429..f51e5c3ce53dc 100644
--- a/packages/kbn-reporting/export_types_helpers_server/types.ts
+++ b/packages/kbn-reporting/export_types_helpers_server/types.ts
@@ -7,59 +7,16 @@
  */
 
 import { Writable } from 'stream';
-import type { SerializedSearchSourceFields } from '@kbn/data-plugin/common';
+import type {
+  BaseParams,
+  BaseParamsV2,
+  BasePayload,
+  BasePayloadV2,
+  TaskRunResult,
+} from '@kbn/reporting-common/types';
 import type { CustomRequestHandlerContext } from '@kbn/core-http-request-handler-context-server';
 import type { KibanaRequest } from '@kbn/core-http-server';
-import type { LocatorParams, ConfigSchema, CancellationToken } from '@kbn/reporting-common';
-import type { Ensure, SerializableRecord } from '@kbn/utility-types';
-import type { LayoutParams } from '@kbn/screenshotting-plugin/common';
-import type { TypeOf } from '@kbn/config-schema';
-import type { TaskRunResult } from '@kbn/reporting-export-types-helpers-public';
-
-/**
- * @deprecated
- */
-export type BaseParams = Ensure<
-  {
-    layout?: LayoutParams;
-    objectType: string;
-    title: string;
-    browserTimezone: string; // to format dates in the user's time zone
-    version: string; // to handle any state migrations
-  },
-  SerializableRecord
->;
-
-/**
- * Report job parameters that an application must return from its
- * getSharingData function.
- */
-export type BaseParamsV2 = BaseParams & {
-  locatorParams: LocatorParams[];
-};
-
-/**
- * @deprecated
- */
-export interface BasePayload extends BaseParams {
-  headers: string;
-  spaceId?: string;
-  isDeprecated?: boolean;
-}
-
-export type JobId = string;
-
-/**
- * Report job parameters, after they are processed in the request handler.
- */
-export interface BasePayloadV2 extends BaseParamsV2 {
-  headers: string;
-  spaceId?: string;
-  isDeprecated?: boolean;
-}
-
-// ExportType dependency types
-export type ReportingConfigType = TypeOf<typeof ConfigSchema>;
+import type { LocatorParams, CancellationToken } from '@kbn/reporting-common';
 
 /**
  * @internal
@@ -106,21 +63,25 @@ export type RunTaskFn<TaskPayloadType = BasePayload> = (
 export interface JobParamsDownloadCSV {
   browserTimezone: string;
   title: string;
-  searchSource: SerializedSearchSourceFields;
+  searchSource: unknown;
   columns?: string[];
 }
 
+interface Layout {
+  id?: 'preserve_layout' | 'print' | 'canvas';
+}
+
 /**
  * Structure of stored job data provided by create_job
  */
 export interface TaskPayloadPDF extends BasePayload {
-  layout: LayoutParams;
+  layout: Layout;
   forceNow?: string;
   objects: Array<{ relativeUrl: string }>;
 }
 
 interface BaseParamsPNG {
-  layout: LayoutParams;
+  layout: Layout;
   forceNow?: string;
   relativeUrl: string;
 }
@@ -135,7 +96,7 @@ export type JobParamsPNGDeprecated = BaseParamsPNG & BaseParams;
 export type TaskPayloadPNG = BaseParamsPNG & BasePayload;
 
 interface BaseParamsPDFV2 {
-  layout: LayoutParams;
+  layout: Layout;
 
   /**
    * This value is used to re-create the same visual state as when the report was requested as well as navigate to the correct page.
@@ -150,14 +111,14 @@ export type JobAppParamsPDFV2 = Omit<JobParamsPDFV2, 'browserTimezone' | 'versio
 
 // Job payload: structure of stored job data provided by create_job
 export interface TaskPayloadPDFV2 extends BasePayload, BaseParamsPDFV2 {
-  layout: LayoutParams;
+  layout: Layout;
   /**
    * The value of forceNow is injected server-side every time a given report is generated.
    */
   forceNow: string;
 }
 interface BaseParamsCSV {
-  searchSource: SerializedSearchSourceFields;
+  searchSource: unknown;
   columns?: string[];
 }
 
@@ -180,7 +141,7 @@ export type JobParamsCsvFromSavedObject = CsvFromSavedObjectBase &
 export type TaskPayloadCsvFromSavedObject = CsvFromSavedObjectBase & BasePayloadV2;
 
 export interface JobParamsPNGV2 extends BaseParams {
-  layout: LayoutParams;
+  layout: Layout;
   /**
    * This value is used to re-create the same visual state as when the report was requested as well as navigate to the correct page.
    */
@@ -189,7 +150,7 @@ export interface JobParamsPNGV2 extends BaseParams {
 
 // Job payload: structure of stored job data provided by create_job
 export interface TaskPayloadPNGV2 extends BasePayload {
-  layout: LayoutParams;
+  layout: Layout;
   forceNow: string;
   /**
    * Even though we only ever handle one locator for a PNG, we store it as an array for consistency with how PDFs are stored
diff --git a/x-pack/examples/reporting_example/public/containers/main.tsx b/x-pack/examples/reporting_example/public/containers/main.tsx
index e3312467abf1a..634b10fae04fe 100644
--- a/x-pack/examples/reporting_example/public/containers/main.tsx
+++ b/x-pack/examples/reporting_example/public/containers/main.tsx
@@ -34,10 +34,7 @@ import * as Rx from 'rxjs';
 import { takeWhile } from 'rxjs/operators';
 import type { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/public';
 import type { ReportingStart } from '@kbn/reporting-plugin/public';
-import type { JobParamsPNGV2 } from '@kbn/reporting-export-types-png';
-import type { JobParamsPDFDeprecated } from '@kbn/reporting-export-types-deprecated';
 import type { LocatorParams } from '@kbn/reporting-common/url';
-import type { JobParamsPDFV2 } from '@kbn/reporting-export-types-helpers-server';
 import { REPORTING_EXAMPLE_LOCATOR_ID } from '../../common';
 import { useApplicationContext } from '../application_context';
 import { ROUTES } from '../constants';
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/share_menu/utils.ts b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/utils.ts
index a3726355aa6bb..ecd63fbb437ac 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/share_menu/utils.ts
+++ b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/utils.ts
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import type { JobAppParamsPDFV2 } from '@kbn/reporting-export-types-helpers-server';
 import type { RedirectOptions } from '@kbn/share-plugin/public';
 import { CanvasAppLocatorParams, CANVAS_APP_LOCATOR } from '../../../../common/locator';
 import { CanvasWorkpad } from '../../../../types';
diff --git a/x-pack/plugins/reporting/common/types.ts b/x-pack/plugins/reporting/common/types.ts
index 1df9a5fbc43cc..d541e2ed203d2 100644
--- a/x-pack/plugins/reporting/common/types.ts
+++ b/x-pack/plugins/reporting/common/types.ts
@@ -7,11 +7,11 @@
 
 import type {
   BasePayload,
+  ReportOutput,
   TaskRunMetrics,
   TaskRunResult,
-} from '@kbn/reporting-export-types-helpers-public';
-import type { PdfScreenshotResult, PngScreenshotResult } from '@kbn/screenshotting-plugin/server';
-import { JobId } from './constants';
+} from '@kbn/reporting-common/types';
+import type { JobId } from './constants';
 
 export interface ReportDocumentHead {
   _id: string;
@@ -20,15 +20,6 @@ export interface ReportDocumentHead {
   _primary_term: number;
 }
 
-export interface ReportOutput extends TaskRunResult {
-  content: string | null;
-  size: number;
-}
-
-export type PngMetrics = PngScreenshotResult['metrics'];
-
-export type PdfMetrics = PdfScreenshotResult['metrics'];
-
 export interface ReportFields {
   queue_time_ms?: number[]; // runtime field: started_at - created_at
   execution_time_ms?: number[]; // runtime field: completed_at - started_at
diff --git a/x-pack/plugins/reporting/common/url.ts b/x-pack/plugins/reporting/common/url.ts
deleted file mode 100644
index 70ebf33116ebd..0000000000000
--- a/x-pack/plugins/reporting/common/url.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { LocatorParams } from '@kbn/reporting-export-types-helpers-public';
-
-type Url = string;
-type UrlLocatorTuple = [url: Url, locatorParams: LocatorParams];
-
-export type UrlOrUrlLocatorTuple = Url | UrlLocatorTuple;
diff --git a/x-pack/plugins/reporting/public/lib/job.tsx b/x-pack/plugins/reporting/public/lib/job.tsx
index 13478d5597907..cc240f390a3eb 100644
--- a/x-pack/plugins/reporting/public/lib/job.tsx
+++ b/x-pack/plugins/reporting/public/lib/job.tsx
@@ -8,7 +8,7 @@
 import { EuiText, EuiTextColor } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import moment from 'moment';
-import type { BaseParamsV2, TaskRunResult } from '@kbn/reporting-export-types-helpers-public';
+import type { BaseParamsV2 } from '@kbn/reporting-export-types-helpers-public';
 import React from 'react';
 import { JobId, JobTypes, JOB_STATUSES } from '../../common/constants';
 import type { ReportApiJSON, ReportFields, ReportOutput, ReportSource } from '../../common/types';
@@ -17,6 +17,23 @@ const { COMPLETED, FAILED, PENDING, PROCESSING, WARNINGS } = JOB_STATUSES;
 
 type ReportPayload = ReportSource['payload'];
 
+interface TaskRunResult {
+  content_type: string | null;
+  csv_contains_formulas?: boolean;
+  max_size_reached?: boolean;
+  warnings?: string[];
+  metrics?: unknown;
+  /**
+   * When running a report task we may finish with warnings that were triggered
+   * by an error. We can pass the error code via the task run result to the
+   * task runner so that it can be recorded for telemetry.
+   *
+   * Alternatively, this field can be populated in the event that the task does
+   * not complete in the task runner's error handler.
+   */
+  error_code?: string;
+}
+
 /*
  * This class represents a report job for the UI
  * It can be instantiated with ReportApiJSON: the response data format for the report job APIs
diff --git a/x-pack/plugins/reporting/public/lib/reporting_api_client/reporting_api_client.ts b/x-pack/plugins/reporting/public/lib/reporting_api_client/reporting_api_client.ts
index 1b20ca4283784..3e719199f43dd 100644
--- a/x-pack/plugins/reporting/public/lib/reporting_api_client/reporting_api_client.ts
+++ b/x-pack/plugins/reporting/public/lib/reporting_api_client/reporting_api_client.ts
@@ -11,8 +11,6 @@ import { i18n } from '@kbn/i18n';
 import rison from '@kbn/rison';
 import moment from 'moment';
 import { stringify } from 'query-string';
-import { ManagementLinkFn } from '@kbn/reporting-export-types-helpers-public';
-import type { BaseParams } from '@kbn/reporting-export-types-helpers-server';
 import { buildKibanaPath } from '@kbn/reporting-common';
 import {
   getRedirectAppPath,
diff --git a/x-pack/plugins/reporting/public/notifier/job_failure.tsx b/x-pack/plugins/reporting/public/notifier/job_failure.tsx
index 38d3e83beea11..13e283efbe12c 100644
--- a/x-pack/plugins/reporting/public/notifier/job_failure.tsx
+++ b/x-pack/plugins/reporting/public/notifier/job_failure.tsx
@@ -11,7 +11,6 @@ import React from 'react';
 import { DocLinksStart, ThemeServiceStart, ToastInput } from '@kbn/core/public';
 import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import * as errors from '@kbn/reporting-common/errors';
-import { ManagementLinkFn } from '@kbn/reporting-export-types-helpers-public';
 import type { JobSummary } from '../../common/types';
 import { sharedI18nTexts } from '../shared_i18n_texts';
 
diff --git a/x-pack/plugins/reporting/public/share_context_menu/reporting_panel_content/reporting_panel_content.tsx b/x-pack/plugins/reporting/public/share_context_menu/reporting_panel_content/reporting_panel_content.tsx
index 54f3a799e3d4e..e5db2122c78e5 100644
--- a/x-pack/plugins/reporting/public/share_context_menu/reporting_panel_content/reporting_panel_content.tsx
+++ b/x-pack/plugins/reporting/public/share_context_menu/reporting_panel_content/reporting_panel_content.tsx
@@ -5,6 +5,8 @@
  * 2.0.
  */
 
+import url from 'url';
+
 import {
   EuiAccordion,
   EuiButton,
@@ -15,20 +17,12 @@ import {
   EuiSpacer,
   EuiText,
 } from '@elastic/eui';
+import { IUiSettingsClient, ThemeServiceSetup, ToastsSetup } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n-react';
-import React, { Component, ReactElement } from 'react';
-import { IUiSettingsClient, ThemeServiceSetup, ToastsSetup } from '@kbn/core/public';
-import url from 'url';
 import { toMountPoint } from '@kbn/kibana-react-plugin/public';
-import type { BaseParams } from '@kbn/reporting-export-types-helpers-server';
-import {
-  PDF_REPORT_TYPE_V2,
-  PDF_REPORT_TYPE,
-  CSV_REPORT_TYPE,
-  PNG_REPORT_TYPE_V2,
-  PNG_REPORT_TYPE,
-} from '@kbn/reporting-common';
+import React, { Component, ReactElement } from 'react';
+
 import { ReportingAPIClient } from '../../lib/reporting_api_client';
 import { ErrorUnsavedWorkPanel, ErrorUrlTooLongPanel } from './components';
 import { getMaxUrlLength } from './constants';
diff --git a/x-pack/plugins/reporting/server/config/create_config.ts b/x-pack/plugins/reporting/server/config/create_config.ts
index 58af92ad0b705..d0a7770237195 100644
--- a/x-pack/plugins/reporting/server/config/create_config.ts
+++ b/x-pack/plugins/reporting/server/config/create_config.ts
@@ -7,9 +7,10 @@
 
 import crypto from 'crypto';
 import ipaddr from 'ipaddr.js';
-import type { CoreSetup, Logger } from '@kbn/core/server';
 import { sum } from 'lodash';
-import type { ReportingConfigType } from '@kbn/reporting-common/schema';
+
+import type { CoreSetup, Logger } from '@kbn/core/server';
+import { ReportingConfigType } from '.';
 
 /*
  * Set up dynamic config defaults
diff --git a/x-pack/plugins/reporting/server/config/index.ts b/x-pack/plugins/reporting/server/config/index.ts
index 2823a1ed3226f..7c2f6030965c3 100644
--- a/x-pack/plugins/reporting/server/config/index.ts
+++ b/x-pack/plugins/reporting/server/config/index.ts
@@ -5,10 +5,12 @@
  * 2.0.
  */
 
+import { get } from 'lodash';
+
 import { PluginConfigDescriptor } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
-import { get } from 'lodash';
-import { ConfigSchema, ReportingConfigType } from '@kbn/reporting-common';
+
+import { ConfigSchema, ReportingConfigType } from './schema';
 
 export const config: PluginConfigDescriptor<ReportingConfigType> = {
   exposeToBrowser: { poll: true, roles: true, export_types: true, statefulSettings: true },
diff --git a/x-pack/plugins/reporting/server/config/schema.test.ts b/x-pack/plugins/reporting/server/config/schema.test.ts
index 0814a435e88bc..f30be71db09ea 100644
--- a/x-pack/plugins/reporting/server/config/schema.test.ts
+++ b/x-pack/plugins/reporting/server/config/schema.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ConfigSchema } from '@kbn/reporting-common';
+import { ConfigSchema } from './schema';
 
 describe('Reporting Config Schema', () => {
   it(`context {"dev":false,"dist":false} produces correct config`, () => {
diff --git a/packages/kbn-reporting/common/schema.ts b/x-pack/plugins/reporting/server/config/schema.ts
similarity index 96%
rename from packages/kbn-reporting/common/schema.ts
rename to x-pack/plugins/reporting/server/config/schema.ts
index f7c910d9c425b..ff0cda89a693b 100644
--- a/packages/kbn-reporting/common/schema.ts
+++ b/x-pack/plugins/reporting/server/config/schema.ts
@@ -1,9 +1,8 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
  */
 
 import { ByteSizeValue, offeringBasedSchema, schema, TypeOf } from '@kbn/config-schema';
diff --git a/x-pack/plugins/reporting/server/lib/tasks/execute_report.test.ts b/x-pack/plugins/reporting/server/lib/tasks/execute_report.test.ts
index 48729920b0bce..99a7b5adcc490 100644
--- a/x-pack/plugins/reporting/server/lib/tasks/execute_report.test.ts
+++ b/x-pack/plugins/reporting/server/lib/tasks/execute_report.test.ts
@@ -6,10 +6,11 @@
  */
 
 import { loggingSystemMock } from '@kbn/core/server/mocks';
-import { ExportType } from '@kbn/reporting-export-types-helpers-server';
-import { KibanaShuttingDownError } from '@kbn/generate-csv/src/errors';
+import { KibanaShuttingDownError } from '@kbn/reporting-common';
+import type { ExportType } from '@kbn/reporting-export-types-helpers-server';
 import type { RunContext } from '@kbn/task-manager-plugin/server';
 import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
+
 import { ExecuteReportTask } from '.';
 import type { ReportingCore } from '../..';
 import type { ReportingConfigType } from '../../config';
diff --git a/x-pack/plugins/reporting/server/lib/tasks/execute_report.ts b/x-pack/plugins/reporting/server/lib/tasks/execute_report.ts
index 318fbec44a9b3..0fa21b17c6d64 100644
--- a/x-pack/plugins/reporting/server/lib/tasks/execute_report.ts
+++ b/x-pack/plugins/reporting/server/lib/tasks/execute_report.ts
@@ -7,33 +7,34 @@
 
 import { UpdateResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type { Logger } from '@kbn/core/server';
+import {
+  CancellationToken,
+  KibanaShuttingDownError,
+  QueueTimeoutError,
+  ReportingError,
+} from '@kbn/reporting-common';
+import type {
+  RunContext,
+  TaskManagerStartContract,
+  TaskRunCreatorFunction,
+} from '@kbn/task-manager-plugin/server';
 import moment from 'moment';
 import * as Rx from 'rxjs';
 import { timeout } from 'rxjs/operators';
 import { Writable } from 'stream';
 import { finished } from 'stream/promises';
 import { setTimeout } from 'timers/promises';
-import type {
-  RunContext,
-  TaskManagerStartContract,
-  TaskRunCreatorFunction,
-} from '@kbn/task-manager-plugin/server';
-import { CancellationToken, TaskRunResult } from '@kbn/reporting-common';
-import {
-  QueueTimeoutError,
-  ReportingError,
-  KibanaShuttingDownError,
-} from '@kbn/generate-csv/src/errors';
-import { mapToReportingError } from '../../../common/errors/map_to_reporting_error';
+
+import { REPORTING_EXECUTE_TYPE, ReportTaskParams, ReportingTask, ReportingTaskStatus } from '.';
 import { ExportTypesRegistry, getContentStream } from '..';
 import type { ReportingCore } from '../..';
+import { mapToReportingError } from '../../../common/errors/map_to_reporting_error';
 import { durationToNumber, numberToDuration } from '../../../common/schema_utils';
-import type { ReportOutput } from '../../../common/types';
+import type { ReportOutput, TaskRunResult } from '../../../common/types';
 import type { ReportingConfigType } from '../../config';
 import type { ReportDocument, ReportingStore } from '../store';
 import { Report, SavedReport } from '../store';
 import type { ReportFailedFields, ReportProcessingFields } from '../store/store';
-import { ReportingTask, ReportingTaskStatus, REPORTING_EXECUTE_TYPE, ReportTaskParams } from '.';
 import { errorLogger } from './error_logger';
 
 type CompletedReportOutput = Omit<ReportOutput, 'content'>;