179 files changed, 316 insertions, 316 deletions

diff --git a/src/proj_4D_api.cpp b/src/4D_api.cpp
index 88210348..88210348 100644
--- a/src/proj_4D_api.cpp
+++ b/src/4D_api.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 4912ae02..c67f187e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,7 +16,7 @@ include_HEADERS = proj.h proj_experimental.h proj_constants.h proj_api.h geodesi
 EXTRA_DIST = bin_cct.cmake bin_gie.cmake bin_cs2cs.cmake \
 	bin_geod.cmake bin_nad2bin.cmake bin_proj.cmake bin_projinfo.cmake \
 	lib_proj.cmake CMakeLists.txt bin_geodtest.cmake tests/geodtest.cpp \
-	pj_wkt1_grammar.y pj_wkt2_grammar.y apps/emess.h
+	wkt1_grammar.y wkt2_grammar.y apps/emess.h
 
 proj_SOURCES = apps/proj.cpp apps/gen_cheb.cpp apps/p_series.cpp apps/emess.cpp
 projinfo_SOURCES = apps/projinfo.cpp
@@ -63,166 +63,166 @@ libproj_la_SOURCES = \
 	iso19111/factory.cpp \
 	iso19111/c_api.cpp \
 	\
-	projections/PJ_aeqd.cpp \
-	projections/PJ_gnom.cpp \
-	projections/PJ_laea.cpp \
-	projections/PJ_mod_ster.cpp \
-	projections/PJ_nsper.cpp \
-	projections/PJ_nzmg.cpp \
-	projections/PJ_ortho.cpp \
-	projections/PJ_stere.cpp \
-	projections/PJ_sterea.cpp \
-	projections/PJ_aea.cpp \
-	projections/PJ_bipc.cpp \
-	projections/PJ_bonne.cpp \
-	projections/PJ_eqdc.cpp \
-	projections/PJ_isea.cpp \
-	projections/PJ_ccon.cpp \
-	projections/PJ_imw_p.cpp \
-	projections/PJ_krovak.cpp \
-	projections/PJ_lcc.cpp \
-	projections/PJ_poly.cpp \
-	projections/PJ_rpoly.cpp \
-	projections/PJ_sconics.cpp \
-	projections/proj_rouss.cpp \
-	projections/PJ_cass.cpp \
-	projections/PJ_cc.cpp \
-	projections/PJ_cea.cpp \
-	projections/PJ_eqc.cpp \
-	projections/PJ_gall.cpp \
-	projections/PJ_labrd.cpp \
-	projections/PJ_lsat.cpp \
-	projections/PJ_misrsom.cpp \
-	projections/PJ_merc.cpp \
-	projections/PJ_mill.cpp \
-	projections/PJ_ocea.cpp \
-	projections/PJ_omerc.cpp \
-	projections/PJ_somerc.cpp \
-	projections/PJ_tcc.cpp \
-	projections/PJ_tcea.cpp \
-	projections/PJ_times.cpp \
-	projections/PJ_tmerc.cpp \
-	projections/PJ_tobmerc.cpp \
-	projections/PJ_airy.cpp \
-	projections/PJ_aitoff.cpp \
-	projections/PJ_august.cpp \
-	projections/PJ_bacon.cpp \
-	projections/PJ_bertin1953.cpp \
-	projections/PJ_chamb.cpp \
-	projections/PJ_hammer.cpp \
-	projections/PJ_lagrng.cpp \
-	projections/PJ_larr.cpp \
-	projections/PJ_lask.cpp \
-	projections/PJ_latlong.cpp \
-	projections/PJ_nocol.cpp \
-	projections/PJ_ob_tran.cpp \
-	projections/PJ_oea.cpp \
-	projections/PJ_tpeqd.cpp \
-	projections/PJ_vandg.cpp \
-	projections/PJ_vandg2.cpp \
-	projections/PJ_vandg4.cpp \
-	projections/PJ_wag7.cpp \
-	projections/PJ_lcca.cpp \
-	projections/PJ_geos.cpp \
-	projections/proj_etmerc.cpp \
-	projections/PJ_boggs.cpp \
-	projections/PJ_collg.cpp \
-	projections/PJ_comill.cpp \
-	projections/PJ_crast.cpp \
-	projections/PJ_denoy.cpp \
-	projections/PJ_eck1.cpp \
-	projections/PJ_eck2.cpp \
-	projections/PJ_eck3.cpp \
-	projections/PJ_eck4.cpp \
-	projections/PJ_eck5.cpp \
-	projections/PJ_fahey.cpp \
-	projections/PJ_fouc_s.cpp \
-	projections/PJ_gins8.cpp \
-	projections/PJ_gstmerc.cpp \
-	projections/PJ_gn_sinu.cpp \
-	projections/PJ_goode.cpp \
-	projections/PJ_igh.cpp \
-	projections/PJ_hatano.cpp \
-	projections/PJ_loxim.cpp \
-	projections/PJ_mbt_fps.cpp \
-	projections/PJ_mbtfpp.cpp \
-	projections/PJ_mbtfpq.cpp \
-	projections/PJ_moll.cpp \
-	projections/PJ_nell.cpp \
-	projections/PJ_nell_h.cpp \
-	projections/PJ_patterson.cpp \
-	projections/PJ_putp2.cpp \
-	projections/PJ_putp3.cpp \
-	projections/PJ_putp4p.cpp \
-	projections/PJ_putp5.cpp \
-	projections/PJ_putp6.cpp \
-	projections/PJ_qsc.cpp \
-	projections/PJ_robin.cpp \
-	projections/PJ_sch.cpp \
-	projections/PJ_sts.cpp \
-	projections/PJ_urm5.cpp \
-	projections/PJ_urmfps.cpp \
-	projections/PJ_wag2.cpp \
-	projections/PJ_wag3.cpp \
-	projections/PJ_wink1.cpp \
-	projections/PJ_wink2.cpp \
-	projections/PJ_healpix.cpp \
-	projections/PJ_natearth.cpp \
-	projections/PJ_natearth2.cpp \
-	projections/PJ_calcofi.cpp \
-	projections/PJ_eqearth.cpp \
+	projections/aeqd.cpp \
+	projections/gnom.cpp \
+	projections/laea.cpp \
+	projections/mod_ster.cpp \
+	projections/nsper.cpp \
+	projections/nzmg.cpp \
+	projections/ortho.cpp \
+	projections/stere.cpp \
+	projections/sterea.cpp \
+	projections/aea.cpp \
+	projections/bipc.cpp \
+	projections/bonne.cpp \
+	projections/eqdc.cpp \
+	projections/isea.cpp \
+	projections/ccon.cpp \
+	projections/imw_p.cpp \
+	projections/krovak.cpp \
+	projections/lcc.cpp \
+	projections/poly.cpp \
+	projections/rpoly.cpp \
+	projections/sconics.cpp \
+	projections/rouss.cpp \
+	projections/cass.cpp \
+	projections/cc.cpp \
+	projections/cea.cpp \
+	projections/eqc.cpp \
+	projections/gall.cpp \
+	projections/labrd.cpp \
+	projections/lsat.cpp \
+	projections/misrsom.cpp \
+	projections/merc.cpp \
+	projections/mill.cpp \
+	projections/ocea.cpp \
+	projections/omerc.cpp \
+	projections/somerc.cpp \
+	projections/tcc.cpp \
+	projections/tcea.cpp \
+	projections/times.cpp \
+	projections/tmerc.cpp \
+	projections/tobmerc.cpp \
+	projections/airy.cpp \
+	projections/aitoff.cpp \
+	projections/august.cpp \
+	projections/bacon.cpp \
+	projections/bertin1953.cpp \
+	projections/chamb.cpp \
+	projections/hammer.cpp \
+	projections/lagrng.cpp \
+	projections/larr.cpp \
+	projections/lask.cpp \
+	projections/latlong.cpp \
+	projections/nocol.cpp \
+	projections/ob_tran.cpp \
+	projections/oea.cpp \
+	projections/tpeqd.cpp \
+	projections/vandg.cpp \
+	projections/vandg2.cpp \
+	projections/vandg4.cpp \
+	projections/wag7.cpp \
+	projections/lcca.cpp \
+	projections/geos.cpp \
+	projections/etmerc.cpp \
+	projections/boggs.cpp \
+	projections/collg.cpp \
+	projections/comill.cpp \
+	projections/crast.cpp \
+	projections/denoy.cpp \
+	projections/eck1.cpp \
+	projections/eck2.cpp \
+	projections/eck3.cpp \
+	projections/eck4.cpp \
+	projections/eck5.cpp \
+	projections/fahey.cpp \
+	projections/fouc_s.cpp \
+	projections/gins8.cpp \
+	projections/gstmerc.cpp \
+	projections/gn_sinu.cpp \
+	projections/goode.cpp \
+	projections/igh.cpp \
+	projections/hatano.cpp \
+	projections/loxim.cpp \
+	projections/mbt_fps.cpp \
+	projections/mbtfpp.cpp \
+	projections/mbtfpq.cpp \
+	projections/moll.cpp \
+	projections/nell.cpp \
+	projections/nell_h.cpp \
+	projections/patterson.cpp \
+	projections/putp2.cpp \
+	projections/putp3.cpp \
+	projections/putp4p.cpp \
+	projections/putp5.cpp \
+	projections/putp6.cpp \
+	projections/qsc.cpp \
+	projections/robin.cpp \
+	projections/sch.cpp \
+	projections/sts.cpp \
+	projections/urm5.cpp \
+	projections/urmfps.cpp \
+	projections/wag2.cpp \
+	projections/wag3.cpp \
+	projections/wink1.cpp \
+	projections/wink2.cpp \
+	projections/healpix.cpp \
+	projections/natearth.cpp \
+	projections/natearth2.cpp \
+	projections/calcofi.cpp \
+	projections/eqearth.cpp \
 	\
-	conversions/PJ_axisswap.cpp \
-	conversions/PJ_cart.cpp \
-	conversions/PJ_geoc.cpp \
-	conversions/pj_geocent.cpp \
-	conversions/PJ_unitconvert.cpp \
+	conversions/axisswap.cpp \
+	conversions/cart.cpp \
+	conversions/geoc.cpp \
+	conversions/geocent.cpp \
+	conversions/unitconvert.cpp \
 	\
-	transformations/PJ_affine.cpp \
-	transformations/PJ_deformation.cpp \
-	transformations/PJ_helmert.cpp \
-	transformations/PJ_hgridshift.cpp \
-	transformations/PJ_horner.cpp \
-	transformations/PJ_molodensky.cpp \
-	transformations/PJ_vgridshift.cpp \
+	transformations/affine.cpp \
+	transformations/deformation.cpp \
+	transformations/helmert.cpp \
+	transformations/hgridshift.cpp \
+	transformations/horner.cpp \
+	transformations/molodensky.cpp \
+	transformations/vgridshift.cpp \
 	\
 	aasincos.cpp adjlon.cpp bch2bps.cpp bchgen.cpp \
-	biveval.cpp dmstor.cpp mk_cheby.cpp pj_auth.cpp \
-	pj_deriv.cpp pj_ell_set.cpp pj_ellps.cpp pj_errno.cpp \
-	pj_factors.cpp pj_fwd.cpp pj_init.cpp pj_inv.cpp \
-	pj_list.cpp pj_malloc.cpp pj_mlfn.cpp pj_msfn.cpp proj_mdist.cpp \
-	pj_open_lib.cpp pj_param.cpp pj_phi2.cpp pj_pr_list.cpp \
-	pj_qsfn.cpp pj_strerrno.cpp \
-	pj_tsfn.cpp pj_units.cpp pj_ctx.cpp pj_log.cpp pj_zpoly1.cpp rtodms.cpp \
-	vector1.cpp pj_release.cpp pj_gauss.cpp \
-	pj_fileapi.cpp \
+	biveval.cpp dmstor.cpp mk_cheby.cpp auth.cpp \
+	deriv.cpp ell_set.cpp ellps.cpp errno.cpp \
+	factors.cpp fwd.cpp init.cpp inv.cpp \
+	list.cpp malloc.cpp mlfn.cpp msfn.cpp proj_mdist.cpp \
+	open_lib.cpp param.cpp phi2.cpp pr_list.cpp \
+	qsfn.cpp strerrno.cpp \
+	tsfn.cpp units.cpp ctx.cpp log.cpp zpoly1.cpp rtodms.cpp \
+	vector1.cpp release.cpp gauss.cpp \
+	fileapi.cpp \
 	\
-	pj_gc_reader.cpp pj_gridcatalog.cpp \
+	gc_reader.cpp gridcatalog.cpp \
 	nad_cvt.cpp nad_init.cpp nad_intr.cpp \
-	pj_apply_gridshift.cpp pj_datums.cpp pj_datum_set.cpp pj_transform.cpp \
-	geocent.cpp geocent.h pj_utils.cpp pj_gridinfo.cpp pj_gridlist.cpp \
-	jniproj.cpp pj_mutex.cpp pj_initcache.cpp pj_apply_vgridshift.cpp geodesic.cpp \
-	pj_strtod.cpp pj_math.cpp \
+	apply_gridshift.cpp datums.cpp datum_set.cpp transform.cpp \
+	geocent.cpp geocent.h utils.cpp gridinfo.cpp gridlist.cpp \
+	jniproj.cpp mutex.cpp initcache.cpp apply_vgridshift.cpp geodesic.cpp \
+	strtod.cpp math.cpp \
 	\
-	proj_4D_api.cpp PJ_pipeline.cpp \
-	pj_internal.cpp \
-	pj_wkt_parser.hpp pj_wkt_parser.cpp \
-	pj_wkt1_parser.h pj_wkt1_parser.cpp \
-	pj_wkt1_generated_parser.h pj_wkt1_generated_parser.c \
-	pj_wkt2_parser.h pj_wkt2_parser.cpp \
-	pj_wkt2_generated_parser.h pj_wkt2_generated_parser.c
+	4D_api.cpp pipeline.cpp \
+	internal.cpp \
+	wkt_parser.hpp wkt_parser.cpp \
+	wkt1_parser.h wkt1_parser.cpp \
+	wkt1_generated_parser.h wkt1_generated_parser.c \
+	wkt2_parser.h wkt2_parser.cpp \
+	wkt2_generated_parser.h wkt2_generated_parser.c
 
 
 # The sed hack is to please MSVC
 wkt1_parser:
-	bison --no-lines -d  -p pj_wkt1_ -o$(top_srcdir)/src/pj_wkt1_generated_parser.c $(top_srcdir)/src/pj_wkt1_grammar.y
-	sed "s/\*yyssp = yystate/\*yyssp = (yytype_int16)yystate/" < $(top_srcdir)/src/pj_wkt1_generated_parser.c | sed "s/yyerrorlab:/#if 0\nyyerrorlab:/" | sed "s/yyerrlab1:/#endif\nyyerrlab1:/" | sed "s/for (yylen = 0; yystr\[yylen\]; yylen++)/for (yylen = 0; yystr \&\& yystr\[yylen\]; yylen++)/"  > $(top_srcdir)/src/pj_wkt1_generated_parser.c.tmp
-	mv $(top_srcdir)/src/pj_wkt1_generated_parser.c.tmp $(top_srcdir)/src/pj_wkt1_generated_parser.c
+	bison --no-lines -d  -p pj_wkt1_ -o$(top_srcdir)/src/wkt1_generated_parser.c $(top_srcdir)/src/wkt1_grammar.y
+	sed "s/\*yyssp = yystate/\*yyssp = (yytype_int16)yystate/" < $(top_srcdir)/src/wkt1_generated_parser.c | sed "s/yyerrorlab:/#if 0\nyyerrorlab:/" | sed "s/yyerrlab1:/#endif\nyyerrlab1:/" | sed "s/for (yylen = 0; yystr\[yylen\]; yylen++)/for (yylen = 0; yystr \&\& yystr\[yylen\]; yylen++)/"  > $(top_srcdir)/src/wkt1_generated_parser.c.tmp
+	mv $(top_srcdir)/src/wkt1_generated_parser.c.tmp $(top_srcdir)/src/wkt1_generated_parser.c
 
 wkt2_parser:
-	bison --no-lines -d  -p pj_wkt2_ -o$(top_srcdir)/src/pj_wkt2_generated_parser.c $(top_srcdir)/src/pj_wkt2_grammar.y
-	sed "s/\*yyssp = yystate/\*yyssp = (yytype_int16)yystate/" < $(top_srcdir)/src/pj_wkt2_generated_parser.c | sed "s/yyerrorlab:/#if 0\nyyerrorlab:/" | sed "s/yyerrlab1:/#endif\nyyerrlab1:/" | sed "s/for (yylen = 0; yystr\[yylen\]; yylen++)/for (yylen = 0; yystr \&\& yystr\[yylen\]; yylen++)/"  > $(top_srcdir)/src/pj_wkt2_generated_parser.c.tmp
-	mv $(top_srcdir)/src/pj_wkt2_generated_parser.c.tmp $(top_srcdir)/src/pj_wkt2_generated_parser.c
+	bison --no-lines -d  -p pj_wkt2_ -o$(top_srcdir)/src/wkt2_generated_parser.c $(top_srcdir)/src/wkt2_grammar.y
+	sed "s/\*yyssp = yystate/\*yyssp = (yytype_int16)yystate/" < $(top_srcdir)/src/wkt2_generated_parser.c | sed "s/yyerrorlab:/#if 0\nyyerrorlab:/" | sed "s/yyerrlab1:/#endif\nyyerrlab1:/" | sed "s/for (yylen = 0; yystr\[yylen\]; yylen++)/for (yylen = 0; yystr \&\& yystr\[yylen\]; yylen++)/"  > $(top_srcdir)/src/wkt2_generated_parser.c.tmp
+	mv $(top_srcdir)/src/wkt2_generated_parser.c.tmp $(top_srcdir)/src/wkt2_generated_parser.c
 
 
 install-exec-local: install-binPROGRAMS
diff --git a/src/pj_apply_gridshift.cpp b/src/apply_gridshift.cpp
index 4c8115cc..4c8115cc 100644
--- a/src/pj_apply_gridshift.cpp
+++ b/src/apply_gridshift.cpp
diff --git a/src/pj_apply_vgridshift.cpp b/src/apply_vgridshift.cpp
index 1facfed6..1facfed6 100644
--- a/src/pj_apply_vgridshift.cpp
+++ b/src/apply_vgridshift.cpp
diff --git a/src/pj_auth.cpp b/src/auth.cpp
index cde60a29..cde60a29 100644
--- a/src/pj_auth.cpp
+++ b/src/auth.cpp
diff --git a/src/conversions/PJ_axisswap.cpp b/src/conversions/axisswap.cpp
index 8714ec85..8714ec85 100644
--- a/src/conversions/PJ_axisswap.cpp
+++ b/src/conversions/axisswap.cpp
diff --git a/src/conversions/PJ_cart.cpp b/src/conversions/cart.cpp
index 6fed9985..6fed9985 100644
--- a/src/conversions/PJ_cart.cpp
+++ b/src/conversions/cart.cpp
diff --git a/src/conversions/PJ_geoc.cpp b/src/conversions/geoc.cpp
index 0455fada..0455fada 100644
--- a/src/conversions/PJ_geoc.cpp
+++ b/src/conversions/geoc.cpp
diff --git a/src/conversions/pj_geocent.cpp b/src/conversions/geocent.cpp
index 0e9d725e..0e9d725e 100644
--- a/src/conversions/pj_geocent.cpp
+++ b/src/conversions/geocent.cpp
diff --git a/src/conversions/PJ_unitconvert.cpp b/src/conversions/unitconvert.cpp
index b25fd5d2..b25fd5d2 100644
--- a/src/conversions/PJ_unitconvert.cpp
+++ b/src/conversions/unitconvert.cpp
diff --git a/src/pj_ctx.cpp b/src/ctx.cpp
index ab51d6c1..ab51d6c1 100644
--- a/src/pj_ctx.cpp
+++ b/src/ctx.cpp
diff --git a/src/pj_datum_set.cpp b/src/datum_set.cpp
index c9dfdb80..c9dfdb80 100644
--- a/src/pj_datum_set.cpp
+++ b/src/datum_set.cpp
diff --git a/src/pj_datums.cpp b/src/datums.cpp
index acbe12f7..acbe12f7 100644
--- a/src/pj_datums.cpp
+++ b/src/datums.cpp
diff --git a/src/pj_deriv.cpp b/src/deriv.cpp
index 0e285265..0e285265 100644
--- a/src/pj_deriv.cpp
+++ b/src/deriv.cpp
diff --git a/src/pj_ell_set.cpp b/src/ell_set.cpp
index 486230a5..486230a5 100644
--- a/src/pj_ell_set.cpp
+++ b/src/ell_set.cpp
diff --git a/src/pj_ellps.cpp b/src/ellps.cpp
index f548d30d..f548d30d 100644
--- a/src/pj_ellps.cpp
+++ b/src/ellps.cpp
diff --git a/src/pj_errno.cpp b/src/errno.cpp
index f6ea9bfc..f6ea9bfc 100644
--- a/src/pj_errno.cpp
+++ b/src/errno.cpp
diff --git a/src/pj_factors.cpp b/src/factors.cpp
index 768bf585..768bf585 100644
--- a/src/pj_factors.cpp
+++ b/src/factors.cpp
diff --git a/src/pj_fileapi.cpp b/src/fileapi.cpp
index 3df73236..3df73236 100644
--- a/src/pj_fileapi.cpp
+++ b/src/fileapi.cpp
diff --git a/src/pj_fwd.cpp b/src/fwd.cpp
index e8f73999..e8f73999 100644
--- a/src/pj_fwd.cpp
+++ b/src/fwd.cpp
diff --git a/src/pj_gauss.cpp b/src/gauss.cpp
index 2db713ad..2db713ad 100644
--- a/src/pj_gauss.cpp
+++ b/src/gauss.cpp
diff --git a/src/pj_gc_reader.cpp b/src/gc_reader.cpp
index 118aadf6..118aadf6 100644
--- a/src/pj_gc_reader.cpp
+++ b/src/gc_reader.cpp
diff --git a/src/pj_gridcatalog.cpp b/src/gridcatalog.cpp
index fef2df56..fef2df56 100644
--- a/src/pj_gridcatalog.cpp
+++ b/src/gridcatalog.cpp
diff --git a/src/pj_gridinfo.cpp b/src/gridinfo.cpp
index 046abfcc..046abfcc 100644
--- a/src/pj_gridinfo.cpp
+++ b/src/gridinfo.cpp
diff --git a/src/pj_gridlist.cpp b/src/gridlist.cpp
index 169abcb9..169abcb9 100644
--- a/src/pj_gridlist.cpp
+++ b/src/gridlist.cpp
diff --git a/src/pj_init.cpp b/src/init.cpp
index 5710031c..5710031c 100644
--- a/src/pj_init.cpp
+++ b/src/init.cpp
diff --git a/src/pj_initcache.cpp b/src/initcache.cpp
index 052a016c..052a016c 100644
--- a/src/pj_initcache.cpp
+++ b/src/initcache.cpp
diff --git a/src/pj_internal.cpp b/src/internal.cpp
index 3f3d191e..3f3d191e 100644
--- a/src/pj_internal.cpp
+++ b/src/internal.cpp
diff --git a/src/pj_inv.cpp b/src/inv.cpp
index ba7e6722..ba7e6722 100644
--- a/src/pj_inv.cpp
+++ b/src/inv.cpp
diff --git a/src/iso19111/io.cpp b/src/iso19111/io.cpp
index fe3680fb..7f68a579 100644
--- a/src/iso19111/io.cpp
+++ b/src/iso19111/io.cpp
@@ -60,8 +60,8 @@
 
 #include "proj_constants.h"
 
-#include "pj_wkt1_parser.h"
-#include "pj_wkt2_parser.h"
+#include "wkt1_parser.h"
+#include "wkt2_parser.h"
 
 // PROJ include order is sensitive
 // clang-format off
diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake
index 237f26ec..0e72d7e4 100644
--- a/src/lib_proj.cmake
+++ b/src/lib_proj.cmake
@@ -56,132 +56,132 @@ endif()
 ##############################################
 
 SET(SRC_LIBPROJ_PROJECTIONS
-        projections/PJ_aeqd.cpp
-        projections/PJ_gnom.cpp
-        projections/PJ_laea.cpp
-        projections/PJ_mod_ster.cpp
-        projections/PJ_nsper.cpp
-        projections/PJ_nzmg.cpp
-        projections/PJ_ortho.cpp
-        projections/PJ_stere.cpp
-        projections/PJ_sterea.cpp
-        projections/PJ_aea.cpp
-        projections/PJ_bipc.cpp
-        projections/PJ_bonne.cpp
-        projections/PJ_eqdc.cpp
-        projections/PJ_isea.cpp
-        projections/PJ_ccon.cpp
-        projections/PJ_imw_p.cpp
-        projections/PJ_krovak.cpp
-        projections/PJ_lcc.cpp
-        projections/PJ_poly.cpp
-        projections/PJ_rpoly.cpp
-        projections/PJ_sconics.cpp
-        projections/proj_rouss.cpp
-        projections/PJ_cass.cpp
-        projections/PJ_cc.cpp
-        projections/PJ_cea.cpp
-        projections/PJ_eqc.cpp
-        projections/PJ_gall.cpp
-        projections/PJ_labrd.cpp
-        projections/PJ_lsat.cpp
-        projections/PJ_misrsom.cpp
-        projections/PJ_merc.cpp
-        projections/PJ_mill.cpp
-        projections/PJ_ocea.cpp
-        projections/PJ_omerc.cpp
-        projections/PJ_somerc.cpp
-        projections/PJ_tcc.cpp
-        projections/PJ_tcea.cpp
-        projections/PJ_times.cpp
-        projections/PJ_tmerc.cpp
-        projections/PJ_tobmerc.cpp
-        projections/PJ_airy.cpp
-        projections/PJ_aitoff.cpp
-        projections/PJ_august.cpp
-        projections/PJ_bacon.cpp
-        projections/PJ_bertin1953.cpp
-        projections/PJ_chamb.cpp
-        projections/PJ_hammer.cpp
-        projections/PJ_lagrng.cpp
-        projections/PJ_larr.cpp
-        projections/PJ_lask.cpp
-        projections/PJ_latlong.cpp
-        projections/PJ_nocol.cpp
-        projections/PJ_ob_tran.cpp
-        projections/PJ_oea.cpp
-        projections/PJ_tpeqd.cpp
-        projections/PJ_vandg.cpp
-        projections/PJ_vandg2.cpp
-        projections/PJ_vandg4.cpp
-        projections/PJ_wag7.cpp
-        projections/PJ_lcca.cpp
-        projections/PJ_geos.cpp
-        projections/proj_etmerc.cpp
-        projections/PJ_boggs.cpp
-        projections/PJ_collg.cpp
-        projections/PJ_comill.cpp
-        projections/PJ_crast.cpp
-        projections/PJ_denoy.cpp
-        projections/PJ_eck1.cpp
-        projections/PJ_eck2.cpp
-        projections/PJ_eck3.cpp
-        projections/PJ_eck4.cpp
-        projections/PJ_eck5.cpp
-        projections/PJ_fahey.cpp
-        projections/PJ_fouc_s.cpp
-        projections/PJ_gins8.cpp
-        projections/PJ_gstmerc.cpp
-        projections/PJ_gn_sinu.cpp
-        projections/PJ_goode.cpp
-        projections/PJ_igh.cpp
-        projections/PJ_hatano.cpp
-        projections/PJ_loxim.cpp
-        projections/PJ_mbt_fps.cpp
-        projections/PJ_mbtfpp.cpp
-        projections/PJ_mbtfpq.cpp
-        projections/PJ_moll.cpp
-        projections/PJ_nell.cpp
-        projections/PJ_nell_h.cpp
-        projections/PJ_patterson.cpp
-        projections/PJ_putp2.cpp
-        projections/PJ_putp3.cpp
-        projections/PJ_putp4p.cpp
-        projections/PJ_putp5.cpp
-        projections/PJ_putp6.cpp
-        projections/PJ_qsc.cpp
-        projections/PJ_robin.cpp
-        projections/PJ_sch.cpp
-        projections/PJ_sts.cpp
-        projections/PJ_urm5.cpp
-        projections/PJ_urmfps.cpp
-        projections/PJ_wag2.cpp
-        projections/PJ_wag3.cpp
-        projections/PJ_wink1.cpp
-        projections/PJ_wink2.cpp
-        projections/PJ_healpix.cpp
-        projections/PJ_natearth.cpp
-        projections/PJ_natearth2.cpp
-        projections/PJ_calcofi.cpp
-        projections/PJ_eqearth.cpp
+        projections/aeqd.cpp
+        projections/gnom.cpp
+        projections/laea.cpp
+        projections/mod_ster.cpp
+        projections/nsper.cpp
+        projections/nzmg.cpp
+        projections/ortho.cpp
+        projections/stere.cpp
+        projections/sterea.cpp
+        projections/aea.cpp
+        projections/bipc.cpp
+        projections/bonne.cpp
+        projections/eqdc.cpp
+        projections/isea.cpp
+        projections/ccon.cpp
+        projections/imw_p.cpp
+        projections/krovak.cpp
+        projections/lcc.cpp
+        projections/poly.cpp
+        projections/rpoly.cpp
+        projections/sconics.cpp
+        projections/rouss.cpp
+        projections/cass.cpp
+        projections/cc.cpp
+        projections/cea.cpp
+        projections/eqc.cpp
+        projections/gall.cpp
+        projections/labrd.cpp
+        projections/lsat.cpp
+        projections/misrsom.cpp
+        projections/merc.cpp
+        projections/mill.cpp
+        projections/ocea.cpp
+        projections/omerc.cpp
+        projections/somerc.cpp
+        projections/tcc.cpp
+        projections/tcea.cpp
+        projections/times.cpp
+        projections/tmerc.cpp
+        projections/tobmerc.cpp
+        projections/airy.cpp
+        projections/aitoff.cpp
+        projections/august.cpp
+        projections/bacon.cpp
+        projections/bertin1953.cpp
+        projections/chamb.cpp
+        projections/hammer.cpp
+        projections/lagrng.cpp
+        projections/larr.cpp
+        projections/lask.cpp
+        projections/latlong.cpp
+        projections/nocol.cpp
+        projections/ob_tran.cpp
+        projections/oea.cpp
+        projections/tpeqd.cpp
+        projections/vandg.cpp
+        projections/vandg2.cpp
+        projections/vandg4.cpp
+        projections/wag7.cpp
+        projections/lcca.cpp
+        projections/geos.cpp
+        projections/etmerc.cpp
+        projections/boggs.cpp
+        projections/collg.cpp
+        projections/comill.cpp
+        projections/crast.cpp
+        projections/denoy.cpp
+        projections/eck1.cpp
+        projections/eck2.cpp
+        projections/eck3.cpp
+        projections/eck4.cpp
+        projections/eck5.cpp
+        projections/fahey.cpp
+        projections/fouc_s.cpp
+        projections/gins8.cpp
+        projections/gstmerc.cpp
+        projections/gn_sinu.cpp
+        projections/goode.cpp
+        projections/igh.cpp
+        projections/hatano.cpp
+        projections/loxim.cpp
+        projections/mbt_fps.cpp
+        projections/mbtfpp.cpp
+        projections/mbtfpq.cpp
+        projections/moll.cpp
+        projections/nell.cpp
+        projections/nell_h.cpp
+        projections/patterson.cpp
+        projections/putp2.cpp
+        projections/putp3.cpp
+        projections/putp4p.cpp
+        projections/putp5.cpp
+        projections/putp6.cpp
+        projections/qsc.cpp
+        projections/robin.cpp
+        projections/sch.cpp
+        projections/sts.cpp
+        projections/urm5.cpp
+        projections/urmfps.cpp
+        projections/wag2.cpp
+        projections/wag3.cpp
+        projections/wink1.cpp
+        projections/wink2.cpp
+        projections/healpix.cpp
+        projections/natearth.cpp
+        projections/natearth2.cpp
+        projections/calcofi.cpp
+        projections/eqearth.cpp
 )
 
 SET(SRC_LIBPROJ_CONVERSIONS
-        conversions/PJ_axisswap.cpp
-        conversions/PJ_cart.cpp
-        conversions/PJ_geoc.cpp
-        conversions/pj_geocent.cpp
-        conversions/PJ_unitconvert.cpp
+        conversions/axisswap.cpp
+        conversions/cart.cpp
+        conversions/geoc.cpp
+        conversions/geocent.cpp
+        conversions/unitconvert.cpp
 )
 
 SET(SRC_LIBPROJ_TRANSFORMATIONS
-        transformations/PJ_affine.cpp
-        transformations/PJ_deformation.cpp
-        transformations/PJ_helmert.cpp
-        transformations/PJ_hgridshift.cpp
-        transformations/PJ_horner.cpp
-        transformations/PJ_molodensky.cpp
-        transformations/PJ_vgridshift.cpp
+        transformations/affine.cpp
+        transformations/deformation.cpp
+        transformations/helmert.cpp
+        transformations/hgridshift.cpp
+        transformations/horner.cpp
+        transformations/molodensky.cpp
+        transformations/vgridshift.cpp
 )
 
 SET(SRC_LIBPROJ_ISO19111
@@ -202,28 +202,28 @@ SET(SRC_LIBPROJ_ISO19111
 SET(SRC_LIBPROJ_CORE
         pj_list.h proj_internal.h proj_math.h projects.h
         aasincos.cpp adjlon.cpp bch2bps.cpp bchgen.cpp
-        biveval.cpp dmstor.cpp mk_cheby.cpp pj_auth.cpp
-        pj_deriv.cpp pj_ell_set.cpp pj_ellps.cpp pj_errno.cpp
-        pj_factors.cpp pj_fwd.cpp pj_init.cpp pj_inv.cpp
-        pj_list.cpp pj_malloc.cpp pj_mlfn.cpp pj_msfn.cpp proj_mdist.cpp
-        pj_open_lib.cpp pj_param.cpp pj_phi2.cpp pj_pr_list.cpp
-        pj_qsfn.cpp pj_strerrno.cpp
-        pj_tsfn.cpp pj_units.cpp pj_ctx.cpp pj_log.cpp pj_zpoly1.cpp rtodms.cpp
-        vector1.cpp pj_release.cpp pj_gauss.cpp
-        pj_fileapi.cpp
-        pj_gc_reader.cpp pj_gridcatalog.cpp
+        biveval.cpp dmstor.cpp mk_cheby.cpp auth.cpp
+        deriv.cpp ell_set.cpp ellps.cpp errno.cpp
+        factors.cpp fwd.cpp init.cpp inv.cpp
+        list.cpp malloc.cpp mlfn.cpp msfn.cpp proj_mdist.cpp
+        open_lib.cpp param.cpp phi2.cpp pr_list.cpp
+        qsfn.cpp strerrno.cpp
+        tsfn.cpp units.cpp ctx.cpp log.cpp zpoly1.cpp rtodms.cpp
+        vector1.cpp release.cpp gauss.cpp
+        fileapi.cpp
+        gc_reader.cpp gridcatalog.cpp
         nad_cvt.cpp nad_init.cpp nad_intr.cpp
-        pj_apply_gridshift.cpp pj_datums.cpp pj_datum_set.cpp pj_transform.cpp
-        geocent.cpp geocent.h pj_utils.cpp pj_gridinfo.cpp pj_gridlist.cpp
-        jniproj.cpp pj_mutex.cpp pj_initcache.cpp pj_apply_vgridshift.cpp geodesic.cpp
-        pj_strtod.cpp pj_math.cpp
-        proj_4D_api.cpp PJ_pipeline.cpp
-        pj_internal.cpp
-        pj_wkt_parser.hpp pj_wkt_parser.cpp
-        pj_wkt1_parser.h pj_wkt1_parser.cpp
-        pj_wkt1_generated_parser.h pj_wkt1_generated_parser.c
-        pj_wkt2_parser.h pj_wkt2_parser.cpp
-        pj_wkt2_generated_parser.h pj_wkt2_generated_parser.c
+        apply_gridshift.cpp datums.cpp datum_set.cpp transform.cpp
+        geocent.cpp geocent.h utils.cpp gridinfo.cpp gridlist.cpp
+        jniproj.cpp mutex.cpp initcache.cpp apply_vgridshift.cpp geodesic.cpp
+        strtod.cpp math.cpp
+        4D_api.cpp pipeline.cpp
+        internal.cpp
+        wkt_parser.hpp wkt_parser.cpp
+        wkt1_parser.h wkt1_parser.cpp
+        wkt1_generated_parser.h wkt1_generated_parser.c
+        wkt2_parser.h wkt2_parser.cpp
+        wkt2_generated_parser.h wkt2_generated_parser.c
         ${CMAKE_CURRENT_BINARY_DIR}/proj_config.h
 )
 
diff --git a/src/pj_list.cpp b/src/list.cpp
index 73ca5f86..73ca5f86 100644
--- a/src/pj_list.cpp
+++ b/src/list.cpp
diff --git a/src/pj_log.cpp b/src/log.cpp
index 0f81dc13..0f81dc13 100644
--- a/src/pj_log.cpp
+++ b/src/log.cpp
diff --git a/src/pj_malloc.cpp b/src/malloc.cpp
index c8681570..c8681570 100644
--- a/src/pj_malloc.cpp
+++ b/src/malloc.cpp
diff --git a/src/pj_math.cpp b/src/math.cpp
index 540ab9eb..540ab9eb 100644
--- a/src/pj_math.cpp
+++ b/src/math.cpp
diff --git a/src/pj_mlfn.cpp b/src/mlfn.cpp
index e032e642..e032e642 100644
--- a/src/pj_mlfn.cpp
+++ b/src/mlfn.cpp
diff --git a/src/pj_msfn.cpp b/src/msfn.cpp
index 999e73a7..999e73a7 100644
--- a/src/pj_msfn.cpp
+++ b/src/msfn.cpp
diff --git a/src/pj_mutex.cpp b/src/mutex.cpp
index 3752324c..3752324c 100644
--- a/src/pj_mutex.cpp
+++ b/src/mutex.cpp
diff --git a/src/pj_open_lib.cpp b/src/open_lib.cpp
index c75b4af6..c75b4af6 100644
--- a/src/pj_open_lib.cpp
+++ b/src/open_lib.cpp
diff --git a/src/pj_param.cpp b/src/param.cpp
index 74247b72..74247b72 100644
--- a/src/pj_param.cpp
+++ b/src/param.cpp
diff --git a/src/pj_phi2.cpp b/src/phi2.cpp
index a83302e6..a83302e6 100644
--- a/src/pj_phi2.cpp
+++ b/src/phi2.cpp
diff --git a/src/PJ_pipeline.cpp b/src/pipeline.cpp
index 76fc58a5..76fc58a5 100644
--- a/src/PJ_pipeline.cpp
+++ b/src/pipeline.cpp
diff --git a/src/pj_pr_list.cpp b/src/pr_list.cpp
index b8ad2c04..b8ad2c04 100644
--- a/src/pj_pr_list.cpp
+++ b/src/pr_list.cpp
diff --git a/src/projections/PJ_aea.cpp b/src/projections/aea.cpp
index c4a4a72a..c4a4a72a 100644
--- a/src/projections/PJ_aea.cpp
+++ b/src/projections/aea.cpp
diff --git a/src/projections/PJ_aeqd.cpp b/src/projections/aeqd.cpp
index 1a350d90..1a350d90 100644
--- a/src/projections/PJ_aeqd.cpp
+++ b/src/projections/aeqd.cpp
diff --git a/src/projections/PJ_airy.cpp b/src/projections/airy.cpp
index 0eb5efd7..0eb5efd7 100644
--- a/src/projections/PJ_airy.cpp
+++ b/src/projections/airy.cpp
diff --git a/src/projections/PJ_aitoff.cpp b/src/projections/aitoff.cpp
index effd2c29..effd2c29 100644
--- a/src/projections/PJ_aitoff.cpp
+++ b/src/projections/aitoff.cpp
diff --git a/src/projections/PJ_august.cpp b/src/projections/august.cpp
index b5a21ef7..b5a21ef7 100644
--- a/src/projections/PJ_august.cpp
+++ b/src/projections/august.cpp
diff --git a/src/projections/PJ_bacon.cpp b/src/projections/bacon.cpp
index 6c6350fe..6c6350fe 100644
--- a/src/projections/PJ_bacon.cpp
+++ b/src/projections/bacon.cpp
diff --git a/src/projections/PJ_bertin1953.cpp b/src/projections/bertin1953.cpp
index 2203d6f1..2203d6f1 100644
--- a/src/projections/PJ_bertin1953.cpp
+++ b/src/projections/bertin1953.cpp
diff --git a/src/projections/PJ_bipc.cpp b/src/projections/bipc.cpp
index 19a6bbe1..19a6bbe1 100644
--- a/src/projections/PJ_bipc.cpp
+++ b/src/projections/bipc.cpp
diff --git a/src/projections/PJ_boggs.cpp b/src/projections/boggs.cpp
index 119357c0..119357c0 100644
--- a/src/projections/PJ_boggs.cpp
+++ b/src/projections/boggs.cpp
diff --git a/src/projections/PJ_bonne.cpp b/src/projections/bonne.cpp
index 385c1c4b..385c1c4b 100644
--- a/src/projections/PJ_bonne.cpp
+++ b/src/projections/bonne.cpp
diff --git a/src/projections/PJ_calcofi.cpp b/src/projections/calcofi.cpp
index e81e4d2a..e81e4d2a 100644
--- a/src/projections/PJ_calcofi.cpp
+++ b/src/projections/calcofi.cpp
diff --git a/src/projections/PJ_cass.cpp b/src/projections/cass.cpp
index c831558c..c831558c 100644
--- a/src/projections/PJ_cass.cpp
+++ b/src/projections/cass.cpp
diff --git a/src/projections/PJ_cc.cpp b/src/projections/cc.cpp
index 152e6e4a..152e6e4a 100644
--- a/src/projections/PJ_cc.cpp
+++ b/src/projections/cc.cpp
diff --git a/src/projections/PJ_ccon.cpp b/src/projections/ccon.cpp
index 4f7dedb4..4f7dedb4 100644
--- a/src/projections/PJ_ccon.cpp
+++ b/src/projections/ccon.cpp
diff --git a/src/projections/PJ_cea.cpp b/src/projections/cea.cpp
index f8275b62..f8275b62 100644
--- a/src/projections/PJ_cea.cpp
+++ b/src/projections/cea.cpp
diff --git a/src/projections/PJ_chamb.cpp b/src/projections/chamb.cpp
index a490e817..a490e817 100644
--- a/src/projections/PJ_chamb.cpp
+++ b/src/projections/chamb.cpp
diff --git a/src/projections/PJ_collg.cpp b/src/projections/collg.cpp
index 7904de29..7904de29 100644
--- a/src/projections/PJ_collg.cpp
+++ b/src/projections/collg.cpp
diff --git a/src/projections/PJ_comill.cpp b/src/projections/comill.cpp
index b6e0192e..b6e0192e 100644
--- a/src/projections/PJ_comill.cpp
+++ b/src/projections/comill.cpp
diff --git a/src/projections/PJ_crast.cpp b/src/projections/crast.cpp
index 4e4dee8b..4e4dee8b 100644
--- a/src/projections/PJ_crast.cpp
+++ b/src/projections/crast.cpp
diff --git a/src/projections/PJ_denoy.cpp b/src/projections/denoy.cpp
index 5c337c45..5c337c45 100644
--- a/src/projections/PJ_denoy.cpp
+++ b/src/projections/denoy.cpp
diff --git a/src/projections/PJ_eck1.cpp b/src/projections/eck1.cpp
index 88a7430c..88a7430c 100644
--- a/src/projections/PJ_eck1.cpp
+++ b/src/projections/eck1.cpp
diff --git a/src/projections/PJ_eck2.cpp b/src/projections/eck2.cpp
index f76ab4ec..f76ab4ec 100644
--- a/src/projections/PJ_eck2.cpp
+++ b/src/projections/eck2.cpp
diff --git a/src/projections/PJ_eck3.cpp b/src/projections/eck3.cpp
index 90376631..90376631 100644
--- a/src/projections/PJ_eck3.cpp
+++ b/src/projections/eck3.cpp
diff --git a/src/projections/PJ_eck4.cpp b/src/projections/eck4.cpp
index 4fa4c21f..4fa4c21f 100644
--- a/src/projections/PJ_eck4.cpp
+++ b/src/projections/eck4.cpp
diff --git a/src/projections/PJ_eck5.cpp b/src/projections/eck5.cpp
index f9f28460..f9f28460 100644
--- a/src/projections/PJ_eck5.cpp
+++ b/src/projections/eck5.cpp
diff --git a/src/projections/PJ_eqc.cpp b/src/projections/eqc.cpp
index 3fdb6dc0..3fdb6dc0 100644
--- a/src/projections/PJ_eqc.cpp
+++ b/src/projections/eqc.cpp
diff --git a/src/projections/PJ_eqdc.cpp b/src/projections/eqdc.cpp
index 0831fca4..0831fca4 100644
--- a/src/projections/PJ_eqdc.cpp
+++ b/src/projections/eqdc.cpp
diff --git a/src/projections/PJ_eqearth.cpp b/src/projections/eqearth.cpp
index e5c1f974..e5c1f974 100644
--- a/src/projections/PJ_eqearth.cpp
+++ b/src/projections/eqearth.cpp
diff --git a/src/projections/proj_etmerc.cpp b/src/projections/etmerc.cpp
index 05f86f37..05f86f37 100644
--- a/src/projections/proj_etmerc.cpp
+++ b/src/projections/etmerc.cpp
diff --git a/src/projections/PJ_fahey.cpp b/src/projections/fahey.cpp
index 85e0ab69..85e0ab69 100644
--- a/src/projections/PJ_fahey.cpp
+++ b/src/projections/fahey.cpp
diff --git a/src/projections/PJ_fouc_s.cpp b/src/projections/fouc_s.cpp
index c5e711de..c5e711de 100644
--- a/src/projections/PJ_fouc_s.cpp
+++ b/src/projections/fouc_s.cpp
diff --git a/src/projections/PJ_gall.cpp b/src/projections/gall.cpp
index a8697482..a8697482 100644
--- a/src/projections/PJ_gall.cpp
+++ b/src/projections/gall.cpp
diff --git a/src/projections/PJ_geos.cpp b/src/projections/geos.cpp
index 90fb01ab..90fb01ab 100644
--- a/src/projections/PJ_geos.cpp
+++ b/src/projections/geos.cpp
diff --git a/src/projections/PJ_gins8.cpp b/src/projections/gins8.cpp
index cc422437..cc422437 100644
--- a/src/projections/PJ_gins8.cpp
+++ b/src/projections/gins8.cpp
diff --git a/src/projections/PJ_gn_sinu.cpp b/src/projections/gn_sinu.cpp
index 530de229..530de229 100644
--- a/src/projections/PJ_gn_sinu.cpp
+++ b/src/projections/gn_sinu.cpp
diff --git a/src/projections/PJ_gnom.cpp b/src/projections/gnom.cpp
index a4b5e35d..a4b5e35d 100644
--- a/src/projections/PJ_gnom.cpp
+++ b/src/projections/gnom.cpp
diff --git a/src/projections/PJ_goode.cpp b/src/projections/goode.cpp
index c79d125e..c79d125e 100644
--- a/src/projections/PJ_goode.cpp
+++ b/src/projections/goode.cpp
diff --git a/src/projections/PJ_gstmerc.cpp b/src/projections/gstmerc.cpp
index 9b819bac..9b819bac 100644
--- a/src/projections/PJ_gstmerc.cpp
+++ b/src/projections/gstmerc.cpp
diff --git a/src/projections/PJ_hammer.cpp b/src/projections/hammer.cpp
index d4caa656..d4caa656 100644
--- a/src/projections/PJ_hammer.cpp
+++ b/src/projections/hammer.cpp
diff --git a/src/projections/PJ_hatano.cpp b/src/projections/hatano.cpp
index 019671cc..019671cc 100644
--- a/src/projections/PJ_hatano.cpp
+++ b/src/projections/hatano.cpp
diff --git a/src/projections/PJ_healpix.cpp b/src/projections/healpix.cpp
index 7f0b3e83..7f0b3e83 100644
--- a/src/projections/PJ_healpix.cpp
+++ b/src/projections/healpix.cpp
diff --git a/src/projections/PJ_igh.cpp b/src/projections/igh.cpp
index e3576861..e3576861 100644
--- a/src/projections/PJ_igh.cpp
+++ b/src/projections/igh.cpp
diff --git a/src/projections/PJ_imw_p.cpp b/src/projections/imw_p.cpp
index 012c5caa..012c5caa 100644
--- a/src/projections/PJ_imw_p.cpp
+++ b/src/projections/imw_p.cpp
diff --git a/src/projections/PJ_isea.cpp b/src/projections/isea.cpp
index 522e6813..522e6813 100644
--- a/src/projections/PJ_isea.cpp
+++ b/src/projections/isea.cpp
diff --git a/src/projections/PJ_krovak.cpp b/src/projections/krovak.cpp
index 9ecffb89..9ecffb89 100644
--- a/src/projections/PJ_krovak.cpp
+++ b/src/projections/krovak.cpp
diff --git a/src/projections/PJ_labrd.cpp b/src/projections/labrd.cpp
index d3930243..d3930243 100644
--- a/src/projections/PJ_labrd.cpp
+++ b/src/projections/labrd.cpp
diff --git a/src/projections/PJ_laea.cpp b/src/projections/laea.cpp
index dd02c75a..dd02c75a 100644
--- a/src/projections/PJ_laea.cpp
+++ b/src/projections/laea.cpp
diff --git a/src/projections/PJ_lagrng.cpp b/src/projections/lagrng.cpp
index 8c0150aa..8c0150aa 100644
--- a/src/projections/PJ_lagrng.cpp
+++ b/src/projections/lagrng.cpp
diff --git a/src/projections/PJ_larr.cpp b/src/projections/larr.cpp
index e4d5d240..e4d5d240 100644
--- a/src/projections/PJ_larr.cpp
+++ b/src/projections/larr.cpp
diff --git a/src/projections/PJ_lask.cpp b/src/projections/lask.cpp
index 46f23edb..46f23edb 100644
--- a/src/projections/PJ_lask.cpp
+++ b/src/projections/lask.cpp
diff --git a/src/projections/PJ_latlong.cpp b/src/projections/latlong.cpp
index 1331d59a..1331d59a 100644
--- a/src/projections/PJ_latlong.cpp
+++ b/src/projections/latlong.cpp
diff --git a/src/projections/PJ_lcc.cpp b/src/projections/lcc.cpp
index 7d6e3f57..7d6e3f57 100644
--- a/src/projections/PJ_lcc.cpp
+++ b/src/projections/lcc.cpp
diff --git a/src/projections/PJ_lcca.cpp b/src/projections/lcca.cpp
index 70b5dff9..70b5dff9 100644
--- a/src/projections/PJ_lcca.cpp
+++ b/src/projections/lcca.cpp
diff --git a/src/projections/PJ_loxim.cpp b/src/projections/loxim.cpp
index f68e844a..f68e844a 100644
--- a/src/projections/PJ_loxim.cpp
+++ b/src/projections/loxim.cpp
diff --git a/src/projections/PJ_lsat.cpp b/src/projections/lsat.cpp
index a0eca1bd..a0eca1bd 100644
--- a/src/projections/PJ_lsat.cpp
+++ b/src/projections/lsat.cpp
diff --git a/src/projections/PJ_mbt_fps.cpp b/src/projections/mbt_fps.cpp
index 66ed9458..66ed9458 100644
--- a/src/projections/PJ_mbt_fps.cpp
+++ b/src/projections/mbt_fps.cpp
diff --git a/src/projections/PJ_mbtfpp.cpp b/src/projections/mbtfpp.cpp
index 276a43eb..276a43eb 100644
--- a/src/projections/PJ_mbtfpp.cpp
+++ b/src/projections/mbtfpp.cpp
diff --git a/src/projections/PJ_mbtfpq.cpp b/src/projections/mbtfpq.cpp
index b7c0eb16..b7c0eb16 100644
--- a/src/projections/PJ_mbtfpq.cpp
+++ b/src/projections/mbtfpq.cpp
diff --git a/src/projections/PJ_merc.cpp b/src/projections/merc.cpp
index 1998234e..1998234e 100644
--- a/src/projections/PJ_merc.cpp
+++ b/src/projections/merc.cpp
diff --git a/src/projections/PJ_mill.cpp b/src/projections/mill.cpp
index 3ea9636f..3ea9636f 100644
--- a/src/projections/PJ_mill.cpp
+++ b/src/projections/mill.cpp
diff --git a/src/projections/PJ_misrsom.cpp b/src/projections/misrsom.cpp
index c84b96e3..c84b96e3 100644
--- a/src/projections/PJ_misrsom.cpp
+++ b/src/projections/misrsom.cpp
diff --git a/src/projections/PJ_mod_ster.cpp b/src/projections/mod_ster.cpp
index 7c4f363b..7c4f363b 100644
--- a/src/projections/PJ_mod_ster.cpp
+++ b/src/projections/mod_ster.cpp
diff --git a/src/projections/PJ_moll.cpp b/src/projections/moll.cpp
index c877a1bb..c877a1bb 100644
--- a/src/projections/PJ_moll.cpp
+++ b/src/projections/moll.cpp
diff --git a/src/projections/PJ_natearth.cpp b/src/projections/natearth.cpp
index 27a6b137..27a6b137 100644
--- a/src/projections/PJ_natearth.cpp
+++ b/src/projections/natearth.cpp
diff --git a/src/projections/PJ_natearth2.cpp b/src/projections/natearth2.cpp
index f6aba671..f6aba671 100644
--- a/src/projections/PJ_natearth2.cpp
+++ b/src/projections/natearth2.cpp
diff --git a/src/projections/PJ_nell.cpp b/src/projections/nell.cpp
index 2a7ea32c..2a7ea32c 100644
--- a/src/projections/PJ_nell.cpp
+++ b/src/projections/nell.cpp
diff --git a/src/projections/PJ_nell_h.cpp b/src/projections/nell_h.cpp
index 28c3ace7..28c3ace7 100644
--- a/src/projections/PJ_nell_h.cpp
+++ b/src/projections/nell_h.cpp
diff --git a/src/projections/PJ_nocol.cpp b/src/projections/nocol.cpp
index 541d08b2..541d08b2 100644
--- a/src/projections/PJ_nocol.cpp
+++ b/src/projections/nocol.cpp
diff --git a/src/projections/PJ_nsper.cpp b/src/projections/nsper.cpp
index f93010f8..f93010f8 100644
--- a/src/projections/PJ_nsper.cpp
+++ b/src/projections/nsper.cpp
diff --git a/src/projections/PJ_nzmg.cpp b/src/projections/nzmg.cpp
index bf0862fb..bf0862fb 100644
--- a/src/projections/PJ_nzmg.cpp
+++ b/src/projections/nzmg.cpp
diff --git a/src/projections/PJ_ob_tran.cpp b/src/projections/ob_tran.cpp
index d34059a9..d34059a9 100644
--- a/src/projections/PJ_ob_tran.cpp
+++ b/src/projections/ob_tran.cpp
diff --git a/src/projections/PJ_ocea.cpp b/src/projections/ocea.cpp
index 0576ace7..0576ace7 100644
--- a/src/projections/PJ_ocea.cpp
+++ b/src/projections/ocea.cpp
diff --git a/src/projections/PJ_oea.cpp b/src/projections/oea.cpp
index 0c401b2f..0c401b2f 100644
--- a/src/projections/PJ_oea.cpp
+++ b/src/projections/oea.cpp
diff --git a/src/projections/PJ_omerc.cpp b/src/projections/omerc.cpp
index ead07128..ead07128 100644
--- a/src/projections/PJ_omerc.cpp
+++ b/src/projections/omerc.cpp
diff --git a/src/projections/PJ_ortho.cpp b/src/projections/ortho.cpp
index 6ea55248..6ea55248 100644
--- a/src/projections/PJ_ortho.cpp
+++ b/src/projections/ortho.cpp
diff --git a/src/projections/PJ_patterson.cpp b/src/projections/patterson.cpp
index 0d19414e..0d19414e 100644
--- a/src/projections/PJ_patterson.cpp
+++ b/src/projections/patterson.cpp
diff --git a/src/projections/PJ_poly.cpp b/src/projections/poly.cpp
index a970fdb1..a970fdb1 100644
--- a/src/projections/PJ_poly.cpp
+++ b/src/projections/poly.cpp
diff --git a/src/projections/PJ_putp2.cpp b/src/projections/putp2.cpp
index d7a847c8..d7a847c8 100644
--- a/src/projections/PJ_putp2.cpp
+++ b/src/projections/putp2.cpp
diff --git a/src/projections/PJ_putp3.cpp b/src/projections/putp3.cpp
index 98bb2ff0..98bb2ff0 100644
--- a/src/projections/PJ_putp3.cpp
+++ b/src/projections/putp3.cpp
diff --git a/src/projections/PJ_putp4p.cpp b/src/projections/putp4p.cpp
index 608fc76e..608fc76e 100644
--- a/src/projections/PJ_putp4p.cpp
+++ b/src/projections/putp4p.cpp
diff --git a/src/projections/PJ_putp5.cpp b/src/projections/putp5.cpp
index 79e2ad15..79e2ad15 100644
--- a/src/projections/PJ_putp5.cpp
+++ b/src/projections/putp5.cpp
diff --git a/src/projections/PJ_putp6.cpp b/src/projections/putp6.cpp
index 1186b18b..1186b18b 100644
--- a/src/projections/PJ_putp6.cpp
+++ b/src/projections/putp6.cpp
diff --git a/src/projections/PJ_qsc.cpp b/src/projections/qsc.cpp
index b50a7c95..b50a7c95 100644
--- a/src/projections/PJ_qsc.cpp
+++ b/src/projections/qsc.cpp
diff --git a/src/projections/PJ_robin.cpp b/src/projections/robin.cpp
index 987977ae..987977ae 100644
--- a/src/projections/PJ_robin.cpp
+++ b/src/projections/robin.cpp
diff --git a/src/projections/proj_rouss.cpp b/src/projections/rouss.cpp
index 3b4428bc..3b4428bc 100644
--- a/src/projections/proj_rouss.cpp
+++ b/src/projections/rouss.cpp
diff --git a/src/projections/PJ_rpoly.cpp b/src/projections/rpoly.cpp
index a34f6171..a34f6171 100644
--- a/src/projections/PJ_rpoly.cpp
+++ b/src/projections/rpoly.cpp
diff --git a/src/projections/PJ_sch.cpp b/src/projections/sch.cpp
index 5a2f944b..5a2f944b 100644
--- a/src/projections/PJ_sch.cpp
+++ b/src/projections/sch.cpp
diff --git a/src/projections/PJ_sconics.cpp b/src/projections/sconics.cpp
index 1d19a13d..1d19a13d 100644
--- a/src/projections/PJ_sconics.cpp
+++ b/src/projections/sconics.cpp
diff --git a/src/projections/PJ_somerc.cpp b/src/projections/somerc.cpp
index 15d2e765..15d2e765 100644
--- a/src/projections/PJ_somerc.cpp
+++ b/src/projections/somerc.cpp
diff --git a/src/projections/PJ_stere.cpp b/src/projections/stere.cpp
index 1502b2a6..1502b2a6 100644
--- a/src/projections/PJ_stere.cpp
+++ b/src/projections/stere.cpp
diff --git a/src/projections/PJ_sterea.cpp b/src/projections/sterea.cpp
index bb498068..bb498068 100644
--- a/src/projections/PJ_sterea.cpp
+++ b/src/projections/sterea.cpp
diff --git a/src/projections/PJ_sts.cpp b/src/projections/sts.cpp
index 9f889611..9f889611 100644
--- a/src/projections/PJ_sts.cpp
+++ b/src/projections/sts.cpp
diff --git a/src/projections/PJ_tcc.cpp b/src/projections/tcc.cpp
index 64fdc182..64fdc182 100644
--- a/src/projections/PJ_tcc.cpp
+++ b/src/projections/tcc.cpp
diff --git a/src/projections/PJ_tcea.cpp b/src/projections/tcea.cpp
index d30f3df0..d30f3df0 100644
--- a/src/projections/PJ_tcea.cpp
+++ b/src/projections/tcea.cpp
diff --git a/src/projections/PJ_times.cpp b/src/projections/times.cpp
index e8b4499f..e8b4499f 100644
--- a/src/projections/PJ_times.cpp
+++ b/src/projections/times.cpp
diff --git a/src/projections/PJ_tmerc.cpp b/src/projections/tmerc.cpp
index 5a2dacbd..5a2dacbd 100644
--- a/src/projections/PJ_tmerc.cpp
+++ b/src/projections/tmerc.cpp
diff --git a/src/projections/PJ_tobmerc.cpp b/src/projections/tobmerc.cpp
index 9c939f0b..9c939f0b 100644
--- a/src/projections/PJ_tobmerc.cpp
+++ b/src/projections/tobmerc.cpp
diff --git a/src/projections/PJ_tpeqd.cpp b/src/projections/tpeqd.cpp
index 2720327a..2720327a 100644
--- a/src/projections/PJ_tpeqd.cpp
+++ b/src/projections/tpeqd.cpp
diff --git a/src/projections/PJ_urm5.cpp b/src/projections/urm5.cpp
index 0e3c7e3c..0e3c7e3c 100644
--- a/src/projections/PJ_urm5.cpp
+++ b/src/projections/urm5.cpp
diff --git a/src/projections/PJ_urmfps.cpp b/src/projections/urmfps.cpp
index 7103222a..7103222a 100644
--- a/src/projections/PJ_urmfps.cpp
+++ b/src/projections/urmfps.cpp
diff --git a/src/projections/PJ_vandg.cpp b/src/projections/vandg.cpp
index d148e210..d148e210 100644
--- a/src/projections/PJ_vandg.cpp
+++ b/src/projections/vandg.cpp
diff --git a/src/projections/PJ_vandg2.cpp b/src/projections/vandg2.cpp
index 61d50044..61d50044 100644
--- a/src/projections/PJ_vandg2.cpp
+++ b/src/projections/vandg2.cpp
diff --git a/src/projections/PJ_vandg4.cpp b/src/projections/vandg4.cpp
index d9a53c87..d9a53c87 100644
--- a/src/projections/PJ_vandg4.cpp
+++ b/src/projections/vandg4.cpp
diff --git a/src/projections/PJ_wag2.cpp b/src/projections/wag2.cpp
index 1bee737a..1bee737a 100644
--- a/src/projections/PJ_wag2.cpp
+++ b/src/projections/wag2.cpp
diff --git a/src/projections/PJ_wag3.cpp b/src/projections/wag3.cpp
index bb1b4d49..bb1b4d49 100644
--- a/src/projections/PJ_wag3.cpp
+++ b/src/projections/wag3.cpp
diff --git a/src/projections/PJ_wag7.cpp b/src/projections/wag7.cpp
index c8807f12..c8807f12 100644
--- a/src/projections/PJ_wag7.cpp
+++ b/src/projections/wag7.cpp
diff --git a/src/projections/PJ_wink1.cpp b/src/projections/wink1.cpp
index de2f55ee..de2f55ee 100644
--- a/src/projections/PJ_wink1.cpp
+++ b/src/projections/wink1.cpp
diff --git a/src/projections/PJ_wink2.cpp b/src/projections/wink2.cpp
index 74a47283..74a47283 100644
--- a/src/projections/PJ_wink2.cpp
+++ b/src/projections/wink2.cpp
diff --git a/src/pj_qsfn.cpp b/src/qsfn.cpp
index c18a7b95..c18a7b95 100644
--- a/src/pj_qsfn.cpp
+++ b/src/qsfn.cpp
diff --git a/src/pj_release.cpp b/src/release.cpp
index 9beb45ef..9beb45ef 100644
--- a/src/pj_release.cpp
+++ b/src/release.cpp
diff --git a/src/pj_strerrno.cpp b/src/strerrno.cpp
index 18ed0d33..18ed0d33 100644
--- a/src/pj_strerrno.cpp
+++ b/src/strerrno.cpp
diff --git a/src/pj_strtod.cpp b/src/strtod.cpp
index 5a360c2e..5a360c2e 100644
--- a/src/pj_strtod.cpp
+++ b/src/strtod.cpp
diff --git a/src/pj_transform.cpp b/src/transform.cpp
index 433fc017..433fc017 100644
--- a/src/pj_transform.cpp
+++ b/src/transform.cpp
diff --git a/src/transformations/PJ_affine.cpp b/src/transformations/affine.cpp
index e2b668d3..e2b668d3 100644
--- a/src/transformations/PJ_affine.cpp
+++ b/src/transformations/affine.cpp
diff --git a/src/transformations/PJ_deformation.cpp b/src/transformations/deformation.cpp
index 6c30f21c..6c30f21c 100644
--- a/src/transformations/PJ_deformation.cpp
+++ b/src/transformations/deformation.cpp
diff --git a/src/transformations/PJ_helmert.cpp b/src/transformations/helmert.cpp
index 4a3abf4e..4a3abf4e 100644
--- a/src/transformations/PJ_helmert.cpp
+++ b/src/transformations/helmert.cpp
diff --git a/src/transformations/PJ_hgridshift.cpp b/src/transformations/hgridshift.cpp
index f0e57251..f0e57251 100644
--- a/src/transformations/PJ_hgridshift.cpp
+++ b/src/transformations/hgridshift.cpp
diff --git a/src/transformations/PJ_horner.cpp b/src/transformations/horner.cpp
index 73977de6..73977de6 100644
--- a/src/transformations/PJ_horner.cpp
+++ b/src/transformations/horner.cpp
diff --git a/src/transformations/PJ_molodensky.cpp b/src/transformations/molodensky.cpp
index 91743fda..91743fda 100644
--- a/src/transformations/PJ_molodensky.cpp
+++ b/src/transformations/molodensky.cpp
diff --git a/src/transformations/PJ_vgridshift.cpp b/src/transformations/vgridshift.cpp
index b3da906d..b3da906d 100644
--- a/src/transformations/PJ_vgridshift.cpp
+++ b/src/transformations/vgridshift.cpp
diff --git a/src/pj_tsfn.cpp b/src/tsfn.cpp
index ea3b896d..ea3b896d 100644
--- a/src/pj_tsfn.cpp
+++ b/src/tsfn.cpp
diff --git a/src/pj_units.cpp b/src/units.cpp
index 50f11396..50f11396 100644
--- a/src/pj_units.cpp
+++ b/src/units.cpp
diff --git a/src/pj_utils.cpp b/src/utils.cpp
index 8587dc30..8587dc30 100644
--- a/src/pj_utils.cpp
+++ b/src/utils.cpp
diff --git a/src/pj_wkt1_generated_parser.c b/src/wkt1_generated_parser.c
index 91d5e60d..7a590f80 100644
--- a/src/pj_wkt1_generated_parser.c
+++ b/src/wkt1_generated_parser.c
@@ -97,7 +97,7 @@
  * DEALINGS IN THE SOFTWARE.
  ****************************************************************************/
 
-#include "pj_wkt1_parser.h"
+#include "wkt1_parser.h"
 
 
 
@@ -119,9 +119,9 @@
 #endif
 
 /* In a future release of Bison, this section will be replaced
-   by #include "pj_wkt1_generated_parser.h".  */
-#ifndef YY_PJ_WKT1_SRC_PJ_WKT1_GENERATED_PARSER_H_INCLUDED
-# define YY_PJ_WKT1_SRC_PJ_WKT1_GENERATED_PARSER_H_INCLUDED
+   by #include "wkt1_generated_parser.h".  */
+#ifndef YY_PJ_WKT1_SRC_WKT1_GENERATED_PARSER_H_INCLUDED
+# define YY_PJ_WKT1_SRC_WKT1_GENERATED_PARSER_H_INCLUDED
 /* Debug traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
@@ -176,7 +176,7 @@ typedef int YYSTYPE;
 
 int pj_wkt1_parse (pj_wkt1_parse_context *context);
 
-#endif /* !YY_PJ_WKT1_SRC_PJ_WKT1_GENERATED_PARSER_H_INCLUDED  */
+#endif /* !YY_PJ_WKT1_SRC_WKT1_GENERATED_PARSER_H_INCLUDED  */
 
 /* Copy the second part of user declarations.  */
 
diff --git a/src/pj_wkt1_generated_parser.h b/src/wkt1_generated_parser.h
index 7bdec61f..989f1f32 100644
--- a/src/pj_wkt1_generated_parser.h
+++ b/src/wkt1_generated_parser.h
@@ -30,8 +30,8 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-#ifndef YY_PJ_WKT1_SRC_PJ_WKT1_GENERATED_PARSER_H_INCLUDED
-# define YY_PJ_WKT1_SRC_PJ_WKT1_GENERATED_PARSER_H_INCLUDED
+#ifndef YY_PJ_WKT1_SRC_WKT1_GENERATED_PARSER_H_INCLUDED
+# define YY_PJ_WKT1_SRC_WKT1_GENERATED_PARSER_H_INCLUDED
 /* Debug traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
@@ -86,4 +86,4 @@ typedef int YYSTYPE;
 
 int pj_wkt1_parse (pj_wkt1_parse_context *context);
 
-#endif /* !YY_PJ_WKT1_SRC_PJ_WKT1_GENERATED_PARSER_H_INCLUDED  */
+#endif /* !YY_PJ_WKT1_SRC_WKT1_GENERATED_PARSER_H_INCLUDED  */
diff --git a/src/pj_wkt1_grammar.y b/src/wkt1_grammar.y
index 05ae792a..28ff7a6e 100644
--- a/src/pj_wkt1_grammar.y
+++ b/src/wkt1_grammar.y
@@ -26,7 +26,7 @@
  * DEALINGS IN THE SOFTWARE.
  ****************************************************************************/
 
-#include "pj_wkt1_parser.h"
+#include "wkt1_parser.h"
 
 %}
 
diff --git a/src/pj_wkt1_parser.cpp b/src/wkt1_parser.cpp
index cdeb6b87..9db7d4bd 100644
--- a/src/pj_wkt1_parser.cpp
+++ b/src/wkt1_parser.cpp
@@ -35,8 +35,8 @@
 #include <cstring>
 #include <string>
 
-#include "pj_wkt1_parser.h"
-#include "pj_wkt_parser.hpp"
+#include "wkt1_parser.h"
+#include "wkt_parser.hpp"
 
 using namespace NS_PROJ::internal;
 
diff --git a/src/pj_wkt1_parser.h b/src/wkt1_parser.h
index f8f7c841..f04ee67f 100644
--- a/src/pj_wkt1_parser.h
+++ b/src/wkt1_parser.h
@@ -36,7 +36,7 @@ extern "C" {
 
 typedef struct pj_wkt1_parse_context pj_wkt1_parse_context;
 
-#include "pj_wkt1_generated_parser.h"
+#include "wkt1_generated_parser.h"
 
 void pj_wkt1_error( pj_wkt1_parse_context *context, const char *msg );
 int pj_wkt1_lex(YYSTYPE* pNode, pj_wkt1_parse_context *context);
diff --git a/src/pj_wkt2_generated_parser.c b/src/wkt2_generated_parser.c
index 759ad052..6d816135 100644
--- a/src/pj_wkt2_generated_parser.c
+++ b/src/wkt2_generated_parser.c
@@ -97,7 +97,7 @@
  * DEALINGS IN THE SOFTWARE.
  ****************************************************************************/
 
-#include "pj_wkt2_parser.h"
+#include "wkt2_parser.h"
 
 
 
@@ -119,9 +119,9 @@
 #endif
 
 /* In a future release of Bison, this section will be replaced
-   by #include "pj_wkt2_generated_parser.h".  */
-#ifndef YY_PJ_WKT2_SRC_PJ_WKT2_GENERATED_PARSER_H_INCLUDED
-# define YY_PJ_WKT2_SRC_PJ_WKT2_GENERATED_PARSER_H_INCLUDED
+   by #include "wkt2_generated_parser.h".  */
+#ifndef YY_PJ_WKT2_SRC_WKT2_GENERATED_PARSER_H_INCLUDED
+# define YY_PJ_WKT2_SRC_WKT2_GENERATED_PARSER_H_INCLUDED
 /* Debug traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
@@ -295,7 +295,7 @@ typedef int YYSTYPE;
 
 int pj_wkt2_parse (pj_wkt2_parse_context *context);
 
-#endif /* !YY_PJ_WKT2_SRC_PJ_WKT2_GENERATED_PARSER_H_INCLUDED  */
+#endif /* !YY_PJ_WKT2_SRC_WKT2_GENERATED_PARSER_H_INCLUDED  */
 
 /* Copy the second part of user declarations.  */
 
diff --git a/src/pj_wkt2_generated_parser.h b/src/wkt2_generated_parser.h
index f9d17ea0..baeb0b4f 100644
--- a/src/pj_wkt2_generated_parser.h
+++ b/src/wkt2_generated_parser.h
@@ -30,8 +30,8 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-#ifndef YY_PJ_WKT2_SRC_PJ_WKT2_GENERATED_PARSER_H_INCLUDED
-# define YY_PJ_WKT2_SRC_PJ_WKT2_GENERATED_PARSER_H_INCLUDED
+#ifndef YY_PJ_WKT2_SRC_WKT2_GENERATED_PARSER_H_INCLUDED
+# define YY_PJ_WKT2_SRC_WKT2_GENERATED_PARSER_H_INCLUDED
 /* Debug traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
@@ -205,4 +205,4 @@ typedef int YYSTYPE;
 
 int pj_wkt2_parse (pj_wkt2_parse_context *context);
 
-#endif /* !YY_PJ_WKT2_SRC_PJ_WKT2_GENERATED_PARSER_H_INCLUDED  */
+#endif /* !YY_PJ_WKT2_SRC_WKT2_GENERATED_PARSER_H_INCLUDED  */
diff --git a/src/pj_wkt2_grammar.y b/src/wkt2_grammar.y
index 2c8393e2..f028eb5b 100644
--- a/src/pj_wkt2_grammar.y
+++ b/src/wkt2_grammar.y
@@ -26,7 +26,7 @@
  * DEALINGS IN THE SOFTWARE.
  ****************************************************************************/
 
-#include "pj_wkt2_parser.h"
+#include "wkt2_parser.h"
 
 %}
 
diff --git a/src/pj_wkt2_parser.cpp b/src/wkt2_parser.cpp
index 0e898436..f77c7ceb 100644
--- a/src/pj_wkt2_parser.cpp
+++ b/src/wkt2_parser.cpp
@@ -36,8 +36,8 @@
 #include <cstring>
 #include <string>
 
-#include "pj_wkt2_parser.h"
-#include "pj_wkt_parser.hpp"
+#include "wkt2_parser.h"
+#include "wkt_parser.hpp"
 
 using namespace NS_PROJ::internal;
 
diff --git a/src/pj_wkt2_parser.h b/src/wkt2_parser.h
index 9229f2ff..1eaadab6 100644
--- a/src/pj_wkt2_parser.h
+++ b/src/wkt2_parser.h
@@ -36,7 +36,7 @@ extern "C" {
 
 typedef struct pj_wkt2_parse_context pj_wkt2_parse_context;
 
-#include "pj_wkt2_generated_parser.h"
+#include "wkt2_generated_parser.h"
 
 void pj_wkt2_error( pj_wkt2_parse_context *context, const char *msg );
 int pj_wkt2_lex(YYSTYPE* pNode, pj_wkt2_parse_context *context);
diff --git a/src/pj_wkt_parser.cpp b/src/wkt_parser.cpp
index ea8d2a29..32fc4e34 100644
--- a/src/pj_wkt_parser.cpp
+++ b/src/wkt_parser.cpp
@@ -25,7 +25,7 @@
  * DEALINGS IN THE SOFTWARE.
  ****************************************************************************/
 
-#include "pj_wkt_parser.hpp"
+#include "wkt_parser.hpp"
 
 #include <algorithm>
 #include <string>
diff --git a/src/pj_wkt_parser.hpp b/src/wkt_parser.hpp
index 0e7e9e8b..0e7e9e8b 100644
--- a/src/pj_wkt_parser.hpp
+++ b/src/wkt_parser.hpp
diff --git a/src/pj_zpoly1.cpp b/src/zpoly1.cpp
index bacb62ce..bacb62ce 100644
--- a/src/pj_zpoly1.cpp
+++ b/src/zpoly1.cpp