12 files changed, 0 insertions, 53 deletions
diff --git a/src/mongo/db/instance.cpp b/src/mongo/db/instance.cpp
index c596ca82d47..40bb5800afc 100644
--- a/src/mongo/db/instance.cpp
+++ b/src/mongo/db/instance.cpp
@@ -87,7 +87,6 @@
 #include "mongo/util/exit.h"
 #include "mongo/util/fail_point_service.h"
 #include "mongo/util/gcov.h"
-#include "mongo/util/goodies.h"
 #include "mongo/util/log.h"
 #include "mongo/util/mongoutils/str.h"
 #include "mongo/util/quick_exit.h"
diff --git a/src/mongo/db/introspect.cpp b/src/mongo/db/introspect.cpp
index e4483e904f6..f7b430ffd44 100644
--- a/src/mongo/db/introspect.cpp
+++ b/src/mongo/db/introspect.cpp
@@ -42,7 +42,6 @@
 #include "mongo/db/jsobj.h"
 #include "mongo/db/storage_options.h"
 #include "mongo/db/catalog/collection.h"
-#include "mongo/util/goodies.h"
 #include "mongo/util/log.h"
 
 namespace mongo {
diff --git a/src/mongo/db/sorter/sorter.cpp b/src/mongo/db/sorter/sorter.cpp
index 5935e8d107e..bb862df1626 100644
--- a/src/mongo/db/sorter/sorter.cpp
+++ b/src/mongo/db/sorter/sorter.cpp
@@ -56,7 +56,6 @@
 #include "mongo/platform/atomic_word.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/bufreader.h"
-#include "mongo/util/goodies.h"
 #include "mongo/util/mongoutils/str.h"
 #include "mongo/util/print.h"
 #include "mongo/util/ptr.h"
diff --git a/src/mongo/db/sorter/sorter_test.cpp b/src/mongo/db/sorter/sorter_test.cpp
index 78a129d2b0e..1009fbe5577 100644
--- a/src/mongo/db/sorter/sorter_test.cpp
+++ b/src/mongo/db/sorter/sorter_test.cpp
@@ -35,7 +35,6 @@
 
 #include "mongo/unittest/temp_dir.h"
 #include "mongo/unittest/unittest.h"
-#include "mongo/util/goodies.h"
 #include "mongo/util/mongoutils/str.h"
 
 // Need access to internal classes
diff --git a/src/mongo/pch.h b/src/mongo/pch.h
index 6b1bd2a7f73..0afa874284b 100644
--- a/src/mongo/pch.h
+++ b/src/mongo/pch.h
@@ -74,6 +74,5 @@ namespace mongo {
 
 #include "mongo/util/assert_util.h"
 #include "mongo/util/debug_util.h"
-#include "mongo/util/goodies.h"
 
 #endif // MONGO_PCH_H
diff --git a/src/mongo/util/concurrency/task.cpp b/src/mongo/util/concurrency/task.cpp
index d4ca1aaa50b..75e0e85cc87 100644
--- a/src/mongo/util/concurrency/task.cpp
+++ b/src/mongo/util/concurrency/task.cpp
@@ -37,7 +37,6 @@
 
 #include "mongo/db/repl/server.h"
 #include "mongo/util/exit.h"
-#include "mongo/util/goodies.h"
 #include "mongo/util/log.h"
 #include "mongo/util/startup_test.h"
 #include "mongo/util/time_support.h"
diff --git a/src/mongo/util/goodies.h b/src/mongo/util/goodies.h
deleted file mode 100644
index 4198220da8e..00000000000
--- a/src/mongo/util/goodies.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// @file goodies.h
-// miscellaneous
-
-/*    Copyright 2009 10gen Inc.
- *
- *    This program is free software: you can redistribute it and/or  modify
- *    it under the terms of the GNU Affero General Public License, version 3,
- *    as published by the Free Software Foundation.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Affero General Public License for more details.
- *
- *    You should have received a copy of the GNU Affero General Public License
- *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *    As a special exception, the copyright holders give permission to link the
- *    code of portions of this program with the OpenSSL library under certain
- *    conditions as described in each individual source file and distribute
- *    linked combinations including the program with the OpenSSL library. You
- *    must comply with the GNU Affero General Public License in all respects
- *    for all of the code used other than as permitted herein. If you modify
- *    file(s) with this exception, you may extend this exception to your
- *    version of the file(s), but you are not obligated to do so. If you do not
- *    wish to do so, delete this exception statement from your version. If you
- *    delete this exception statement from all source files in the program,
- *    then also delete it in the license file.
- */
-
-#pragma once
-
-#include <boost/intrusive_ptr.hpp>
-#include <boost/scoped_array.hpp>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/utility.hpp>
-#include <iostream>
-#include <sstream>
-
-#include "mongo/util/assert_util.h"
-
diff --git a/src/mongo/util/mmap.h b/src/mongo/util/mmap.h
index 2a0cc09767c..09896c53455 100644
--- a/src/mongo/util/mmap.h
+++ b/src/mongo/util/mmap.h
@@ -37,7 +37,6 @@
 
 #include "mongo/client/export_macros.h"
 #include "mongo/util/concurrency/rwlock.h"
-#include "mongo/util/goodies.h"
 
 namespace mongo {
 
diff --git a/src/mongo/util/net/message.cpp b/src/mongo/util/net/message.cpp
index ce038190601..6712890dbc8 100644
--- a/src/mongo/util/net/message.cpp
+++ b/src/mongo/util/net/message.cpp
@@ -35,7 +35,6 @@
 #include <errno.h>
 #include <time.h>
 
-#include "mongo/util/goodies.h"
 #include "mongo/util/net/listen.h"
 #include "mongo/util/net/message_port.h"
 
diff --git a/src/mongo/util/net/message.h b/src/mongo/util/net/message.h
index 77519140f0f..cd35a794211 100644
--- a/src/mongo/util/net/message.h
+++ b/src/mongo/util/net/message.h
@@ -36,7 +36,6 @@
 #include "mongo/base/data_view.h"
 #include "mongo/base/encoded_value_storage.h"
 #include "mongo/util/allocator.h"
-#include "mongo/util/goodies.h"
 #include "mongo/util/mongoutils/str.h"
 #include "mongo/util/net/hostandport.h"
 #include "mongo/util/net/sock.h"
diff --git a/src/mongo/util/net/message_port.cpp b/src/mongo/util/net/message_port.cpp
index e02c218b13f..e29bba9584d 100644
--- a/src/mongo/util/net/message_port.cpp
+++ b/src/mongo/util/net/message_port.cpp
@@ -38,7 +38,6 @@
 
 #include "mongo/util/allocator.h"
 #include "mongo/util/background.h"
-#include "mongo/util/goodies.h"
 #include "mongo/util/log.h"
 #include "mongo/util/net/listen.h"
 #include "mongo/util/net/message.h"
diff --git a/src/mongo/util/progress_meter.h b/src/mongo/util/progress_meter.h
index 9b3dc744c64..8b3adb9e633 100644
--- a/src/mongo/util/progress_meter.h
+++ b/src/mongo/util/progress_meter.h
@@ -29,7 +29,6 @@
 
 #pragma once
 
-#include "mongo/util/goodies.h"
 #include "mongo/util/thread_safe_string.h"
 #include <boost/noncopyable.hpp>