diff --git a/src/evdev-mt-touchpad-gestures.c b/src/evdev-mt-touchpad-gestures.c
index 07cf5a11..6c568a38 100644
--- a/src/evdev-mt-touchpad-gestures.c
+++ b/src/evdev-mt-touchpad-gestures.c
@@ -327,7 +327,7 @@ tp_gesture_handle_state_unknown(struct tp_dispatch *tp, uint64_t time)
 {
 	struct tp_touch *first = tp->gesture.touches[0],
 			*second = tp->gesture.touches[1];
-	int dir1, dir2;
+	uint32_t dir1, dir2;
 	int yres = tp->device->abs.absinfo_y->resolution;
 	int vert_distance;
 
diff --git a/src/filter.c b/src/filter.c
index ec258fad..83dcb35b 100644
--- a/src/filter.c
+++ b/src/filter.c
@@ -135,7 +135,7 @@ filter_get_type(struct motion_filter *filter)
 struct pointer_tracker {
 	struct normalized_coords delta; /* delta to most recent event */
 	uint64_t time;  /* us */
-	int dir;
+	uint32_t dir;
 };
 
 struct pointer_accelerator {
diff --git a/src/libinput-private.h b/src/libinput-private.h
index 60685b5a..46258802 100644
--- a/src/libinput-private.h
+++ b/src/libinput-private.h
@@ -700,10 +700,10 @@ enum directions {
 	UNDEFINED_DIRECTION = 0xff
 };
 
-static inline int
+static inline uint32_t
 normalized_get_direction(struct normalized_coords norm)
 {
-	int dir = UNDEFINED_DIRECTION;
+	uint32_t dir = UNDEFINED_DIRECTION;
 	int d1, d2;
 	double r;