diff --git a/lib/src/generator/dartdoc_generator_backend.dart b/lib/src/generator/dartdoc_generator_backend.dart
index c98dacb7df..315cab16f6 100644
--- a/lib/src/generator/dartdoc_generator_backend.dart
+++ b/lib/src/generator/dartdoc_generator_backend.dart
@@ -9,9 +9,6 @@ import 'package:dartdoc/src/generator/generator_utils.dart' as generator_util;
 import 'package:dartdoc/src/generator/template_data.dart';
 import 'package:dartdoc/src/generator/templates.dart';
 import 'package:dartdoc/src/generator/templates.renderers.dart';
-import 'package:dartdoc/src/model/model.dart';
-import 'package:dartdoc/src/model/package.dart';
-import 'package:dartdoc/src/model/package_graph.dart';
 import 'package:dartdoc/src/mustachio/renderer_base.dart';
 import 'package:dartdoc/src/warnings.dart';
 import 'package:path/path.dart' as path show Context;
diff --git a/lib/src/logging.dart b/lib/src/logging.dart
index 5002318bed..bdb7e8fe0e 100644
--- a/lib/src/logging.dart
+++ b/lib/src/logging.dart
@@ -7,8 +7,8 @@ import 'dart:io' show stderr, stdout;
 
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:cli_util/cli_logging.dart' show Ansi;
-import 'package:dartdoc/dartdoc.dart';
 import 'package:dartdoc/src/dartdoc_options.dart';
+import 'package:dartdoc/src/package_meta.dart';
 import 'package:logging/logging.dart';
 
 final _logger = Logger('dartdoc');
diff --git a/lib/src/model/dynamic.dart b/lib/src/model/dynamic.dart
index 32a9d3be84..49e109834e 100644
--- a/lib/src/model/dynamic.dart
+++ b/lib/src/model/dynamic.dart
@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer/dart/element/element.dart';
+import 'package:dartdoc/src/element_type.dart';
 import 'package:dartdoc/src/model/comment_referable.dart';
-import 'package:dartdoc/dartdoc.dart';
 import 'package:dartdoc/src/model/model.dart';
 
 class Dynamic extends ModelElement {
diff --git a/lib/src/model/model_element.dart b/lib/src/model/model_element.dart
index 4b65be4283..ef277b0f9b 100644
--- a/lib/src/model/model_element.dart
+++ b/lib/src/model/model_element.dart
@@ -17,7 +17,6 @@ import 'package:collection/collection.dart';
 import 'package:dartdoc/src/dartdoc_options.dart';
 import 'package:dartdoc/src/model/comment_referable.dart';
 import 'package:dartdoc/src/model/annotation.dart';
-import 'package:dartdoc/src/model/documentation_comment.dart';
 import 'package:dartdoc/src/model/feature.dart';
 import 'package:dartdoc/src/model/feature_set.dart';
 import 'package:dartdoc/src/model/model.dart';
diff --git a/lib/src/model_utils.dart b/lib/src/model_utils.dart
index f711e9f143..44cf421b8a 100644
--- a/lib/src/model_utils.dart
+++ b/lib/src/model_utils.dart
@@ -12,7 +12,6 @@ import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/src/dart/ast/utilities.dart';
 import 'package:dartdoc/dartdoc.dart';
-import 'package:dartdoc/src/model/model.dart';
 import 'package:glob/glob.dart';
 import 'package:path/path.dart' as path;
 
diff --git a/test/dartdoc_options_test.dart b/test/dartdoc_options_test.dart
index 3f73c5fdb2..4b4a4cd721 100644
--- a/test/dartdoc_options_test.dart
+++ b/test/dartdoc_options_test.dart
@@ -5,9 +5,9 @@
 library dartdoc.options_test;
 
 import 'package:analyzer/file_system/file_system.dart';
-import 'package:dartdoc/dartdoc.dart';
 import 'package:dartdoc/src/dartdoc_options.dart';
 import 'package:dartdoc/src/io_utils.dart';
+import 'package:dartdoc/src/package_meta.dart';
 import 'package:path/path.dart' as path;
 import 'package:test/test.dart';
 import 'package:yaml/yaml.dart';
diff --git a/test/end2end/dartdoc_test.dart b/test/end2end/dartdoc_test.dart
index 28480e7348..657da8bf75 100644
--- a/test/end2end/dartdoc_test.dart
+++ b/test/end2end/dartdoc_test.dart
@@ -12,7 +12,6 @@ import 'package:dartdoc/dartdoc.dart';
 import 'package:dartdoc/options.dart';
 import 'package:dartdoc/src/io_utils.dart';
 import 'package:dartdoc/src/logging.dart';
-import 'package:dartdoc/src/model/model.dart';
 import 'package:dartdoc/src/warnings.dart';
 import 'package:path/path.dart' as path;
 import 'package:test/test.dart';
diff --git a/test/end2end/model_special_cases_test.dart b/test/end2end/model_special_cases_test.dart
index 668814120f..340db61f24 100644
--- a/test/end2end/model_special_cases_test.dart
+++ b/test/end2end/model_special_cases_test.dart
@@ -11,7 +11,7 @@ library dartdoc.model_special_cases_test;
 import 'dart:io';
 
 import 'package:async/async.dart';
-import 'package:dartdoc/dartdoc.dart';
+import 'package:dartdoc/src/element_type.dart';
 import 'package:dartdoc/src/model/model.dart';
 import 'package:dartdoc/src/package_config_provider.dart';
 import 'package:dartdoc/src/package_meta.dart';
diff --git a/test/end2end/model_test.dart b/test/end2end/model_test.dart
index af97bc37af..20f75990b8 100644
--- a/test/end2end/model_test.dart
+++ b/test/end2end/model_test.dart
@@ -7,9 +7,12 @@ library dartdoc.model_test;
 import 'dart:io';
 
 import 'package:async/async.dart';
-import 'package:dartdoc/dartdoc.dart';
+import 'package:dartdoc/src/element_type.dart';
+//import 'package:dartdoc/dartdoc.dart';
 import 'package:dartdoc/src/model/feature.dart';
 import 'package:dartdoc/src/model/model.dart';
+import 'package:dartdoc/src/package_config_provider.dart';
+import 'package:dartdoc/src/package_meta.dart';
 import 'package:dartdoc/src/render/category_renderer.dart';
 import 'package:dartdoc/src/render/enum_field_renderer.dart';
 import 'package:dartdoc/src/render/model_element_renderer.dart';
diff --git a/test/html_generator_test.dart b/test/html_generator_test.dart
index e8559b9af5..322fb2ced0 100644
--- a/test/html_generator_test.dart
+++ b/test/html_generator_test.dart
@@ -10,8 +10,6 @@ import 'package:dartdoc/src/generator/html_generator.dart';
 import 'package:dartdoc/src/generator/html_resources.g.dart';
 import 'package:dartdoc/src/generator/resource_loader.dart';
 import 'package:dartdoc/src/generator/templates.dart';
-import 'package:dartdoc/src/package_config_provider.dart';
-import 'package:dartdoc/src/package_meta.dart';
 import 'package:dartdoc/src/warnings.dart';
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
diff --git a/test/src/utils.dart b/test/src/utils.dart
index 0f70e209b0..22ab9705f9 100644
--- a/test/src/utils.dart
+++ b/test/src/utils.dart
@@ -7,7 +7,9 @@ library test_utils;
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/memory_file_system.dart';
 import 'package:analyzer/src/test_utilities/mock_sdk.dart';
-import 'package:dartdoc/dartdoc.dart';
+import 'package:dartdoc/src/dartdoc_options.dart';
+import 'package:dartdoc/src/model/package_builder.dart';
+import 'package:dartdoc/src/model/package_graph.dart';
 import 'package:dartdoc/src/package_config_provider.dart';
 import 'package:dartdoc/src/package_meta.dart';
 
diff --git a/test/tool_runner_test.dart b/test/tool_runner_test.dart
index e7b0d9681e..f49af7840e 100644
--- a/test/tool_runner_test.dart
+++ b/test/tool_runner_test.dart
@@ -6,8 +6,8 @@ library dartdoc.model_test;
 
 import 'dart:io';
 
-import 'package:dartdoc/dartdoc.dart';
 import 'package:dartdoc/src/dartdoc_options.dart';
+import 'package:dartdoc/src/package_meta.dart';
 import 'package:dartdoc/src/tool_runner.dart';
 import 'package:path/path.dart' as path;
 import 'package:test/test.dart';