diff --git a/cpld.hpp b/cpld.hpp
index 688fb54..84db3ba 100644
--- a/cpld.hpp
+++ b/cpld.hpp
@@ -18,14 +18,25 @@
 
 #include <ipmid/api.h>
 
+#include <ipmid/api-types.hpp>
+#include <vector>
+
 namespace google
 {
 namespace ipmi
 {
 
+struct CpldReply
+{
+    uint8_t major;
+    uint8_t minor;
+    uint8_t point;
+    uint8_t subpoint;
+} __attribute__((packed));
+
 // Given a cpld identifier, return a version if available.
-ipmi_ret_t cpldVersion(const uint8_t* reqBuf, uint8_t* replyBuf,
-                       size_t* dataLen, const HandlerInterface* handler);
+Resp cpldVersion(const std::vector<std::uint8_t>& data,
+                 const HandlerInterface* handler);
 
 } // namespace ipmi
 } // namespace google