diff --git a/lib/handle_ping.c b/lib/handle_ping.c
index c8c0a5f5..9009b720 100644
--- a/lib/handle_ping.c
+++ b/lib/handle_ping.c
@@ -39,12 +39,9 @@ Contributors:
 
 int handle__pingreq(struct mosquitto *mosq)
 {
-	int state;
-
 	assert(mosq);
 
-	state = mosquitto__get_state(mosq);
-	if(state != mosq_cs_active){
+	if(mosquitto__get_state(mosq) != mosq_cs_active){
 		return MOSQ_ERR_PROTOCOL;
 	}
 
@@ -58,12 +55,9 @@ int handle__pingreq(struct mosquitto *mosq)
 
 int handle__pingresp(struct mosquitto *mosq)
 {
-	int state;
-
 	assert(mosq);
 
-	state = mosquitto__get_state(mosq);
-	if(state != mosq_cs_active){
+	if(mosquitto__get_state(mosq) != mosq_cs_active){
 		return MOSQ_ERR_PROTOCOL;
 	}
 
diff --git a/lib/handle_pubackcomp.c b/lib/handle_pubackcomp.c
index fe154daa..ed0c5dca 100644
--- a/lib/handle_pubackcomp.c
+++ b/lib/handle_pubackcomp.c
@@ -45,12 +45,10 @@ int handle__pubackcomp(struct mosquitto *mosq, const char *type)
 	int rc;
 	mosquitto_property *properties = NULL;
 	int qos;
-	int state;
 
 	assert(mosq);
 
-	state = mosquitto__get_state(mosq);
-	if(state != mosq_cs_active){
+	if(mosquitto__get_state(mosq) != mosq_cs_active){
 		return MOSQ_ERR_PROTOCOL;
 	}
 
diff --git a/lib/handle_publish.c b/lib/handle_publish.c
index 502ea673..31d2dba8 100644
--- a/lib/handle_publish.c
+++ b/lib/handle_publish.c
@@ -42,12 +42,10 @@ int handle__publish(struct mosquitto *mosq)
 	uint16_t mid;
 	uint16_t slen;
 	mosquitto_property *properties = NULL;
-	int state;
 
 	assert(mosq);
 
-	state = mosquitto__get_state(mosq);
-	if(state != mosq_cs_active){
+	if(mosquitto__get_state(mosq) != mosq_cs_active){
 		return MOSQ_ERR_PROTOCOL;
 	}
 
diff --git a/lib/handle_pubrec.c b/lib/handle_pubrec.c
index 21e718d4..fc5b7cf4 100644
--- a/lib/handle_pubrec.c
+++ b/lib/handle_pubrec.c
@@ -43,12 +43,10 @@ int handle__pubrec(struct mosquitto *mosq)
 	uint16_t mid;
 	int rc;
 	mosquitto_property *properties = NULL;
-	int state;
 
 	assert(mosq);
 
-	state = mosquitto__get_state(mosq);
-	if(state != mosq_cs_active){
+	if(mosquitto__get_state(mosq) != mosq_cs_active){
 		return MOSQ_ERR_PROTOCOL;
 	}
 
diff --git a/lib/handle_pubrel.c b/lib/handle_pubrel.c
index 3c98a576..1cd2864a 100644
--- a/lib/handle_pubrel.c
+++ b/lib/handle_pubrel.c
@@ -47,12 +47,10 @@ int handle__pubrel(struct mosquitto *mosq)
 #endif
 	int rc;
 	mosquitto_property *properties = NULL;
-	int state;
 
 	assert(mosq);
 
-	state = mosquitto__get_state(mosq);
-	if(state != mosq_cs_active){
+	if(mosquitto__get_state(mosq) != mosq_cs_active){
 		return MOSQ_ERR_PROTOCOL;
 	}
 
diff --git a/lib/handle_suback.c b/lib/handle_suback.c
index 0d20c28a..93a64e8a 100644
--- a/lib/handle_suback.c
+++ b/lib/handle_suback.c
@@ -43,12 +43,10 @@ int handle__suback(struct mosquitto *mosq)
 	int i = 0;
 	int rc;
 	mosquitto_property *properties = NULL;
-	int state;
 
 	assert(mosq);
 
-	state = mosquitto__get_state(mosq);
-	if(state != mosq_cs_active){
+	if(mosquitto__get_state(mosq) != mosq_cs_active){
 		return MOSQ_ERR_PROTOCOL;
 	}
 
diff --git a/lib/handle_unsuback.c b/lib/handle_unsuback.c
index 5e8079dc..fdd255c1 100644
--- a/lib/handle_unsuback.c
+++ b/lib/handle_unsuback.c
@@ -44,12 +44,10 @@ int handle__unsuback(struct mosquitto *mosq)
 	uint16_t mid;
 	int rc;
 	mosquitto_property *properties = NULL;
-	int state;
 
 	assert(mosq);
 
-	state = mosquitto__get_state(mosq);
-	if(state != mosq_cs_active){
+	if(mosquitto__get_state(mosq) != mosq_cs_active){
 		return MOSQ_ERR_PROTOCOL;
 	}
 
diff --git a/lib/loop.c b/lib/loop.c
index 0fc7a69e..24ec984a 100644
--- a/lib/loop.c
+++ b/lib/loop.c
@@ -49,9 +49,6 @@ int mosquitto_loop(struct mosquitto *mosq, int timeout, int max_packets)
 	char pairbuf;
 	int maxfd = 0;
 	time_t now;
-#ifdef WITH_SRV
-	int state;
-#endif
 	time_t timeout_ms;
 
 	if(!mosq || max_packets < 1) return MOSQ_ERR_INVAL;
@@ -89,8 +86,7 @@ int mosquitto_loop(struct mosquitto *mosq, int timeout, int max_packets)
 	}else{
 #ifdef WITH_SRV
 		if(mosq->achan){
-			state = mosquitto__get_state(mosq);
-			if(state == mosq_cs_connect_srv){
+			if(mosquitto__get_state(mosq) == mosq_cs_connect_srv){
 				rc = ares_fds(mosq->achan, &readfds, &writefds);
 				if(rc > maxfd){
 					maxfd = rc;
@@ -252,7 +248,7 @@ int mosquitto_loop_forever(struct mosquitto *mosq, int timeout, int max_packets)
 	int run = 1;
 	int rc;
 	unsigned long reconnect_delay;
-	int state;
+	enum mosquitto_client_state state;
 
 	if(!mosq) return MOSQ_ERR_INVAL;
 
@@ -338,7 +334,7 @@ int mosquitto_loop_misc(struct mosquitto *mosq)
 
 static int mosquitto__loop_rc_handle(struct mosquitto *mosq, int rc)
 {
-	int state;
+	enum mosquitto_client_state state;
 
 	if(rc){
 		net__socket_close(mosq);
diff --git a/lib/packet_mosq.c b/lib/packet_mosq.c
index 6403a12b..23a29688 100644
--- a/lib/packet_mosq.c
+++ b/lib/packet_mosq.c
@@ -210,7 +210,7 @@ int packet__write(struct mosquitto *mosq)
 {
 	ssize_t write_length;
 	struct mosquitto__packet *packet;
-	int state;
+	enum mosquitto_client_state state;
 
 	if(!mosq) return MOSQ_ERR_INVAL;
 	if(mosq->sock == INVALID_SOCKET) return MOSQ_ERR_NO_CONN;
@@ -228,7 +228,7 @@ int packet__write(struct mosquitto *mosq)
 
 	state = mosquitto__get_state(mosq);
 #if defined(WITH_TLS) && !defined(WITH_BROKER)
-	if((state == mosq_cs_connect_pending) || mosq->want_connect){
+	if(state == mosq_cs_connect_pending || mosq->want_connect){
 #else
 	if(state == mosq_cs_connect_pending){
 #endif
@@ -328,7 +328,7 @@ int packet__read(struct mosquitto *mosq)
 	uint8_t byte;
 	ssize_t read_length;
 	int rc = 0;
-	int state;
+	enum mosquitto_client_state state;
 
 	if(!mosq){
 		return MOSQ_ERR_INVAL;
@@ -363,7 +363,7 @@ int packet__read(struct mosquitto *mosq)
 #ifdef WITH_BROKER
 			G_BYTES_RECEIVED_INC(1);
 			/* Clients must send CONNECT as their first command. */
-			if(!(mosq->bridge) && mosq->state == mosq_cs_connected && (byte&0xF0) != CMD_CONNECT){
+			if(!(mosq->bridge) && state == mosq_cs_connected && (byte&0xF0) != CMD_CONNECT){
 				return MOSQ_ERR_PROTOCOL;
 			}
 #endif
diff --git a/lib/socks_mosq.c b/lib/socks_mosq.c
index 13b3c0ed..68ef72a6 100644
--- a/lib/socks_mosq.c
+++ b/lib/socks_mosq.c
@@ -122,7 +122,7 @@ int socks5__send(struct mosquitto *mosq)
 	struct in6_addr addr_ipv6;
 	int ipv4_pton_result;
 	int ipv6_pton_result;
-	int state;
+	enum mosquitto_client_state state;
 
 	state = mosquitto__get_state(mosq);
 
@@ -264,7 +264,7 @@ int socks5__read(struct mosquitto *mosq)
 	ssize_t len;
 	uint8_t *payload;
 	uint8_t i;
-	int state;
+	enum mosquitto_client_state state;
 
 	state = mosquitto__get_state(mosq);
 	if(state == mosq_cs_socks5_start){
diff --git a/lib/thread_mosq.c b/lib/thread_mosq.c
index 1e56aed1..141cf30c 100644
--- a/lib/thread_mosq.c
+++ b/lib/thread_mosq.c
@@ -99,7 +99,6 @@ int mosquitto_loop_stop(struct mosquitto *mosq, bool force)
 void *mosquitto__thread_main(void *obj)
 {
 	struct mosquitto *mosq = obj;
-	int state;
 #ifndef WIN32
 	struct timespec ts;
 	ts.tv_sec = 0;
@@ -109,8 +108,7 @@ void *mosquitto__thread_main(void *obj)
 	if(!mosq) return NULL;
 
 	do{
-		state = mosquitto__get_state(mosq);
-		if(state == mosq_cs_new){
+		if(mosquitto__get_state(mosq) == mosq_cs_new){
 #ifdef WIN32
 			Sleep(10);
 #else
diff --git a/lib/util_mosq.c b/lib/util_mosq.c
index 2d44e4e9..05b29ff7 100644
--- a/lib/util_mosq.c
+++ b/lib/util_mosq.c
@@ -67,7 +67,7 @@ int mosquitto__check_keepalive(struct mosquitto *mosq)
 #ifndef WITH_BROKER
 	int rc;
 #endif
-	int state;
+	enum mosquitto_client_state state;
 
 	assert(mosq);
 #ifdef WITH_BROKER
diff --git a/src/mosquitto_broker_internal.h b/src/mosquitto_broker_internal.h
index 613e8a74..0a64f203 100644
--- a/src/mosquitto_broker_internal.h
+++ b/src/mosquitto_broker_internal.h
@@ -374,7 +374,7 @@ struct mosquitto_msg_store{
 	uint16_t mid;
 	uint8_t qos;
 	bool retain;
-	uint8_t origin;
+	enum mosquitto_msg_origin origin;
 };
 
 struct mosquitto_client_msg{