diff --git a/src/files.c b/src/files.c
index e937aa52..275fac14 100644
--- a/src/files.c
+++ b/src/files.c
@@ -2891,14 +2891,14 @@ void load_history(void)
 
 bool writehist(FILE *hist, historyheadtype *histhead)
 {
-    historytype *h;
+    historytype *p;
 
     /* Write oldest history first. */
-    for (h = histhead->tail; h->prev != NULL; h = h->prev) {
-	size_t len = strlen(h->data);
+    for (p = histhead->tail; p->prev != NULL; p = p->prev) {
+	size_t p_len = strlen(p->data);
 
-	sunder(h->data);
-	if (fwrite(h->data, sizeof(char), len, hist) < len ||
+	sunder(p->data);
+	if (fwrite(p->data, sizeof(char), p_len, hist) < p_len ||
 		putc('\n', hist) == EOF)
 	    return FALSE;
     }
diff --git a/src/winio.c b/src/winio.c
index 43aba48d..5812b9fc 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -2429,13 +2429,13 @@ void nanoget_repaint(const char *buf, const char *inputbuf, size_t x)
  * statusq(). */
 int nanogetstr(bool allow_tabs, const char *buf, const char *def,
 #ifndef NANO_SMALL
-		historyheadtype *history_list,
+	historyheadtype *history_list,
 #endif
-		const shortcut *s
+	const shortcut *s
 #ifndef DISABLE_TABCOMP
-		, bool *list
+	, bool *list
 #endif
-		)
+	)
 {
     int kbinput;
     bool meta_key, func_key, s_or_t, ran_func, finished;