diff --git a/src/common/Common.h b/src/common/Common.h
index 8216c519746..aa04abacd30 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -44,6 +44,8 @@
 #include <cerrno>
 #include <csignal>
 
+#include <boost/optional.hpp>
+#include <boost/utility/in_place_factory.hpp>
 #include <boost/functional/hash.hpp>
 
 #include "Debugging/Errors.h"
@@ -152,6 +154,10 @@ typedef std::vector<std::string> StringVector;
 
 #define MAX_QUERY_LEN 32*1024
 
+//! Optional helper class to wrap optional values within.
+template <typename T>
+using Optional = boost::optional<T>;
+
 namespace Trinity
 {
     //! std::make_unique implementation (TODO: remove this once C++14 is supported)