diff --git a/api/string_test.c b/api/string_test.c
index 0372222b7..91993c3d8 100644
--- a/api/string_test.c
+++ b/api/string_test.c
@@ -39,10 +39,11 @@ static void format(void **) {
 	cpu_set_t set;
 	char buf[256];
 
+	CPU_ZERO(&set);
+
 	assert_errno_equal(cpuset_format(buf, sizeof(buf), NULL), EINVAL);
 	assert_errno_equal(cpuset_format(NULL, 0, &set), EINVAL);
 
-	CPU_ZERO(&set);
 	assert_errno_equal(cpuset_format(buf, sizeof(buf), &set), 0);
 	assert_string_equal(buf, "");
 
diff --git a/main/api.c b/main/api.c
index 59108e93e..f8a3a0105 100644
--- a/main/api.c
+++ b/main/api.c
@@ -19,7 +19,6 @@
 #include <event2/listener.h>
 
 #include <fcntl.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
diff --git a/main/module.c b/main/module.c
index 53690aef4..5ff0c6e57 100644
--- a/main/module.c
+++ b/main/module.c
@@ -11,8 +11,6 @@
 
 #include <assert.h>
 #include <fnmatch.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <sys/queue.h>
 
 static STAILQ_HEAD(, gr_api_handler) handlers = STAILQ_HEAD_INITIALIZER(handlers);
diff --git a/modules/dhcp/cli/dhcp.c b/modules/dhcp/cli/dhcp.c
index 08fa6fda7..d23f9d730 100644
--- a/modules/dhcp/cli/dhcp.c
+++ b/modules/dhcp/cli/dhcp.c
@@ -10,10 +10,6 @@
 #include <ecoli.h>
 #include <libsmartcols.h>
 
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
 static cmd_status_t dhcp_enable_cmd(struct gr_api_client *c, const struct ec_pnode *p) {
 	const char *iface_name = arg_str(p, "IFACE");
 	struct gr_dhcp_start_req req;
diff --git a/modules/infra/control/vlan.c b/modules/infra/control/vlan.c
index 417b4d56d..b9de555f9 100644
--- a/modules/infra/control/vlan.c
+++ b/modules/infra/control/vlan.c
@@ -15,8 +15,6 @@
 #include <rte_ether.h>
 #include <rte_hash.h>
 
-#include <string.h>
-
 struct vlan_key {
 	uint16_t parent_id;
 	uint16_t vlan_id;
diff --git a/modules/ip/control/address.c b/modules/ip/control/address.c
index 129f25ab4..b0994889b 100644
--- a/modules/ip/control/address.c
+++ b/modules/ip/control/address.c
@@ -27,7 +27,6 @@
 #include <arpa/inet.h>
 #include <errno.h>
 #include <stdint.h>
-#include <stdio.h>
 #include <string.h>
 #include <sys/queue.h>
 
diff --git a/modules/ip/control/nexthop.c b/modules/ip/control/nexthop.c
index e8b9ce29f..88c6781e3 100644
--- a/modules/ip/control/nexthop.c
+++ b/modules/ip/control/nexthop.c
@@ -21,7 +21,6 @@
 #include <rte_mempool.h>
 
 #include <errno.h>
-#include <stdio.h>
 #include <string.h>
 #include <sys/queue.h>
 
diff --git a/modules/ip6/control/address.c b/modules/ip6/control/address.c
index f9f4eac56..036097ef6 100644
--- a/modules/ip6/control/address.c
+++ b/modules/ip6/control/address.c
@@ -26,7 +26,6 @@
 
 #include <errno.h>
 #include <stdint.h>
-#include <stdio.h>
 #include <string.h>
 #include <sys/queue.h>
 
diff --git a/modules/ip6/control/nexthop.c b/modules/ip6/control/nexthop.c
index fce8e1376..6e16c25d4 100644
--- a/modules/ip6/control/nexthop.c
+++ b/modules/ip6/control/nexthop.c
@@ -22,7 +22,6 @@
 #include <rte_ip6.h>
 
 #include <errno.h>
-#include <stdio.h>
 #include <string.h>
 #include <sys/queue.h>