diff --git a/Extractor/Extractor.cpp b/Extractor/Extractor.cpp
index 91f0c02a2..d10c0dd10 100644
--- a/Extractor/Extractor.cpp
+++ b/Extractor/Extractor.cpp
@@ -42,15 +42,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../Util/TimingUtil.h"
 #include "../typedefs.h"
 
+#include <boost/program_options.hpp>
 #include <cstdlib>
-
 #include <thread>
 #include <chrono>
 #include <iostream>
 #include <fstream>
 #include <string>
 #include <unordered_map>
-
 #include <tbb/task_scheduler_init.h>
 
 Extractor::Extractor(const char* git_desc) :
diff --git a/Extractor/Extractor.h b/Extractor/Extractor.h
index f8cc81007..7400e6057 100644
--- a/Extractor/Extractor.h
+++ b/Extractor/Extractor.h
@@ -1,14 +1,11 @@
-#pragma once
-
-#include <vector>
-
-#include <boost/filesystem.hpp>
-#include <boost/program_options.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/noncopyable.hpp>
+#ifndef EXTRACTOR_H_
+#define EXTRACTOR_H_
 
 #include "../Util/FingerPrint.h"
 
+#include <boost/filesystem.hpp>
+
+
 class ExtractorCallbacks;
 
 /** \brief Class of 'extract' utility. */
@@ -42,3 +39,4 @@ public:
 
     int Execute(int argc, char *argv[]);
 };
+#endif /* EXTRACTOR_H_ */