diff --git a/src/main/options.c b/src/main/options.c
index 5c1f6e8..f49a676 100644
--- a/src/main/options.c
+++ b/src/main/options.c
@@ -423,7 +423,7 @@ static bool opts_watchfd_parse(opts_t opts, const char *argument, /*@null@ */ co
  */
 static off_t dir_tree_file_size_so_far = 0;
 static int dir_tree_total_file_size( /*@unused@ */  __attribute__((unused))
-				    const char *fpath, const struct stat *sb, int typeflag, /*@unused@ */
+				    const char *fpath, const struct stat *sb, int typeflag,	/*@unused@ */
 				    __attribute__((unused))
 				    struct FTW *ftwbuf)
 {
diff --git a/src/pv/remote.c b/src/pv/remote.c
index dc65e7c..aeeec91 100644
--- a/src/pv/remote.c
+++ b/src/pv/remote.c
@@ -499,7 +499,7 @@ bool pv_remote_check(pvstate_t state)
  *
  * Returns nonzero on error.  If "silent" is false, reports the error.
  */
-int pv_remote_transferstate_fetch(pvstate_t state, pid_t query, /*@null@ */ off_t * sizeptr, bool silent)
+int pv_remote_transferstate_fetch(pvstate_t state, pid_t query, /*@null@ */ off_t *sizeptr, bool silent)
 {
 	char control_filename[4096];	 /* flawfinder: ignore */
 	FILE *control_fptr;
@@ -653,7 +653,7 @@ int pv_remote_transferstate_fetch(	 /*@unused@ */
 					 __attribute__((unused)) pid_t query,
 					 /*@null@ */
 					 /*@unused@ */
-					 __attribute__((unused)) off_t * sizeptr,
+					 __attribute__((unused)) off_t *sizeptr,
 					 /*@unused@ */
 					 __attribute__((unused))
 					 bool silent)
diff --git a/src/pv/signal.c b/src/pv/signal.c
index 72cc85e..33c1d96 100644
--- a/src/pv/signal.c
+++ b/src/pv/signal.c
@@ -262,7 +262,7 @@ static void pv_sig_term( /*@unused@ */  __attribute__((unused))
  * the sending PID.
  */
 static void pv_sig_usr2( /*@unused@ */  __attribute__((unused))
-			int sig, siginfo_t * info, /*@unused@ */  __attribute__((unused))
+			int sig, siginfo_t *info, /*@unused@ */  __attribute__((unused))
 			void *ucontext)
 {
 	if (NULL == pv_sig_state)
@@ -278,7 +278,7 @@ static void pv_sig_usr2( /*@unused@ */  __attribute__((unused))
  * Return true if a SIGUSR2 signal has been received since the last time
  * this function was called, populating *pid with the sending PID if so.
  */
-bool pv_sigusr2_received(pvstate_t state, pid_t * pid)
+bool pv_sigusr2_received(pvstate_t state, pid_t *pid)
 {
 	if (NULL == state)
 		return false;
@@ -296,7 +296,7 @@ bool pv_sigusr2_received(pvstate_t state, pid_t * pid)
  * the sending PID.
  */
 static void pv_sig_usr1( /*@unused@ */  __attribute__((unused))
-			int sig, siginfo_t * info, /*@unused@ */  __attribute__((unused))
+			int sig, siginfo_t *info, /*@unused@ */  __attribute__((unused))
 			void *ucontext)
 {
 	if (NULL == pv_sig_state)
@@ -312,7 +312,7 @@ static void pv_sig_usr1( /*@unused@ */  __attribute__((unused))
  * Return true if a SIGUSR1 signal has been received since the last time
  * this function was called, populating *pid with the sending PID if so.
  */
-bool pv_sigusr1_received(pvstate_t state, pid_t * pid)
+bool pv_sigusr1_received(pvstate_t state, pid_t *pid)
 {
 	if (NULL == state)
 		return false;
diff --git a/src/pv/state.c b/src/pv/state.c
index 86026ad..2345576 100644
--- a/src/pv/state.c
+++ b/src/pv/state.c
@@ -815,7 +815,7 @@ void pv_state_inputfiles(pvstate_t state, unsigned int input_file_count, const c
 /*
  * Set the arrays of watchfd process IDs and file descriptors.
  */
-void pv_state_watchfds(pvstate_t state, unsigned int watchfd_count, const pid_t * pids, const int *fds)
+void pv_state_watchfds(pvstate_t state, unsigned int watchfd_count, const pid_t *pids, const int *fds)
 {
 	unsigned int item_idx;
 	/*@only@ */ struct pvwatcheditem_s *new_array = NULL;
diff --git a/src/pv/watchpid.c b/src/pv/watchpid.c
index ba49799..2cc7f50 100644
--- a/src/pv/watchpid.c
+++ b/src/pv/watchpid.c
@@ -336,7 +336,7 @@ static int pidfds(pvstate_t state, unsigned int pid, struct proc_fdinfo **fds, i
 /*
  * Extend the info array by one, returning false on error.
  */
-static bool extend_info_array(int *array_length_ptr, pvwatchfd_t * info_array_ptr)
+static bool extend_info_array(int *array_length_ptr, pvwatchfd_t *info_array_ptr)
 {
 	int array_length = 0;
 	struct pvwatchfd_s *info_array = NULL;
@@ -433,7 +433,7 @@ static int pv_compare_watchfd(const void *a, const void *b)
  * read, or 2 for a memory allocation error.
  */
 int pv_watchpid_scanfds(pvstate_t state, pid_t watch_pid, int watch_fd, int *array_length_ptr,
-			pvwatchfd_t * info_array_ptr)
+			pvwatchfd_t *info_array_ptr)
 {
 	int array_length = 0;
 	struct pvwatchfd_s *info_array = NULL;