From cec7b33afb2bfdbbbad63f4ec45f526a8d16a3b2 Mon Sep 17 00:00:00 2001
From: "mike@arpaia.co" <mike@arpaia.co>
Date: Tue, 9 Sep 2014 18:43:27 -0700
Subject: [PATCH] removing unused header includes

---
 osquery/config/plugins/filesystem.cpp  | 7 -------
 osquery/core/darwin/test_util.cpp      | 2 --
 osquery/core/text_tests.cpp            | 1 +
 osquery/database/db_handle_tests.cpp   | 6 ------
 osquery/main/daemon.cpp                | 2 --
 osquery/tables/system/darwin/nvram.cpp | 3 ---
 6 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/osquery/config/plugins/filesystem.cpp b/osquery/config/plugins/filesystem.cpp
index 9c0e7a91..810e711e 100644
--- a/osquery/config/plugins/filesystem.cpp
+++ b/osquery/config/plugins/filesystem.cpp
@@ -2,16 +2,9 @@
 
 #include "osquery/config/plugin.h"
 
-#include <algorithm>
 #include <fstream>
-#include <streambuf>
-#include <string>
 
 #include <boost/filesystem/operations.hpp>
-#include <boost/filesystem/path.hpp>
-
-#include <gflags/gflags.h>
-#include <glog/logging.h>
 
 namespace fs = boost::filesystem;
 using osquery::Status;
diff --git a/osquery/core/darwin/test_util.cpp b/osquery/core/darwin/test_util.cpp
index a61b29dd..57df9551 100644
--- a/osquery/core/darwin/test_util.cpp
+++ b/osquery/core/darwin/test_util.cpp
@@ -2,8 +2,6 @@
 
 #include "osquery/core/darwin/test_util.h"
 
-#include <sstream>
-
 #include <boost/property_tree/json_parser.hpp>
 
 using namespace osquery::db;
diff --git a/osquery/core/text_tests.cpp b/osquery/core/text_tests.cpp
index f5be5808..7eaa1d00 100644
--- a/osquery/core/text_tests.cpp
+++ b/osquery/core/text_tests.cpp
@@ -21,6 +21,7 @@ TEST_F(TextTests, test_split) {
 }
 
 int main(int argc, char* argv[]) {
+  google::InitGoogleLogging(argv[0]);
   testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }
diff --git a/osquery/database/db_handle_tests.cpp b/osquery/database/db_handle_tests.cpp
index 2d13336f..7afc3b24 100644
--- a/osquery/database/db_handle_tests.cpp
+++ b/osquery/database/db_handle_tests.cpp
@@ -2,14 +2,8 @@
 
 #include "osquery/database/db_handle.h"
 
-#include <algorithm>
-#include <stdexcept>
-
 #include <glog/logging.h>
 #include <gtest/gtest.h>
-#include <rocksdb/version.h>
-
-#include "osquery/status.h"
 
 using osquery::Status;
 
diff --git a/osquery/main/daemon.cpp b/osquery/main/daemon.cpp
index b8222def..7f650adc 100644
--- a/osquery/main/daemon.cpp
+++ b/osquery/main/daemon.cpp
@@ -7,9 +7,7 @@
 #include "osquery/config.h"
 #include "osquery/config/plugin.h"
 #include "osquery/core.h"
-#include "osquery/logger.h"
 #include "osquery/logger/plugin.h"
-#include "osquery/registry.h"
 #include "osquery/scheduler.h"
 
 int main(int argc, char* argv[]) {
diff --git a/osquery/tables/system/darwin/nvram.cpp b/osquery/tables/system/darwin/nvram.cpp
index e1e95aa5..2009191c 100644
--- a/osquery/tables/system/darwin/nvram.cpp
+++ b/osquery/tables/system/darwin/nvram.cpp
@@ -1,19 +1,16 @@
 // Copyright 2004-present Facebook. All Rights Reserved.
 
 #include <string>
-#include <stdio.h>
 #include <stdlib.h>
 
 #include <boost/lexical_cast.hpp>
 
 #include <IOKit/IOKitLib.h>
-#include <IOKit/IOKitKeys.h>
 #include <CoreFoundation/CoreFoundation.h>
 
 #include <glog/logging.h>
 
 #include "osquery/core.h"
-#include "osquery/database.h"
 
 using namespace osquery::core;
 using namespace osquery::db;