--- a/imap4d/imap4d.h
+++ b/imap4d/imap4d.h
@@ -229,8 +229,6 @@ extern struct mu_tls_config global_tls_conf;
 extern int test_mode;
 extern int silent_expunge;
 
-int tls_available;
-
 /* Input functions */
 extern mu_stream_t iostream;
 extern int  io_untagged_response (int, const char *, ...) MU_PRINTFLIKE(2,3);
--- a/lib/tcpwrap.h
+++ b/lib/tcpwrap.h
@@ -17,7 +17,7 @@
 #include <mailutils/types.h>
 
 extern int mu_tcp_wrapper_enable;
-const char *mu_tcp_wrapper_daemon;
+extern const char *mu_tcp_wrapper_daemon;
 extern int mu_tcpwrapper_access (int fd);
 extern void mu_tcpwrapper_cfg_init (void);
 extern int mu_tcp_wrapper_prefork (int fd,