3 files changed, 21 insertions, 8 deletions
diff --git a/toolsrc/include/vcpkg/base/util.h b/toolsrc/include/vcpkg/base/util.h
index 3d32e3aa8..ad628e071 100644
--- a/toolsrc/include/vcpkg/base/util.h
+++ b/toolsrc/include/vcpkg/base/util.h
@@ -11,14 +11,6 @@
 
 namespace vcpkg::Util
 {
-    template<class T>
-    constexpr std::add_const_t<T>& as_const(T& t) noexcept
-    {
-        return t;
-    }
-    template<class T>
-    void as_const(const T&&) = delete;
-
     template<class Container>
     using ElementT =
         std::remove_reference_t<decltype(*std::declval<typename std::remove_reference_t<Container>::iterator>())>;
diff --git a/toolsrc/include/vcpkg/build.h b/toolsrc/include/vcpkg/build.h
index b535698dc..be5424296 100644
--- a/toolsrc/include/vcpkg/build.h
+++ b/toolsrc/include/vcpkg/build.h
@@ -219,6 +219,7 @@ namespace vcpkg::Build
     {
         EMPTY_PACKAGE,
         DLLS_WITHOUT_LIBS,
+        DLLS_WITHOUT_EXPORTS,
         ONLY_RELEASE_CRT,
         EMPTY_INCLUDE_FOLDER,
         ALLOW_OBSOLETE_MSVCRT,
@@ -229,6 +230,7 @@ namespace vcpkg::Build
     constexpr std::array<BuildPolicy, size_t(BuildPolicy::COUNT)> G_ALL_POLICIES = {
         BuildPolicy::EMPTY_PACKAGE,
         BuildPolicy::DLLS_WITHOUT_LIBS,
+        BuildPolicy::DLLS_WITHOUT_EXPORTS,
         BuildPolicy::ONLY_RELEASE_CRT,
         BuildPolicy::EMPTY_INCLUDE_FOLDER,
         BuildPolicy::ALLOW_OBSOLETE_MSVCRT,
diff --git a/toolsrc/include/vcpkg/export.chocolatey.h b/toolsrc/include/vcpkg/export.chocolatey.h
new file mode 100644
index 000000000..7804108fd
--- /dev/null
+++ b/toolsrc/include/vcpkg/export.chocolatey.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include <vcpkg/dependencies.h>
+#include <vcpkg/vcpkgpaths.h>
+
+#include <vector>
+
+namespace vcpkg::Export::Chocolatey
+{
+    struct Options
+    {
+        Optional<std::string> maybe_maintainer;
+        Optional<std::string> maybe_version_suffix;
+    };
+
+    void do_export(const std::vector<Dependencies::ExportPlanAction>& export_plan,
+                   const VcpkgPaths& paths,
+                   const Options& chocolatey_options);
+}