diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca8886069..cee6224d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,80 +27,204 @@ if(${QT_VERSION_MAJOR} EQUAL "6")
   list(APPEND QT_LIBRARIES Qt${QT_VERSION_MAJOR}::Core5Compat)
 endif()
 
+# MINIMAL_FMTS
 set(MINIMAL_FMTS
-  magproto.cc explorist_ini.cc gpx.cc geo.cc garmin.cc
-  garmin_device_xml.cc garmin_tables.cc internal_styles.cc nmea.cc
-  kml.cc wbt-200.cc
+  explorist_ini.cc
+  garmin.cc
+  garmin_device_xml.cc
+  garmin_tables.cc
+  geo.cc
+  gpx.cc
+  kml.cc
+  magproto.cc
+  nmea.cc
+  wbt-200.cc
 )
 
-set(ALL_FMTS
-  ${MINIMAL_FMTS} gtm.cc
-  skytraq.cc holux.cc tpg.cc tpo.cc
-  xcsv.cc easygps.cc
-  saroute.cc navicache.cc delgpl.cc
-  ozi.cc text.cc html.cc
-  igc.cc brauniger_iq.cc shape.cc hiketech.cc glogbook.cc
-  vcf.cc lowranceusr.cc tomtom.cc
-  tef_xml.cc gdb.cc bcr.cc
-  ignrando.cc
-  unicsv.cc garmin_txt.cc gpssim.cc
-  gtrnctr.cc dmtlog.cc raymarine.cc 
-  ggv_log.cc garmin_gpi.cc lmx.cc random.cc xol.cc dg-100.cc
-  navilink.cc mtk_logger.cc ik3d.cc osm.cc destinator.cc exif.cc
-  igo8.cc humminbird.cc mapasia.cc gnav_trl.cc navitel.cc ggv_ovl.cc
-  sbp.cc sbn.cc mmo.cc itracku.cc v900.cc
+# ALL_FMTS
+set(ALL_FMTS ${MINIMAL_FMTS}
+  bcr.cc
+  brauniger_iq.cc
+  delgpl.cc
+  destinator.cc
+  dg-100.cc
+  dmtlog.cc
+  easygps.cc
+  energympro.cc
   enigma.cc
-  teletype.cc wintec_tes.cc
-  subrip.cc garmin_xt.cc garmin_fit.cc
-  mtk_locus.cc googledir.cc mapbar_track.cc mapfactor.cc f90g_track.cc
-  energympro.cc mynav.cc ggv_bin.cc globalsat_sport.cc geojson.cc qstarz_bl_1000.cc
+  exif.cc
+  f90g_track.cc
+  garmin_fit.cc
+  garmin_gpi.cc
+  garmin_txt.cc
+  garmin_xt.cc
+  gdb.cc
+  geojson.cc
+  ggv_bin.cc
+  ggv_log.cc
+  ggv_ovl.cc
+  globalsat_sport.cc
+  glogbook.cc
+  gnav_trl.cc
+  googledir.cc
+  gpssim.cc
+  gtm.cc
+  gtrnctr.cc
+  hiketech.cc
+  holux.cc
+  html.cc
+  humminbird.cc
+  igc.cc
+  ignrando.cc
+  igo8.cc
+  ik3d.cc
+  itracku.cc
+  lmx.cc
+  lowranceusr.cc
+  mapasia.cc
+  mapbar_track.cc
+  mapfactor.cc
+  mmo.cc
+  mtk_locus.cc
+  mtk_logger.cc
+  mynav.cc
+  navicache.cc
+  navilink.cc
+  navitel.cc
+  osm.cc
+  ozi.cc
+  qstarz_bl_1000.cc
+  random.cc
+  raymarine.cc
+  saroute.cc
+  sbn.cc
+  sbp.cc
+  shape.cc
+  skytraq.cc
+  subrip.cc
+  tef_xml.cc
+  teletype.cc
+  text.cc
+  tomtom.cc
+  tpg.cc
+  tpo.cc
+  unicsv.cc
+  v900.cc
+  vcf.cc
+  wintec_tes.cc
+  xcsv.cc
+  xol.cc
 )
 
-# ALL_FMTS=$$MINIMAL_FMTS
+# ALL_FMTS = $$MINIMAL_FMTS
+
+# FILTERS
 set(FILTERS
-  position.cc radius.cc duplicate.cc arcdist.cc polygon.cc smplrout.cc
-  reverse_route.cc sort.cc stackfilter.cc trackfilter.cc discard.cc
-  nukedata.cc interpolate.cc transform.cc height.cc swapdata.cc bend.cc
-  validate.cc resample.cc
+  arcdist.cc
+  bend.cc
+  discard.cc
+  duplicate.cc
+  height.cc
+  interpolate.cc
+  nukedata.cc
+  polygon.cc
+  position.cc
+  radius.cc
+  resample.cc
+  reverse_route.cc
+  smplrout.cc
+  sort.cc
+  stackfilter.cc
+  swapdata.cc
+  trackfilter.cc
+  transform.cc
+  validate.cc
 )
 
+# SHAPE
 set(SHAPE
-  shapelib/shpopen.c shapelib/dbfopen.c shapelib/safileio.c
+  shapelib/dbfopen.c
+  shapelib/safileio.c
+  shapelib/shpopen.c
 )
 
+# ZLIB
 set(ZLIB
-  zlib/adler32.c zlib/compress.c zlib/crc32.c zlib/deflate.c zlib/inffast.c
-  zlib/inflate.c zlib/infback.c zlib/inftrees.c zlib/trees.c
-  zlib/uncompr.c zlib/gzlib.c zlib/gzclose.c zlib/gzread.c
-  zlib/gzwrite.c zlib/zutil.c
+  zlib/adler32.c
+  zlib/compress.c
+  zlib/crc32.c
+  zlib/deflate.c
+  zlib/gzclose.c
+  zlib/gzlib.c
+  zlib/gzread.c
+  zlib/gzwrite.c
+  zlib/infback.c
+  zlib/inffast.c
+  zlib/inflate.c
+  zlib/inftrees.c
+  zlib/trees.c
+  zlib/uncompr.c
+  zlib/zutil.c
 )
 
+# JEEPS
 set(JEEPS
-  jeeps/gpsapp.cc jeeps/gpscom.cc
-  jeeps/gpsmath.cc jeeps/gpsmem.cc
-  jeeps/gpsprot.cc jeeps/gpsread.cc
-  jeeps/gpsdevice.cc jeeps/gpsdevice_ser.cc jeeps/gpsdevice_usb.cc
-  jeeps/gpsrqst.cc jeeps/gpssend.cc jeeps/gpsserial.cc jeeps/jgpsutil.cc
-  jeeps/gpsusbread.cc jeeps/gpsusbsend.cc
+  jeeps/gpsapp.cc
+  jeeps/gpscom.cc
+  jeeps/gpsdevice.cc
+  jeeps/gpsdevice_ser.cc
+  jeeps/gpsdevice_usb.cc
+  jeeps/gpsmath.cc
+  jeeps/gpsmem.cc
+  jeeps/gpsprot.cc
+  jeeps/gpsread.cc
+  jeeps/gpsrqst.cc
+  jeeps/gpssend.cc
+  jeeps/gpsserial.cc
   jeeps/gpsusbcommon.cc
+  jeeps/gpsusbread.cc
+  jeeps/gpsusbsend.cc
+  jeeps/jgpsutil.cc
 )
 
+# SUPPORT
 set(SUPPORT
-  route.cc waypt.cc filter_vecs.cc util.cc vecs.cc mkshort.cc
-  csv_util.cc strptime.c grtcirc.cc util_crc.cc xmlgeneric.cc
-  formspec.cc xmltag.cc cet_util.cc fatal.cc rgbcolors.cc
-  inifile.cc garmin_fs.cc units.cc gbser.cc
-  gbfile.cc parse.cc session.cc main.cc globals.cc
+  cet_util.cc
+  csv_util.cc
+  fatal.cc
+  filter_vecs.cc
+  formspec.cc
+  garmin_fs.cc
+  gbfile.cc
+  gbser.cc
+  globals.cc
+  grtcirc.cc
+  inifile.cc
+  main.cc
+  mkshort.cc
+  parse.cc
+  rgbcolors.cc
+  route.cc
+  session.cc
   src/core/nvector.cc
   src/core/textstream.cc
   src/core/usasciicodec.cc
   src/core/vector3d.cc
   src/core/xmlstreamwriter.cc
+  strptime.c
+  units.cc
+  util.cc
+  util_crc.cc
+  vecs.cc
+  waypt.cc
+  xmlgeneric.cc
+  xmltag.cc
 )
 if(${QT_VERSION_MAJOR} EQUAL "6")
   set(SUPPORT ${SUPPORT} src/core/codecdevice.cc)
 endif()
 
+# HEADERS
 set(HEADERS
   cet_util.h
   csv_util.h
@@ -130,6 +254,24 @@ set(HEADERS
   heightgrid.h
   holux.h
   inifile.h
+  kml.h
+  legacyformat.h
+  lowranceusr.h
+  magellan.h
+  mynav.h
+  navilink.h
+  nmea.h
+  osm.h
+  random.h
+  session.h
+  shape.h
+  strptime.h
+  subrip.h
+  unicsv.h
+  units.h
+  vecs.h
+  xcsv.h
+  xmlgeneric.h
   jeeps/garminusb.h
   jeeps/gps.h
   jeeps/gpsapp.h
@@ -148,26 +290,18 @@ set(HEADERS
   jeeps/gpsusbcommon.h
   jeeps/gpsusbint.h
   jeeps/gpsutil.h
-  kml.h
-  legacyformat.h
-  lowranceusr.h
-  magellan.h
-  mynav.h
-  navilink.h
-  nmea.h
-  osm.h
-  random.h
-  session.h
-  shape.h
+  src/core/datetime.h
+  src/core/file.h
+  src/core/logging.h
+  src/core/nvector.h
+  src/core/textstream.h
+  src/core/usasciicodec.h
+  src/core/vector3d.h
+  src/core/xmlstreamwriter.h
+  src/core/xmltag.h
+
   shapelib/shapefil.h
-  strptime.h
-  subrip.h
-  unicsv.h
-  units.h
-  vecs.h
-  xcsv.h
-  xmlgeneric.h
-  
+
   zlib/crc32.h
   zlib/deflate.h
   zlib/gzguts.h
@@ -179,15 +313,6 @@ set(HEADERS
   zlib/zconf.h
   zlib/zlib.h
   zlib/zutil.h
-  src/core/datetime.h
-  src/core/file.h
-  src/core/logging.h
-  src/core/nvector.h
-  src/core/textstream.h
-  src/core/usasciicodec.h
-  src/core/vector3d.h
-  src/core/xmlstreamwriter.h
-  src/core/xmltag.h
 )
 if(${QT_VERSION_MAJOR} EQUAL "6")
   set(HEADERS ${HEADERS} src/core/codecdevice.h)
@@ -196,6 +321,8 @@ endif()
 string(REPLACE .cc .h FILTER_HEADERS "${FILTERS}")
 set(HEADERS ${HEADERS} ${FILTER_HEADERS})
 
+set(SOURCES ${SOURCES} internal_styles.cc)
+
 include_directories(AFTER zlib)
 
 include(CheckIncludeFile)
diff --git a/GPSBabel.pro b/GPSBabel.pro
index 0428a879d..2926027d7 100644
--- a/GPSBabel.pro
+++ b/GPSBabel.pro
@@ -55,135 +55,249 @@ GB.setupfile.input = gui/setup.iss.qmake.in
 GB.setupfile.output = gui/setup.iss
 QMAKE_SUBSTITUTES += GB.setupfile
 
-MINIMAL_FMTS =  magproto.cc explorist_ini.cc gpx.cc geo.cc garmin.cc \
-               garmin_device_xml.cc garmin_tables.cc nmea.cc \
-               kml.cc wbt-200.cc
-
-ALL_FMTS=$$MINIMAL_FMTS gtm.cc \
-        skytraq.cc holux.cc tpg.cc tpo.cc \
-        xcsv.cc easygps.cc \
-        saroute.cc navicache.cc delgpl.cc \
-        ozi.cc text.cc html.cc \
-        igc.cc brauniger_iq.cc shape.cc hiketech.cc glogbook.cc \
-        vcf.cc lowranceusr.cc tomtom.cc \
-        tef_xml.cc gdb.cc bcr.cc \
-        ignrando.cc \
-        unicsv.cc garmin_txt.cc gpssim.cc \
-        gtrnctr.cc dmtlog.cc raymarine.cc \
-        ggv_log.cc garmin_gpi.cc lmx.cc random.cc xol.cc dg-100.cc \
-        navilink.cc mtk_logger.cc ik3d.cc osm.cc destinator.cc exif.cc \
-        igo8.cc humminbird.cc mapasia.cc gnav_trl.cc navitel.cc ggv_ovl.cc \
-        sbp.cc sbn.cc mmo.cc itracku.cc v900.cc \
-        enigma.cc \
-        teletype.cc wintec_tes.cc \
-        subrip.cc garmin_xt.cc garmin_fit.cc \
-        mtk_locus.cc googledir.cc mapbar_track.cc mapfactor.cc f90g_track.cc \
-        energympro.cc mynav.cc ggv_bin.cc globalsat_sport.cc geojson.cc qstarz_bl_1000.cc
-
-# ALL_FMTS=$$MINIMAL_FMTS
-FILTERS=position.cc radius.cc duplicate.cc arcdist.cc polygon.cc smplrout.cc \
-        reverse_route.cc sort.cc stackfilter.cc trackfilter.cc discard.cc \
-        nukedata.cc interpolate.cc transform.cc height.cc swapdata.cc bend.cc \
-        validate.cc resample.cc
+# MINIMAL_FMTS
+MINIMAL_FMTS = \
+  explorist_ini.cc \
+  garmin.cc \
+  garmin_device_xml.cc \
+  garmin_tables.cc \
+  geo.cc \
+  gpx.cc \
+  kml.cc \
+  magproto.cc \
+  nmea.cc \
+  wbt-200.cc
+
+# ALL_FMTS
+ALL_FMTS = $$MINIMAL_FMTS \
+  bcr.cc \
+  brauniger_iq.cc \
+  delgpl.cc \
+  destinator.cc \
+  dg-100.cc \
+  dmtlog.cc \
+  easygps.cc \
+  energympro.cc \
+  enigma.cc \
+  exif.cc \
+  f90g_track.cc \
+  garmin_fit.cc \
+  garmin_gpi.cc \
+  garmin_txt.cc \
+  garmin_xt.cc \
+  gdb.cc \
+  geojson.cc \
+  ggv_bin.cc \
+  ggv_log.cc \
+  ggv_ovl.cc \
+  globalsat_sport.cc \
+  glogbook.cc \
+  gnav_trl.cc \
+  googledir.cc \
+  gpssim.cc \
+  gtm.cc \
+  gtrnctr.cc \
+  hiketech.cc \
+  holux.cc \
+  html.cc \
+  humminbird.cc \
+  igc.cc \
+  ignrando.cc \
+  igo8.cc \
+  ik3d.cc \
+  itracku.cc \
+  lmx.cc \
+  lowranceusr.cc \
+  mapasia.cc \
+  mapbar_track.cc \
+  mapfactor.cc \
+  mmo.cc \
+  mtk_locus.cc \
+  mtk_logger.cc \
+  mynav.cc \
+  navicache.cc \
+  navilink.cc \
+  navitel.cc \
+  osm.cc \
+  ozi.cc \
+  qstarz_bl_1000.cc \
+  random.cc \
+  raymarine.cc \
+  saroute.cc \
+  sbn.cc \
+  sbp.cc \
+  shape.cc \
+  skytraq.cc \
+  subrip.cc \
+  tef_xml.cc \
+  teletype.cc \
+  text.cc \
+  tomtom.cc \
+  tpg.cc \
+  tpo.cc \
+  unicsv.cc \
+  v900.cc \
+  vcf.cc \
+  wintec_tes.cc \
+  xcsv.cc \
+  xol.cc
+
+# ALL_FMTS = $$MINIMAL_FMTS
+
+# FILTERS
+FILTERS = \
+  arcdist.cc \
+  bend.cc \
+  discard.cc \
+  duplicate.cc \
+  height.cc \
+  interpolate.cc \
+  nukedata.cc \
+  polygon.cc \
+  position.cc \
+  radius.cc \
+  resample.cc \
+  reverse_route.cc \
+  smplrout.cc \
+  sort.cc \
+  stackfilter.cc \
+  swapdata.cc \
+  trackfilter.cc \
+  transform.cc \
+  validate.cc
 FILTER_HEADERS = $$FILTERS
 FILTER_HEADERS ~= s/\\.cc/.h/g
 
-JEEPS += jeeps/gpsapp.cc jeeps/gpscom.cc \
-         jeeps/gpsmath.cc jeeps/gpsmem.cc  \
-         jeeps/gpsprot.cc jeeps/gpsread.cc \
-         jeeps/gpsdevice.cc jeeps/gpsdevice_ser.cc jeeps/gpsdevice_usb.cc \
-         jeeps/gpsrqst.cc jeeps/gpssend.cc jeeps/gpsserial.cc jeeps/jgpsutil.cc \
-         jeeps/gpsusbread.cc jeeps/gpsusbsend.cc \
-         jeeps/gpsusbcommon.cc
-
-
-SUPPORT = route.cc waypt.cc filter_vecs.cc util.cc vecs.cc mkshort.cc \
-          csv_util.cc strptime.c grtcirc.cc util_crc.cc xmlgeneric.cc \
-          formspec.cc xmltag.cc cet_util.cc fatal.cc rgbcolors.cc \
-          inifile.cc garmin_fs.cc units.cc gbser.cc \
-          gbfile.cc parse.cc session.cc main.cc globals.cc \
-          src/core/nvector.cc \
-          src/core/textstream.cc \
-          src/core/usasciicodec.cc \
-          src/core/vector3d.cc \
-          src/core/xmlstreamwriter.cc
+# JEEPS
+JEEPS += \
+  jeeps/gpsapp.cc \
+  jeeps/gpscom.cc \
+  jeeps/gpsdevice.cc \
+  jeeps/gpsdevice_ser.cc \
+  jeeps/gpsdevice_usb.cc \
+  jeeps/gpsmath.cc \
+  jeeps/gpsmem.cc \
+  jeeps/gpsprot.cc \
+  jeeps/gpsread.cc \
+  jeeps/gpsrqst.cc \
+  jeeps/gpssend.cc \
+  jeeps/gpsserial.cc \
+  jeeps/gpsusbcommon.cc \
+  jeeps/gpsusbread.cc \
+  jeeps/gpsusbsend.cc \
+  jeeps/jgpsutil.cc
+
+
+# SUPPORT
+SUPPORT = \
+  cet_util.cc \
+  csv_util.cc \
+  fatal.cc \
+  filter_vecs.cc \
+  formspec.cc \
+  garmin_fs.cc \
+  gbfile.cc \
+  gbser.cc \
+  globals.cc \
+  grtcirc.cc \
+  inifile.cc \
+  main.cc \
+  mkshort.cc \
+  parse.cc \
+  rgbcolors.cc \
+  route.cc \
+  session.cc \
+  src/core/nvector.cc \
+  src/core/textstream.cc \
+  src/core/usasciicodec.cc \
+  src/core/vector3d.cc \
+  src/core/xmlstreamwriter.cc \
+  strptime.c \
+  units.cc \
+  util.cc \
+  util_crc.cc \
+  vecs.cc \
+  waypt.cc \
+  xmlgeneric.cc \
+  xmltag.cc
 
 versionAtLeast(QT_VERSION, 6.0): SUPPORT += src/core/codecdevice.cc
 
+# HEADERS
 HEADERS =  \
-	cet_util.h \
-	csv_util.h \
-	defs.h \
-	dg-100.h \
-	energympro.h \
-	explorist_ini.h \
-	filter.h \
-	filter_vecs.h \
-	format.h \
-	formspec.h \
-	garmin_device_xml.h \
-	garmin_fit.h \
-	garmin_fs.h \
-	garmin_gpi.h \
-	garmin_icon_tables.h \
-	garmin_tables.h \
-	gbfile.h \
-	gbser.h \
-	gbser_private.h \
-	gbversion.h \
-	geojson.h \
-	ggv_bin.h \
-	globalsat_sport.h \
-	gpx.h \
-	grtcirc.h \
-	heightgrid.h \
-	holux.h \
-	inifile.h \
-	jeeps/garminusb.h \
-	jeeps/gps.h \
-	jeeps/gpsapp.h \
-	jeeps/gpscom.h \
-	jeeps/gpsdatum.h \
-	jeeps/gpsdevice.h \
-	jeeps/gpsfmt.h \
-	jeeps/gpsmath.h \
-	jeeps/gpsmem.h \
-	jeeps/gpsport.h \
-	jeeps/gpsprot.h \
-	jeeps/gpsread.h \
-	jeeps/gpsrqst.h \
-	jeeps/gpssend.h \
-	jeeps/gpsserial.h \
-	jeeps/gpsusbcommon.h \
-	jeeps/gpsusbint.h \
-	jeeps/gpsutil.h \
-	kml.h \
-	legacyformat.h \
-	lowranceusr.h \
-	magellan.h \
-	mynav.h \
-	navilink.h \
-	nmea.h \
-	osm.h \
-	random.h \
-	session.h \
-	shape.h \
-	strptime.h \
-	subrip.h \
-	unicsv.h \
-	units.h \
-	vecs.h \
-	xcsv.h \
-	xmlgeneric.h \
-	src/core/datetime.h \
-	src/core/file.h \
-	src/core/logging.h \
-	src/core/nvector.h \
-	src/core/textstream.h \
-	src/core/usasciicodec.h \
-	src/core/vector3d.h \
-	src/core/xmlstreamwriter.h \
-	src/core/xmltag.h
+  cet_util.h \
+  csv_util.h \
+  defs.h \
+  dg-100.h \
+  energympro.h \
+  explorist_ini.h \
+  filter.h \
+  filter_vecs.h \
+  format.h \
+  formspec.h \
+  garmin_device_xml.h \
+  garmin_fit.h \
+  garmin_fs.h \
+  garmin_gpi.h \
+  garmin_icon_tables.h \
+  garmin_tables.h \
+  gbfile.h \
+  gbser.h \
+  gbser_private.h \
+  gbversion.h \
+  geojson.h \
+  ggv_bin.h \
+  globalsat_sport.h \
+  gpx.h \
+  grtcirc.h \
+  heightgrid.h \
+  holux.h \
+  inifile.h \
+  kml.h \
+  legacyformat.h \
+  lowranceusr.h \
+  magellan.h \
+  mynav.h \
+  navilink.h \
+  nmea.h \
+  osm.h \
+  random.h \
+  session.h \
+  shape.h \
+  strptime.h \
+  subrip.h \
+  unicsv.h \
+  units.h \
+  vecs.h \
+  xcsv.h \
+  xmlgeneric.h \
+  jeeps/garminusb.h \
+  jeeps/gps.h \
+  jeeps/gpsapp.h \
+  jeeps/gpscom.h \
+  jeeps/gpsdatum.h \
+  jeeps/gpsdevice.h \
+  jeeps/gpsfmt.h \
+  jeeps/gpsmath.h \
+  jeeps/gpsmem.h \
+  jeeps/gpsport.h \
+  jeeps/gpsprot.h \
+  jeeps/gpsread.h \
+  jeeps/gpsrqst.h \
+  jeeps/gpssend.h \
+  jeeps/gpsserial.h \
+  jeeps/gpsusbcommon.h \
+  jeeps/gpsusbint.h \
+  jeeps/gpsutil.h \
+  src/core/datetime.h \
+  src/core/file.h \
+  src/core/logging.h \
+  src/core/nvector.h \
+  src/core/textstream.h \
+  src/core/usasciicodec.h \
+  src/core/vector3d.h \
+  src/core/xmlstreamwriter.h \
+  src/core/xmltag.h
 
 versionAtLeast(QT_VERSION, 6.0): HEADERS += src/core/codecdevice.h
 
diff --git a/libusb.pri b/libusb.pri
index 7569f113a..a6604f94b 100644
--- a/libusb.pri
+++ b/libusb.pri
@@ -35,23 +35,25 @@ macx|linux|openbsd {
           LIBS += -lobjc -framework IOKit -framework CoreFoundation
           INCLUDEPATH += mac/libusb \
                          mac/libusb/Xcode
-          SOURCES += mac/libusb/core.c \
-                     mac/libusb/descriptor.c \
-                     mac/libusb/hotplug.c \
-                     mac/libusb/io.c \
-                     mac/libusb/strerror.c \
-                     mac/libusb/sync.c \
-                     mac/libusb/os/darwin_usb.c \
-                     mac/libusb/os/events_posix.c \
-                     mac/libusb/os/threads_posix.c
-          HEADERS += mac/libusb/hotplug.h \
-                     mac/libusb/libusb.h \
-                     mac/libusb/libusbi.h \
-                     mac/libusb/version.h \
-                     mac/libusb/version_nano.h \
-                     mac/libusb/os/darwin_usb.h \
-                     mac/libusb/os/events_posix.h \
-                     mac/libusb/os/threads_posix.h
+          SOURCES += \
+            mac/libusb/core.c \
+            mac/libusb/descriptor.c \
+            mac/libusb/hotplug.c \
+            mac/libusb/io.c \
+            mac/libusb/strerror.c \
+            mac/libusb/sync.c \
+            mac/libusb/os/darwin_usb.c \
+            mac/libusb/os/events_posix.c \
+            mac/libusb/os/threads_posix.c
+          HEADERS += \
+            mac/libusb/hotplug.h \
+            mac/libusb/libusb.h \
+            mac/libusb/libusbi.h \
+            mac/libusb/version.h \
+            mac/libusb/version_nano.h \
+            mac/libusb/os/darwin_usb.h \
+            mac/libusb/os/events_posix.h \
+            mac/libusb/os/threads_posix.h
         } else:equals(WITH_LIBUSB, custom) {
           message("libusb-1.0 is enabled but but must be manually configured")
           message("  e.g. qmake WITH_LIBUSB=custom LIBS+=... INCLUDEPATH+=...")
diff --git a/msvc/GPSBabel.sln b/msvc/GPSBabel.sln
deleted file mode 100644
index bc82c7613..000000000
--- a/msvc/GPSBabel.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.489
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GPSBabel", "GPSBabel.vcxproj", "{3E927E7F-E970-3403-8520-5CA7309B5F7D}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x86 = Debug|x86
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3E927E7F-E970-3403-8520-5CA7309B5F7D}.Debug|x86.ActiveCfg = Debug|Win32
-		{3E927E7F-E970-3403-8520-5CA7309B5F7D}.Debug|x86.Build.0 = Debug|Win32
-		{3E927E7F-E970-3403-8520-5CA7309B5F7D}.Release|x86.ActiveCfg = Release|Win32
-		{3E927E7F-E970-3403-8520-5CA7309B5F7D}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {F41D6FA3-985A-44BF-9CB0-117948BA5FD3}
-	EndGlobalSection
-EndGlobal
diff --git a/msvc/GPSBabel.vcxproj b/msvc/GPSBabel.vcxproj
deleted file mode 100644
index 2b717c65d..000000000
--- a/msvc/GPSBabel.vcxproj
+++ /dev/null
@@ -1,412 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{3E927E7F-E970-3403-8520-5CA7309B5F7D}</ProjectGuid>
-    <RootNamespace>GPSBabel</RootNamespace>
-    <Keyword>Qt4VSv1.0</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;Release|Win32&apos;" Label="Configuration">
-    <PlatformToolset>v141</PlatformToolset>
-    <OutputDirectory>release\</OutputDirectory>
-    <ATLMinimizesCRunTimeLibraryUsage>false</ATLMinimizesCRunTimeLibraryUsage>
-    <CharacterSet>NotSet</CharacterSet>
-    <ConfigurationType>Application</ConfigurationType>
-    <IntermediateDirectory>release\</IntermediateDirectory>
-    <PrimaryOutput>GPSBabel</PrimaryOutput>
-  </PropertyGroup>
-  <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;Debug|Win32&apos;" Label="Configuration">
-    <PlatformToolset>v141</PlatformToolset>
-    <OutputDirectory>debug\</OutputDirectory>
-    <ATLMinimizesCRunTimeLibraryUsage>false</ATLMinimizesCRunTimeLibraryUsage>
-    <CharacterSet>NotSet</CharacterSet>
-    <ConfigurationType>Application</ConfigurationType>
-    <IntermediateDirectory>debug\</IntermediateDirectory>
-    <PrimaryOutput>GPSBabel</PrimaryOutput>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings" />
-  <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;Release|Win32&apos;" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" />
-  </ImportGroup>
-  <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;Debug|Win32&apos;" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;Release|Win32&apos;">release\</OutDir>
-    <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;Release|Win32&apos;">release\</IntDir>
-    <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;Release|Win32&apos;">GPSBabel</TargetName>
-    <IgnoreImportLibrary Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;Release|Win32&apos;">true</IgnoreImportLibrary>
-    <LinkIncremental Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;Release|Win32&apos;">false</LinkIncremental>
-    <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;Debug|Win32&apos;">debug\</OutDir>
-    <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;Debug|Win32&apos;">debug\</IntDir>
-    <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;Debug|Win32&apos;">GPSBabel</TargetName>
-    <IgnoreImportLibrary Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;Debug|Win32&apos;">true</IgnoreImportLibrary>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;Release|Win32&apos;">
-    <ClCompile>
-      <AdditionalIncludeDirectories>.;zlib;C:\Qt\5.12.2\msvc2017\include;C:\Qt\5.12.2\msvc2017\include\QtCore;release;C:\Qt\5.12.2\msvc2017\mkspecs\win32-msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalOptions>-Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -std:c++14 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions)</AdditionalOptions>
-      <AssemblerListingLocation>release\</AssemblerListingLocation>
-      <BrowseInformation>false</BrowseInformation>
-      <DebugInformationFormat>None</DebugInformationFormat>
-      <DisableSpecificWarnings>4100;4577;4467;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <ObjectFileName>release\</ObjectFileName>
-      <Optimization>MaxSpeed</Optimization>
-      <PreprocessorDefinitions>_CONSOLE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;__WIN32__;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;MAXIMAL_ENABLED;FILTERS_ENABLED;SHAPELIB_ENABLED;CSVFMTS_ENABLED;QT_NO_DEBUG;QT_CORE_LIB;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessToFile>false</PreprocessToFile>
-      <ProgramDataBaseFileName></ProgramDataBaseFileName>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <WarningLevel>Level3</WarningLevel>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>&quot;C:\Program Files (x86)\Windows Kits\10\lib\10.0.17763.0\um\x86\setupapi.lib&quot;;C:\Qt\5.12.2\msvc2017\lib\Qt5Core.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:\Qt\5.12.2\msvc2017\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalOptions>&quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot; %(AdditionalOptions)</AdditionalOptions>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <IgnoreImportLibrary>true</IgnoreImportLibrary>
-      <LinkIncremental>false</LinkIncremental>
-      <OutputFile>$(OutDir)\GPSBabel.exe</OutputFile>
-      <SubSystem>Console</SubSystem>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Link>
-    <Midl>
-      <DefaultCharType>Unsigned</DefaultCharType>
-      <EnableErrorChecks>None</EnableErrorChecks>
-      <WarningLevel>0</WarningLevel>
-    </Midl>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_CONSOLE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;__WIN32__;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;MAXIMAL_ENABLED;FILTERS_ENABLED;SHAPELIB_ENABLED;CSVFMTS_ENABLED;QT_NO_DEBUG;QT_CORE_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;Debug|Win32&apos;">
-    <ClCompile>
-      <AdditionalIncludeDirectories>.;zlib;C:\Qt\5.12.2\msvc2017\include;C:\Qt\5.12.2\msvc2017\include\QtCore;debug;C:\Qt\5.12.2\msvc2017\mkspecs\win32-msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalOptions>-Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -std:c++14 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions)</AdditionalOptions>
-      <AssemblerListingLocation>debug\</AssemblerListingLocation>
-      <BrowseInformation>false</BrowseInformation>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4100;4577;4467;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <ObjectFileName>debug\</ObjectFileName>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_CONSOLE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;__WIN32__;_CONSOLE;_DEBUG;_CRT_SECURE_NO_DEPRECATE;MAXIMAL_ENABLED;FILTERS_ENABLED;SHAPELIB_ENABLED;CSVFMTS_ENABLED;QT_CORE_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessToFile>false</PreprocessToFile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <WarningLevel>Level3</WarningLevel>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>&quot;C:\Program Files (x86)\Windows Kits\10\lib\10.0.17763.0\um\x86\setupapi.lib&quot;;C:\Qt\5.12.2\msvc2017\lib\Qt5Cored.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:\Qt\5.12.2\msvc2017\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalOptions>&quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot; %(AdditionalOptions)</AdditionalOptions>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <IgnoreImportLibrary>true</IgnoreImportLibrary>
-      <OutputFile>$(OutDir)\GPSBabel.exe</OutputFile>
-      <SubSystem>Console</SubSystem>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Link>
-    <Midl>
-      <DefaultCharType>Unsigned</DefaultCharType>
-      <EnableErrorChecks>None</EnableErrorChecks>
-      <WarningLevel>0</WarningLevel>
-    </Midl>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_CONSOLE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;__WIN32__;_CONSOLE;_DEBUG;_CRT_SECURE_NO_DEPRECATE;MAXIMAL_ENABLED;FILTERS_ENABLED;SHAPELIB_ENABLED;CSVFMTS_ENABLED;QT_CORE_LIB;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="zlib\adler32.c" />
-    <ClCompile Include="alan.cc" />
-    <ClCompile Include="an1.cc" />
-    <ClCompile Include="arcdist.cc" />
-    <ClCompile Include="bcr.cc" />
-    <ClCompile Include="bend.cc" />
-    <ClCompile Include="brauniger_iq.cc" />
-    <ClCompile Include="bushnell.cc" />
-    <ClCompile Include="bushnell_trl.cc" />
-    <ClCompile Include="cet.cc" />
-    <ClCompile Include="cet_util.cc" />
-    <ClCompile Include="zlib\compress.c" />
-    <ClCompile Include="zlib\crc32.c" />
-    <ClCompile Include="csv_util.cc" />
-    <ClCompile Include="shapelib\dbfopen.c" />
-    <ClCompile Include="zlib\deflate.c" />
-    <ClCompile Include="delgpl.cc" />
-    <ClCompile Include="destinator.cc" />
-    <ClCompile Include="dg-100.cc" />
-    <ClCompile Include="discard.cc" />
-    <ClCompile Include="dmtlog.cc" />
-    <ClCompile Include="duplicate.cc" />
-    <ClCompile Include="easygps.cc" />
-    <ClCompile Include="energympro.cc" />
-    <ClCompile Include="enigma.cc" />
-    <ClCompile Include="exif.cc" />
-    <ClCompile Include="explorist_ini.cc" />
-    <ClCompile Include="f90g_track.cc" />
-    <ClCompile Include="fatal.cc" />
-    <ClCompile Include="filter_vecs.cc" />
-    <ClCompile Include="formspec.cc" />
-    <ClCompile Include="garmin.cc" />
-    <ClCompile Include="garmin_device_xml.cc" />
-    <ClCompile Include="garmin_fit.cc" />
-    <ClCompile Include="garmin_fs.cc" />
-    <ClCompile Include="garmin_gpi.cc" />
-    <ClCompile Include="garmin_tables.cc" />
-    <ClCompile Include="garmin_txt.cc" />
-    <ClCompile Include="garmin_xt.cc" />
-    <ClCompile Include="gbfile.cc" />
-    <ClCompile Include="gbser.cc" />
-    <ClCompile Include="gbser_win.cc" />
-    <ClCompile Include="gdb.cc" />
-    <ClCompile Include="geo.cc" />
-    <ClCompile Include="geojson.cc" />
-    <ClCompile Include="ggv_bin.cc" />
-    <ClCompile Include="ggv_log.cc" />
-    <ClCompile Include="ggv_ovl.cc" />
-    <ClCompile Include="globals.cc" />
-    <ClCompile Include="globalsat_sport.cc" />
-    <ClCompile Include="glogbook.cc" />
-    <ClCompile Include="gnav_trl.cc" />
-    <ClCompile Include="googledir.cc" />
-    <ClCompile Include="jeeps\gpsapp.cc" />
-    <ClCompile Include="jeeps\gpscom.cc" />
-    <ClCompile Include="jeeps\gpsdevice.cc" />
-    <ClCompile Include="jeeps\gpsdevice_ser.cc" />
-    <ClCompile Include="jeeps\gpsdevice_usb.cc" />
-    <ClCompile Include="jeeps\gpsmath.cc" />
-    <ClCompile Include="jeeps\gpsmem.cc" />
-    <ClCompile Include="jeeps\gpsprot.cc" />
-    <ClCompile Include="jeeps\gpsread.cc" />
-    <ClCompile Include="jeeps\gpsrqst.cc" />
-    <ClCompile Include="jeeps\gpssend.cc" />
-    <ClCompile Include="jeeps\gpsserial.cc" />
-    <ClCompile Include="gpssim.cc" />
-    <ClCompile Include="jeeps\gpsusbcommon.cc" />
-    <ClCompile Include="jeeps\gpsusbread.cc" />
-    <ClCompile Include="jeeps\gpsusbsend.cc" />
-    <ClCompile Include="jeeps\gpsusbwin.cc" />
-    <ClCompile Include="gpx.cc" />
-    <ClCompile Include="grtcirc.cc" />
-    <ClCompile Include="gtm.cc" />
-    <ClCompile Include="gtrnctr.cc" />
-    <ClCompile Include="zlib\gzclose.c" />
-    <ClCompile Include="zlib\gzlib.c" />
-    <ClCompile Include="zlib\gzread.c" />
-    <ClCompile Include="zlib\gzwrite.c" />
-    <ClCompile Include="height.cc" />
-    <ClCompile Include="hiketech.cc" />
-    <ClCompile Include="holux.cc" />
-    <ClCompile Include="html.cc" />
-    <ClCompile Include="humminbird.cc" />
-    <ClCompile Include="igc.cc" />
-    <ClCompile Include="igo8.cc" />
-    <ClCompile Include="ik3d.cc" />
-    <ClCompile Include="zlib\infback.c" />
-    <ClCompile Include="zlib\inffast.c" />
-    <ClCompile Include="zlib\inflate.c" />
-    <ClCompile Include="zlib\inftrees.c" />
-    <ClCompile Include="inifile.cc" />
-    <ClCompile Include="internal_styles.cc" />
-    <ClCompile Include="interpolate.cc" />
-    <ClCompile Include="itracku.cc" />
-    <ClCompile Include="kml.cc" />
-    <ClCompile Include="lmx.cc" />
-    <ClCompile Include="lowranceusr.cc" />
-    <ClCompile Include="magproto.cc" />
-    <ClCompile Include="main.cc" />
-    <ClCompile Include="mapasia.cc" />
-    <ClCompile Include="mapbar_track.cc" />
-    <ClCompile Include="mapfactor.cc" />
-    <ClCompile Include="mapsource.cc" />
-    <ClCompile Include="mkshort.cc" />
-    <ClCompile Include="mmo.cc" />
-    <ClCompile Include="mtk_locus.cc" />
-    <ClCompile Include="mtk_logger.cc" />
-    <ClCompile Include="mynav.cc" />
-    <ClCompile Include="navicache.cc" />
-    <ClCompile Include="naviguide.cc" />
-    <ClCompile Include="navilink.cc" />
-    <ClCompile Include="navitel.cc" />
-    <ClCompile Include="netstumbler.cc" />
-    <ClCompile Include="nmea.cc" />
-    <ClCompile Include="nmn4.cc" />
-    <ClCompile Include="nukedata.cc" />
-    <ClCompile Include="osm.cc" />
-    <ClCompile Include="ozi.cc" />
-    <ClCompile Include="parse.cc" />
-    <ClCompile Include="polygon.cc" />
-    <ClCompile Include="position.cc" />
-    <ClCompile Include="radius.cc" />
-    <ClCompile Include="raymarine.cc" />
-    <ClCompile Include="reverse_route.cc" />
-    <ClCompile Include="rgbcolors.cc" />
-    <ClCompile Include="route.cc" />
-    <ClCompile Include="shapelib\safileio.c" />
-    <ClCompile Include="saroute.cc" />
-    <ClCompile Include="sbn.cc" />
-    <ClCompile Include="sbp.cc" />
-    <ClCompile Include="session.cc" />
-    <ClCompile Include="shape.cc" />
-    <ClCompile Include="shapelib\shpopen.c" />
-    <ClCompile Include="skytraq.cc" />
-    <ClCompile Include="smplrout.cc" />
-    <ClCompile Include="sort.cc" />
-    <ClCompile Include="stackfilter.cc" />
-    <ClCompile Include="strptime.c" />
-    <ClCompile Include="subrip.cc" />
-    <ClCompile Include="swapdata.cc" />
-    <ClCompile Include="tef_xml.cc" />
-    <ClCompile Include="teletype.cc" />
-    <ClCompile Include="text.cc" />
-    <ClCompile Include="tmpro.cc" />
-    <ClCompile Include="tomtom.cc" />
-    <ClCompile Include="tpg.cc" />
-    <ClCompile Include="tpo.cc" />
-    <ClCompile Include="trackfilter.cc" />
-    <ClCompile Include="transform.cc" />
-    <ClCompile Include="zlib\trees.c" />
-    <ClCompile Include="zlib\uncompr.c" />
-    <ClCompile Include="unicsv.cc" />
-    <ClCompile Include="units.cc" />
-    <ClCompile Include="src\core\usasciicodec.cc" />
-    <ClCompile Include="util.cc" />
-    <ClCompile Include="util_crc.cc" />
-    <ClCompile Include="v900.cc" />
-    <ClCompile Include="validate.cc" />
-    <ClCompile Include="vcf.cc" />
-    <ClCompile Include="vecs.cc" />
-    <ClCompile Include="waypt.cc" />
-    <ClCompile Include="wbt-200.cc" />
-    <ClCompile Include="wintec_tes.cc" />
-    <ClCompile Include="xcsv.cc" />
-    <ClCompile Include="xmlgeneric.cc" />
-    <ClCompile Include="src\core\xmlstreamwriter.cc" />
-    <ClCompile Include="xmltag.cc" />
-    <ClCompile Include="xol.cc" />
-    <ClCompile Include="zlib\zutil.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="an1sym.h" />
-    <ClInclude Include="cet\ansi_x3_4_1968.h" />
-    <ClInclude Include="arcdist.h" />
-    <ClInclude Include="bend.h" />
-    <ClInclude Include="cet.h" />
-    <ClInclude Include="cet_util.h" />
-    <ClInclude Include="cet\cp1252.h" />
-    <ClInclude Include="zlib\crc32.h" />
-    <ClInclude Include="csv_util.h" />
-    <ClInclude Include="src\core\datetime.h" />
-    <ClInclude Include="zlib\deflate.h" />
-    <ClInclude Include="defs.h" />
-    <ClInclude Include="discard.h" />
-    <ClInclude Include="duplicate.h" />
-    <ClInclude Include="explorist_ini.h" />
-    <ClInclude Include="src\core\file.h" />
-    <ClInclude Include="filter.h" />
-    <ClInclude Include="filterdefs.h" />
-    <ClInclude Include="garmin_device_xml.h" />
-    <ClInclude Include="garmin_fs.h" />
-    <ClInclude Include="garmin_gpi.h" />
-    <ClInclude Include="garmin_tables.h" />
-    <ClInclude Include="jeeps\garminusb.h" />
-    <ClInclude Include="gbfile.h" />
-    <ClInclude Include="gbser.h" />
-    <ClInclude Include="gbser_private.h" />
-    <ClInclude Include="gbser_win.h" />
-    <ClInclude Include="gbversion.h" />
-    <ClInclude Include="jeeps\gps.h" />
-    <ClInclude Include="jeeps\gpsapp.h" />
-    <ClInclude Include="jeeps\gpscom.h" />
-    <ClInclude Include="jeeps\gpsdatum.h" />
-    <ClInclude Include="jeeps\gpsdevice.h" />
-    <ClInclude Include="jeeps\gpsfmt.h" />
-    <ClInclude Include="jeeps\gpsmath.h" />
-    <ClInclude Include="jeeps\gpsmem.h" />
-    <ClInclude Include="jeeps\gpsport.h" />
-    <ClInclude Include="jeeps\gpsprot.h" />
-    <ClInclude Include="jeeps\gpsread.h" />
-    <ClInclude Include="jeeps\gpsrqst.h" />
-    <ClInclude Include="jeeps\gpssend.h" />
-    <ClInclude Include="jeeps\gpsserial.h" />
-    <ClInclude Include="jeeps\gpsusbcommon.h" />
-    <ClInclude Include="jeeps\gpsusbint.h" />
-    <ClInclude Include="grtcirc.h" />
-    <ClInclude Include="zlib\gzguts.h" />
-    <ClInclude Include="height.h" />
-    <ClInclude Include="heightgrid.h" />
-    <ClInclude Include="holux.h" />
-    <ClInclude Include="zlib\inffast.h" />
-    <ClInclude Include="zlib\inffixed.h" />
-    <ClInclude Include="zlib\inflate.h" />
-    <ClInclude Include="zlib\inftrees.h" />
-    <ClInclude Include="inifile.h" />
-    <ClInclude Include="interpolate.h" />
-    <ClInclude Include="cet\iso_8859_8.h" />
-    <ClInclude Include="src\core\logging.h" />
-    <ClInclude Include="magellan.h" />
-    <ClInclude Include="navilink.h" />
-    <ClInclude Include="nukedata.h" />
-    <ClInclude Include="polygon.h" />
-    <ClInclude Include="position.h" />
-    <ClInclude Include="radius.h" />
-    <ClInclude Include="reverse_route.h" />
-    <ClInclude Include="session.h" />
-    <ClInclude Include="shapelib\shapefil.h" />
-    <ClInclude Include="smplrout.h" />
-    <ClInclude Include="sort.h" />
-    <ClInclude Include="stackfilter.h" />
-    <ClInclude Include="strptime.h" />
-    <ClInclude Include="swapdata.h" />
-    <ClInclude Include="trackfilter.h" />
-    <ClInclude Include="transform.h" />
-    <ClInclude Include="units.h" />
-    <ClInclude Include="zlib\trees.h" />
-    <ClInclude Include="src\core\usasciicodec.h" />
-    <ClInclude Include="validate.h" />
-    <ClInclude Include="xcsv.h" />
-    <ClInclude Include="xmlgeneric.h" />
-    <ClInclude Include="src\core\xmlstreamwriter.h" />
-    <ClInclude Include="src\core\xmltag.h" />
-    <ClInclude Include="zlib\zconf.h" />
-    <ClInclude Include="zlib\zlib.h" />
-    <ClInclude Include="zlib\zutil.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="debug\moc_predefs.h.cbt">
-      <FileType>Document</FileType>
-      <ExcludedFromBuild Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;Release|Win32&apos;">true</ExcludedFromBuild>
-      <AdditionalInputs Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;Debug|Win32&apos;">C:\Qt\5.12.2\msvc2017\mkspecs\features\data\dummy.cpp;%(AdditionalInputs)</AdditionalInputs>
-      <Message Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;Debug|Win32&apos;">Generate moc_predefs.h</Message>
-      <Outputs Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;Debug|Win32&apos;">debug\moc_predefs.h;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="release\moc_predefs.h.cbt">
-      <FileType>Document</FileType>
-      <AdditionalInputs Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;Release|Win32&apos;">C:\Qt\5.12.2\msvc2017\mkspecs\features\data\dummy.cpp;%(AdditionalInputs)</AdditionalInputs>
-      <Message Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;Release|Win32&apos;">Generate moc_predefs.h</Message>
-      <Outputs Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;Release|Win32&apos;">release\moc_predefs.h;%(Outputs)</Outputs>
-      <ExcludedFromBuild Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;Debug|Win32&apos;">true</ExcludedFromBuild>
-    </CustomBuild>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets" />
-</Project>
diff --git a/msvc/GPSBabel.vcxproj.filters b/msvc/GPSBabel.vcxproj.filters
deleted file mode 100755
index 98d5b69f6..000000000
--- a/msvc/GPSBabel.vcxproj.filters
+++ /dev/null
@@ -1,859 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Generated Files">
-      <UniqueIdentifier>{71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;moc;h;def;odl;idl;res;</Extensions>
-    </Filter>
-    <Filter Include="Generated Files">
-      <UniqueIdentifier>{71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;moc;h;def;odl;idl;res;</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="zlib\adler32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="alan.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="an1.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="arcdist.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="bcr.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="bend.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="brauniger_iq.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="bushnell.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="bushnell_trl.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="cet.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="cet_util.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="zlib\compress.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="zlib\crc32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="csv_util.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="shapelib\dbfopen.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="zlib\deflate.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="delgpl.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="destinator.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="dg-100.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="discard.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="dmtlog.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="duplicate.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="easygps.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="energympro.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="enigma.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="exif.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="explorist_ini.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="f90g_track.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="fatal.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="filter_vecs.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="formspec.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="garmin.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="garmin_device_xml.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="garmin_fit.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="garmin_fs.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="garmin_gpi.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="garmin_tables.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="garmin_txt.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="garmin_xt.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gbfile.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gbser.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gbser_win.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gdb.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="geo.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="geojson.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ggv_bin.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ggv_log.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ggv_ovl.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="globals.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="globalsat_sport.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="glogbook.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gnav_trl.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="googledir.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="jeeps\gpsapp.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="jeeps\gpscom.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="jeeps\gpsdevice.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="jeeps\gpsdevice_ser.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="jeeps\gpsdevice_usb.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="jeeps\gpsmath.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="jeeps\gpsmem.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="jeeps\gpsprot.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="jeeps\gpsread.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="jeeps\gpsrqst.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="jeeps\gpssend.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="jeeps\gpsserial.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gpssim.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="jeeps\gpsusbcommon.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="jeeps\gpsusbread.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="jeeps\gpsusbsend.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="jeeps\gpsusbwin.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gpx.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="grtcirc.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gtm.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gtrnctr.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="zlib\gzclose.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="zlib\gzlib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="zlib\gzread.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="zlib\gzwrite.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="height.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="hiketech.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="holux.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="html.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="humminbird.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="igc.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="igo8.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ik3d.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="zlib\infback.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="zlib\inffast.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="zlib\inflate.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="zlib\inftrees.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="inifile.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="internal_styles.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="interpolate.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="itracku.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-      <Filter>Source Files</Filter>
-    </ClCompile>
-      <Filter>Source Files</Filter>
-    </ClCompile>
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="kml.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="lmx.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="lowranceusr.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="magproto.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="main.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="mapasia.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="mapbar_track.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="mapfactor.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="mapsource.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="mkshort.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="mmo.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="mtk_locus.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="mtk_logger.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="mynav.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="navicache.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="naviguide.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="navilink.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="navitel.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="netstumbler.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="nmea.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="nmn4.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="nukedata.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="osm.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ozi.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="parse.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-      <Filter>Source Files</Filter>
-    </ClCompile>
-      <Filter>Source Files</Filter>
-    </ClCompile>
-      <Filter>Source Files</Filter>
-    </ClCompile>
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="polygon.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="position.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="psitrex.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="radius.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="raymarine.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="reverse_route.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="rgbcolors.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="route.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="shapelib\safileio.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="saroute.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sbn.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sbp.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="session.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="shape.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="shapelib\shpopen.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="skytraq.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="smplrout.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sort.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="stackfilter.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-      <Filter>Source Files</Filter>
-    </ClCompile>
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="strptime.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="subrip.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="swapdata.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="tef_xml.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="teletype.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="text.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="tmpro.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="tomtom.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="tpg.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="tpo.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="trackfilter.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="transform.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="zlib\trees.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="zlib\uncompr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="unicsv.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="units.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\core\usasciicodec.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util_crc.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="v900.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="validate.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vcf.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vecs.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-      <Filter>Source Files</Filter>
-    </ClCompile>
-      <Filter>Source Files</Filter>
-    </ClCompile>
-      <Filter>Source Files</Filter>
-    </ClCompile>
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="waypt.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="wbt-200.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="wintec_tes.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="xcsv.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="xmlgeneric.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\core\xmlstreamwriter.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="xmltag.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="xol.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="zlib\zutil.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="an1sym.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="cet\ansi_x3_4_1968.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="arcdist.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="bend.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="cet.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="cet_util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="cet\cp1252.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="zlib\crc32.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="csv_util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\core\datetime.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="zlib\deflate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="defs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="discard.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="duplicate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="explorist_ini.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\core\file.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="filter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="filterdefs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="garmin_device_xml.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="garmin_fs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="garmin_gpi.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="garmin_tables.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="jeeps\garminusb.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="gbfile.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="gbser.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="gbser_private.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="gbser_win.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="gbversion.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="jeeps\gps.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="jeeps\gpsapp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="jeeps\gpscom.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="jeeps\gpsdatum.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="jeeps\gpsdevice.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="jeeps\gpsfmt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="jeeps\gpsmath.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="jeeps\gpsmem.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="jeeps\gpsport.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="jeeps\gpsprot.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="jeeps\gpsread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="jeeps\gpsrqst.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="jeeps\gpssend.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="jeeps\gpsserial.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="jeeps\gpsusbcommon.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="jeeps\gpsusbint.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="grtcirc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="zlib\gzguts.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="height.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="heightgrid.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="holux.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="zlib\inffast.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="zlib\inffixed.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="zlib\inflate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="zlib\inftrees.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="inifile.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="interpolate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="cet\iso_8859_8.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\core\logging.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="magellan.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="navilink.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="nukedata.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="polygon.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="position.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="radius.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="reverse_route.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="session.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="shapelib\shapefil.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="smplrout.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="sort.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="stackfilter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="strptime.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="swapdata.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="trackfilter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="transform.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="zlib\trees.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\core\usasciicodec.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="units.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="validate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="xcsv.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="xmlgeneric.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\core\xmlstreamwriter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\core\xmltag.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="zlib\zconf.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="zlib\zlib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="zlib\zutil.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="debug\moc_predefs.h.cbt">
-      <Filter>Generated Files</Filter>
-    </CustomBuild>
-    <CustomBuild Include="release\moc_predefs.h.cbt">
-      <Filter>Generated Files</Filter>
-    </CustomBuild>
-  </ItemGroup>
-</Project>
diff --git a/shapelib.pri b/shapelib.pri
index 806c2966e..4a0c8df46 100644
--- a/shapelib.pri
+++ b/shapelib.pri
@@ -10,8 +10,12 @@ equals(WITH_SHAPELIB, no) {
   } else:equals(WITH_SHAPELIB, included) {
     # TODO: It would be better to create an archive and link to it
     #       to separate library build requirements from gpsbabel requirements.
-    SOURCES += shapelib/shpopen.c shapelib/dbfopen.c shapelib/safileio.c
-    HEADERS += shapelib/shapefil.h
+    SOURCES += \
+      shapelib/dbfopen.c \
+      shapelib/safileio.c \
+      shapelib/shpopen.c
+    HEADERS += \
+      shapelib/shapefil.h
   } else:equals(WITH_SHAPELIB, custom) {
     message("shapelib is enabled but but must be manually configured")
     message("  e.g. qmake WITH_SHAPELIB=custom LIBS+=... INCLUDEPATH+=...")
diff --git a/tools/nuke_format b/tools/nuke_format
index 0d20c1564..95997dfc9 100755
--- a/tools/nuke_format
+++ b/tools/nuke_format
@@ -6,10 +6,11 @@ EDITOR="${EDITOR:-vim}"
 # $1 = format $2 = file in all functions
 
 
-remove_word() {
-  # This uses a GNU extension ? for zero or more, letting us match with last
-  # entry in a line which has no following whitespace
-  $SED -i "s/$1\s*//g" $2
+remove_line() {
+  # This uses a GNU extension \? for zero or one, letting us match a
+  # qmake continuation character that may or may not be at the end of
+  # the line.
+  $SED -i "/^\s*$1\s*[\]\?/d" $2
   git add $2
 }
 
@@ -24,10 +25,10 @@ remove_manually() {
   git add $2
 }
 
-remove_word $1.cc CMakelists.txt
-remove_word $1.h CMakelists.txt
-remove_word $1.cc GPSBabel.pro
-remove_word $1.h GPSBabel.pro
+remove_line $1.cc CMakeLists.txt
+remove_line $1.h CMakeLists.txt
+remove_line $1.cc GPSBabel.pro
+remove_line $1.h GPSBabel.pro
 
 remove_manually $1 reference/help.txt
 
@@ -41,9 +42,6 @@ remove_manually $1 vecs.h
 remove_line_containing $1 reference/format0.txt
 remove_line_containing $1 reference/format1.txt
 remove_line_containing $1 reference/format2.txt
-# This breaks these, but at least it leaves a clue in version history.
-remove_line_containing $1 msvc/GPSBabel.vcxproj
-remove_line_containing $1 msvc/GPSBabel.vcxproj.filters
 
 git rm -f reference/$1*
 git rm -f xmldoc/formats/$1.xml
diff --git a/zlib.pri b/zlib.pri
index 36dcbb0c4..2ab1a42f5 100644
--- a/zlib.pri
+++ b/zlib.pri
@@ -10,33 +10,35 @@ equals(WITH_ZLIB, no) {
   } else:equals(WITH_ZLIB, included) {
     # TODO: It would be better to create an archive and link to it
     #       to separate library build requirements from gpsbabel requirements.
-    SOURCES += zlib/adler32.c \
-               zlib/compress.c \
-               zlib/crc32.c \
-               zlib/deflate.c \
-               zlib/inffast.c \
-               zlib/inflate.c \
-               zlib/infback.c \
-               zlib/inftrees.c \
-               zlib/trees.c \
-               zlib/uncompr.c \
-               zlib/gzlib.c \
-               zlib/gzclose.c \
-               zlib/gzread.c \
-               zlib/gzwrite.c \
-               zlib/zutil.c
+    SOURCES += \
+      zlib/adler32.c \
+      zlib/compress.c \
+      zlib/crc32.c \
+      zlib/deflate.c \
+      zlib/inffast.c \
+      zlib/inflate.c \
+      zlib/infback.c \
+      zlib/inftrees.c \
+      zlib/trees.c \
+      zlib/uncompr.c \
+      zlib/gzlib.c \
+      zlib/gzclose.c \
+      zlib/gzread.c \
+      zlib/gzwrite.c \
+      zlib/zutil.c
     INCLUDEPATH += zlib
-    HEADERS += zlib/crc32.h \
-               zlib/deflate.h \
-               zlib/gzguts.h \
-               zlib/inffast.h \
-               zlib/inffixed.h \
-               zlib/inflate.h \
-               zlib/inftrees.h \
-               zlib/trees.h \
-               zlib/zconf.h \
-               zlib/zlib.h \
-               zlib/zutil.h
+    HEADERS += \
+      zlib/crc32.h \
+      zlib/deflate.h \
+      zlib/gzguts.h \
+      zlib/inffast.h \
+      zlib/inffixed.h \
+      zlib/inflate.h \
+      zlib/inftrees.h \
+      zlib/trees.h \
+      zlib/zconf.h \
+      zlib/zlib.h \
+      zlib/zutil.h
   } else:equals(WITH_ZLIB, custom) {
     message("zlib is enabled but but must be manually configured")
     message("  e.g. qmake WITH_ZLIB=custom LIBS+=... INCLUDEPATH+=...")