diff --git a/loudmouth/lm-connection.c b/loudmouth/lm-connection.c
index 74ed958..abe65ac 100644
--- a/loudmouth/lm-connection.c
+++ b/loudmouth/lm-connection.c
@@ -608,6 +608,8 @@ connection_connect_cb (GIOChannel   *source,
  	return TRUE; 
 }
 
+#ifndef LM_NO_DEBUG
+
 static const char *
 connection_condition_to_str (GIOCondition condition)
 {
@@ -629,6 +631,8 @@ connection_condition_to_str (GIOCondition condition)
 	return buf;
 }
 
+#endif /* LM_NO_DEBUG */
+
 static gboolean
 connection_do_connect (LmConnectData *connect_data) 
 {
diff --git a/loudmouth/lm-connection.h b/loudmouth/lm-connection.h
diff --git a/loudmouth/lm-debug.c b/loudmouth/lm-debug.c
index 8f0a3f5..fbb86b1 100644
--- a/loudmouth/lm-debug.c
+++ b/loudmouth/lm-debug.c
@@ -77,5 +77,13 @@ lm_debug_init (void)
 
 	initialized = TRUE;
 }
+
+#else  /* LM_NO_DEBUG */
+
+void 
+lm_debug_init (void)
+{
+}
+
 #endif /* LM_NO_DEBUG */
 
diff --git a/loudmouth/lm-debug.h b/loudmouth/lm-debug.h
index b7857e7..22c0c8d 100644
--- a/loudmouth/lm-debug.h
+++ b/loudmouth/lm-debug.h
@@ -65,11 +65,7 @@ lm_verbose (const gchar *format, ...)
 #  endif
 #endif
 
-#if LM_NO_DEBUG
-#  define lm_debug_init() {};
-#else
 void lm_debug_init (void);
-#endif
 
 #endif /* __LM_DEBUG_H__ */