diff --git a/unodevtools/Executable_uno-skeletonmaker.mk b/unodevtools/Executable_uno-skeletonmaker.mk
index 87f8d3ca9b17..0bee9985434d 100644
--- a/unodevtools/Executable_uno-skeletonmaker.mk
+++ b/unodevtools/Executable_uno-skeletonmaker.mk
@@ -9,8 +9,6 @@
 
 $(eval $(call gb_Executable_Executable,uno-skeletonmaker))
 
-$(eval $(call gb_Executable_use_external,uno-skeletonmaker,boost_headers))
-
 $(eval $(call gb_Executable_set_include,uno-skeletonmaker,\
     -I$(SRCDIR)/unodevtools/inc \
     $$(INCLUDE) \
diff --git a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
index 8fbb96c19452..0942d7cde694 100644
--- a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
+++ b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
@@ -689,10 +689,10 @@ static OString generateClassDefinition(std::ostream& o,
          "    virtual ~" << classname << "() {}\n\n";
 
     if (options.componenttype == 2) {
-        o << "    typedef boost::unordered_map< ::sal_Int32, OUString, "
-            "boost::hash<::sal_Int32> > ParamMap;\n"
-            "    typedef boost::unordered_map< OUString, ParamMap, "
-            "OUStringHash > FunctionMap;\n\n"
+        o << "    typedef std::map< ::sal_Int32, OUString "
+            "> ParamMap;\n"
+            "    typedef std::map< OUString, ParamMap "
+            "> FunctionMap;\n\n"
             "    OUString SAL_CALL getAddinProperty(const OUString & "
             "funcName, const OUString & paramName, const char * propName) "
             "throw (css::uno::RuntimeException);\n\n";
@@ -1146,7 +1146,7 @@ void generateCalcAddin(ProgramOptions const & options,
             "#include \"com/sun/star/container/XNameAccess.hpp\"\n"
             "#include \"com/sun/star/container/XHierarchicalNameAccess.hpp\"\n\n"
             "#include \"rtl/ustrbuf.hxx\"\n\n"
-            "#include <boost/unordered_map.hpp>\n"
+            "#include <map>\n"
             "#include <set>\n";
 
         // namespace