diff --git a/tests/ampctl.c b/tests/ampctl.c
index facb707e9..787cbbdef 100644
--- a/tests/ampctl.c
+++ b/tests/ampctl.c
@@ -314,7 +314,7 @@ int main(int argc, char *argv[])
 
     if (amp_file)
     {
-        strncpy(my_amp->state.ampport.pathname, amp_file, FILPATHLEN - 1);
+        strncpy(my_amp->state.ampport.pathname, amp_file, HAMLIB_FILPATHLEN - 1);
     }
 
     /* FIXME: bound checking and port type == serial */
diff --git a/tests/ampctld.c b/tests/ampctld.c
index 05f10ef21..730c086e1 100644
--- a/tests/ampctld.c
+++ b/tests/ampctld.c
@@ -338,7 +338,7 @@ int main(int argc, char *argv[])
 
     if (amp_file)
     {
-        strncpy(my_amp->state.ampport.pathname, amp_file, FILPATHLEN - 1);
+        strncpy(my_amp->state.ampport.pathname, amp_file, HAMLIB_FILPATHLEN - 1);
     }
 
     /* FIXME: bound checking and port type == serial */
diff --git a/tests/dumpcaps.c b/tests/dumpcaps.c
index 31a8f8b23..3e37a5ef1 100644
--- a/tests/dumpcaps.c
+++ b/tests/dumpcaps.c
@@ -268,7 +268,7 @@ int dumpcaps(RIG *rig, FILE *fout)
 
     fprintf(fout, "Preamp:");
 
-    for (i = 0; i < MAXDBLSTSIZ && caps->preamp[i] != 0; i++)
+    for (i = 0; i < HAMLIB_MAXDBLSTSIZ && caps->preamp[i] != 0; i++)
     {
         fprintf(fout, " %ddB", caps->preamp[i]);
     }
@@ -281,7 +281,7 @@ int dumpcaps(RIG *rig, FILE *fout)
     fprintf(fout, "\n");
     fprintf(fout, "Attenuator:");
 
-    for (i = 0; i < MAXDBLSTSIZ && caps->attenuator[i] != 0; i++)
+    for (i = 0; i < HAMLIB_MAXDBLSTSIZ && caps->attenuator[i] != 0; i++)
     {
         fprintf(fout, " %ddB", caps->attenuator[i]);
     }
@@ -422,7 +422,7 @@ int dumpcaps(RIG *rig, FILE *fout)
 
     fprintf(fout, "Memories:");
 
-    for (i = 0; i < CHANLSTSIZ && caps->chan_list[i].type; i++)
+    for (i = 0; i < HAMLIB_CHANLSTSIZ && caps->chan_list[i].type; i++)
     {
         fprintf(fout,
                 "\n\t%d..%d:   \t%s",
@@ -602,7 +602,7 @@ int dumpcaps(RIG *rig, FILE *fout)
 
     fprintf(fout, "Tuning steps:");
 
-    for (i = 0; i < TSLSTSIZ && !RIG_IS_TS_END(caps->tuning_steps[i]); i++)
+    for (i = 0; i < HAMLIB_TSLSTSIZ && !RIG_IS_TS_END(caps->tuning_steps[i]); i++)
     {
         if (caps->tuning_steps[i].ts == RIG_TS_ANY)
         {
@@ -634,7 +634,7 @@ int dumpcaps(RIG *rig, FILE *fout)
 
     fprintf(fout, "Filters:");
 
-    for (i = 0; i < FLTLSTSIZ && !RIG_IS_FLT_END(caps->filters[i]); i++)
+    for (i = 0; i < HAMLIB_FLTLSTSIZ && !RIG_IS_FLT_END(caps->filters[i]); i++)
     {
         if (caps->filters[i].width == RIG_FLT_ANY)
         {
@@ -840,7 +840,7 @@ void range_print(FILE *fout, const struct freq_range_list range_list[], int rx)
     int i;
     char prntbuf[1024];  /* a malloc would be better.. */
 
-    for (i = 0; i < FRQRANGESIZ; i++)
+    for (i = 0; i < HAMLIB_FRQRANGESIZ; i++)
     {
         if (range_list[i].startf == 0 && range_list[i].endf == 0)
         {
@@ -918,7 +918,7 @@ int range_sanity_check(const struct freq_range_list range_list[], int rx)
 {
     int i;
 
-    for (i = 0; i < FRQRANGESIZ; i++)
+    for (i = 0; i < HAMLIB_FRQRANGESIZ; i++)
     {
         if (range_list[i].startf == 0 && range_list[i].endf == 0)
         {
@@ -956,7 +956,7 @@ int range_sanity_check(const struct freq_range_list range_list[], int rx)
         }
     }
 
-    if (i == FRQRANGESIZ)
+    if (i == HAMLIB_FRQRANGESIZ)
     {
         return -4;
     }
@@ -981,7 +981,7 @@ int ts_sanity_check(const struct tuning_step_list tuning_step[])
     last_ts = 0;
     last_modes = RIG_MODE_NONE;
 
-    for (i = 0; i < TSLSTSIZ; i++)
+    for (i = 0; i < HAMLIB_TSLSTSIZ; i++)
     {
         if (RIG_IS_TS_END(tuning_step[i]))
         {
@@ -1005,7 +1005,7 @@ int ts_sanity_check(const struct tuning_step_list tuning_step[])
         last_modes = tuning_step[i].modes;
     }
 
-    if (i == TSLSTSIZ)
+    if (i == HAMLIB_TSLSTSIZ)
     {
         return -4;
     }
diff --git a/tests/memcsv.c b/tests/memcsv.c
index 6d6d55be3..d6dc94397 100644
--- a/tests/memcsv.c
+++ b/tests/memcsv.c
@@ -748,7 +748,7 @@ int set_channel_data(RIG *rig,
     n = chan->channel_num = atoi(line_data_list[ i ]);
 
     /* find channel caps of appropriate memory group? */
-    for (j = 0; j < CHANLSTSIZ; j++)
+    for (j = 0; j < HAMLIB_CHANLSTSIZ; j++)
     {
         if (rig->state.chan_list[j].startc <= n && rig->state.chan_list[j].endc >= n)
         {
@@ -756,7 +756,7 @@ int set_channel_data(RIG *rig,
         }
     }
 
-    if (j == CHANLSTSIZ)
+    if (j == HAMLIB_CHANLSTSIZ)
     {
         return -RIG_EINVAL;
     }
diff --git a/tests/rigctl.c b/tests/rigctl.c
index 20a893fa7..978fc8710 100644
--- a/tests/rigctl.c
+++ b/tests/rigctl.c
@@ -472,7 +472,7 @@ int main(int argc, char *argv[])
 
     if (rig_file)
     {
-        strncpy(my_rig->state.rigport.pathname, rig_file, FILPATHLEN - 1);
+        strncpy(my_rig->state.rigport.pathname, rig_file, HAMLIB_FILPATHLEN - 1);
     }
 
     /*
@@ -490,12 +490,12 @@ int main(int argc, char *argv[])
 
     if (ptt_file)
     {
-        strncpy(my_rig->state.pttport.pathname, ptt_file, FILPATHLEN - 1);
+        strncpy(my_rig->state.pttport.pathname, ptt_file, HAMLIB_FILPATHLEN - 1);
     }
 
     if (dcd_file)
     {
-        strncpy(my_rig->state.dcdport.pathname, dcd_file, FILPATHLEN - 1);
+        strncpy(my_rig->state.dcdport.pathname, dcd_file, HAMLIB_FILPATHLEN - 1);
     }
 
     /* FIXME: bound checking and port type == serial */
diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c
index f81b47f9c..e83dfea0d 100644
--- a/tests/rigctl_parse.c
+++ b/tests/rigctl_parse.c
@@ -4083,7 +4083,7 @@ declare_proto_rig(dump_state)
     fprintf(fout, "%d\n", 0);
 #endif
 
-    for (i = 0; i < FRQRANGESIZ && !RIG_IS_FRNG_END(rs->rx_range_list[i]); i++)
+    for (i = 0; i < HAMLIB_FRQRANGESIZ && !RIG_IS_FRNG_END(rs->rx_range_list[i]); i++)
     {
         fprintf(fout,
                 "%"FREQFMT" %"FREQFMT" 0x%"PRXll" %d %d 0x%x 0x%x\n",
@@ -4098,7 +4098,7 @@ declare_proto_rig(dump_state)
 
     fprintf(fout, "0 0 0 0 0 0 0\n");
 
-    for (i = 0; i < FRQRANGESIZ && !RIG_IS_FRNG_END(rs->tx_range_list[i]); i++)
+    for (i = 0; i < HAMLIB_FRQRANGESIZ && !RIG_IS_FRNG_END(rs->tx_range_list[i]); i++)
     {
         fprintf(fout,
                 "%"FREQFMT" %"FREQFMT" 0x%"PRXll" %d %d 0x%x 0x%x\n",
@@ -4113,7 +4113,7 @@ declare_proto_rig(dump_state)
 
     fprintf(fout, "0 0 0 0 0 0 0\n");
 
-    for (i = 0; i < TSLSTSIZ && !RIG_IS_TS_END(rs->tuning_steps[i]); i++)
+    for (i = 0; i < HAMLIB_TSLSTSIZ && !RIG_IS_TS_END(rs->tuning_steps[i]); i++)
     {
         fprintf(fout,
                 "0x%"PRXll" %ld\n",
@@ -4123,7 +4123,7 @@ declare_proto_rig(dump_state)
 
     fprintf(fout, "0 0\n");
 
-    for (i = 0; i < FLTLSTSIZ && !RIG_IS_FLT_END(rs->filters[i]); i++)
+    for (i = 0; i < HAMLIB_FLTLSTSIZ && !RIG_IS_FLT_END(rs->filters[i]); i++)
     {
         fprintf(fout,
                 "0x%"PRXll" %ld\n",
@@ -4134,7 +4134,7 @@ declare_proto_rig(dump_state)
     fprintf(fout, "0 0\n");
 
 #if 0
-    chan_t chan_list[CHANLSTSIZ]; /*!< Channel list, zero ended */
+    chan_t chan_list[HAMLIB_CHANLSTSIZ]; /*!< Channel list, zero ended */
 #endif
 
     fprintf(fout, "%ld\n", rs->max_rit);
@@ -4142,14 +4142,14 @@ declare_proto_rig(dump_state)
     fprintf(fout, "%ld\n", rs->max_ifshift);
     fprintf(fout, "%d\n", rs->announces);
 
-    for (i = 0; i < MAXDBLSTSIZ && rs->preamp[i]; i++)
+    for (i = 0; i < HAMLIB_MAXDBLSTSIZ && rs->preamp[i]; i++)
     {
         fprintf(fout, "%d ", rs->preamp[i]);
     }
 
     fprintf(fout, "\n");
 
-    for (i = 0; i < MAXDBLSTSIZ && rs->attenuator[i]; i++)
+    for (i = 0; i < HAMLIB_MAXDBLSTSIZ && rs->attenuator[i]; i++)
     {
         fprintf(fout, "%d ", rs->attenuator[i]);
     }
diff --git a/tests/rigctlcom.c b/tests/rigctlcom.c
index eda52b98a..370d774ff 100644
--- a/tests/rigctlcom.c
+++ b/tests/rigctlcom.c
@@ -502,7 +502,7 @@ int main(int argc, char *argv[])
 
     if (rig_file)
     {
-        strncpy(my_rig->state.rigport.pathname, rig_file, FILPATHLEN - 1);
+        strncpy(my_rig->state.rigport.pathname, rig_file, HAMLIB_FILPATHLEN - 1);
     }
 
     if (!rig_file2)
@@ -511,7 +511,7 @@ int main(int argc, char *argv[])
         exit(2);
     }
 
-    strncpy(my_com.pathname, rig_file2, FILPATHLEN - 1);
+    strncpy(my_com.pathname, rig_file2, HAMLIB_FILPATHLEN - 1);
 
     /*
      * ex: RIG_PTT_PARALLEL and /dev/parport0
@@ -528,12 +528,12 @@ int main(int argc, char *argv[])
 
     if (ptt_file)
     {
-        strncpy(my_rig->state.pttport.pathname, ptt_file, FILPATHLEN - 1);
+        strncpy(my_rig->state.pttport.pathname, ptt_file, HAMLIB_FILPATHLEN - 1);
     }
 
     if (dcd_file)
     {
-        strncpy(my_rig->state.dcdport.pathname, dcd_file, FILPATHLEN - 1);
+        strncpy(my_rig->state.dcdport.pathname, dcd_file, HAMLIB_FILPATHLEN - 1);
     }
 
     /* FIXME: bound checking and port type == serial */
diff --git a/tests/rigctld.c b/tests/rigctld.c
index aa2bf1f99..a59388a6a 100644
--- a/tests/rigctld.c
+++ b/tests/rigctld.c
@@ -583,7 +583,7 @@ int main(int argc, char *argv[])
 
     if (rig_file)
     {
-        strncpy(my_rig->state.rigport.pathname, rig_file, FILPATHLEN - 1);
+        strncpy(my_rig->state.rigport.pathname, rig_file, HAMLIB_FILPATHLEN - 1);
     }
 
     my_rig->state.twiddle_timeout = twiddle_timeout;
@@ -607,12 +607,12 @@ int main(int argc, char *argv[])
 
     if (ptt_file)
     {
-        strncpy(my_rig->state.pttport.pathname, ptt_file, FILPATHLEN - 1);
+        strncpy(my_rig->state.pttport.pathname, ptt_file, HAMLIB_FILPATHLEN - 1);
     }
 
     if (dcd_file)
     {
-        strncpy(my_rig->state.dcdport.pathname, dcd_file, FILPATHLEN - 1);
+        strncpy(my_rig->state.dcdport.pathname, dcd_file, HAMLIB_FILPATHLEN - 1);
     }
 
     /* FIXME: bound checking and port type == serial */
diff --git a/tests/rigmem.c b/tests/rigmem.c
index 2174686ec..c8ab19a3e 100644
--- a/tests/rigmem.c
+++ b/tests/rigmem.c
@@ -288,7 +288,7 @@ int main(int argc, char *argv[])
 
     if (rig_file)
     {
-        strncpy(rig->state.rigport.pathname, rig_file, FILPATHLEN - 1);
+        strncpy(rig->state.rigport.pathname, rig_file, HAMLIB_FILPATHLEN - 1);
     }
 
     /* FIXME: bound checking and port type == serial */
diff --git a/tests/rigsmtr.c b/tests/rigsmtr.c
index 814355173..4a99570fa 100644
--- a/tests/rigsmtr.c
+++ b/tests/rigsmtr.c
@@ -271,7 +271,7 @@ int main(int argc, char *argv[])
 
     if (rig_file)
     {
-        strncpy(rig->state.rigport.pathname, rig_file, FILPATHLEN - 1);
+        strncpy(rig->state.rigport.pathname, rig_file, HAMLIB_FILPATHLEN - 1);
     }
 
     /* FIXME: bound checking and port type == serial */
@@ -335,7 +335,7 @@ int main(int argc, char *argv[])
 
     if (rot_file)
     {
-        strncpy(rot->state.rotport.pathname, rot_file, FILPATHLEN - 1);
+        strncpy(rot->state.rotport.pathname, rot_file, HAMLIB_FILPATHLEN - 1);
     }
 
     /* FIXME: bound checking and port type == serial */
diff --git a/tests/rigswr.c b/tests/rigswr.c
index ce8deac60..88d89d4cc 100644
--- a/tests/rigswr.c
+++ b/tests/rigswr.c
@@ -268,12 +268,12 @@ int main(int argc, char *argv[])
 
     if (ptt_file)
     {
-        strncpy(rig->state.pttport.pathname, ptt_file, FILPATHLEN - 1);
+        strncpy(rig->state.pttport.pathname, ptt_file, HAMLIB_FILPATHLEN - 1);
     }
 
     if (rig_file)
     {
-        strncpy(rig->state.rigport.pathname, rig_file, FILPATHLEN - 1);
+        strncpy(rig->state.rigport.pathname, rig_file, HAMLIB_FILPATHLEN - 1);
     }
 
     /* FIXME: bound checking and port type == serial */
diff --git a/tests/rotctl.c b/tests/rotctl.c
index 68f6b7a51..633d052cf 100644
--- a/tests/rotctl.c
+++ b/tests/rotctl.c
@@ -341,7 +341,7 @@ int main(int argc, char *argv[])
 
     if (rot_file)
     {
-        strncpy(my_rot->state.rotport.pathname, rot_file, FILPATHLEN - 1);
+        strncpy(my_rot->state.rotport.pathname, rot_file, HAMLIB_FILPATHLEN - 1);
     }
 
     /* FIXME: bound checking and port type == serial */
diff --git a/tests/rotctld.c b/tests/rotctld.c
index ab4e4d520..8b28c3bb6 100644
--- a/tests/rotctld.c
+++ b/tests/rotctld.c
@@ -348,7 +348,7 @@ int main(int argc, char *argv[])
 
     if (rot_file)
     {
-        strncpy(my_rot->state.rotport.pathname, rot_file, FILPATHLEN - 1);
+        strncpy(my_rot->state.rotport.pathname, rot_file, HAMLIB_FILPATHLEN - 1);
     }
 
     /* FIXME: bound checking and port type == serial */