diff --git a/externals/nitro/modules/c++/nitf/include/nitf/Field.hpp b/externals/nitro/modules/c++/nitf/include/nitf/Field.hpp
index 0debda3e2..e60df5276 100644
--- a/externals/nitro/modules/c++/nitf/include/nitf/Field.hpp
+++ b/externals/nitro/modules/c++/nitf/include/nitf/Field.hpp
@@ -82,7 +82,7 @@ struct GetConvType<false, IsSignedT>
  *  The Field is a generic type object that allows storage
  *  and casting of data amongst disparate data types.
  */
-class Field final : public nitf::Object<nitf_Field>
+class Field /*final*/ : public nitf::Object<nitf_Field> // no "final", SWIG doesn't like it
 {
     void setU_(uint32_t data)
     {
diff --git a/externals/nitro/modules/c++/nitf/include/nitf/HashTable.hpp b/externals/nitro/modules/c++/nitf/include/nitf/HashTable.hpp
index cf11dbbfe..13d5250ec 100644
--- a/externals/nitro/modules/c++/nitf/include/nitf/HashTable.hpp
+++ b/externals/nitro/modules/c++/nitf/include/nitf/HashTable.hpp
@@ -61,7 +61,7 @@ class HashIterator
  *
  *  Iterates a hash table, unordered.
  */
-struct HashTableIterator final
+struct HashTableIterator /*final*/   // no "final", SWIG doesn't like it
 {
     HashTableIterator() = default;
     ~HashTableIterator() = default;
diff --git a/externals/nitro/modules/c++/nitf/include/nitf/IOStreamReader.hpp b/externals/nitro/modules/c++/nitf/include/nitf/IOStreamReader.hpp
index ddd512a3e..b2a3a5694 100644
--- a/externals/nitro/modules/c++/nitf/include/nitf/IOStreamReader.hpp
+++ b/externals/nitro/modules/c++/nitf/include/nitf/IOStreamReader.hpp
@@ -33,7 +33,7 @@ namespace nitf
  *  \brief Adapter class that takes in any io::SeekableInputStream and creates
  *         an interface that usable by NITRO.
  */
-struct IOStreamReader final : public CustomIO
+struct IOStreamReader /*final*/ : public CustomIO // no "final", SWIG doesn't like it
 {
     /*
      *  \func Constructor
diff --git a/externals/nitro/modules/c++/nitf/include/nitf/ImageBlocker.hpp b/externals/nitro/modules/c++/nitf/include/nitf/ImageBlocker.hpp
index df3e68942..d4de52ab8 100644
--- a/externals/nitro/modules/c++/nitf/include/nitf/ImageBlocker.hpp
+++ b/externals/nitro/modules/c++/nitf/include/nitf/ImageBlocker.hpp
@@ -43,7 +43,7 @@ namespace nitf
  * means for multi-segment cases, there may be a different num rows / block in
  * each segment).
  */
-struct ImageBlocker final
+struct ImageBlocker /*final*/   // no "final", SWIG doesn't like it
 {
     ImageBlocker(const ImageBlocker&) = delete;
     ImageBlocker& operator=(const ImageBlocker&) = delete;
diff --git a/externals/nitro/modules/c++/nitf/include/nitf/ImageReader.hpp b/externals/nitro/modules/c++/nitf/include/nitf/ImageReader.hpp
index d43e789c6..c0d673bdd 100644
--- a/externals/nitro/modules/c++/nitf/include/nitf/ImageReader.hpp
+++ b/externals/nitro/modules/c++/nitf/include/nitf/ImageReader.hpp
@@ -44,7 +44,7 @@
 namespace nitf
 {
     template<typename T>
-    class BufferList final
+    class BufferList /*final*/   // no "final", SWIG doesn't like it
     {
         std::vector<T*> buffer;
         std::vector<std::unique_ptr<T[]>> buffer_;
diff --git a/externals/nitro/modules/c++/nitf/include/nitf/ImageSegmentComputer.h b/externals/nitro/modules/c++/nitf/include/nitf/ImageSegmentComputer.h
index 32fdf5322..ed27d4a2d 100644
--- a/externals/nitro/modules/c++/nitf/include/nitf/ImageSegmentComputer.h
+++ b/externals/nitro/modules/c++/nitf/include/nitf/ImageSegmentComputer.h
@@ -42,7 +42,7 @@ namespace nitf
  *
  * Currently only supports segmenting in the row direction.
  */
-struct ImageSegmentComputer final
+struct ImageSegmentComputer /*final*/   // no "final", SWIG doesn't like it
 {
     ImageSegmentComputer(const ImageSegmentComputer&) = delete;
     ImageSegmentComputer& operator=(const ImageSegmentComputer&) = delete;
diff --git a/externals/nitro/modules/c++/nitf/include/nitf/List.hpp b/externals/nitro/modules/c++/nitf/include/nitf/List.hpp
index 2c4ac70f6..6cfbd2572 100644
--- a/externals/nitro/modules/c++/nitf/include/nitf/List.hpp
+++ b/externals/nitro/modules/c++/nitf/include/nitf/List.hpp
@@ -91,7 +91,7 @@ DECLARE_CLASS(ListNode)
  *
  *  Iterates a linked list.
  */
-struct ListIterator final
+struct ListIterator /*final*/   // no "final", SWIG doesn't like it
 {
     ListIterator() = default;
     ~ListIterator() = default;
diff --git a/externals/nitro/modules/c++/nitf/include/nitf/NITFException.hpp b/externals/nitro/modules/c++/nitf/include/nitf/NITFException.hpp
index 750d8351c..a4f8092d7 100644
--- a/externals/nitro/modules/c++/nitf/include/nitf/NITFException.hpp
+++ b/externals/nitro/modules/c++/nitf/include/nitf/NITFException.hpp
@@ -37,7 +37,7 @@ namespace nitf
  *  \class NITFException
  *  \brief  The C++ wrapper for the nitf_Error
  */
-class NITFException final : public except::Exception
+class NITFException  /*final*/ : public except::Exception // no "final", SWIG doesn't like it
 {
     static except::Context make_Context_(const nitf_Error* error, const std::string& message)
     {
diff --git a/externals/nitro/modules/c++/nitf/include/nitf/Object.hpp b/externals/nitro/modules/c++/nitf/include/nitf/Object.hpp
index 98b12479a..5c6ca2f95 100644
--- a/externals/nitro/modules/c++/nitf/include/nitf/Object.hpp
+++ b/externals/nitro/modules/c++/nitf/include/nitf/Object.hpp
@@ -213,8 +213,9 @@ void operator()(Package_##_##Name_ * nativeObject) override \
     DECLARE_CLASS_IN_operator_function_(Name_, Package_)
 #endif
 
+// SWIG doesn't like "final"
 #define DECLARE_CLASS_IN(_Name, _Package) \
-    struct _Name##Destructor final : public nitf::MemoryDestructor<_Package##_##_Name> \
+    struct _Name##Destructor /*final*/ : public nitf::MemoryDestructor<_Package##_##_Name> \
     { DECLARE_CLASS_IN_operator_function(_Name, _Package) }; \
     class _Name : public nitf::Object<_Package##_##_Name, _Name##Destructor>
 
diff --git a/externals/nitro/modules/c++/nitf/include/nitf/TRE.hpp b/externals/nitro/modules/c++/nitf/include/nitf/TRE.hpp
index c94070b73..4f3fedd76 100644
--- a/externals/nitro/modules/c++/nitf/include/nitf/TRE.hpp
+++ b/externals/nitro/modules/c++/nitf/include/nitf/TRE.hpp
@@ -40,7 +40,7 @@ namespace nitf
  *  \class FieldIterator
  *  \brief  The C++ wrapper for the nitf_TREEnumerator
  */
- struct TREFieldIterator : public nitf::Object<nitf_TREEnumerator> // no "final", SWIG doesn't like it
+ struct TREFieldIterator /*final*/ : public nitf::Object<nitf_TREEnumerator> // no "final", SWIG doesn't like it
 {
     TREFieldIterator() noexcept(false)
     {
diff --git a/externals/nitro/modules/c++/nitf/tests/test_round_trip.cpp b/externals/nitro/modules/c++/nitf/tests/test_round_trip.cpp
index 45a19e301..2ea2176f5 100644
--- a/externals/nitro/modules/c++/nitf/tests/test_round_trip.cpp
+++ b/externals/nitro/modules/c++/nitf/tests/test_round_trip.cpp
@@ -65,7 +65,7 @@ class RowStreamer : public nitf::RowSourceCallback
 };
 
 // RAII for managing a list of RowStreamer's
-struct RowStreamers final
+struct RowStreamers /*final*/   // no "final", SWIG doesn't like it
 {
     nitf::RowSourceCallback* add(uint32_t band,
                                  uint32_t numCols,