diff --git a/lib/browser/progress.js b/lib/browser/progress.js
index 553fc6eb56..3838cdc0ed 100644
--- a/lib/browser/progress.js
+++ b/lib/browser/progress.js
@@ -1,5 +1,9 @@
 'use strict';
 
+/**
+ @module Progress
+*/
+
 /**
  * Expose `Progress`.
  */
diff --git a/lib/cli/collect-files.js b/lib/cli/collect-files.js
index 5dc5e1fc99..551d5138e4 100644
--- a/lib/cli/collect-files.js
+++ b/lib/cli/collect-files.js
@@ -81,6 +81,7 @@ module.exports = ({ignore, extension, file, recursive, sort, spec} = {}) => {
 
 /**
  * An object to configure how Mocha gathers test files
+ * @private
  * @typedef {Object} FileCollectionOptions
  * @property {string[]} extension - File extensions to use
  * @property {string[]} spec - Files, dirs, globs to run
diff --git a/lib/interfaces/common.js b/lib/interfaces/common.js
index 3c171ef8d7..663948d7ef 100644
--- a/lib/interfaces/common.js
+++ b/lib/interfaces/common.js
@@ -1,5 +1,9 @@
 'use strict';
 
+/**
+ @module common
+*/
+
 var Suite = require('../suite');
 var errors = require('../errors');
 var createMissingArgumentError = errors.createMissingArgumentError;
@@ -9,6 +13,7 @@ var createForbiddenExclusivityError = errors.createForbiddenExclusivityError;
 /**
  * Functions common to more than one interface.
  *
+ * @private
  * @param {Suite[]} suites
  * @param {Context} context
  * @param {Mocha} mocha
diff --git a/lib/mocha.js b/lib/mocha.js
index 8aabcb8762..ee76ba1d50 100644
--- a/lib/mocha.js
+++ b/lib/mocha.js
@@ -35,23 +35,28 @@ exports = module.exports = Mocha;
 /**
  * A Mocha instance is a finite state machine.
  * These are the states it can be in.
+ * @private
  */
 var mochaStates = utils.defineConstants({
   /**
    * Initial state of the mocha instance
+   * @private
    */
   INIT: 'init',
   /**
    * Mocha instance is running tests
+   * @private
    */
   RUNNING: 'running',
   /**
    * Mocha instance is done running tests and references to test functions and hooks are cleaned.
    * You can reset this state by unloading the test files.
+   * @private
    */
   REFERENCES_CLEANED: 'referencesCleaned',
   /**
    * Mocha instance is disposed and can no longer be used.
+   * @private
    */
   DISPOSED: 'disposed'
 });
@@ -67,6 +72,7 @@ if (!utils.isBrowser() && typeof module.paths !== 'undefined') {
 
 /**
  * Expose internals.
+ * @private
  */
 
 exports.utils = utils;
@@ -921,6 +927,7 @@ Object.defineProperty(Mocha.prototype, 'version', {
 /**
  * Callback to be invoked when test execution is complete.
  *
+ * @private
  * @callback DoneCB
  * @param {number} failures - Number of failures that occurred.
  */
@@ -1091,6 +1098,7 @@ Mocha.prototype.lazyLoadFiles = function lazyLoadFiles(enable) {
 
 /**
  * An alternative way to define root hooks that works with parallel runs.
+ * @private
  * @typedef {Object} MochaRootHookObject
  * @property {Function|Function[]} [beforeAll] - "Before all" hook(s)
  * @property {Function|Function[]} [beforeEach] - "Before each" hook(s)
@@ -1100,6 +1108,7 @@ Mocha.prototype.lazyLoadFiles = function lazyLoadFiles(enable) {
 
 /**
  * An function that returns a {@link MochaRootHookObject}, either sync or async.
+ * @private
  * @callback MochaRootHookFunction
  * @returns {MochaRootHookObject|Promise<MochaRootHookObject>}
  */
diff --git a/lib/nodejs/parallel-buffered-runner.js b/lib/nodejs/parallel-buffered-runner.js
index d31929804a..ee8635ab98 100644
--- a/lib/nodejs/parallel-buffered-runner.js
+++ b/lib/nodejs/parallel-buffered-runner.js
@@ -281,12 +281,14 @@ module.exports = ParallelBufferedRunner;
 
 /**
  * Listener function intended to be bound to `Process.SIGINT` event
+ * @private
  * @callback SigIntListener
  * @returns {Promise<void>}
  */
 
 /**
  * A function accepting a test file path and returning the results of a test run
+ * @private
  * @callback FileRunner
  * @param {string} filename - File to run
  * @returns {Promise<SerializedWorkerResult>}
diff --git a/lib/nodejs/serializer.js b/lib/nodejs/serializer.js
index dae366ce79..ac95bdc344 100644
--- a/lib/nodejs/serializer.js
+++ b/lib/nodejs/serializer.js
@@ -387,6 +387,7 @@ exports.SerializableWorkerResult = SerializableWorkerResult;
 /**
  * The result of calling `SerializableEvent.serialize`, as received
  * by the deserializer.
+ * @private
  * @typedef {Object} SerializedEvent
  * @property {object?} data - Optional serialized data
  * @property {object?} error - Optional serialized `Error`
@@ -395,6 +396,7 @@ exports.SerializableWorkerResult = SerializableWorkerResult;
 /**
  * The result of calling `SerializableWorkerResult.serialize` as received
  * by the deserializer.
+ * @private
  * @typedef {Object} SerializedWorkerResult
  * @property {number} failureCount - Number of failures
  * @property {SerializedEvent[]} events - Serialized events
diff --git a/lib/pending.js b/lib/pending.js
index bb9a505337..cf9cc84a0e 100644
--- a/lib/pending.js
+++ b/lib/pending.js
@@ -1,5 +1,9 @@
 'use strict';
 
+/**
+ @module Pending
+*/
+
 module.exports = Pending;
 
 /**
diff --git a/lib/runnable.js b/lib/runnable.js
index 342152c3c2..e1de63df47 100644
--- a/lib/runnable.js
+++ b/lib/runnable.js
@@ -1,5 +1,9 @@
 'use strict';
 
+/**
+ @module Runnable
+*/
+
 var EventEmitter = require('events').EventEmitter;
 var Pending = require('./pending');
 var debug = require('debug')('mocha:runnable');
diff --git a/lib/runner.js b/lib/runner.js
index 22e7bb91d6..4b6e067c5c 100644
--- a/lib/runner.js
+++ b/lib/runner.js
@@ -1,5 +1,9 @@
 'use strict';
 
+/**
+ @module Runner
+*/
+
 /**
  * Module dependencies.
  */
diff --git a/lib/suite.js b/lib/suite.js
index 24e6dd344e..d7a139bbde 100644
--- a/lib/suite.js
+++ b/lib/suite.js
@@ -1,5 +1,9 @@
 'use strict';
 
+/**
+ @module Suite
+*/
+
 /**
  * Module dependencies.
  */