diff --git a/Makefile b/Makefile
index 63d0af4..c1d04ba 100644
--- a/Makefile
+++ b/Makefile
@@ -87,8 +87,6 @@ CFLAGS_MYSQL += ${CFLAGS_MXQ_MYSQL_DEFAULT_GROUP}
 
 CFLAGS += -g
 CFLAGS += -Wall
-CFLAGS += -Wno-unused-variable
-CFLAGS += -Wno-unused-function
 CFLAGS += -DMXQ_VERSION=\"${MXQ_VERSION}\"
 CFLAGS += -DMXQ_VERSIONFULL=\"${MXQ_VERSIONFULL}\"
 CFLAGS += -DMXQ_VERSIONDATE=\"${MXQ_VERSIONDATE}\"
@@ -276,6 +274,7 @@ clean: CLEAN += mxqkill.o
 mxq_util.o: $(mx_log.h)
 mxq_util.o: $(mxq_util.h)
 mxq_util.o: CFLAGS += $(CFLAGS_MYSQL)
+mxq_util.o: CFLAGS += -Wno-unused-variable
 
 clean: CLEAN += mxq_util.o
 
diff --git a/mx_mysql.c b/mx_mysql.c
index 9c672be..a0bd22f 100644
--- a/mx_mysql.c
+++ b/mx_mysql.c
@@ -1341,9 +1341,6 @@ struct mx_mysql_stmt *mx_mysql_statement_prepare_with_bindings(struct mx_mysql *
 
 struct mx_mysql_stmt *mx_mysql_statement_prepare(struct mx_mysql *mysql, char *statement)
 {
-    int res;
-    struct mx_mysql_stmt *stmt = NULL;
-
     mx_assert_return_NULL(mysql, EINVAL);
     mx_assert_return_NULL(statement, EINVAL);
     mx_assert_return_NULL(*statement, EINVAL);
diff --git a/mxq_group.c b/mxq_group.c
index ae47356..424f74e 100644
--- a/mxq_group.c
+++ b/mxq_group.c
@@ -41,57 +41,6 @@
             " stats_max_stime_sec," \
             " stats_max_real_sec"
 
-#define MXQ_GROUP_FIELDS "group_id," \
-                "group_name," \
-                "group_status," \
-                "group_priority," \
-                "user_uid," \
-                "user_name," \
-                "user_gid," \
-                "user_group," \
-                "job_command," \
-                "job_threads," \
-                "job_memory," \
-                "job_time," \
-                "group_jobs," \
-                "group_jobs_running," \
-                "group_jobs_finished," \
-                "group_jobs_failed," \
-                "group_jobs_cancelled," \
-                "group_jobs_unknown," \
-                "group_slots_running," \
-                "stats_max_maxrss," \
-                "stats_max_utime_sec," \
-                "stats_max_stime_sec," \
-                "stats_max_real_sec"
-
-enum mxq_group_columns {
-    MXQ_GROUP_COL_GROUP_ID=0,
-    MXQ_GROUP_COL_GROUP_NAME,
-    MXQ_GROUP_COL_GROUP_STATUS,
-    MXQ_GROUP_COL_GROUP_PRIORITY,
-    MXQ_GROUP_COL_USER_UID,
-    MXQ_GROUP_COL_USER_NAME,
-    MXQ_GROUP_COL_USER_GID,
-    MXQ_GROUP_COL_USER_GROUP,
-    MXQ_GROUP_COL_JOB_COMMAND,
-    MXQ_GROUP_COL_JOB_THREADS,
-    MXQ_GROUP_COL_JOB_MEMORY,
-    MXQ_GROUP_COL_JOB_TIME,
-    MXQ_GROUP_COL_GROUP_JOBS,
-    MXQ_GROUP_COL_GROUP_JOBS_RUNNING,
-    MXQ_GROUP_COL_GROUP_JOBS_FINISHED,
-    MXQ_GROUP_COL_GROUP_JOBS_FAILED,
-    MXQ_GROUP_COL_GROUP_JOBS_CANCELLED,
-    MXQ_GROUP_COL_GROUP_JOBS_UNKNOWN,
-    MXQ_GROUP_COL_GROUP_SLOTS_RUNNING,
-    MXQ_GROUP_COL_STATS_MAX_MAXRSS,
-    MXQ_GROUP_COL_STATS_MAX_UTIME_SEC,
-    MXQ_GROUP_COL_STATS_MAX_STIME_SEC,
-    MXQ_GROUP_COL_STATS_MAX_REAL_SEC,
-    MXQ_GROUP_COL__END
-};
-
 static int bind_result_group_fields(struct mx_mysql_bind *result, struct mxq_group *g)
 {
     int res = 0;
diff --git a/mxq_job.c b/mxq_job.c
index bb3ad75..354d574 100644
--- a/mxq_job.c
+++ b/mxq_job.c
@@ -516,8 +516,6 @@ int mxq_set_job_status_exited(struct mx_mysql *mysql, struct mxq_job *job)
 
 int mxq_job_set_tmpfilenames(struct mxq_group *g, struct mxq_job *j)
 {
-    int res;
-
     if (!streq(j->job_stdout, "/dev/null")) {
         _mx_cleanup_free_ char *dir = NULL;
 
diff --git a/mxqd.c b/mxqd.c
index 4e7b9f0..577591c 100644
--- a/mxqd.c
+++ b/mxqd.c
@@ -1156,7 +1156,6 @@ unsigned long start_users(struct mxq_server *server)
     unsigned long slots_started_total = 0;
 
     struct mxq_user_list  *user, *unext=NULL;
-    struct mxq_group_list *group, *gnext;
 
     assert(server);
 
@@ -1201,7 +1200,6 @@ int remove_orphaned_groups(struct mxq_server *server)
 {
     struct mxq_user_list  *user,  *unext, *uprev;
     struct mxq_group_list *group, *gnext, *gprev;
-    struct mxq_job_list   *job;
     int cnt=0;
 
     for (user=server->users, uprev=NULL; user; user=unext) {
@@ -1527,17 +1525,13 @@ static void sig_handler(int sig)
 
 int main(int argc, char *argv[])
 {
-    struct mxq_group *mxqgroups;
-
     int group_cnt;
 
     struct mxq_server server;
-    struct mxq_group_list *group;
 
     unsigned long slots_started  = 0;
     unsigned long slots_returned = 0;
 
-    int i;
     int res;
 
     /*** server init ***/
diff --git a/mxqdump.c b/mxqdump.c
index bea145e..1024372 100644
--- a/mxqdump.c
+++ b/mxqdump.c
@@ -193,9 +193,6 @@ static int dump_group(struct mx_mysql *mysql, uint64_t group_id)
     struct mxq_group *grp, *groups = NULL;
 
     int grp_cnt = 0;
-    int total = 0;
-
-    int g;
 
     assert(mysql);
     assert(UINT64_HASVALUE(group_id));
@@ -219,7 +216,6 @@ static int dump_groups(struct mx_mysql *mysql, uint64_t status, uint64_t user_ui
     struct mxq_group *grp, *groups = NULL;
 
     int grp_cnt = 0;
-    int total = 0;
 
     int g;
 
@@ -260,9 +256,6 @@ static int dump_job(struct mx_mysql *mysql, uint64_t job_id)
 
     int grp_cnt = 0;
     int job_cnt = 0;
-    int total = 0;
-
-    int g, j;
 
     assert(mysql);
     assert(UINT64_HASVALUE(job_id));