diff --git a/src/builder/b-artifacts.c b/src/builder/b-artifacts.c
index b16767f..a0f0bf4 100644
--- a/src/builder/b-artifacts.c
+++ b/src/builder/b-artifacts.c
@@ -35,7 +35,7 @@
 #pragma warning(disable:4996)
 #endif
 
-static int
+static lws_ss_state_return_t
 saib_artifact_rx(void *userobj, const uint8_t *buf, size_t len, int flags)
 {
 	// sai_artifact_t *ap = (sai_artifact_t *)userobj;
@@ -43,7 +43,7 @@ saib_artifact_rx(void *userobj, const uint8_t *buf, size_t len, int flags)
 	return 0;
 }
 
-static int
+static lws_ss_state_return_t
 saib_artifact_tx(void *userobj, lws_ss_tx_ordinal_t ord, uint8_t *buf,
 		 size_t *len, int *flags)
 {
@@ -112,7 +112,7 @@ saib_artifact_tx(void *userobj, lws_ss_tx_ordinal_t ord, uint8_t *buf,
 	return 0;
 }
 
-static int
+static lws_ss_state_return_t
 saib_artifact_state(void *userobj, void *sh, lws_ss_constate_t state,
 		    lws_ss_tx_ordinal_t ack)
 {
diff --git a/src/builder/b-comms.c b/src/builder/b-comms.c
index 3acb7f6..c01ea4d 100644
--- a/src/builder/b-comms.c
+++ b/src/builder/b-comms.c
@@ -27,7 +27,7 @@
 
 #include "../common/struct-metadata.c"
 
-static int
+static lws_ss_state_return_t
 saib_m_rx(void *userobj, const uint8_t *buf, size_t len, int flags)
 {
 	struct sai_plat_master *spm = (struct sai_plat_master *)userobj;
@@ -203,7 +203,7 @@ next:
  * platform / sai_plat is implied...
  */
 
-static int
+static lws_ss_state_return_t
 saib_m_tx(void *userobj, lws_ss_tx_ordinal_t ord, uint8_t *buf, size_t *len,
 	  int *flags)
 {
@@ -508,7 +508,7 @@ cleanup_on_ss_disconnect(struct lws_dll2 *d, void *user)
 	return 0;
 }
 
-static int
+static lws_ss_state_return_t
 saib_m_state(void *userobj, void *sh, lws_ss_constate_t state,
 	     lws_ss_tx_ordinal_t ack)
 {
diff --git a/src/common/ss-client-logproxy.c b/src/common/ss-client-logproxy.c
index df42962..9d1d30f 100644
--- a/src/common/ss-client-logproxy.c
+++ b/src/common/ss-client-logproxy.c
@@ -121,13 +121,13 @@ saicom_lp_callback_on_drain(saicom_drain_cb _cb, void *_opaque)
 	return 0;
 }
 
-static int
+static lws_ss_state_return_t
 saicom_lp_rx(void *userobj, const uint8_t *buf, size_t len, int flags)
 {
 	return 0;
 }
 
-static int
+static lws_ss_state_return_t
 saicom_lp_tx(void *userobj, lws_ss_tx_ordinal_t ord, uint8_t *buf, size_t *len,
 	     int *flags)
 {
@@ -162,7 +162,7 @@ saicom_lp_tx(void *userobj, lws_ss_tx_ordinal_t ord, uint8_t *buf, size_t *len,
 	return 0;
 }
 
-static int
+static lws_ss_state_return_t
 saicom_lp_state(void *userobj, void *sh, lws_ss_constate_t state,
 	        lws_ss_tx_ordinal_t ack)
 {