diff --git a/.gitignore b/.gitignore
index c2f8b94..99c06fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,7 +37,7 @@ have_arc4random.h
 have_ban_pragma.h
 have_const.h
 have_environ.h
-have_fpos.h
+have_fgetsetpos.h
 have_fpos_pos.h
 have_getpgid.h
 have_getprid.h
diff --git a/CHANGES b/CHANGES
index 4a20e03..81b0245 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,35 @@
 The following are the changes from calc version 2.14.1.2 to date:
 
+    Restored use of the #define FPOS_POS_LEN symbol.  This refers to
+    the length of the __pos element (if the __pos element exists),
+    the fpos_t type (if that type exists).
+
+    Changed SWAP_HALF_IN_FILEPOS(dest, src) mato to use FILEPOS_LEN Little
+    Endian when FILEPOS is a simple scalar type (i.e., HAVE_FILEPOS_SCALAR
+    is defined).
+
+    Changed #define HAVE_FPOS to HAVE_FGETSETPOS.
+
+    Corrected comment in have_fpos_pos.h.  The HAVE_FPOS_POS symbol was
+    NOT related to fgetpos & fsetpos but rather if we we have an __pos
+    element in FILEPOS.
+
+    Changed #define HAVE_NO_FPOS to HAVE_NO_FGETSETPOS.
+
+    Improved comments in have_fpos_pos.h to show why and how
+    HAVE_FPOS_POS, FPOS_POS_BITS, and FPOS_POS_LEN were defined or undefed.
+
+    Changed showfiles builtin to print sizes cast to (long int) with
+    the "%ld" printf format to avoid implementations that do not support
+    the "%lld" printf format specifier.
+
+    Renamed have_fpos.h to have_fgetsetpos.h.  Renamed CALC_HAVE_FPOS_H
+    to CALC_HAVE_FGETSETPOS_H.  The make install and the olduninstall
+    rules remove the any old have_fpos.h that was previously installed.
+
+
+The following are the changes from calc version 2.14.1.1 to 2.14.1.1:
+
     Added a few remarks on calc version numbers to version.c.
 
     Fixed how fposval.h is built.  On a number of systems, the fposval.c
@@ -48,29 +78,6 @@ The following are the changes from calc version 2.14.1.2 to date:
     The full_debug rule will no longer stop when one of the sub-tasks
     failed (exit non-zero).
 
-    Restored use of the #define FPOS_POS_LEN symbol.  This refers to
-    the length of the __pos element (if the __pos element exists),
-    the fpos_t type (if that type exists).
-
-    Changed SWAP_HALF_IN_FILEPOS(dest, src) mato to use FILEPOS_LEN Little
-    Endian when FILEPOS is a simple scalar type (i.e., HAVE_FILEPOS_SCALAR
-    is defined).
-
-    Changed #define HAVE_FPOS to HAVE_FGETSETPOS.
-
-    Corrected comment in have_fpos_pos.h.  The HAVE_FPOS_POS symbol was
-    NOT related to fgetpos & fsetpos but rather if we we have an __pos
-    element in FILEPOS.
-
-    Changed #define HAVE_NO_FPOS to HAVE_NO_FGETSETPOS.
-
-    Improved comments in have_fpos_pos.h to show why and how
-    HAVE_FPOS_POS, FPOS_POS_BITS, and FPOS_POS_LEN were defined or undefed.
-
-    Changed showfiles builtin to print sizes cast to (long int) with
-    the "%ld" printf format to avoid implementations that do not support
-    the "%lld" printf format specifier.
-
 
 The following are the changes from calc version 2.14.1.0 to 2.14.1.0:
 
diff --git a/Makefile b/Makefile
index b5d0731..a81dd1b 100644
--- a/Makefile
+++ b/Makefile
@@ -2069,7 +2069,7 @@ LIB_H_SRC= alloc.h banned.h blkcpy.h block.h byteswap.h calc.h cmath.h \
 # we build these .h files during the make
 #
 BUILD_H_SRC= align32.h args.h calcerr.h conf.h endian_calc.h \
-	fposval.h have_ban_pragma.h have_const.h have_fpos.h \
+	fposval.h have_ban_pragma.h have_const.h have_fgetsetpos.h \
 	have_fpos_pos.h have_getpgid.h have_getprid.h have_getsid.h \
 	have_gettime.h have_memmv.h have_newstr.h have_offscl.h \
 	have_posscl.h have_rusage.h have_stdlib.h have_strdup.h \
@@ -2087,7 +2087,7 @@ BUILD_C_SRC= calcerr.c
 # There MUST be a .c for every .o in UTIL_OBJS.
 #
 UTIL_C_SRC= align32.c endian.c longbits.c have_newstr.c have_uid_t.c \
-	have_const.c have_stdvs.c have_varvs.c fposval.c have_fpos.c \
+	have_const.c have_stdvs.c have_varvs.c fposval.c have_fgetsetpos.c \
 	have_fpos_pos.c have_offscl.c have_posscl.c have_memmv.c \
 	have_ustat.c have_getsid.c have_getpgid.c have_environ.c \
 	have_gettime.c have_getprid.c have_rusage.c have_strdup.c \
@@ -2105,7 +2105,7 @@ UTIL_MISC_SRC= calcerr_h.sed calcerr_h.awk calcerr_c.sed calcerr_c.awk \
 # There MUST be a .o for every .c in UTIL_C_SRC.
 #
 UTIL_OBJS= endian.o longbits.o have_newstr.o have_uid_t.o \
-	have_const.o fposval.o have_fpos.o have_fpos_pos.o \
+	have_const.o fposval.o have_fgetsetpos.o have_fpos_pos.o \
 	try_strarg.o have_stdvs.o have_varvs.o have_posscl.o have_memmv.o \
 	have_ustat.o have_getsid.o have_getpgid.o have_environ.o \
 	have_gettime.o have_getprid.o ver_calc.o have_rusage.o have_strdup.o \
@@ -3176,7 +3176,7 @@ terminal.h: ${MAKE_FILE} ${LOC_MKF}
 	    ${TRUE}; \
 	fi
 
-have_fpos.h: have_fpos.c banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
+have_fgetsetpos.h: have_fgetsetpos.c banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f fpos_tmp $@
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -3184,15 +3184,15 @@ have_fpos.h: have_fpos.c banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
 	${Q} echo ' */' >> $@
 	${Q} echo '' >> $@
 	${Q} echo '' >> $@
-	${Q} echo '#if !defined(CALC_HAVE_FPOS_H)' >> $@
-	${Q} echo '#define CALC_HAVE_FPOS_H' >> $@
+	${Q} echo '#if !defined(CALC_HAVE_FGETSETPOS_H)' >> $@
+	${Q} echo '#define CALC_HAVE_FGETSETPOS_H' >> $@
 	${Q} echo '' >> $@
 	${Q} echo '' >> $@
 	${Q} echo '/* do we have fgetpos & fsetpos functions? */' >> $@
-	${Q} ${RM} -f have_fpos.o have_fpos${EXT}
-	-${Q} ${LCC} ${HAVE_FGETSETPOS} ${ICFLAGS} have_fpos.c -c ${S} \
+	${Q} ${RM} -f have_fgetsetpos.o have_fpos${EXT}
+	-${Q} ${LCC} ${HAVE_FGETSETPOS} ${ICFLAGS} have_fgetsetpos.c -c ${S} \
 		|| ${TRUE}
-	-${Q} ${LCC} ${ILDFLAGS} have_fpos.o -o have_fpos${EXT} ${S} \
+	-${Q} ${LCC} ${ILDFLAGS} have_fgetsetpos.o -o have_fpos${EXT} ${S} \
 		|| ${TRUE}
 	-${Q} ./have_fpos${EXT} > fpos_tmp ${E} \
 		|| ${TRUE}
@@ -3205,8 +3205,8 @@ have_fpos.h: have_fpos.c banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
 	fi
 	${Q} echo '' >> $@
 	${Q} echo '' >> $@
-	${Q} echo '#endif /* !CALC_HAVE_FPOS_H */' >> $@
-	${Q} ${RM} -f have_fpos${EXT} have_fpos.o fpos_tmp
+	${Q} echo '#endif /* !CALC_HAVE_FGETSETPOS_H */' >> $@
+	${Q} ${RM} -f have_fpos${EXT} have_fgetsetpos.o fpos_tmp
 	${H} echo '$@ formed'
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
@@ -3218,7 +3218,7 @@ have_fpos.h: have_fpos.c banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
 	    ${TRUE}; \
 	fi
 
-have_fpos_pos.h: have_fpos_pos.c have_fpos.h have_posscl.h \
+have_fpos_pos.h: have_fpos_pos.c have_fgetsetpos.h have_posscl.h \
 		 banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f fpos_tmp $@
 	${H} echo 'forming $@'
@@ -3262,7 +3262,7 @@ have_fpos_pos.h: have_fpos_pos.c have_fpos.h have_posscl.h \
 	    ${TRUE}; \
 	fi
 
-fposval.h: fposval.c have_fpos.h have_fpos_pos.h have_offscl.h have_posscl.h \
+fposval.h: fposval.c have_fgetsetpos.h have_fpos_pos.h have_offscl.h have_posscl.h \
 	   endian_calc.h banned.h have_ban_pragma.h fposval.h.def alloc.h \
 	   have_newstr.h have_memmv.h have_string.h have_const.h have_string.h \
 	   have_unused.h ${MAKE_FILE} ${LOC_MKF}
@@ -3390,7 +3390,7 @@ have_offscl.h: have_offscl.c have_unistd.h \
 	    ${TRUE}; \
 	fi
 
-have_posscl.h: have_posscl.c have_fpos.h have_unistd.h \
+have_posscl.h: have_posscl.c have_fgetsetpos.h have_unistd.h \
 	banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f have_posscl have_posscl.o posscl_tmp $@
 	${H} echo 'forming $@'
@@ -5143,6 +5143,7 @@ olduninstall:
 	-${RMDIR} /usr/local/bin/cscript
 	${RM} -f inst_files
 	${RM} -f ${CALC_INCDIR}/calcerr.c
+	${RM} -f ${CALC_INCDIR}/have_fgetsetpos.h
 
 tags: ${CALCSRC} ${LIBSRC} ${H_SRC} ${BUILD_H_SRC} ${MAKE_FILE}
 	-${CTAGS} ${CALCSRC} ${LIBSRC} ${H_SRC} ${BUILD_H_SRC} 2>&1 | \
@@ -5529,6 +5530,9 @@ endif
 	fi
 	${V} # NOTE: misc install cleanup
 	${Q} ${RM} -f tmp
+	${V} # NOTE: have_fgetsetpos.h has been renamed to have_fgetsetpos.h so we
+	${V} #       remove the old have_fgetsetpos.h include file.
+	${Q} ${RM} -f ${CALC_INCDIR}/have_fgetsetpos.h
 	${V} # NOTE: remove the calcerr.c that was installed by mistake
 	${V} #	     under ${INC_DIR} in calc v2.12.9.1
 	${Q} ${RM} -f ${T}${CALC_INCDIR}/calcerr.c
@@ -5865,7 +5869,7 @@ blkcpy.o: file.h
 blkcpy.o: hash.h
 blkcpy.o: have_ban_pragma.h
 blkcpy.o: have_const.h
-blkcpy.o: have_fpos.h
+blkcpy.o: have_fgetsetpos.h
 blkcpy.o: have_memmv.h
 blkcpy.o: have_newstr.h
 blkcpy.o: have_stdlib.h
@@ -6153,7 +6157,7 @@ file.o: fposval.h
 file.o: hash.h
 file.o: have_ban_pragma.h
 file.o: have_const.h
-file.o: have_fpos.h
+file.o: have_fgetsetpos.h
 file.o: have_fpos_pos.h
 file.o: have_memmv.h
 file.o: have_newstr.h
@@ -6177,7 +6181,7 @@ fposval.o: endian_calc.h
 fposval.o: fposval.c
 fposval.o: have_ban_pragma.h
 fposval.o: have_const.h
-fposval.o: have_fpos.h
+fposval.o: have_fgetsetpos.h
 fposval.o: have_fpos_pos.h
 fposval.o: have_memmv.h
 fposval.o: have_newstr.h
@@ -6203,7 +6207,7 @@ func.o: func.h
 func.o: hash.h
 func.o: have_ban_pragma.h
 func.o: have_const.h
-func.o: have_fpos.h
+func.o: have_fgetsetpos.h
 func.o: have_memmv.h
 func.o: have_newstr.h
 func.o: have_rusage.h
@@ -6271,12 +6275,12 @@ have_const.o: have_const.c
 have_environ.o: banned.h
 have_environ.o: have_ban_pragma.h
 have_environ.o: have_environ.c
-have_fpos.o: banned.h
-have_fpos.o: have_ban_pragma.h
-have_fpos.o: have_fpos.c
+have_fgetsetpos.o: banned.h
+have_fgetsetpos.o: have_ban_pragma.h
+have_fgetsetpos.o: have_fgetsetpos.c
 have_fpos_pos.o: banned.h
 have_fpos_pos.o: have_ban_pragma.h
-have_fpos_pos.o: have_fpos.h
+have_fpos_pos.o: have_fgetsetpos.h
 have_fpos_pos.o: have_fpos_pos.c
 have_fpos_pos.o: have_posscl.h
 have_getpgid.o: banned.h
@@ -6308,7 +6312,7 @@ have_offscl.o: have_offscl.c
 have_offscl.o: have_unistd.h
 have_posscl.o: banned.h
 have_posscl.o: have_ban_pragma.h
-have_posscl.o: have_fpos.h
+have_posscl.o: have_fgetsetpos.h
 have_posscl.o: have_posscl.c
 have_posscl.o: have_unistd.h
 have_rusage.o: banned.h
@@ -6672,7 +6676,7 @@ opcodes.o: func.h
 opcodes.o: hash.h
 opcodes.o: have_ban_pragma.h
 opcodes.o: have_const.h
-opcodes.o: have_fpos.h
+opcodes.o: have_fgetsetpos.h
 opcodes.o: have_memmv.h
 opcodes.o: have_newstr.h
 opcodes.o: have_stdlib.h
@@ -7125,7 +7129,7 @@ value.o: func.h
 value.o: hash.h
 value.o: have_ban_pragma.h
 value.o: have_const.h
-value.o: have_fpos.h
+value.o: have_fgetsetpos.h
 value.o: have_memmv.h
 value.o: have_newstr.h
 value.o: have_stdlib.h
diff --git a/Makefile.simple b/Makefile.simple
index 0267dbd..c2d4561 100644
--- a/Makefile.simple
+++ b/Makefile.simple
@@ -1476,7 +1476,7 @@ LIB_H_SRC= alloc.h banned.h blkcpy.h block.h byteswap.h calc.h cmath.h \
 # we build these .h files during the make
 #
 BUILD_H_SRC= align32.h args.h calcerr.h conf.h endian_calc.h \
-	fposval.h have_ban_pragma.h have_const.h have_fpos.h \
+	fposval.h have_ban_pragma.h have_const.h have_fgetsetpos.h \
 	have_fpos_pos.h have_getpgid.h have_getprid.h have_getsid.h \
 	have_gettime.h have_memmv.h have_newstr.h have_offscl.h \
 	have_posscl.h have_rusage.h have_stdlib.h have_strdup.h \
@@ -1494,7 +1494,7 @@ BUILD_C_SRC= calcerr.c
 # There MUST be a .c for every .o in UTIL_OBJS.
 #
 UTIL_C_SRC= align32.c endian.c longbits.c have_newstr.c have_uid_t.c \
-	have_const.c have_stdvs.c have_varvs.c fposval.c have_fpos.c \
+	have_const.c have_stdvs.c have_varvs.c fposval.c have_fgetsetpos.c \
 	have_fpos_pos.c have_offscl.c have_posscl.c have_memmv.c \
 	have_ustat.c have_getsid.c have_getpgid.c have_environ.c \
 	have_gettime.c have_getprid.c have_rusage.c have_strdup.c \
@@ -1512,7 +1512,7 @@ UTIL_MISC_SRC= calcerr_h.sed calcerr_h.awk calcerr_c.sed calcerr_c.awk \
 # There MUST be a .o for every .c in UTIL_C_SRC.
 #
 UTIL_OBJS= endian.o longbits.o have_newstr.o have_uid_t.o \
-	have_const.o fposval.o have_fpos.o have_fpos_pos.o \
+	have_const.o fposval.o have_fgetsetpos.o have_fpos_pos.o \
 	try_strarg.o have_stdvs.o have_varvs.o have_posscl.o have_memmv.o \
 	have_ustat.o have_getsid.o have_getpgid.o have_environ.o \
 	have_gettime.o have_getprid.o ver_calc.o have_rusage.o have_strdup.o \
@@ -2490,7 +2490,7 @@ terminal.h: ${MAKE_FILE} ${LOC_MKF}
 	    ${TRUE}; \
 	fi
 
-have_fpos.h: have_fpos.c banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
+have_fgetsetpos.h: have_fgetsetpos.c banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f fpos_tmp $@
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -2498,15 +2498,15 @@ have_fpos.h: have_fpos.c banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
 	${Q} echo ' */' >> $@
 	${Q} echo '' >> $@
 	${Q} echo '' >> $@
-	${Q} echo '#if !defined(CALC_HAVE_FPOS_H)' >> $@
-	${Q} echo '#define CALC_HAVE_FPOS_H' >> $@
+	${Q} echo '#if !defined(CALC_HAVE_FGETSETPOS_H)' >> $@
+	${Q} echo '#define CALC_HAVE_FGETSETPOS_H' >> $@
 	${Q} echo '' >> $@
 	${Q} echo '' >> $@
 	${Q} echo '/* do we have fgetpos & fsetpos functions? */' >> $@
-	${Q} ${RM} -f have_fpos.o have_fpos${EXT}
-	-${Q} ${LCC} ${HAVE_FGETSETPOS} ${ICFLAGS} have_fpos.c -c ${S} \
+	${Q} ${RM} -f have_fgetsetpos.o have_fpos${EXT}
+	-${Q} ${LCC} ${HAVE_FGETSETPOS} ${ICFLAGS} have_fgetsetpos.c -c ${S} \
 		|| ${TRUE}
-	-${Q} ${LCC} ${ILDFLAGS} have_fpos.o -o have_fpos${EXT} ${S} \
+	-${Q} ${LCC} ${ILDFLAGS} have_fgetsetpos.o -o have_fpos${EXT} ${S} \
 		|| ${TRUE}
 	-${Q} ./have_fpos${EXT} > fpos_tmp ${E} \
 		|| ${TRUE}
@@ -2519,8 +2519,8 @@ have_fpos.h: have_fpos.c banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
 	fi
 	${Q} echo '' >> $@
 	${Q} echo '' >> $@
-	${Q} echo '#endif /* !CALC_HAVE_FPOS_H */' >> $@
-	${Q} ${RM} -f have_fpos${EXT} have_fpos.o fpos_tmp
+	${Q} echo '#endif /* !CALC_HAVE_FGETSETPOS_H */' >> $@
+	${Q} ${RM} -f have_fpos${EXT} have_fgetsetpos.o fpos_tmp
 	${H} echo '$@ formed'
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
@@ -2532,7 +2532,7 @@ have_fpos.h: have_fpos.c banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
 	    ${TRUE}; \
 	fi
 
-have_fpos_pos.h: have_fpos_pos.c have_fpos.h have_posscl.h \
+have_fpos_pos.h: have_fpos_pos.c have_fgetsetpos.h have_posscl.h \
 		 banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f fpos_tmp $@
 	${H} echo 'forming $@'
@@ -2576,7 +2576,7 @@ have_fpos_pos.h: have_fpos_pos.c have_fpos.h have_posscl.h \
 	    ${TRUE}; \
 	fi
 
-fposval.h: fposval.c have_fpos.h have_fpos_pos.h have_offscl.h have_posscl.h \
+fposval.h: fposval.c have_fgetsetpos.h have_fpos_pos.h have_offscl.h have_posscl.h \
 	   endian_calc.h banned.h have_ban_pragma.h fposval.h.def alloc.h \
 	   have_newstr.h have_memmv.h have_string.h have_const.h have_string.h \
 	   have_unused.h ${MAKE_FILE} ${LOC_MKF}
@@ -2704,7 +2704,7 @@ have_offscl.h: have_offscl.c have_unistd.h \
 	    ${TRUE}; \
 	fi
 
-have_posscl.h: have_posscl.c have_fpos.h have_unistd.h \
+have_posscl.h: have_posscl.c have_fgetsetpos.h have_unistd.h \
 	banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f have_posscl have_posscl.o posscl_tmp $@
 	${H} echo 'forming $@'
@@ -4431,6 +4431,7 @@ olduninstall:
 	-${RMDIR} /usr/local/bin/cscript
 	${RM} -f inst_files
 	${RM} -f ${CALC_INCDIR}/calcerr.c
+	${RM} -f ${CALC_INCDIR}/have_fgetsetpos.h
 
 tags: ${CALCSRC} ${LIBSRC} ${H_SRC} ${BUILD_H_SRC} ${MAKE_FILE}
 	-${CTAGS} ${CALCSRC} ${LIBSRC} ${H_SRC} ${BUILD_H_SRC} 2>&1 | \
@@ -4797,6 +4798,9 @@ install: ${LIB_H_SRC} ${BUILD_H_SRC} calc.1 all custom/Makefile
 	fi
 	${V} # NOTE: misc install cleanup
 	${Q} ${RM} -f tmp
+	${V} # NOTE: have_fgetsetpos.h has been renamed to have_fgetsetpos.h so we
+	${V} #       remove the old have_fgetsetpos.h include file.
+	${Q} ${RM} -f ${CALC_INCDIR}/have_fgetsetpos.h
 	${V} # NOTE: remove the calcerr.c that was installed by mistake
 	${V} #	     under ${INC_DIR} in calc v2.12.9.1
 	${Q} ${RM} -f ${T}${CALC_INCDIR}/calcerr.c
@@ -5133,7 +5137,7 @@ blkcpy.o: file.h
 blkcpy.o: hash.h
 blkcpy.o: have_ban_pragma.h
 blkcpy.o: have_const.h
-blkcpy.o: have_fpos.h
+blkcpy.o: have_fgetsetpos.h
 blkcpy.o: have_memmv.h
 blkcpy.o: have_newstr.h
 blkcpy.o: have_stdlib.h
@@ -5421,7 +5425,7 @@ file.o: fposval.h
 file.o: hash.h
 file.o: have_ban_pragma.h
 file.o: have_const.h
-file.o: have_fpos.h
+file.o: have_fgetsetpos.h
 file.o: have_fpos_pos.h
 file.o: have_memmv.h
 file.o: have_newstr.h
@@ -5445,7 +5449,7 @@ fposval.o: endian_calc.h
 fposval.o: fposval.c
 fposval.o: have_ban_pragma.h
 fposval.o: have_const.h
-fposval.o: have_fpos.h
+fposval.o: have_fgetsetpos.h
 fposval.o: have_fpos_pos.h
 fposval.o: have_memmv.h
 fposval.o: have_newstr.h
@@ -5471,7 +5475,7 @@ func.o: func.h
 func.o: hash.h
 func.o: have_ban_pragma.h
 func.o: have_const.h
-func.o: have_fpos.h
+func.o: have_fgetsetpos.h
 func.o: have_memmv.h
 func.o: have_newstr.h
 func.o: have_rusage.h
@@ -5539,12 +5543,12 @@ have_const.o: have_const.c
 have_environ.o: banned.h
 have_environ.o: have_ban_pragma.h
 have_environ.o: have_environ.c
-have_fpos.o: banned.h
-have_fpos.o: have_ban_pragma.h
-have_fpos.o: have_fpos.c
+have_fgetsetpos.o: banned.h
+have_fgetsetpos.o: have_ban_pragma.h
+have_fgetsetpos.o: have_fgetsetpos.c
 have_fpos_pos.o: banned.h
 have_fpos_pos.o: have_ban_pragma.h
-have_fpos_pos.o: have_fpos.h
+have_fpos_pos.o: have_fgetsetpos.h
 have_fpos_pos.o: have_fpos_pos.c
 have_fpos_pos.o: have_posscl.h
 have_getpgid.o: banned.h
@@ -5576,7 +5580,7 @@ have_offscl.o: have_offscl.c
 have_offscl.o: have_unistd.h
 have_posscl.o: banned.h
 have_posscl.o: have_ban_pragma.h
-have_posscl.o: have_fpos.h
+have_posscl.o: have_fgetsetpos.h
 have_posscl.o: have_posscl.c
 have_posscl.o: have_unistd.h
 have_rusage.o: banned.h
@@ -5940,7 +5944,7 @@ opcodes.o: func.h
 opcodes.o: hash.h
 opcodes.o: have_ban_pragma.h
 opcodes.o: have_const.h
-opcodes.o: have_fpos.h
+opcodes.o: have_fgetsetpos.h
 opcodes.o: have_memmv.h
 opcodes.o: have_newstr.h
 opcodes.o: have_stdlib.h
@@ -6393,7 +6397,7 @@ value.o: func.h
 value.o: hash.h
 value.o: have_ban_pragma.h
 value.o: have_const.h
-value.o: have_fpos.h
+value.o: have_fgetsetpos.h
 value.o: have_memmv.h
 value.o: have_newstr.h
 value.o: have_stdlib.h
diff --git a/file.c b/file.c
index 09af7be..f78b3af 100644
--- a/file.c
+++ b/file.c
@@ -39,7 +39,7 @@
 #include "calc.h"
 #include "alloc.h"
 #include "longbits.h"
-#include "have_fpos.h"
+#include "have_fgetsetpos.h"
 #include "have_fpos_pos.h"
 #include "fposval.h"
 #include "file.h"
diff --git a/file.h b/file.h
index c0b1ddb..38a20c9 100644
--- a/file.h
+++ b/file.h
@@ -32,9 +32,9 @@
 
 
 #if defined(CALC_SRC)	/* if we are building from the calc source tree */
-# include "have_fpos.h"
+# include "have_fgetsetpos.h"
 #else
-# include <calc/have_fpos.h>
+# include <calc/have_fgetsetpos.h>
 #endif
 
 
diff --git a/fposval.c b/fposval.c
index 89ff7af..04d3042 100644
--- a/fposval.c
+++ b/fposval.c
@@ -64,7 +64,7 @@
 # include <string.h>
 #endif
 #include "decl.h"
-#include "have_fpos.h"
+#include "have_fgetsetpos.h"
 #include "endian_calc.h"
 #include "have_offscl.h"
 #include "have_posscl.h"
diff --git a/have_fpos.c b/have_fgetsetpos.c
similarity index 91%
rename from have_fpos.c
rename to have_fgetsetpos.c
index 2aa9b00..495f346 100644
--- a/have_fpos.c
+++ b/have_fgetsetpos.c
@@ -1,7 +1,7 @@
 /*
  * have_fpos - Determine if have fgetpos and fsetpos functions
  *
- * Copyright (C) 1999,2021  Landon Curt Noll
+ * Copyright (C) 1999,2021,2022  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -28,7 +28,7 @@
  * If the symbol HAVE_NO_FGETSETPOS is defined, we will output nothing.
  * If we are able to compile this program, then we must have the
  * fgetpos and fsetpos functions and we will output the
- * appropriate have_fpos.h file body.
+ * appropriate have_fgetsetpos.h file body.
  */
 
 #include <stdio.h>
@@ -49,7 +49,7 @@ main(void)
 	/* set the current position */
 	(void) fsetpos(stdin, &pos);
 
-	/* print a have_fpos.h body that says we have the functions */
+	/* print a have_fgetsetpos.h body that says we have the functions */
 	printf("#undef HAVE_FGETSETPOS\n");
 	printf("#define HAVE_FGETSETPOS 1  /* yes */\n\n");
 	printf("typedef fpos_t FILEPOS;\n");
diff --git a/have_fpos_pos.c b/have_fpos_pos.c
index f619791..72e2fa4 100644
--- a/have_fpos_pos.c
+++ b/have_fpos_pos.c
@@ -26,7 +26,7 @@
 
 
 #include <stdio.h>
-#include "have_fpos.h"
+#include "have_fgetsetpos.h"
 #include "have_posscl.h"
 
 
diff --git a/have_posscl.c b/have_posscl.c
index 798d612..50b04f0 100644
--- a/have_posscl.c
+++ b/have_posscl.c
@@ -48,7 +48,7 @@
 #if defined(HAVE_UNISTD_H)
 #include <unistd.h>
 #endif
-#include "have_fpos.h"
+#include "have_fgetsetpos.h"
 
 
 #include "banned.h"	/* include after system header <> includes */
diff --git a/opcodes.c b/opcodes.c
index 8a89804..0216f24 100644
--- a/opcodes.c
+++ b/opcodes.c
@@ -38,7 +38,7 @@
 #include "file.h"
 #include "zrand.h"
 #include "zrandom.h"
-#include "have_fpos.h"
+#include "have_fgetsetpos.h"
 #include "custom.h"
 #include "lib_calc.h"
 #include "block.h"