diff --git a/Libraries/Kanimaji/Include/Kanimaji/Error.hpp b/Libraries/Kanimaji/Include/Kanimaji/Error.hpp
index 79762d1..5f1f974 100644
--- a/Libraries/Kanimaji/Include/Kanimaji/Error.hpp
+++ b/Libraries/Kanimaji/Include/Kanimaji/Error.hpp
@@ -1,7 +1,9 @@
 #ifndef KANIMAJI_ERROR_HPP
 #define KANIMAJI_ERROR_HPP
 
+#include <cstddef>
 #include <stdexcept>
+#include <string_view>
 
 namespace Kanimaji
 {
diff --git a/Libraries/Kanimaji/Source/Kanimaji.cpp b/Libraries/Kanimaji/Source/Kanimaji.cpp
index 8c8335b..7869e94 100644
--- a/Libraries/Kanimaji/Source/Kanimaji.cpp
+++ b/Libraries/Kanimaji/Source/Kanimaji.cpp
@@ -1,3 +1,4 @@
+#include "Kanimaji/Error.hpp"
 #include "Kanimaji/Kanimaji.hpp"
 #include "Kanimaji/Settings.hpp"
 #include "SVG.hpp"
diff --git a/Libraries/Kanimaji/Source/SVG.cpp b/Libraries/Kanimaji/Source/SVG.cpp
index b0f1a72..d2a7a0e 100644
--- a/Libraries/Kanimaji/Source/SVG.cpp
+++ b/Libraries/Kanimaji/Source/SVG.cpp
@@ -1,3 +1,4 @@
+#include "Kanimaji/Error.hpp"
 #include "SVG.hpp"
 
 #include <algorithm>
diff --git a/Libraries/Kanimaji/Source/SVG.hpp b/Libraries/Kanimaji/Source/SVG.hpp
index 3682a7d..6ed8704 100644
--- a/Libraries/Kanimaji/Source/SVG.hpp
+++ b/Libraries/Kanimaji/Source/SVG.hpp
@@ -1,8 +1,6 @@
 #ifndef KANIMAJI_SVG_HPP
 #define KANIMAJI_SVG_HPP
 
-#include "Kanimaji/Error.hpp"
-
 #include <memory>
 #include <string_view>
 #include <vector>
diff --git a/Tools/KanimajiTool/Main.cpp b/Tools/KanimajiTool/Main.cpp
index 67564f2..ca7cb91 100644
--- a/Tools/KanimajiTool/Main.cpp
+++ b/Tools/KanimajiTool/Main.cpp
@@ -4,19 +4,19 @@
 
 int main(const int argc, const char *argv[])
 {
-    //if (argc != 3) {
-    //    std::println("Usage: KanimajiTool SOURCE DESTINATION\n\n"
-    //                 "SOURCE - Path to a file from the KanjiVG dataset.\n"
-    //                 "DESTINATION - Path to write the animated SVG.\n"
-    //    );
-    //    return 1;
-    //}
+    if (argc != 3) {
+        std::println("Usage: KanimajiTool SOURCE DESTINATION\n\n"
+                     "SOURCE - Path to a file from the KanjiVG dataset.\n"
+                     "DESTINATION - Path to write the animated SVG.\n"
+        );
+        return 1;
+    }
 
     try {
-        Kanimaji::AnimateFile("084b8.svg", "084b8-out.svg");
+        Kanimaji::AnimateFile(argv[1], argv[2]);
     }
     catch (const std::exception& e) {
-        std::println("Could not animate the input file");
+        std::println("Could not animate {}: {}", argv[1], argv[2]);
         return 1;
     }