diff --git a/log_manager/test/testlog.c b/log_manager/test/testlog.c
index 797af4d07..9494415db 100644
--- a/log_manager/test/testlog.c
+++ b/log_manager/test/testlog.c
@@ -89,7 +89,7 @@ int main(int argc, char* argv[])
                 goto return_err;
         }
 
-        thr = (thread_t*)calloc(1, nthr*sizeof(thread_t*));
+        thr = (thread_t **)calloc(1, nthr*sizeof(thread_t*));
         
         if (thr == NULL)
         {
@@ -585,7 +585,6 @@ static void* thr_run_morelog(
         void* data)
 {
         thread_t* td = (thread_t *)data;
-        char*     logstr;
         int       err;
         int       i;
         int       nmsg;
diff --git a/server/core/poll.c b/server/core/poll.c
index 2dc4c34ae..fb44a0346 100644
--- a/server/core/poll.c
+++ b/server/core/poll.c
@@ -15,7 +15,6 @@
  *
  * Copyright MariaDB Corporation Ab 2013-2014
  */
-#include <my_config.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>