diff --git a/app/watchdog.hpp b/app/watchdog.hpp
index f434493..c09bd1c 100644
--- a/app/watchdog.hpp
+++ b/app/watchdog.hpp
@@ -1,23 +1,6 @@
-#include "ipmid.hpp"
+#pragma once
 
-/** @brief The SET watchdog IPMI command.
- *
- *  @param[in] netfn
- *  @param[in] cmd
- *  @param[in] request
- *  @param[in,out] response
- *  @param[out] data_len
- *  @param[in] context
- *
- *  @return IPMI_CC_OK on success, -1 otherwise.
- */
-ipmi_ret_t ipmi_app_set_watchdog(
-        ipmi_netfn_t netfn,
-        ipmi_cmd_t cmd,
-        ipmi_request_t request,
-        ipmi_response_t response,
-        ipmi_data_len_t data_len,
-        ipmi_context_t context);
+#include "host-ipmid/ipmid-api.h"
 
 /** @brief The RESET watchdog IPMI command.
  *
@@ -28,9 +11,9 @@
  *  @param[out] data_len
  *  @param[in] context
  *
- *  @return IPMI_CC_OK on success, -1 otherwise.
+ *  @return IPMI_CC_OK on success, an IPMI error code otherwise.
  */
-ipmi_ret_t ipmi_app_reset_watchdog(
+ipmi_ret_t ipmi_app_watchdog_reset(
         ipmi_netfn_t netfn,
         ipmi_cmd_t cmd,
         ipmi_request_t request,
@@ -38,3 +21,21 @@
         ipmi_data_len_t data_len,
         ipmi_context_t context);
 
+/** @brief The SET watchdog IPMI command.
+ *
+ *  @param[in] netfn
+ *  @param[in] cmd
+ *  @param[in] request
+ *  @param[in,out] response
+ *  @param[out] data_len
+ *  @param[in] context
+ *
+ *  @return IPMI_CC_OK on success, an IPMI error code otherwise.
+ */
+ipmi_ret_t ipmi_app_watchdog_set(
+        ipmi_netfn_t netfn,
+        ipmi_cmd_t cmd,
+        ipmi_request_t request,
+        ipmi_response_t response,
+        ipmi_data_len_t data_len,
+        ipmi_context_t context);