diff --git a/src/evdev-mt-touchpad.h b/src/evdev-mt-touchpad.h
index da569264..6ccb1226 100644
--- a/src/evdev-mt-touchpad.h
+++ b/src/evdev-mt-touchpad.h
@@ -640,7 +640,7 @@ tp_button_is_inside_softbutton_area(const struct tp_dispatch *tp,
 
 void
 tp_release_all_taps(struct tp_dispatch *tp,
-		    uint64_t time);
+		    uint64_t now);
 
 void
 tp_tap_suspend(struct tp_dispatch *tp, uint64_t time);
diff --git a/src/evdev-tablet-pad.h b/src/evdev-tablet-pad.h
index feb95272..3fc0f796 100644
--- a/src/evdev-tablet-pad.h
+++ b/src/evdev-tablet-pad.h
@@ -103,6 +103,6 @@ void
 pad_destroy_leds(struct pad_dispatch *pad);
 void
 pad_button_update_mode(struct libinput_tablet_pad_mode_group *g,
-		       unsigned int pressed_button,
+		       unsigned int button_index,
 		       enum libinput_button_state state);
 #endif
diff --git a/src/filter.h b/src/filter.h
index 5c1bdcc8..5d4c1679 100644
--- a/src/filter.h
+++ b/src/filter.h
@@ -158,6 +158,6 @@ touchpad_lenovo_x230_accel_profile(struct motion_filter *filter,
 double
 trackpoint_accel_profile(struct motion_filter *filter,
 			 void *data,
-			 double delta,
+			 double velocity,
 			 uint64_t time);
 #endif /* FILTER_H */
diff --git a/src/libinput.h b/src/libinput.h
index 9570648c..6f12c66f 100644
--- a/src/libinput.h
+++ b/src/libinput.h
@@ -5061,7 +5061,7 @@ libinput_device_config_accel_get_profiles(struct libinput_device *device);
  */
 enum libinput_config_status
 libinput_device_config_accel_set_profile(struct libinput_device *device,
-					 enum libinput_config_accel_profile mode);
+					 enum libinput_config_accel_profile profile);
 
 /**
  * @ingroup config
diff --git a/src/quirks.h b/src/quirks.h
index ee85fe3b..db54d9a9 100644
--- a/src/quirks.h
+++ b/src/quirks.h
@@ -118,7 +118,7 @@ enum quirk {
  * tools, not user consumption. Do not display this in a GUI.
  */
 const char*
-quirk_get_name(enum quirk which);
+quirk_get_name(enum quirk q);
 
 /**
  * Log priorities used if custom logging is enabled.
diff --git a/src/util-ratelimit.h b/src/util-ratelimit.h
index a717ae96..5322a00e 100644
--- a/src/util-ratelimit.h
+++ b/src/util-ratelimit.h
@@ -41,5 +41,5 @@ struct ratelimit {
 	unsigned int num;
 };
 
-void ratelimit_init(struct ratelimit *r, uint64_t ival_ms, unsigned int burst);
+void ratelimit_init(struct ratelimit *r, uint64_t ival_us, unsigned int burst);
 enum ratelimit_state ratelimit_test(struct ratelimit *r);
diff --git a/src/util-strings.h b/src/util-strings.h
index 2c31ff80..5d99cfa2 100644
--- a/src/util-strings.h
+++ b/src/util-strings.h
@@ -225,8 +225,8 @@ safe_atod(const char *str, double *val)
 	return true;
 }
 
-char **strv_from_string(const char *string, const char *separator);
-char *strv_join(char **strv, const char *separator);
+char **strv_from_string(const char *in, const char *separator);
+char *strv_join(char **strv, const char *joiner);
 
 static inline void
 strv_free(char **strv) {