diff --git a/.eslintrc.js b/.eslintrc.js
index 8a9d4da6178e90..1b2459f196efd0 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -247,6 +247,7 @@ module.exports = {
                   '!x-pack/test/**/*',
                   '(src|x-pack)/plugins/**/(public|server)/**/*',
                   'src/core/(public|server)/**/*',
+                  'examples/**/*',
                 ],
                 from: [
                   'src/core/public/**/*',
@@ -283,11 +284,15 @@ module.exports = {
                   'x-pack/legacy/plugins/**/*',
                   '!x-pack/legacy/plugins/*/server/**/*',
                   '!x-pack/legacy/plugins/*/index.{js,ts,tsx}',
+
+                  'examples/**/*',
+                  '!examples/**/server/**/*',
                 ],
                 from: [
                   'src/core/server',
                   'src/core/server/**/*',
                   '(src|x-pack)/plugins/*/server/**/*',
+                  'examples/**/server/**/*',
                 ],
                 errorMessage:
                   'Server modules cannot be imported into client modules or shared modules.',
diff --git a/examples/demo_search/server/plugin.ts b/examples/demo_search/server/plugin.ts
index 23c82225563c89..653aa217717fa2 100644
--- a/examples/demo_search/server/plugin.ts
+++ b/examples/demo_search/server/plugin.ts
@@ -18,7 +18,7 @@
  */
 
 import { Plugin, CoreSetup, PluginInitializerContext } from 'kibana/server';
-import { DataPluginSetup } from 'src/plugins/data/server/plugin';
+import { PluginSetup as DataPluginSetup } from 'src/plugins/data/server';
 import { demoSearchStrategyProvider } from './demo_search_strategy';
 import { DEMO_SEARCH_STRATEGY, IDemoRequest, IDemoResponse } from '../common';
 
diff --git a/src/plugins/data/server/index.ts b/src/plugins/data/server/index.ts
index 8194e9a6c847e4..3cd088744a4391 100644
--- a/src/plugins/data/server/index.ts
+++ b/src/plugins/data/server/index.ts
@@ -18,7 +18,7 @@
  */
 
 import { PluginInitializerContext } from '../../../core/server';
-import { DataServerPlugin } from './plugin';
+import { DataServerPlugin, DataPluginSetup } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
   return new DataServerPlugin(initializerContext);
@@ -93,4 +93,4 @@ export {
   getKbnTypeNames,
 } from '../common';
 
-export { DataServerPlugin as Plugin };
+export { DataServerPlugin as Plugin, DataPluginSetup as PluginSetup };