Merge branch 'untangle_includes' of https://github.com/DennisOSRM/cxxopts into untangle-includes

Conflicts:
	src/cxxopts.hpp

src/cxxopts.cpp

@@ -24,6 +24,8 @@ THE SOFTWARE.
 
 #include "cxxopts.hpp"
 
+#include <regex>
+
 #define OPTION_LONGEST 30
 #define OPTION_DESC_GAP 2
 

src/cxxopts.hpp

@@ -25,13 +25,13 @@ THE SOFTWARE.
 #ifndef CXX_OPTS_HPP
 #define CXX_OPTS_HPP
 
-#include <regex>
-#include <set>
-#include <map>
 #include <exception>
-#include <sstream>
-
 #include <iostream>
+#include <map>
+#include <memory>
+#include <sstream>
+#include <string>
+#include <vector>
 
 namespace cxxopts
 {