3 files changed, 29 insertions, 18 deletions
diff --git a/toolsrc/src/commands_contact.cpp b/toolsrc/src/commands_contact.cpp
new file mode 100644
index 000000000..5bd1c1a67
--- /dev/null
+++ b/toolsrc/src/commands_contact.cpp
@@ -0,0 +1,13 @@
+#include "vcpkg_Commands.h"
+#include "vcpkg_System.h"
+#include "vcpkg_info.h"
+
+namespace vcpkg::Commands
+{
+    void contact_command(const vcpkg_cmd_arguments& args)
+    {
+        args.check_exact_arg_count(0);
+        System::println("Send an email to %s with any feedback.", Info::email());
+        exit(EXIT_SUCCESS);
+    }
+}
diff --git a/toolsrc/src/commands_help.cpp b/toolsrc/src/commands_help.cpp
index 5baec62c7..a0881e64d 100644
--- a/toolsrc/src/commands_help.cpp
+++ b/toolsrc/src/commands_help.cpp
@@ -1,19 +1,8 @@
 #include "vcpkg_Commands.h"
 #include "vcpkg_System.h"
-#include "vcpkg_info.h"
 
 namespace vcpkg::Commands
 {
-    void version_command(const vcpkg_cmd_arguments& args)
-    {
-        args.check_exact_arg_count(0);
-        System::println("Vcpkg package management program version %s\n"
-                        "\n"
-                        "See LICENSE.txt for license information.", Info::version()
-        );
-        exit(EXIT_SUCCESS);
-    }
-
     void help_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths)
     {
         args.check_max_arg_count(1);
@@ -36,13 +25,6 @@ namespace vcpkg::Commands
         exit(EXIT_SUCCESS);
     }
 
-    void contact_command(const vcpkg_cmd_arguments& args)
-    {
-        args.check_exact_arg_count(0);
-        System::println("Send an email to %s with any feedback.", Info::email());
-        exit(EXIT_SUCCESS);
-    }
-
     void help_topic_valid_triplet(const vcpkg_paths& paths)
     {
         System::println("Available architecture triplets:");
diff --git a/toolsrc/src/commands_version.cpp b/toolsrc/src/commands_version.cpp
new file mode 100644
index 000000000..03cce32d4
--- /dev/null
+++ b/toolsrc/src/commands_version.cpp
@@ -0,0 +1,16 @@
+#include "vcpkg_Commands.h"
+#include "vcpkg_System.h"
+#include "vcpkg_info.h"
+
+namespace vcpkg::Commands
+{
+    void version_command(const vcpkg_cmd_arguments& args)
+    {
+        args.check_exact_arg_count(0);
+        System::println("Vcpkg package management program version %s\n"
+                        "\n"
+                        "See LICENSE.txt for license information.", Info::version()
+        );
+        exit(EXIT_SUCCESS);
+    }
+}