diff --git a/externals/coda-oss/modules/c++/sys/include/sys/Path.h b/externals/coda-oss/modules/c++/sys/include/sys/Path.h
index 74d78af5c..cb1ba14c8 100644
--- a/externals/coda-oss/modules/c++/sys/include/sys/Path.h
+++ b/externals/coda-oss/modules/c++/sys/include/sys/Path.h
@@ -298,9 +298,9 @@ class CODA_OSS_API Path
 std::ostream& operator<<(std::ostream& os, const sys::Path& path);
 std::istream& operator>>(std::istream& os, sys::Path& path);
 
-// Convert between collections of paths as strings and sys::filesystem::path
-CODA_OSS_API std::vector<std::string> convertPaths(coda_oss::span<const filesystem::path>);
-CODA_OSS_API std::vector<filesystem::path> convertPaths(coda_oss::span<const std::string>);
+// Convert between collections of paths as strings and coda_oss::filesystem::path
+CODA_OSS_API std::vector<std::string> convertPaths(coda_oss::span<const coda_oss::filesystem::path>);
+CODA_OSS_API std::vector<coda_oss::filesystem::path> convertPaths(coda_oss::span<const std::string>);
 template<typename T>
 inline auto convertPaths(const std::vector<T>& paths)
 {
diff --git a/externals/coda-oss/modules/c++/sys/source/Path.cpp b/externals/coda-oss/modules/c++/sys/source/Path.cpp
index 99233b236..510e3c4c0 100644
--- a/externals/coda-oss/modules/c++/sys/source/Path.cpp
+++ b/externals/coda-oss/modules/c++/sys/source/Path.cpp
@@ -849,6 +849,8 @@ std::string Path::expandEnvironmentVariables(const std::string& path, fs::file_t
     bool unused_checkIfExists = true;
     return expandEnvironmentVariables_(path, unused_checkIfExists, &type);
 }
+} // sys
+
 
 template<typename TReturn, typename TSpan, typename TFunc>
 inline auto convertPaths_(coda_oss::span<const TSpan> paths, TFunc fun)
@@ -857,13 +859,11 @@ inline auto convertPaths_(coda_oss::span<const TSpan> paths, TFunc fun)
     std::transform(paths.begin(), paths.end(), std::back_inserter(retval), fun);
     return retval;
 }
-std::vector<std::string> convertPaths(coda_oss::span<const fs::path> paths)
+std::vector<std::string> sys::convertPaths(coda_oss::span<const fs::path> paths)
 {
     return convertPaths_<std::string>(paths, [](const auto& p) { return p.string(); });
 }
-std::vector<fs::path> convertPaths(coda_oss::span<const std::string> paths)
+std::vector<fs::path> sys::convertPaths(coda_oss::span<const std::string> paths)
 {
     return convertPaths_<fs::path>(paths, [](const auto& p) { return p; });
 }
-
-}
\ No newline at end of file
diff --git a/externals/nitro/modules/c++/nitf/unittests/test_load_plugins.cpp b/externals/nitro/modules/c++/nitf/unittests/test_load_plugins.cpp
index 9e59a2405..91b497968 100644
--- a/externals/nitro/modules/c++/nitf/unittests/test_load_plugins.cpp
+++ b/externals/nitro/modules/c++/nitf/unittests/test_load_plugins.cpp
@@ -49,10 +49,6 @@ static const auto& all_TREs()
 {
     static const std::vector<std::string> retval
     {
-    #if _MSC_VER && NITRO_PCH
-        // only build a handful in Visual Studio
-        "ACCHZB", "ACCPOB", "ACFTA", "AIMIDB", "CSCRNA", "CSEXRB", "ENGRDA", "HISTOA", "JITCID", "PTPRAA", "RPFHDR",
-    #else
         "ACCHZB", "BANDSB", "CSDIDA", "GEOLOB", "JITCID", "NBLOCA", "PIAPEB", "REGPTB", "RSMIDA", "STEROB",
         "ACCPOB", "BCKGDA", "CSEPHA", "GEOPSB", "MAPLOB", "OBJCTA", "PIAPRC", "RPC00B", "RSMPCA", "STREOB",
         "ACCVTB", "BLOCKA", "CSEXRA", "GRDPSB", "MATESA", "OFFSET", "PIAPRD", "RPFDES", "RSMPIA", "TEST_DES",
@@ -63,7 +59,6 @@ static const auto& all_TREs()
         "AIPBCA", "CMETAA", "EXOPTA", "IMRFCA", "MSTGTA", "PIAIMB", "PRADAA", "RSMECA", "SNSRA",
         "ASTORA", "CSCCGA", "EXPLTA", "IOMAPA", "MTIRPA", "PIAIMC", "PRJPSB", "RSMGGA", "SOURCB",
         "BANDSA", "CSCRNA", "EXPLTB", "J2KLRA", "MTIRPB", "PIAPEA", "PTPRAA", "RSMGIA", "STDIDC",
-    #endif
     };
     return retval;
 }
diff --git a/externals/nitro/modules/c/nitf/shared/ACCVTB.c b/externals/nitro/modules/c/nitf/shared/ACCVTB.c
index ed47e56d5..61656f12c 100644
--- a/externals/nitro/modules/c/nitf/shared/ACCVTB.c
+++ b/externals/nitro/modules/c/nitf/shared/ACCVTB.c
@@ -24,7 +24,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription ACCVTB_description[] = {
     {NITF_BCS_N, 2, "Number of vertical accuracy regions",
      "NUMACVT" },
     {NITF_LOOP, 0, NULL, "NUMACVT"},
@@ -46,6 +46,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(ACCVTB, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(ACCVTB)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/ACFTB.c b/externals/nitro/modules/c/nitf/shared/ACFTB.c
index 0d1d335ad..f85afbf08 100644
--- a/externals/nitro/modules/c/nitf/shared/ACFTB.c
+++ b/externals/nitro/modules/c/nitf/shared/ACFTB.c
@@ -24,7 +24,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription ACFTB_description[] = {
     {NITF_BCS_A, 20, "Aircraft Mission ID", "AC_MSN_ID" },
     {NITF_BCS_A, 10, "Aircraft Tail Number", "AC_TAIL_NO" },
     {NITF_BCS_A, 12, "Acrft Takeoff Date/Time", "AC_TO" },
@@ -56,6 +56,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(ACFTB, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(ACFTB)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/AIPBCA.c b/externals/nitro/modules/c/nitf/shared/AIPBCA.c
index 011edb836..5663b65a0 100644
--- a/externals/nitro/modules/c/nitf/shared/AIPBCA.c
+++ b/externals/nitro/modules/c/nitf/shared/AIPBCA.c
@@ -24,7 +24,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription AIPBCA_description[] = {
     {NITF_BCS_N, 5, "Patch Width", "Patch_Width", },
     {NITF_BCS_A, 16, "Semi-major axis (x component)", "u_hat_x" },
     {NITF_BCS_A, 16, "Semi-major axis (y component)", "u_hat_y" },
@@ -78,6 +78,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(AIPBCA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(AIPBCA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/ASTORA.c b/externals/nitro/modules/c/nitf/shared/ASTORA.c
index 352d88e10..e372f9c7b 100644
--- a/externals/nitro/modules/c/nitf/shared/ASTORA.c
+++ b/externals/nitro/modules/c/nitf/shared/ASTORA.c
@@ -24,7 +24,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription ASTORA_description[] = {
 
     {NITF_BCS_N, 6, "Number of rows in full image prod.", "IMG_TOTAL_ROWS" },
     {NITF_BCS_N, 6, "Number of columns in full image prod.",
@@ -174,6 +174,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(ASTORA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(ASTORA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/BANDSA.c b/externals/nitro/modules/c/nitf/shared/BANDSA.c
index f5f75a3f7..f5d2e1595 100644
--- a/externals/nitro/modules/c/nitf/shared/BANDSA.c
+++ b/externals/nitro/modules/c/nitf/shared/BANDSA.c
@@ -24,7 +24,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription BANDSA_description[] = {
     {NITF_BCS_A, 7, "ROW_SPACING", "ROW_SPACING" },
     {NITF_BCS_A, 1, "ROW_SPACING_UNITS", "ROW_SPACING_UNITS" },
     {NITF_BCS_A, 7, "COL_SPACING", "COL_SPACING" },
@@ -45,6 +45,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(BANDSA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(BANDSA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/BANDSB.c b/externals/nitro/modules/c/nitf/shared/BANDSB.c
index b9e82039c..69f8711cb 100644
--- a/externals/nitro/modules/c/nitf/shared/BANDSB.c
+++ b/externals/nitro/modules/c/nitf/shared/BANDSB.c
@@ -26,7 +26,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription BANDSB_description[] = {
     {NITF_BCS_N,  5,  "Number of Bands",                                    "COUNT" },
     {NITF_BCS_A,  24, "Data Representation",                                "RADIOMETRIC_QUANTITY" },
     {NITF_BCS_A,  1,  "Data Representation Unit",                           "RADIOMETRIC_QUANTITY_UNIT" },
@@ -191,7 +191,7 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(BANDSB, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(BANDSB)
 
 NITF_CXX_ENDGUARD
 
diff --git a/externals/nitro/modules/c/nitf/shared/BCKGDA.c b/externals/nitro/modules/c/nitf/shared/BCKGDA.c
index df7a57e80..c48cb5cd9 100644
--- a/externals/nitro/modules/c/nitf/shared/BCKGDA.c
+++ b/externals/nitro/modules/c/nitf/shared/BCKGDA.c
@@ -24,7 +24,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription BCKGDA_description[] = {
     {NITF_BCS_N, 8, "Background Width", "BGWIDTH" },
     {NITF_BCS_N, 8, "Background Height", "BGHEIGHT" },
     {NITF_BCS_N, 8, "Background Red", "BGRED" },
@@ -35,6 +35,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(BCKGDA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(BCKGDA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/BLOCKA.c b/externals/nitro/modules/c/nitf/shared/BLOCKA.c
index 47404830d..d207d3281 100644
--- a/externals/nitro/modules/c/nitf/shared/BLOCKA.c
+++ b/externals/nitro/modules/c/nitf/shared/BLOCKA.c
@@ -25,7 +25,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription BLOCKA_description[] = {
     {NITF_BCS_N, 2, "Block Number", "BLOCK_INSTANCE" },
     {NITF_BCS_A, 5, "No. of Gray Pixels", "N_GRAY" },
     {NITF_BCS_N, 5, "Lines", "L_LINES" },
@@ -40,6 +40,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(BLOCKA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(BLOCKA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/BNDPLB.c b/externals/nitro/modules/c/nitf/shared/BNDPLB.c
index 4405fdea3..073395c54 100644
--- a/externals/nitro/modules/c/nitf/shared/BNDPLB.c
+++ b/externals/nitro/modules/c/nitf/shared/BNDPLB.c
@@ -24,7 +24,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription BNDPLB_description[] = {
     {NITF_BCS_N, 4, "Number of Points in Bounding Polygon", "NUMPTS" },
     {NITF_LOOP, 0, NULL, "NUMPTS"},
     {NITF_BCS_N, 15, "Longitude/Easting", "LON" },
@@ -33,6 +33,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(BNDPLB, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(BNDPLB)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/CCINFA.c b/externals/nitro/modules/c/nitf/shared/CCINFA.c
index df154dfaf..0145c3e20 100644
--- a/externals/nitro/modules/c/nitf/shared/CCINFA.c
+++ b/externals/nitro/modules/c/nitf/shared/CCINFA.c
@@ -25,7 +25,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription CCINFA_description[] = {
     {NITF_BCS_N, 3, "Number of defined codes", "NUMCODE" },
     {NITF_LOOP, 0, NULL, "NUMCODE"},
         {NITF_BCS_N, 1, "Length of the CODE field", "CODE_LEN" },
@@ -43,6 +43,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(CCINFA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(CCINFA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/CLCTNA.c b/externals/nitro/modules/c/nitf/shared/CLCTNA.c
index 633ea16ad..c5d6ebe89 100644
--- a/externals/nitro/modules/c/nitf/shared/CLCTNA.c
+++ b/externals/nitro/modules/c/nitf/shared/CLCTNA.c
@@ -25,7 +25,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription CLCTNA_description[] = {
     {NITF_BCS_N, 4, "VERNUM", "VERNUM" },
     {NITF_BCS_A, 25, "CLCTN_NAME", "CLCTN_NAME" },
     {NITF_BCS_A, 255, "CLCTN_DESCRIPT", "CLCTN_DESCRIPT" },
@@ -57,6 +57,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(CLCTNA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(CLCTNA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/CLCTNB.c b/externals/nitro/modules/c/nitf/shared/CLCTNB.c
index 3a0bb037a..6b738b345 100644
--- a/externals/nitro/modules/c/nitf/shared/CLCTNB.c
+++ b/externals/nitro/modules/c/nitf/shared/CLCTNB.c
@@ -25,7 +25,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription CLCTNB_description[] = {
     {NITF_BCS_N, 4, "VERNUM", "VERNUM" },
     {NITF_BCS_A, 25, "CLCTN_NAME", "CLCTN_NAME" },
     {NITF_BCS_A, 255, "CLCTN_DESCRIPT", "CLCTN_DESCRIPT" },
@@ -61,6 +61,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(CLCTNB, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(CLCTNB)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/CMETAA.c b/externals/nitro/modules/c/nitf/shared/CMETAA.c
index 2168de977..811e40d6e 100644
--- a/externals/nitro/modules/c/nitf/shared/CMETAA.c
+++ b/externals/nitro/modules/c/nitf/shared/CMETAA.c
@@ -25,7 +25,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription CMETAA_description[] = {
     {NITF_BCS_N, 2, "Number of Related TREs", "RELATED_TRES" },
     {NITF_BCS_A, 120, "Related TREs", "ADDITIONAL_TRES" },
     {NITF_BCS_A, 12, "Processor Version No.", "RD_PRC_NO" },
@@ -238,6 +238,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(CMETAA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(CMETAA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/CSCCGA.c b/externals/nitro/modules/c/nitf/shared/CSCCGA.c
index f3161c21f..78d7d11c1 100644
--- a/externals/nitro/modules/c/nitf/shared/CSCCGA.c
+++ b/externals/nitro/modules/c/nitf/shared/CSCCGA.c
@@ -25,7 +25,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription CSCCGA_description[] = {
     {NITF_BCS_A, 18, "Source of Grid", "CCG_SOURCE" },
     {NITF_BCS_A, 6, "Image Segment Sensor to which CCG is registered", "REG_SENSOR" },
     {NITF_BCS_N, 7, "CCG Origin - Line", "ORIGIN_LINE" },
@@ -37,6 +37,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(CSCCGA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(CSCCGA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/CSDIDA.c b/externals/nitro/modules/c/nitf/shared/CSDIDA.c
index ab11b4fff..0e42f9124 100644
--- a/externals/nitro/modules/c/nitf/shared/CSDIDA.c
+++ b/externals/nitro/modules/c/nitf/shared/CSDIDA.c
@@ -26,7 +26,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription CSDIDA_description[] = {
     {NITF_BCS_N,  2,  "Day of Dataset Collection",       "DAY" },
     {NITF_BCS_A,  3,  "Month of Dataset Collection",     "MONTH" },
     {NITF_BCS_N,  4,  "Year of Dataset Collection",      "YEAR" },
@@ -47,7 +47,7 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(CSDIDA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(CSDIDA)
 
 NITF_CXX_ENDGUARD
 
diff --git a/externals/nitro/modules/c/nitf/shared/CSEPHA.c b/externals/nitro/modules/c/nitf/shared/CSEPHA.c
index e3dd2a7b9..f2fdacab6 100644
--- a/externals/nitro/modules/c/nitf/shared/CSEPHA.c
+++ b/externals/nitro/modules/c/nitf/shared/CSEPHA.c
@@ -25,7 +25,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription CSEPHA_description[] = {
     {NITF_BCS_A,  12,  "ephemeris flag",            "EPHEM_FLAG" },
     {NITF_BCS_N,   5,  "time b/w eph vectors",      "DT_EPHEM" },
     {NITF_BCS_N,   8,  "day of first eph vector",   "DATE_EPHEM" },
@@ -39,6 +39,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(CSEPHA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(CSEPHA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/CSEXRA.c b/externals/nitro/modules/c/nitf/shared/CSEXRA.c
index 9eec1eb45..b3fd23717 100644
--- a/externals/nitro/modules/c/nitf/shared/CSEXRA.c
+++ b/externals/nitro/modules/c/nitf/shared/CSEXRA.c
@@ -24,7 +24,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription CSEXRA_description[] = {
     {NITF_BCS_A, 6, "Sensor", "SENSOR" },
     {NITF_BCS_N, 12, "Time of the First Line of Image", "TIME_FIRST_LINE_IMAGE" },
     {NITF_BCS_N, 12, "Image Duration Time", "TIME_IMAGE_DURATION" },
@@ -52,6 +52,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(CSEXRA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(CSEXRA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/CSPROA.c b/externals/nitro/modules/c/nitf/shared/CSPROA.c
index f4240bed4..e77ccf6d1 100644
--- a/externals/nitro/modules/c/nitf/shared/CSPROA.c
+++ b/externals/nitro/modules/c/nitf/shared/CSPROA.c
@@ -25,7 +25,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription CSPROA_description[] = {
     {NITF_BCS_A, 12, "fill0", "RESERVED_0" },
     {NITF_BCS_A, 12, "fill1", "RESERVED_1" },
     {NITF_BCS_A, 12, "fill2", "RESERVED_2" },
@@ -39,6 +39,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(CSPROA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(CSPROA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/CSSFAA.c b/externals/nitro/modules/c/nitf/shared/CSSFAA.c
index 4e7f7e38c..3f0a40c2c 100644
--- a/externals/nitro/modules/c/nitf/shared/CSSFAA.c
+++ b/externals/nitro/modules/c/nitf/shared/CSSFAA.c
@@ -25,7 +25,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription CSSFAA_description[] = {
     {NITF_BCS_N,   1,  "number of bands",           "NUM_BANDS" },
     {NITF_LOOP, 0, NULL, "NUM_BANDS"},
     {NITF_BCS_A,   1,  "band category",             "BAND_TYPE" },
@@ -45,6 +45,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(CSSFAA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(CSSFAA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/CSSHPA.c b/externals/nitro/modules/c/nitf/shared/CSSHPA.c
index cdd8fe30b..706471841 100644
--- a/externals/nitro/modules/c/nitf/shared/CSSHPA.c
+++ b/externals/nitro/modules/c/nitf/shared/CSSHPA.c
@@ -25,7 +25,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription CSSHPA_description[] = {
     {NITF_BCS_A, 25, "Shapefile Use", "SHAPE_USE" },
     {NITF_BCS_A, 10, "Type of shapes", "SHAPE_CLASS" },
     {NITF_IF, 0, "eq CLOUD_SHAPES             ", "SHAPE_USE"},
@@ -40,6 +40,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(CSSHPA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(CSSHPA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/EXOPTA.c b/externals/nitro/modules/c/nitf/shared/EXOPTA.c
index ea85419df..63a567210 100644
--- a/externals/nitro/modules/c/nitf/shared/EXOPTA.c
+++ b/externals/nitro/modules/c/nitf/shared/EXOPTA.c
@@ -24,7 +24,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription EXOPTA_description[] = {
     {NITF_BCS_A, 3, "ANGLE TO NORTH", "ANGLETONORTH" },
     {NITF_BCS_A, 5, "MEAN GSD", "MEANGSD" },
     {NITF_BCS_A, 1, "Reserved 1", "RESERV01" },
@@ -46,6 +46,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(EXOPTA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(EXOPTA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/EXPLTA.c b/externals/nitro/modules/c/nitf/shared/EXPLTA.c
index b7e0c9764..f7b2618a2 100644
--- a/externals/nitro/modules/c/nitf/shared/EXPLTA.c
+++ b/externals/nitro/modules/c/nitf/shared/EXPLTA.c
@@ -68,12 +68,12 @@ static nitf_TREDescription descrip_00101[] = {
 };
 
 /* Define the available descriptions and the default one */
-static nitf_TREDescriptionInfo descriptions[] = {
+static nitf_TREDescriptionInfo EXPLTA_descriptions[] = {
     { "EXPLTA_87", descrip_00087, 87 },
     { "EXPLTA_101", descrip_00101, 101 },
     { NULL, NULL, NITF_TRE_DESC_NO_LENGTH }
 };
-static nitf_TREDescriptionSet EXPLTADescriptionSet = { 0, descriptions };
+static nitf_TREDescriptionSet EXPLTADescriptionSet = { 0, EXPLTA_descriptions };
 
 NITF_DECLARE_PLUGIN(EXPLTA)
 
diff --git a/externals/nitro/modules/c/nitf/shared/EXPLTB.c b/externals/nitro/modules/c/nitf/shared/EXPLTB.c
index e99a2285e..5780ce1d4 100644
--- a/externals/nitro/modules/c/nitf/shared/EXPLTB.c
+++ b/externals/nitro/modules/c/nitf/shared/EXPLTB.c
@@ -25,7 +25,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription EXPLTB_description[] = {
     {NITF_BCS_A, 7, "Angle to True North", "ANGLE_TO_NORTH" },
     {NITF_BCS_A, 6, "Angle North Accuracy", "ANGLE_TO_NORTH_ACCY" },
     {NITF_BCS_A, 7, "Squint Angle", "SQUINT_ANGLE" },
@@ -47,6 +47,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(EXPLTB, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(EXPLTB)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/GEOLOB.c b/externals/nitro/modules/c/nitf/shared/GEOLOB.c
index 2a04b5f5b..17107184d 100644
--- a/externals/nitro/modules/c/nitf/shared/GEOLOB.c
+++ b/externals/nitro/modules/c/nitf/shared/GEOLOB.c
@@ -24,7 +24,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription GEOLOB_description[] = {
     {NITF_BCS_N, 9, "Longitude density", "ARV" },
     {NITF_BCS_N, 9, "Latitude density", "BRV" },
     {NITF_BCS_N, 15, "Longitude of Reference Origin", "LSO" },
@@ -32,6 +32,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(GEOLOB, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(GEOLOB)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/GEOPSB.c b/externals/nitro/modules/c/nitf/shared/GEOPSB.c
index 076b59735..08fbf7601 100644
--- a/externals/nitro/modules/c/nitf/shared/GEOPSB.c
+++ b/externals/nitro/modules/c/nitf/shared/GEOPSB.c
@@ -24,7 +24,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription GEOPSB_description[] = {
     {NITF_BCS_A, 3, "Coordinate System Type", "TYP" },
     {NITF_BCS_A, 3, "Coordinate Units", "UNI" },
     {NITF_BCS_A, 80, "Geodetic Datum Name", "DAG" },
@@ -42,6 +42,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(GEOPSB, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(GEOPSB)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/GRDPSB.c b/externals/nitro/modules/c/nitf/shared/GRDPSB.c
index d23f4f372..c131467a3 100644
--- a/externals/nitro/modules/c/nitf/shared/GRDPSB.c
+++ b/externals/nitro/modules/c/nitf/shared/GRDPSB.c
@@ -25,7 +25,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription GRDPSB_description[] = {
     {NITF_BCS_N, 2, "Number of Location Grids", "NUM_GRDS" },
 
     {NITF_LOOP, 0, NULL, "NUM_GRDS"},
@@ -42,6 +42,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL },
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(GRDPSB, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(GRDPSB)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/ICHIPB.c b/externals/nitro/modules/c/nitf/shared/ICHIPB.c
index d1f4d6c0f..3f282b6bc 100644
--- a/externals/nitro/modules/c/nitf/shared/ICHIPB.c
+++ b/externals/nitro/modules/c/nitf/shared/ICHIPB.c
@@ -25,7 +25,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription ICHIPB_description[] = {
     {NITF_BCS_A, 2, "Non-linear transform flag", "XFRM_FLAG" },
     {NITF_BCS_A, 10, "Scale Factor Relative to RO", "SCALE_FACTOR" },
     {NITF_BCS_A, 2, "Anamorphic Correction Indicator", "ANAMRPH_CORR" },
@@ -99,6 +99,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(ICHIPB, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(ICHIPB)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/IMASDA.c b/externals/nitro/modules/c/nitf/shared/IMASDA.c
index 4ce04defb..0e7a2c429 100644
--- a/externals/nitro/modules/c/nitf/shared/IMASDA.c
+++ b/externals/nitro/modules/c/nitf/shared/IMASDA.c
@@ -25,7 +25,7 @@
 NITF_CXX_GUARD
 
 // MIL-PRF-89034, Table 68 (page 131).
-static nitf_TREDescription description[] = {
+static nitf_TREDescription IMASDA_description[] = {
     {NITF_BCS_A, 22, "Longitude Translation", "LONTR" },
     {NITF_BCS_A, 22, "Latitude Translation", "LATTR" },
     {NITF_BCS_A, 22, "Elevation Translation", "ELVTR" },
@@ -40,6 +40,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(IMASDA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(IMASDA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/IMGDTA.c b/externals/nitro/modules/c/nitf/shared/IMGDTA.c
index 550390ac5..750cac15c 100644
--- a/externals/nitro/modules/c/nitf/shared/IMGDTA.c
+++ b/externals/nitro/modules/c/nitf/shared/IMGDTA.c
@@ -27,7 +27,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription IMGDTA_description[] = {
     {NITF_BCS_N, 4, "VERNUM", "VERNUM" },
     {NITF_BCS_A, 32, "FILENAME", "FILENAME" },
     {NITF_BCS_A, 32, "PARENT_FNAME", "PARENT_FNAME" },
@@ -96,6 +96,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(IMGDTA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(IMGDTA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/IMRFCA.c b/externals/nitro/modules/c/nitf/shared/IMRFCA.c
index 8e0b244f3..517209ff9 100644
--- a/externals/nitro/modules/c/nitf/shared/IMRFCA.c
+++ b/externals/nitro/modules/c/nitf/shared/IMRFCA.c
@@ -25,7 +25,7 @@
 NITF_CXX_GUARD
 
 // MIL-PRF-89034, Table 69 (page 131).
-static nitf_TREDescription description[] = {
+static nitf_TREDescription IMRFCA_description[] = {
     {NITF_LOOP, 0, NITF_CONST_N, "20"},
     {NITF_BCS_A, 22, "X Image Numerator", "XINC" },
     {NITF_ENDLOOP, 0, NULL, NULL},
@@ -41,6 +41,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(IMRFCA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(IMRFCA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/IOMAPA.c b/externals/nitro/modules/c/nitf/shared/IOMAPA.c
index 754055e18..feee71418 100644
--- a/externals/nitro/modules/c/nitf/shared/IOMAPA.c
+++ b/externals/nitro/modules/c/nitf/shared/IOMAPA.c
@@ -74,14 +74,14 @@ static nitf_TREDescription descrip_00091[] = {
 };
 
 /* Define the available descriptions and the default one */
-static nitf_TREDescriptionInfo descriptions[] = {
+static nitf_TREDescriptionInfo IOMAPA_descriptions[] = {
     { "IOMAPA_6", descrip_00006, 6 },
     { "IOMAPA_8202", descrip_08202, 8202 },
     { "IOMAPA_16", descrip_00016, 16 },
     { "IOMAPA_91", descrip_00091, 91 },
     { NULL, NULL, NITF_TRE_DESC_NO_LENGTH }
 };
-static nitf_TREDescriptionSet IOMAPADescriptionSet = { 0, descriptions };
+static nitf_TREDescriptionSet IOMAPADescriptionSet = { 0, IOMAPA_descriptions };
 
 NITF_DECLARE_PLUGIN(IOMAPA)
 
diff --git a/externals/nitro/modules/c/nitf/shared/J2KLRA.c b/externals/nitro/modules/c/nitf/shared/J2KLRA.c
index 43fdea794..3f5a435fe 100644
--- a/externals/nitro/modules/c/nitf/shared/J2KLRA.c
+++ b/externals/nitro/modules/c/nitf/shared/J2KLRA.c
@@ -26,7 +26,7 @@
 NITF_CXX_GUARD
 
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription J2KLRA_description[] = {
     {NITF_BCS_N,  1,  "original compressed data",     "ORIG" },
     {NITF_BCS_N,  2,  "number wavelet levels",        "NLEVELS_O" },
     {NITF_BCS_N,  5,  "number bands",                 "NBANDS_O" },
@@ -55,6 +55,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(J2KLRA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(J2KLRA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/MAPLOB.c b/externals/nitro/modules/c/nitf/shared/MAPLOB.c
index 65fd8ef05..9116fd154 100644
--- a/externals/nitro/modules/c/nitf/shared/MAPLOB.c
+++ b/externals/nitro/modules/c/nitf/shared/MAPLOB.c
@@ -24,7 +24,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription MAPLOB_description[] = {
     {NITF_BCS_A, 3, "Length units", "UNILOA" },
     {NITF_BCS_N, 5, "Easting interval", "LOD" },
     {NITF_BCS_N, 5, "Northing interval", "LAD" },
@@ -33,6 +33,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(MAPLOB, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(MAPLOB)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/MATESA.c b/externals/nitro/modules/c/nitf/shared/MATESA.c
index abc0765ab..8bb86a973 100644
--- a/externals/nitro/modules/c/nitf/shared/MATESA.c
+++ b/externals/nitro/modules/c/nitf/shared/MATESA.c
@@ -27,7 +27,7 @@
 NITF_CXX_GUARD
 
 /* From STDI-0002-1 Appendix AK: Table AK.6-5: MATESA */
-static nitf_TREDescription description[] = {
+static nitf_TREDescription MATESA_description[] = {
     {NITF_BCS_A, 42, "Current File/Segment Source", "CUR_SOURCE" },
     {NITF_BCS_A, 16, "Current File/Segment Mate Type", "CUR_MATE_TYPE" },
     {NITF_BCS_N, 4, "Length of the CUR_FILE_ID field", "CUR_FILE_ID_LEN" },
@@ -46,6 +46,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL },
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(MATESA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(MATESA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/MENSRA.c b/externals/nitro/modules/c/nitf/shared/MENSRA.c
index f59ae864d..0acad0841 100644
--- a/externals/nitro/modules/c/nitf/shared/MENSRA.c
+++ b/externals/nitro/modules/c/nitf/shared/MENSRA.c
@@ -103,13 +103,13 @@ static nitf_TREDescription descrip_00185[] = {
 };
 
 /* Define the available descriptions and the default one */
-static nitf_TREDescriptionInfo descriptions[] = {
+static nitf_TREDescriptionInfo MENSRA_descriptions[] = {
     { "MENSRA_155", descrip_00155, 155 },
     { "MENSRA_174", descrip_00174, 174 },
     { "MENSRA_185", descrip_00185, 185 },
     { NULL, NULL, NITF_TRE_DESC_NO_LENGTH }
 };
-static nitf_TREDescriptionSet MENSRADescriptionSet = { 0, descriptions };
+static nitf_TREDescriptionSet MENSRADescriptionSet = { 0, MENSRA_descriptions };
 
 NITF_DECLARE_PLUGIN(MENSRA)
 
diff --git a/externals/nitro/modules/c/nitf/shared/MENSRB.c b/externals/nitro/modules/c/nitf/shared/MENSRB.c
index 3ff1de0ed..93299d35d 100644
--- a/externals/nitro/modules/c/nitf/shared/MENSRB.c
+++ b/externals/nitro/modules/c/nitf/shared/MENSRB.c
@@ -25,7 +25,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription MENSRB_description[] = {
     {NITF_BCS_A, 25, "Aircraft Location", "ACFT_LOC" },
     {NITF_BCS_A, 6, "Aircraft Location Accuracy", "ACFT_LOC_ACCY" },
     {NITF_BCS_A, 6, "Aircraft Altitude", "ACFT_ALT" },
@@ -55,6 +55,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(MENSRB, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(MENSRB)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/MPDSRA.c b/externals/nitro/modules/c/nitf/shared/MPDSRA.c
index 4f4647131..03826604a 100644
--- a/externals/nitro/modules/c/nitf/shared/MPDSRA.c
+++ b/externals/nitro/modules/c/nitf/shared/MPDSRA.c
@@ -27,7 +27,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription MPDSRA_description[] = {
     {NITF_BCS_A, 2, "Image Block Number", "blkno" },
     {NITF_BCS_A, 2, "Commanded IPR", "cdipr" },
     {NITF_BCS_N, 2, "No of Blocks in WDG", "nblkw" },
@@ -56,6 +56,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(MPDSRA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(MPDSRA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/MSDIRA.c b/externals/nitro/modules/c/nitf/shared/MSDIRA.c
index b65a97cb7..68c6c057a 100644
--- a/externals/nitro/modules/c/nitf/shared/MSDIRA.c
+++ b/externals/nitro/modules/c/nitf/shared/MSDIRA.c
@@ -25,7 +25,7 @@
 NITF_CXX_GUARD
 
 // MIL-PRF-89034, Table 7 (page 46).
-static nitf_TREDescription description[] = {
+static nitf_TREDescription MSDIRA_description[] = {
     {NITF_BCS_A, 9, "Product ID", "PRODID" },
     {NITF_BCS_N, 2, "Product Volume", "PRODVOL" },
     {NITF_BCS_N, 2, "Product Total Volume", "PRODTOTVOLS" },
@@ -45,6 +45,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(MSDIRA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(MSDIRA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/MSTGTA.c b/externals/nitro/modules/c/nitf/shared/MSTGTA.c
index 1274cbebb..1b8bafb9c 100644
--- a/externals/nitro/modules/c/nitf/shared/MSTGTA.c
+++ b/externals/nitro/modules/c/nitf/shared/MSTGTA.c
@@ -24,7 +24,7 @@
 #include <import/nitf.h>
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription MSTGTA_description[] = {
     {NITF_BCS_A, 5, "TGT NUM", "TGTNUM" },
     {NITF_BCS_A, 12, "TGT ID", "TGTID" },
     {NITF_BCS_A, 15, "TGT BE", "TGTBE" },
@@ -41,6 +41,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(MSTGTA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(MSTGTA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/MTIRPA.c b/externals/nitro/modules/c/nitf/shared/MTIRPA.c
index 1bd160b41..3bab9d2d3 100644
--- a/externals/nitro/modules/c/nitf/shared/MTIRPA.c
+++ b/externals/nitro/modules/c/nitf/shared/MTIRPA.c
@@ -27,7 +27,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription MTIRPA_description[] = {
     {NITF_BCS_A, 2, "Destination Point", "destp" },
     {NITF_BCS_A, 3, "MTI Packet ID No.", "mtpid" },
     {NITF_BCS_A, 4, "Patch Number", "pchno" },
@@ -48,6 +48,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(MTIRPA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(MTIRPA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/MTIRPB.c b/externals/nitro/modules/c/nitf/shared/MTIRPB.c
index f3632c347..73b2725d0 100644
--- a/externals/nitro/modules/c/nitf/shared/MTIRPB.c
+++ b/externals/nitro/modules/c/nitf/shared/MTIRPB.c
@@ -27,7 +27,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription MTIRPB_description[] = {
     {NITF_BCS_A, 2, "Destination Point", "destp" },
     {NITF_BCS_A, 3, "MTI Packet ID No.", "mtpid" },
     {NITF_BCS_A, 4, "Patch Number", "pchno" },
@@ -54,6 +54,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(MTIRPB, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(MTIRPB)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/NBLOCA.c b/externals/nitro/modules/c/nitf/shared/NBLOCA.c
index a03754f63..d94f3a243 100644
--- a/externals/nitro/modules/c/nitf/shared/NBLOCA.c
+++ b/externals/nitro/modules/c/nitf/shared/NBLOCA.c
@@ -24,7 +24,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription NBLOCA_description[] = {
     {NITF_BINARY, 4, "First Image Frame Offset", "FRAME_1_OFFSET" },
     {NITF_BINARY, 4, "Number of Blocks", "NUMBER_OF_FRAMES" },
     {NITF_LOOP, 0, "- 1", "NUMBER_OF_FRAMES"},
@@ -33,6 +33,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(NBLOCA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(NBLOCA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/OBJCTA.c b/externals/nitro/modules/c/nitf/shared/OBJCTA.c
index f8d6f1a9b..394c71e01 100644
--- a/externals/nitro/modules/c/nitf/shared/OBJCTA.c
+++ b/externals/nitro/modules/c/nitf/shared/OBJCTA.c
@@ -25,7 +25,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription OBJCTA_description[] = {
     {NITF_BCS_N, 4, "VERNUM", "VERNUM" },
     {NITF_BCS_N, 3, "NUM_OBJ", "NUM_OBJ" },
     {NITF_BCS_A, 10, "OBJ_REF", "OBJ_REF" },
@@ -65,6 +65,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(OBJCTA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(OBJCTA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/OFFSET.c b/externals/nitro/modules/c/nitf/shared/OFFSET.c
index 6297254be..2e118dd66 100644
--- a/externals/nitro/modules/c/nitf/shared/OFFSET.c
+++ b/externals/nitro/modules/c/nitf/shared/OFFSET.c
@@ -24,12 +24,12 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription OFFSET_description[] = {
     {NITF_BCS_N, 8, "Align-Scan Offset of First Pixel", "LINE" },
     {NITF_BCS_N, 8, "Cross-Scan Offset of First Pixel", "SAMPLE" },
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(OFFSET, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(OFFSET)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/PATCHA.c b/externals/nitro/modules/c/nitf/shared/PATCHA.c
index 5a098505a..0e99f6321 100644
--- a/externals/nitro/modules/c/nitf/shared/PATCHA.c
+++ b/externals/nitro/modules/c/nitf/shared/PATCHA.c
@@ -69,13 +69,13 @@ static nitf_TREDescription descrip_00115[] = {
 };
 
 /* Define the available descriptions and the default one */
-static nitf_TREDescriptionInfo descriptions[] = {
+static nitf_TREDescriptionInfo PATCHA_descriptions[] = {
     { "PATCHA_115", descrip_00115, 115 },
     { "PATCHA_74", descrip_00074, 74 },
     { NULL, NULL, NITF_TRE_DESC_NO_LENGTH }
 };
 
-static nitf_TREDescriptionSet PATCHADescriptionSet = { 0, descriptions };
+static nitf_TREDescriptionSet PATCHADescriptionSet = { 0, PATCHA_descriptions };
 
 NITF_DECLARE_PLUGIN(PATCHA)
 
diff --git a/externals/nitro/modules/c/nitf/shared/PATCHB.c b/externals/nitro/modules/c/nitf/shared/PATCHB.c
index fc335b53d..ef1e3f3db 100644
--- a/externals/nitro/modules/c/nitf/shared/PATCHB.c
+++ b/externals/nitro/modules/c/nitf/shared/PATCHB.c
@@ -25,7 +25,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription PATCHB_description[] = {
 
     {NITF_BCS_A, 4, "Patch Number", "PAT_NO" },
     {NITF_BCS_A, 1, "Last Patch of Search Scene", "LAST_PAT_FLAG" },
@@ -52,6 +52,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(PATCHB, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(PATCHB)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/PIAEQA.c b/externals/nitro/modules/c/nitf/shared/PIAEQA.c
index f8ae90e2d..1897b35dd 100644
--- a/externals/nitro/modules/c/nitf/shared/PIAEQA.c
+++ b/externals/nitro/modules/c/nitf/shared/PIAEQA.c
@@ -25,7 +25,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription PIAEQA_description[] = {
     {NITF_BCS_A, 7, "Equipment Code", "EQPCODE" },
     {NITF_BCS_A, 45, "Equipment Nomenclature", "EQPNOMEN" },
     {NITF_BCS_A, 64, "Equipment Manufacturer", "EQPMAN" },
@@ -37,6 +37,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(PIAEQA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(PIAEQA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/PIAEVA.c b/externals/nitro/modules/c/nitf/shared/PIAEVA.c
index 2fb845d91..ecfd6ce32 100644
--- a/externals/nitro/modules/c/nitf/shared/PIAEVA.c
+++ b/externals/nitro/modules/c/nitf/shared/PIAEVA.c
@@ -25,12 +25,12 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription PIAEVA_description[] = {
     {NITF_BCS_A, 38, "Event Name", "EVENTNAME" },
     {NITF_BCS_A, 8, "Event Type", "EVENTTYPE" },
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(PIAEVA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(PIAEVA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/PIAIMB.c b/externals/nitro/modules/c/nitf/shared/PIAIMB.c
index bb8b6571d..a6ca4c06a 100644
--- a/externals/nitro/modules/c/nitf/shared/PIAIMB.c
+++ b/externals/nitro/modules/c/nitf/shared/PIAIMB.c
@@ -25,7 +25,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription PIAIMB_description[] = {
     {NITF_BCS_A, 3, "Cloud Cover", "cloud" },
     {NITF_BCS_A, 1, "Standard Radiometric?", "stdrd" },
     {NITF_BCS_A, 12, "Sensor Mode", "smode" },
@@ -42,6 +42,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(PIAIMB, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(PIAIMB)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/PIAIMC.c b/externals/nitro/modules/c/nitf/shared/PIAIMC.c
index 54cacc896..2127d510f 100644
--- a/externals/nitro/modules/c/nitf/shared/PIAIMC.c
+++ b/externals/nitro/modules/c/nitf/shared/PIAIMC.c
@@ -25,7 +25,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription PIAIMC_description[] = {
     {NITF_BCS_N, 3, "Cloud Cover", "CLOUDCVR" },
     {NITF_BCS_A, 1, "Standard Radiometric Product", "SRP" },
     {NITF_BCS_A, 12, "Sensor Mode", "SENSMODE" },
@@ -48,6 +48,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(PIAIMC, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(PIAIMC)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/PIAPEA.c b/externals/nitro/modules/c/nitf/shared/PIAPEA.c
index 48b7aedf5..b56c13822 100644
--- a/externals/nitro/modules/c/nitf/shared/PIAPEA.c
+++ b/externals/nitro/modules/c/nitf/shared/PIAPEA.c
@@ -24,7 +24,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription PIAPEA_description[] = {
     {NITF_BCS_A, 28, "Last Name", "LASTNME" },
     {NITF_BCS_A, 28, "First Name", "FIRSTNME" },
     {NITF_BCS_A, 28, "Middle Name", "MIDNME" },
@@ -33,6 +33,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(PIAPEA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(PIAPEA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/PIAPEB.c b/externals/nitro/modules/c/nitf/shared/PIAPEB.c
index e1bb1a499..fa0857b51 100644
--- a/externals/nitro/modules/c/nitf/shared/PIAPEB.c
+++ b/externals/nitro/modules/c/nitf/shared/PIAPEB.c
@@ -25,7 +25,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription PIAPEB_description[] = {
     {NITF_BCS_A, 28, "Last Name", "LASTNME" },
     {NITF_BCS_A, 28, "First Name", "FIRSTNME" },
     {NITF_BCS_A, 28, "Middle Name", "MIDNME" },
@@ -34,6 +34,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(PIAPEB, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(PIAPEB)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/PIAPRC.c b/externals/nitro/modules/c/nitf/shared/PIAPRC.c
index 2b70f98c1..a5246ff10 100644
--- a/externals/nitro/modules/c/nitf/shared/PIAPRC.c
+++ b/externals/nitro/modules/c/nitf/shared/PIAPRC.c
@@ -25,7 +25,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription PIAPRC_description[] = {
     {NITF_BCS_A, 64, "Access ID", "accid" },
     {NITF_BCS_A, 32, "FM Control Number", "fmctl" },
     {NITF_BCS_A, 1, "Subjective Detail", "sdet" },
@@ -76,6 +76,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(PIAPRC, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(PIAPRC)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/PIAPRD.c b/externals/nitro/modules/c/nitf/shared/PIAPRD.c
index de004d713..59f1e752b 100644
--- a/externals/nitro/modules/c/nitf/shared/PIAPRD.c
+++ b/externals/nitro/modules/c/nitf/shared/PIAPRD.c
@@ -25,7 +25,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription PIAPRD_description[] = {
     {NITF_BCS_A, 64, "Access ID", "ACCESSID" },
     {NITF_BCS_A, 32, "FM Control Number", "FMCNTROL" },
     {NITF_BCS_A, 1, "Subjective Detail", "SUBDET" },
@@ -61,6 +61,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(PIAPRD, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(PIAPRD)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/PIATGA.c b/externals/nitro/modules/c/nitf/shared/PIATGA.c
index 6084ea95a..152c38bf7 100644
--- a/externals/nitro/modules/c/nitf/shared/PIATGA.c
+++ b/externals/nitro/modules/c/nitf/shared/PIATGA.c
@@ -24,7 +24,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription PIATGA_description[] = {
     {NITF_BCS_A, 15, "Target UTM", "TGTUTM" },
     {NITF_BCS_A, 15, "Target ID", "PIATGAID" },
     {NITF_BCS_A, 2, "Country Code", "PIACTRY" },
@@ -36,6 +36,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(PIATGA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(PIATGA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/PIATGB.c b/externals/nitro/modules/c/nitf/shared/PIATGB.c
index e8d84494a..abbc09d82 100644
--- a/externals/nitro/modules/c/nitf/shared/PIATGB.c
+++ b/externals/nitro/modules/c/nitf/shared/PIATGB.c
@@ -24,7 +24,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription PIATGB_description[] = {
     {NITF_BCS_A, 15, "Target UTM", "TGTUTM" },
     {NITF_BCS_A, 15, "Target Identification", "PIATGAID" },
     {NITF_BCS_A, 2, "Country Code", "PIACTRY" },
@@ -38,6 +38,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(PIATGB, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(PIATGB)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/PIXQLA.c b/externals/nitro/modules/c/nitf/shared/PIXQLA.c
index 43926113d..90fad615b 100644
--- a/externals/nitro/modules/c/nitf/shared/PIXQLA.c
+++ b/externals/nitro/modules/c/nitf/shared/PIXQLA.c
@@ -24,7 +24,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription PIXQLA_description[] = {
     {NITF_BCS_A, 3, "Number of Associated Image Segments", "NUMAIS", },
     {NITF_IF, 0, "ne ALL", "NUMAIS"},
     {NITF_LOOP, 0, NULL, "NUMAIS"},
@@ -39,6 +39,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(PIXQLA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(PIXQLA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/PLTFMA.c b/externals/nitro/modules/c/nitf/shared/PLTFMA.c
index 44f0704b3..368ec9548 100644
--- a/externals/nitro/modules/c/nitf/shared/PLTFMA.c
+++ b/externals/nitro/modules/c/nitf/shared/PLTFMA.c
@@ -25,7 +25,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription PLTFMA_description[] = {
     {NITF_BCS_N, 4, "VERNUM", "VERNUM" },
     {NITF_BCS_A, 12, "P_NAME", "P_NAME" },
     {NITF_BCS_A, 40, "P_DESCR", "P_DESCR" },
@@ -76,6 +76,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(PLTFMA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(PLTFMA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/PRADAA.c b/externals/nitro/modules/c/nitf/shared/PRADAA.c
index 460bc4bf8..6ee7d8e11 100644
--- a/externals/nitro/modules/c/nitf/shared/PRADAA.c
+++ b/externals/nitro/modules/c/nitf/shared/PRADAA.c
@@ -25,7 +25,7 @@
 NITF_CXX_GUARD
 
 // MIL-PRF-89034, Table 9 (page 48).
-static nitf_TREDescription description[] = {
+static nitf_TREDescription PRADAA_description[] = {
     {NITF_BCS_A, 8, "DPPDB Absolute CE 90%", "PACE" },
     {NITF_BCS_A, 8, "DPPDB Absolute LE 90%", "PALE" },
     {NITF_BCS_A, 8, "DPPDB Support Data CE 90%", "PSDCE" },
@@ -35,6 +35,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(PRADAA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(PRADAA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/PRJPSB.c b/externals/nitro/modules/c/nitf/shared/PRJPSB.c
index 67feda8b6..e7c187b43 100644
--- a/externals/nitro/modules/c/nitf/shared/PRJPSB.c
+++ b/externals/nitro/modules/c/nitf/shared/PRJPSB.c
@@ -24,7 +24,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription PRJPSB_description[] = {
     {NITF_BCS_A, 80, "Projection Name", "PRN" },
     {NITF_BCS_A, 2, "Projection Code", "PCO" },
     {NITF_BCS_N, 1, "Number of Projection Parameters", "NUM_PRJ" },
@@ -36,6 +36,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(PRJPSB, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(PRJPSB)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/REGPTB.c b/externals/nitro/modules/c/nitf/shared/REGPTB.c
index 12b456990..245d4da5e 100644
--- a/externals/nitro/modules/c/nitf/shared/REGPTB.c
+++ b/externals/nitro/modules/c/nitf/shared/REGPTB.c
@@ -24,7 +24,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription REGPTB_description[] = {
     {NITF_BCS_N, 4, "Number of Registration Points to Follow",
      "NUMPTS" },
     {NITF_LOOP, 0, NULL, "NUMPTS"},
@@ -38,6 +38,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(REGPTB, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(REGPTB)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/RPC00B.c b/externals/nitro/modules/c/nitf/shared/RPC00B.c
index 3ba2066d1..e5d09de4a 100644
--- a/externals/nitro/modules/c/nitf/shared/RPC00B.c
+++ b/externals/nitro/modules/c/nitf/shared/RPC00B.c
@@ -24,7 +24,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription RPC00B_description[] = {
     {NITF_BCS_N, 1, "Success", "SUCCESS" },
     {NITF_BCS_A, 7, "Error - Bias", "ERR_BIAS" },
     {NITF_BCS_A, 7, "Error - Random", "ERR_RAND" },
@@ -54,6 +54,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(RPC00B, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(RPC00B)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/RPFDES.c b/externals/nitro/modules/c/nitf/shared/RPFDES.c
index 59cf0243c..51b4a5a1f 100644
--- a/externals/nitro/modules/c/nitf/shared/RPFDES.c
+++ b/externals/nitro/modules/c/nitf/shared/RPFDES.c
@@ -25,7 +25,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription RPFDES_description[] = {
     {NITF_BINARY, 1, "location section length", "LOCLEN" },
     {NITF_IF, 0, "> 0", "LOCLEN"},
     {NITF_BINARY, 1, "component location table offset", "CLTOFF" },
@@ -42,6 +42,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(RPFDES, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(RPFDES)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/RPFIMG.c b/externals/nitro/modules/c/nitf/shared/RPFIMG.c
index 444c559af..a06ef2ba5 100644
--- a/externals/nitro/modules/c/nitf/shared/RPFIMG.c
+++ b/externals/nitro/modules/c/nitf/shared/RPFIMG.c
@@ -25,7 +25,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription RPFIMG_description[] = {
     {NITF_BINARY, 1, "location section length", "LOCLEN" },
     {NITF_BINARY, 1, "component location table offset", "CLTOFF" },
     {NITF_BINARY, 1, "# of section location records", "SECRECS" },
@@ -40,6 +40,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(RPFIMG, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(RPFIMG)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/RSMAPA.c b/externals/nitro/modules/c/nitf/shared/RSMAPA.c
index 5da870e3c..7211fbad7 100644
--- a/externals/nitro/modules/c/nitf/shared/RSMAPA.c
+++ b/externals/nitro/modules/c/nitf/shared/RSMAPA.c
@@ -24,7 +24,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription RSMAPA_description[] = {
     {NITF_BCS_A, 80, "Image Identifier", "IID" },
     {NITF_BCS_A, 40, "RSM Image Support Data Edition", "EDITION" },
     {NITF_BCS_A, 40, "Triangulation ID", "TID" },
@@ -117,6 +117,6 @@ static nitf_TREDescription description[] = {
 
 
 
-NITF_DECLARE_SINGLE_PLUGIN(RSMAPA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(RSMAPA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/RSMDCA.c b/externals/nitro/modules/c/nitf/shared/RSMDCA.c
index c9a8f36fc..549552083 100644
--- a/externals/nitro/modules/c/nitf/shared/RSMDCA.c
+++ b/externals/nitro/modules/c/nitf/shared/RSMDCA.c
@@ -36,7 +36,7 @@ static int count(nitf_TRE* tre, char idx[10][10], int depth, nitf_Error* error)
 
 }
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription RSMDCA_description[] = {
     {NITF_BCS_A, 80, "Image Identifier", "IID" },
     {NITF_BCS_A, 40, "RSM Image Support Data Edition", "EDITION" },
     {NITF_BCS_A, 40, "Triangulation ID", "TID" },
@@ -139,6 +139,6 @@ static nitf_TREDescription description[] = {
 
 
 
-NITF_DECLARE_SINGLE_PLUGIN(RSMDCA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(RSMDCA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/RSMECA.c b/externals/nitro/modules/c/nitf/shared/RSMECA.c
index 242a0212f..6848701d3 100644
--- a/externals/nitro/modules/c/nitf/shared/RSMECA.c
+++ b/externals/nitro/modules/c/nitf/shared/RSMECA.c
@@ -58,7 +58,7 @@ static int mapped(nitf_TRE* tre, char idx[10][10], int depth, nitf_Error* error)
 
 }
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription RSMECA_description[] = {
     {NITF_BCS_A, 80, "Image Identifier", "IID" },
     {NITF_BCS_A, 40, "RSM Image Support Data Edition", "EDITION" },
     {NITF_BCS_A, 40, "Triangulation ID", "TID" },
@@ -210,6 +210,6 @@ static nitf_TREDescription description[] = {
 
 
 
-NITF_DECLARE_SINGLE_PLUGIN(RSMECA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(RSMECA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/RSMGGA.c b/externals/nitro/modules/c/nitf/shared/RSMGGA.c
index 6e3c82e8a..c00450003 100644
--- a/externals/nitro/modules/c/nitf/shared/RSMGGA.c
+++ b/externals/nitro/modules/c/nitf/shared/RSMGGA.c
@@ -44,7 +44,7 @@ static int nxptsXnypts(nitf_TRE* tre, char idx[10][10], int depth, nitf_Error* e
     return nxpts * nypts;
 }
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription RSMGGA_description[] = {
     {NITF_BCS_A, 80, "Image Identifier", "IID" },
     {NITF_BCS_A, 40, "RSM Image Support Data Edition", "EDITION" },
 
@@ -104,6 +104,6 @@ static nitf_TREDescription description[] = {
 
 
 
-NITF_DECLARE_SINGLE_PLUGIN(RSMGGA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(RSMGGA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/RSMGIA.c b/externals/nitro/modules/c/nitf/shared/RSMGIA.c
index 50a126a08..9c4a1ffc5 100644
--- a/externals/nitro/modules/c/nitf/shared/RSMGIA.c
+++ b/externals/nitro/modules/c/nitf/shared/RSMGIA.c
@@ -24,7 +24,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription RSMGIA_description[] = {
     {NITF_BCS_A, 80, "Image Identifier", "IID" },
     {NITF_BCS_A, 40, "RSM Image Support Data Edition", "EDITION" },
 
@@ -71,6 +71,6 @@ static nitf_TREDescription description[] = {
 
 
 
-NITF_DECLARE_SINGLE_PLUGIN(RSMGIA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(RSMGIA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/RSMIDA.c b/externals/nitro/modules/c/nitf/shared/RSMIDA.c
index cfe0e6e51..26e9e6cda 100644
--- a/externals/nitro/modules/c/nitf/shared/RSMIDA.c
+++ b/externals/nitro/modules/c/nitf/shared/RSMIDA.c
@@ -24,7 +24,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription RSMIDA_description[] = {
     {NITF_BCS_A, 80, "Image Identifier", "IID" },
     {NITF_BCS_A, 40, "RSM Image Support Data Edition", "EDITION" },
     {NITF_BCS_A, 40, "Image Sequence Identifier", "ISID" },
@@ -134,6 +134,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(RSMIDA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(RSMIDA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/RSMPCA.c b/externals/nitro/modules/c/nitf/shared/RSMPCA.c
index 815094815..29e180d5c 100644
--- a/externals/nitro/modules/c/nitf/shared/RSMPCA.c
+++ b/externals/nitro/modules/c/nitf/shared/RSMPCA.c
@@ -24,7 +24,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription RSMPCA_description[] = {
     {NITF_BCS_A, 80, "Image Identifier", "IID" },
     {NITF_BCS_A, 40, "RSM Image Support Data Edition", "EDITION" },
 
@@ -105,6 +105,6 @@ static nitf_TREDescription description[] = {
 
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(RSMPCA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(RSMPCA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/RSMPIA.c b/externals/nitro/modules/c/nitf/shared/RSMPIA.c
index 757d6069b..cb4062b36 100644
--- a/externals/nitro/modules/c/nitf/shared/RSMPIA.c
+++ b/externals/nitro/modules/c/nitf/shared/RSMPIA.c
@@ -24,7 +24,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription RSMPIA_description[] = {
     {NITF_BCS_A, 80, "Image Identifier", "IID" },
     {NITF_BCS_A, 40, "RSM Image Support Data Edition", "EDITION" },
 
@@ -67,6 +67,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(RSMPIA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(RSMPIA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/SECTGA.c b/externals/nitro/modules/c/nitf/shared/SECTGA.c
index 5f866dd54..d6bab85ee 100644
--- a/externals/nitro/modules/c/nitf/shared/SECTGA.c
+++ b/externals/nitro/modules/c/nitf/shared/SECTGA.c
@@ -25,13 +25,13 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription SECTGA_description[] = {
     {NITF_BCS_A, 12, "Secondary Target ID", "SEC_ID" },
     {NITF_BCS_A, 15, "Secondary Target BE No", "SEC_BE" },
     {NITF_BCS_A, 1, "reserved 1", "RESVD001" },
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(SECTGA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(SECTGA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/SENSRA.c b/externals/nitro/modules/c/nitf/shared/SENSRA.c
index e6f6e3cd6..fd3cf1324 100644
--- a/externals/nitro/modules/c/nitf/shared/SENSRA.c
+++ b/externals/nitro/modules/c/nitf/shared/SENSRA.c
@@ -25,7 +25,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription SENSRA_description[] = {
     {NITF_BCS_N, 8, "Ref Row", "REFROW" },
     {NITF_BCS_N, 8, "Ref Col", "REFCOL" },
     {NITF_BCS_A, 6, "Sensor Model", "SNSMODEL" },
@@ -53,6 +53,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(SENSRA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(SENSRA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/SENSRB.c b/externals/nitro/modules/c/nitf/shared/SENSRB.c
index cae78468f..8b7b63d52 100644
--- a/externals/nitro/modules/c/nitf/shared/SENSRB.c
+++ b/externals/nitro/modules/c/nitf/shared/SENSRB.c
@@ -25,7 +25,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription SENSRB_description[] = {
     {NITF_BCS_A,  1,     "General Data",                 "GENERAL_DATA"},        /* 01 */
     {NITF_IF,     0,     "eq Y",                         "GENERAL_DATA"},
     {NITF_BCS_A,  25,    "Sensor Name",                  "SENSOR"},              /* 01a */
@@ -402,6 +402,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0,       NULL,                           NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(SENSRB, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(SENSRB)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/SNSPSB.c b/externals/nitro/modules/c/nitf/shared/SNSPSB.c
index 8655b96b6..51565eec7 100644
--- a/externals/nitro/modules/c/nitf/shared/SNSPSB.c
+++ b/externals/nitro/modules/c/nitf/shared/SNSPSB.c
@@ -24,7 +24,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription SNSPSB_description[] = {
     {NITF_BCS_N, 2, "Number of sets of sensor parameters", "NUMSNS" },
     {NITF_LOOP, 0, NULL, "NUMSNS"},
     {NITF_BCS_N, 2, "Number of Bounding Polygons", "NUM_BP" },
@@ -86,6 +86,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(SNSPSB, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(SNSPSB)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/SNSRA.c b/externals/nitro/modules/c/nitf/shared/SNSRA.c
index 35e1f8e91..41a07bb50 100644
--- a/externals/nitro/modules/c/nitf/shared/SNSRA.c
+++ b/externals/nitro/modules/c/nitf/shared/SNSRA.c
@@ -25,7 +25,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription SNSRA_description[] = {
     {NITF_BCS_N, 4, "VERNUM", "VERNUM" },
     {NITF_BCS_A, 20, "SENNAME", "SENNAME" },
     {NITF_BCS_A, 1, "SENTYPE", "SENTYPE" },
@@ -107,6 +107,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(SNSRA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(SNSRA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/SOURCB.c b/externals/nitro/modules/c/nitf/shared/SOURCB.c
index 7adae1ff2..efce785e8 100644
--- a/externals/nitro/modules/c/nitf/shared/SOURCB.c
+++ b/externals/nitro/modules/c/nitf/shared/SOURCB.c
@@ -24,7 +24,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription SOURCB_description[] = {
     {NITF_BCS_N, 9, "Image Segment Reciprocal Scale", "IS_SCA" },
     {NITF_BCS_A, 10, "Colout Patch ID", "CPATCH" },
     {NITF_BCS_N, 2, "Number of Source Descriptions", "NUM_SOUR" },
@@ -121,6 +121,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(SOURCB, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(SOURCB)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/STDIDC.c b/externals/nitro/modules/c/nitf/shared/STDIDC.c
index f10f64922..344f627e1 100644
--- a/externals/nitro/modules/c/nitf/shared/STDIDC.c
+++ b/externals/nitro/modules/c/nitf/shared/STDIDC.c
@@ -25,7 +25,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription STDIDC_description[] = {
     {NITF_BCS_A, 14, "ACQ DATE", "ACQUISITION_DATE" },
     {NITF_BCS_A, 14, "MISSION", "MISSION" },
     {NITF_BCS_A, 2, "PASS", "PASS" },
@@ -47,6 +47,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(STDIDC, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(STDIDC)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/STEROB.c b/externals/nitro/modules/c/nitf/shared/STEROB.c
index 068dcd912..486b1dccf 100644
--- a/externals/nitro/modules/c/nitf/shared/STEROB.c
+++ b/externals/nitro/modules/c/nitf/shared/STEROB.c
@@ -25,7 +25,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription STEROB_description[] = {
     {NITF_BCS_A, 60, "Standard ID", "ST_ID" },
     {NITF_BCS_A, 1, "N Mates", "N_MATES" },
     {NITF_BCS_A, 1, "Mate Instance", "MATE_INSTANCE" },
@@ -38,6 +38,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(STEROB, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(STEROB)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/STREOB.c b/externals/nitro/modules/c/nitf/shared/STREOB.c
index ef46e7761..704279440 100644
--- a/externals/nitro/modules/c/nitf/shared/STREOB.c
+++ b/externals/nitro/modules/c/nitf/shared/STREOB.c
@@ -25,7 +25,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription STREOB_description[] = {
     {NITF_BCS_A, 60, "Standard ID", "ST_ID" },
     {NITF_BCS_A, 1, "Nunber of Stereo Mates", "N_MATES" },
     {NITF_BCS_A, 1, "Mate Instance", "MATE_INSTANCE" },
@@ -38,6 +38,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(STREOB, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(STREOB)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/TRGTA.c b/externals/nitro/modules/c/nitf/shared/TRGTA.c
index dfe226611..08b4855f1 100644
--- a/externals/nitro/modules/c/nitf/shared/TRGTA.c
+++ b/externals/nitro/modules/c/nitf/shared/TRGTA.c
@@ -26,7 +26,7 @@
 NITF_CXX_GUARD
 
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription TRGTA_description[] = {
     {NITF_BCS_N, 4, "VERNUM", "VERNUM" },
     {NITF_BCS_N, 3, "NO_VALID_TGTS", "NO_VALID_TGTS" },
     {NITF_BCS_N, 3, "NO_SCENE_TGTS", "NO_SCENE_TGTS" },
@@ -88,6 +88,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(TRGTA, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(TRGTA)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/shared/USE00A.c b/externals/nitro/modules/c/nitf/shared/USE00A.c
index 96e70d397..1ae9b8e39 100644
--- a/externals/nitro/modules/c/nitf/shared/USE00A.c
+++ b/externals/nitro/modules/c/nitf/shared/USE00A.c
@@ -25,7 +25,7 @@
 
 NITF_CXX_GUARD
 
-static nitf_TREDescription description[] = {
+static nitf_TREDescription USE00A_description[] = {
     {NITF_BCS_N, 3, "Angle to North", "ANGLE_TO_NORTH" },
     {NITF_BCS_A, 5, "Mean GSD     ", "MEAN_GSD" },
     {NITF_BCS_A, 1, "Reserved 1", "rsrvd01" },
@@ -53,6 +53,6 @@ static nitf_TREDescription description[] = {
     {NITF_END, 0, NULL, NULL}
 };
 
-NITF_DECLARE_SINGLE_PLUGIN(USE00A, description)
+NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(USE00A)
 
 NITF_CXX_ENDGUARD
diff --git a/externals/nitro/modules/c/nitf/source/TREs.c b/externals/nitro/modules/c/nitf/source/TREs.c
index 8ac463b98..fc32020de 100644
--- a/externals/nitro/modules/c/nitf/source/TREs.c
+++ b/externals/nitro/modules/c/nitf/source/TREs.c
@@ -33,15 +33,99 @@
 
 #include "../shared/ACCHZB.c"
 #include "../shared/ACCPOB.c"
+#include "../shared/ACCVTB.c"
 #include "../shared/ACFTA.c"
+#include "../shared/ACFTB.c"
+#include "../shared/AIMIDA.c"
 #include "../shared/AIMIDB.c"
+#include "../shared/AIPBCA.c"
+#include "../shared/ASTORA.c"
+#include "../shared/BANDSA.c"
+#include "../shared/BANDSB.c"
+#include "../shared/BCKGDA.c"
+#include "../shared/BLOCKA.c"
+#include "../shared/BNDPLB.c"
+#include "../shared/CCINFA.c"
+#include "../shared/CLCTNA.c"
+#include "../shared/CLCTNB.c"
+#include "../shared/CMETAA.c"
+#include "../shared/CSCCGA.c"
 #include "../shared/CSCRNA.c"
+#include "../shared/CSDIDA.c"
+#include "../shared/CSEPHA.c"
+#include "../shared/CSEXRA.c"
 #include "../shared/CSEXRB.c"
+#include "../shared/CSPROA.c"
+#include "../shared/CSSFAA.c"
+#include "../shared/CSSHPA.c"
 #include "../shared/ENGRDA.c"
+#include "../shared/EXOPTA.c"
+#include "../shared/EXPLTA.c"
+#include "../shared/EXPLTB.c"
+#include "../shared/GEOLOB.c"
+#include "../shared/GEOPSB.c"
+#include "../shared/GRDPSB.c"
 #include "../shared/HISTOA.c"
+#include "../shared/ICHIPB.c"
+#include "../shared/IMASDA.c"
+#include "../shared/IMGDTA.c"
+#include "../shared/IMRFCA.c"
+#include "../shared/IOMAPA.c"
+#include "../shared/J2KLRA.c"
 #include "../shared/JITCID.c"
+#include "../shared/MAPLOB.c"
+#include "../shared/MATESA.c"
+#include "../shared/MENSRA.c"
+#include "../shared/MENSRB.c"
+#include "../shared/MPDSRA.c"
+#include "../shared/MSDIRA.c"
+#include "../shared/MSTGTA.c"
+#include "../shared/MTIRPA.c"
+#include "../shared/MTIRPB.c"
+#include "../shared/NBLOCA.c"
+#include "../shared/OBJCTA.c"
+#include "../shared/OFFSET.c"
+#include "../shared/PATCHA.c"
+#include "../shared/PATCHB.c"
+#include "../shared/PIAEQA.c"
+#include "../shared/PIAEVA.c"
+#include "../shared/PIAIMB.c"
+#include "../shared/PIAIMC.c"
+#include "../shared/PIAPEA.c"
+#include "../shared/PIAPEB.c"
+#include "../shared/PIAPRC.c"
+#include "../shared/PIAPRD.c"
+#include "../shared/PIATGA.c"
+#include "../shared/PIATGB.c"
+#include "../shared/PIXQLA.c"
+#include "../shared/PLTFMA.c"
+#include "../shared/PRADAA.c"
+#include "../shared/PRJPSB.c"
 #include "../shared/PTPRAA.c"
+#include "../shared/REGPTB.c"
+#include "../shared/RPC00B.c"
+#include "../shared/RPFDES.c"
 #include "../shared/RPFHDR.c"
+#include "../shared/RPFIMG.c"
+#include "../shared/RSMAPA.c"
+#include "../shared/RSMDCA.c"
+#include "../shared/RSMECA.c"
+#include "../shared/RSMGGA.c"
+#include "../shared/RSMGIA.c"
+#include "../shared/RSMIDA.c"
+#include "../shared/RSMPCA.c"
+#include "../shared/RSMPIA.c"
+#include "../shared/SECTGA.c"
+#include "../shared/SENSRA.c"
+#include "../shared/SENSRB.c"
+#include "../shared/SNSPSB.c"
+#include "../shared/SNSRA.c"
+#include "../shared/SOURCB.c"
+#include "../shared/STDIDC.c"
+#include "../shared/STEROB.c"
+#include "../shared/STREOB.c"
+#include "../shared/TRGTA.c"
+#include "../shared/USE00A.c"
 
 #include "../shared/TEST_DES.c"
 #include "../shared/XML_DATA_CONTENT.c"
@@ -72,9 +156,9 @@
 
  /*    TRE description for user header */
 static nitf_TREDescription TEST_PRELOADED_DES_description[] = {
-    {NITF_BCS_N, 2, "Number of data values", "COUNT" },
-    {NITF_BCS_N, 3, "Start value in ramp", "START" },
-    {NITF_BCS_N, 2, "Increment between values in ramp", "INCREMENT" },
+    {NITF_BCS_N, 2, "Number of data values",  "COUNT" },
+    {NITF_BCS_N, 3, "Start value in ramp",  "START" },
+    {NITF_BCS_N, 2, "Increment between values in ramp",  "INCREMENT" },
     {NITF_END, 0, NULL, NULL}
 };
 static nitf_TREDescriptionInfo TEST_PRELOADED_DES_descriptions[] = {
@@ -111,17 +195,101 @@ nitf_TREPreloaded defaultPreloadedTREs[] = {
     // Not preloading any TREs right now: with the existing system,
     // a TRE can be removed by deleting the DLL/SO.  If that same TRE
     // were preloaded, there would be no way to get rid of it.
-    NITF_preload_TRE(ACCHZB),
-    NITF_preload_TRE(ACCPOB),
-    NITF_preload_TRE(ACFTA),
-    NITF_preload_TRE(AIMIDB),
-    NITF_preload_TRE(CSCRNA),
-    NITF_preload_TRE(CSEXRB),
-	NITF_preload_TRE(ENGRDA),
-    NITF_preload_TRE(HISTOA),
-    NITF_preload_TRE(JITCID),
-    NITF_preload_TRE(PTPRAA),
-    NITF_preload_TRE(RPFHDR),
+    NITF_preload_TRE(ACCHZB), 
+    NITF_preload_TRE(ACCPOB), 
+    NITF_preload_TRE(ACCVTB), 
+    NITF_preload_TRE(ACFTA), 
+    NITF_preload_TRE(ACFTB), 
+    NITF_preload_TRE(AIMIDA), 
+    NITF_preload_TRE(AIMIDB), 
+    NITF_preload_TRE(AIPBCA), 
+    NITF_preload_TRE(ASTORA), 
+    NITF_preload_TRE(BANDSA), 
+    NITF_preload_TRE(BANDSB), 
+    NITF_preload_TRE(BCKGDA), 
+    NITF_preload_TRE(BLOCKA), 
+    NITF_preload_TRE(BNDPLB), 
+    NITF_preload_TRE(CCINFA), 
+    NITF_preload_TRE(CLCTNA),
+    NITF_preload_TRE(CLCTNB), 
+    NITF_preload_TRE(CMETAA), 
+    NITF_preload_TRE(CSCCGA), 
+    NITF_preload_TRE(CSCRNA), 
+    NITF_preload_TRE(CSDIDA), 
+    NITF_preload_TRE(CSEPHA), 
+    NITF_preload_TRE(CSEXRA), 
+    NITF_preload_TRE(CSEXRB), 
+    NITF_preload_TRE(CSPROA), 
+    NITF_preload_TRE(CSSFAA), 
+    NITF_preload_TRE(CSSHPA), 
+    NITF_preload_TRE(ENGRDA), 
+    NITF_preload_TRE(EXOPTA), 
+    NITF_preload_TRE(EXPLTA), 
+    NITF_preload_TRE(EXPLTB), 
+    NITF_preload_TRE(GEOLOB), 
+    NITF_preload_TRE(GEOPSB), 
+    NITF_preload_TRE(GRDPSB), 
+    NITF_preload_TRE(HISTOA), 
+    NITF_preload_TRE(ICHIPB), 
+    NITF_preload_TRE(IMASDA), 
+    NITF_preload_TRE(IMGDTA), 
+    NITF_preload_TRE(IMRFCA), 
+    NITF_preload_TRE(IOMAPA), 
+    NITF_preload_TRE(J2KLRA), 
+    NITF_preload_TRE(JITCID), 
+    NITF_preload_TRE(MAPLOB), 
+    NITF_preload_TRE(MATESA), 
+    NITF_preload_TRE(MENSRA), 
+    NITF_preload_TRE(MENSRB), 
+    NITF_preload_TRE(MPDSRA), 
+    NITF_preload_TRE(MSDIRA), 
+    NITF_preload_TRE(MSTGTA), 
+    NITF_preload_TRE(MTIRPA), 
+    NITF_preload_TRE(MTIRPB), 
+    NITF_preload_TRE(NBLOCA), 
+    NITF_preload_TRE(OBJCTA), 
+    NITF_preload_TRE(OFFSET), 
+    NITF_preload_TRE(PATCHA), 
+    NITF_preload_TRE(PATCHB), 
+    NITF_preload_TRE(PIAEQA), 
+    NITF_preload_TRE(PIAEVA), 
+    NITF_preload_TRE(PIAIMB), 
+    NITF_preload_TRE(PIAIMC), 
+    NITF_preload_TRE(PIAPEA), 
+    NITF_preload_TRE(PIAPEB), 
+    NITF_preload_TRE(PIAPRC), 
+    NITF_preload_TRE(PIAPRD), 
+    NITF_preload_TRE(PIATGA), 
+    NITF_preload_TRE(PIATGB), 
+    NITF_preload_TRE(PIXQLA), 
+    NITF_preload_TRE(PLTFMA), 
+    NITF_preload_TRE(PRADAA), 
+    NITF_preload_TRE(PRJPSB), 
+    NITF_preload_TRE(PTPRAA), 
+    NITF_preload_TRE(REGPTB), 
+    NITF_preload_TRE(RPC00B), 
+    NITF_preload_TRE(RPFDES), 
+    NITF_preload_TRE(RPFHDR), 
+    NITF_preload_TRE(RPFIMG), 
+    NITF_preload_TRE(RSMAPA), 
+    NITF_preload_TRE(RSMDCA), 
+    NITF_preload_TRE(RSMECA), 
+    NITF_preload_TRE(RSMGGA), 
+    NITF_preload_TRE(RSMGIA), 
+    NITF_preload_TRE(RSMIDA), 
+    NITF_preload_TRE(RSMPCA), 
+    NITF_preload_TRE(RSMPIA), 
+    NITF_preload_TRE(SECTGA), 
+    NITF_preload_TRE(SENSRA), 
+    NITF_preload_TRE(SENSRB), 
+    NITF_preload_TRE(SNSPSB), 
+    NITF_preload_TRE(SNSRA), 
+    NITF_preload_TRE(SOURCB), 
+    NITF_preload_TRE(STDIDC), 
+    NITF_preload_TRE(STEROB), 
+    NITF_preload_TRE(STREOB), 
+    NITF_preload_TRE(TRGTA), 
+    NITF_preload_TRE(USE00A), 
     NITF_preload_TRE(XML_DATA_CONTENT),
 
     //NITF_preload_TRE(TEST_DES), // This should ALWAYS come from the DLL/SO