diff --git a/src/main.c b/src/main.c
index 711cbae..b04c4db 100644
--- a/src/main.c
+++ b/src/main.c
@@ -77,7 +77,7 @@ create_status_icon (void)
 }
 
 static gboolean
-status_icon_get_visible ()
+status_icon_get_visible (void)
 {
 	return status_icon_or_null && gtk_status_icon_get_visible (status_icon_or_null);
 }
diff --git a/src/process-statusbar.c b/src/process-statusbar.c
index 64f33e4..f39b3df 100644
--- a/src/process-statusbar.c
+++ b/src/process-statusbar.c
@@ -139,7 +139,7 @@ xtm_process_statusbar_set_property (GObject *object, guint property_id, const GV
 		text = g_strdup_printf (_("CPU: %s%%"), float_value);
 		gtk_label_set_text (GTK_LABEL (statusbar->label_cpu), text);
 		gdk_rgba_parse (&color, "#ff6e00");
-		gtk_widget_override_color (statusbar->label_cpu, GTK_STATE_NORMAL, &color);
+		gtk_widget_override_color (statusbar->label_cpu, GTK_STATE_FLAG_NORMAL, &color);
 		g_free (float_value);
 		g_free (text);
 		break;
@@ -150,7 +150,7 @@ xtm_process_statusbar_set_property (GObject *object, guint property_id, const GV
 		gtk_label_set_text (GTK_LABEL (statusbar->label_memory), text);
 		gtk_widget_set_tooltip_text (statusbar->label_memory, text);
 		gdk_rgba_parse (&color, "#c22b66");
-		gtk_widget_override_color (statusbar->label_memory, GTK_STATE_NORMAL, &color);
+		gtk_widget_override_color (statusbar->label_memory, GTK_STATE_FLAG_NORMAL, &color);
 		g_free (text);
 		break;
 
diff --git a/src/process-window.c b/src/process-window.c
index c086831..7d5a761 100644
--- a/src/process-window.c
+++ b/src/process-window.c
@@ -24,7 +24,6 @@
 #include <X11/Xproto.h>
 
 #include <glib-object.h>
-#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
@@ -239,7 +238,6 @@ static void
 xtm_process_window_init (XtmProcessWindow *window)
 {
 	GtkWidget *button;
-	GtkWidget *icon;
 	gint width, height;
 	gboolean show_legend;
 
diff --git a/src/settings-dialog.c b/src/settings-dialog.c
index c4e908d..bb910b9 100644
--- a/src/settings-dialog.c
+++ b/src/settings-dialog.c
@@ -12,7 +12,6 @@
 #endif
 
 #include <glib-object.h>
-#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
 #include <libxfce4ui/libxfce4ui.h>
@@ -79,7 +78,7 @@ combobox_foreach (GtkTreeModel *model,
 
 	gtk_tree_model_get_value (model, iter, 0, &prop);
 
-	if (g_value_get_int (&prop) == refresh_rate->rate)
+	if ((guint) g_value_get_int (&prop) == refresh_rate->rate)
 	{
 		gtk_combo_box_set_active_iter (GTK_COMBO_BOX (refresh_rate->combobox), iter);
 		return TRUE;
diff --git a/src/task-manager.h b/src/task-manager.h
index 22f0dd6..7b8e9f4 100644
--- a/src/task-manager.h
+++ b/src/task-manager.h
@@ -101,7 +101,7 @@ gboolean	set_priority_to_pid	(GPid pid, gint priority);
 #	define __unused				__attribute__((__unused__))
 #endif
 
-#if DEBUG
+#ifdef DEBUG
 #	define G_DEBUG_FMT(fmt, args...)	g_debug((fmt), ##args)
 #else
 #	define G_DEBUG_FMT(fmt, args...)