diff --git a/divelist-gtk.c b/divelist-gtk.c
index 79613e012..49f4b143c 100644
--- a/divelist-gtk.c
+++ b/divelist-gtk.c
@@ -34,6 +34,7 @@
 #include "display.h"
 #include "display-gtk.h"
 #include "webservice.h"
+#include "profile.h"
 
 #include <gdk-pixbuf/gdk-pixdata.h>
 #include "satellite.h"
diff --git a/gps.c b/gps.c
index a3806dee8..6f62b624e 100644
--- a/gps.c
+++ b/gps.c
@@ -147,7 +147,7 @@ static void add_gps_point(OsmGpsMap *map, float latitude, float longitude)
 static void key_press_event(GtkWidget *window, GdkEventKey *event, gpointer data)
 {
 	if ((event->string != NULL && event->keyval == GDK_Escape) ||
-			(event->string != NULL && event->keyval == GDK_w && event->state & GDK_CONTROL_MASK)) {
+			(event->string != NULL && event->keyval == GDK_w && (event->state & GDK_CONTROL_MASK))) {
 		gtk_widget_destroy(window);
 	}
 }