diff --git a/Common/Core/vtkArray.h b/Common/Core/vtkArray.h
index 70ef5767638f4d5eafa56ff44c924b09b91dbb31..d34165d5db2b1dd263dae4537004b42d8fef9f26 100644
--- a/Common/Core/vtkArray.h
+++ b/Common/Core/vtkArray.h
@@ -267,8 +267,8 @@ private:
    * Implemented in concrete derivatives to get dimension labels.
    */
   virtual vtkStdString InternalGetDimensionLabel(DimensionT i) = 0;
-};
   //@}
+};
 
 vtkVariant vtkArray::GetVariantValue(CoordinateT i)
 {
diff --git a/Common/Core/vtkArrayRange.h b/Common/Core/vtkArrayRange.h
index 9fb05b897123aea6496ce197dcb2c9b91fc96ddd..be0c20470db97cc96a68f89a26c57147c1eed242 100644
--- a/Common/Core/vtkArrayRange.h
+++ b/Common/Core/vtkArrayRange.h
@@ -109,8 +109,8 @@ private:
    * Stores one-past-the-end of the range.
    */
   CoordinateT End;
-};
   //@}
+};
 
 #endif
 // VTK-HeaderTest-Exclude: vtkArrayRange.h
diff --git a/Common/Core/vtkBreakPoint.h b/Common/Core/vtkBreakPoint.h
index 919e79b562a16cc813986f3d8c2e09986caa5846..a45928ca7b98b97d33f8417cd432efb18f6431de 100644
--- a/Common/Core/vtkBreakPoint.h
+++ b/Common/Core/vtkBreakPoint.h
@@ -48,8 +48,8 @@ public:
    * from 0 inside a debugger.
    */
   static void Break();
-};
   //@}
+};
 
 #endif // #ifndef vtkBreakPoint_h
 // VTK-HeaderTest-Exclude: vtkBreakPoint.h
diff --git a/Common/Core/vtkDenseArray.h b/Common/Core/vtkDenseArray.h
index cfd970d28f93e9d8f0e9cf0e38e376ec52260423..6e07d89039bf397585618d4f0c57fe6d32a5c033 100644
--- a/Common/Core/vtkDenseArray.h
+++ b/Common/Core/vtkDenseArray.h
@@ -97,8 +97,8 @@ public:
      * Returns a pointer to the block of memory to be used for storage.
      */
     virtual T* GetAddress() = 0;
-  };
     //@}
+  };
 
   //@{
   /**
@@ -228,8 +228,8 @@ private:
    * Stores the stride along each array dimension (used for fast lookups).
    */
   std::vector<vtkIdType> Strides;
-};
   //@}
+};
 
 #include "vtkDenseArray.txx"
 
diff --git a/Common/Core/vtkMappedDataArray.h b/Common/Core/vtkMappedDataArray.h
index 4d8fac9d4bc2d669190dcaa40f73cf9825e3faa8..a2863f853747b6337fab2b8cd05c40beb1bbdfe7 100644
--- a/Common/Core/vtkMappedDataArray.h
+++ b/Common/Core/vtkMappedDataArray.h
@@ -141,8 +141,8 @@ private:
    */
   ValueType *TemporaryScalarPointer;
   size_t TemporaryScalarPointerSize;
-};
   //@}
+};
 
 // Declare vtkArrayDownCast implementations for mapped containers:
 vtkArrayDownCast_TemplateFastCastMacro(vtkMappedDataArray);
diff --git a/Common/Core/vtkOStreamWrapper.h b/Common/Core/vtkOStreamWrapper.h
index af5c5a4d3e6cc4915fa0574d2d2d1e720881ec5c..04f016b92d9b1fcc8a09918e0ad0ac2ca561a520 100644
--- a/Common/Core/vtkOStreamWrapper.h
+++ b/Common/Core/vtkOStreamWrapper.h
@@ -146,6 +146,7 @@ public:
    * or may not be used.
    */
   static void UseEndl(const EndlType&) {}
+  //@}
 protected:
   // Reference to the real ostream.
   ostream& ostr;
@@ -153,7 +154,6 @@ private:
   vtkOStreamWrapper& operator=(const vtkOStreamWrapper& r) = delete;
   vtkOStreamWrapper& operator << (std_string const&);
 };
-  //@}
 
 #endif
 // VTK-HeaderTest-Exclude: vtkOStreamWrapper.h
diff --git a/Common/Core/vtkObject.h b/Common/Core/vtkObject.h
index 23ea79c2d220022f0aea6749386a97ba0bd1a2bd..8ab2482dcdc7b2e8b1b1724be7c433d519efcfc8 100644
--- a/Common/Core/vtkObject.h
+++ b/Common/Core/vtkObject.h
@@ -283,8 +283,8 @@ private:
      */
     virtual bool operator()(vtkObject*, unsigned long, void*) = 0;
     virtual ~vtkClassMemberCallbackBase(){}
-  };
     //@}
+  };
 
   //@{
   /**
@@ -339,7 +339,6 @@ private:
       void (T::*Method1)();
       void (T::*Method2)(vtkObject*, unsigned long, void*);
       bool (T::*Method3)(vtkObject*, unsigned long, void*);
-  //@}
 
     public:
       vtkClassMemberCallback(T* handler, void (T::*method)())
@@ -392,6 +391,7 @@ private:
         return false;
       }
   };
+  //@}
 
   //@{
   /**
diff --git a/Common/Core/vtkSparseArray.h b/Common/Core/vtkSparseArray.h
index b91850cb3234871a18e4f64712ab2435557b5ecf..3f62063bcf11741646d0bd882c26e12741925ae6 100644
--- a/Common/Core/vtkSparseArray.h
+++ b/Common/Core/vtkSparseArray.h
@@ -251,8 +251,8 @@ private:
    * of the array.
    */
   T NullValue;
-};
   //@}
+};
 
 #include "vtkSparseArray.txx"
 
diff --git a/Common/DataModel/vtkAMRBox.h b/Common/DataModel/vtkAMRBox.h
index 83b21615c9d4b1d324fbeeee75e4dbad833d0fed..3c32161f94579a6e3a5155541a2133c3aed1d8d8 100644
--- a/Common/DataModel/vtkAMRBox.h
+++ b/Common/DataModel/vtkAMRBox.h
@@ -341,8 +341,8 @@ class VTKCOMMONDATAMODEL_EXPORT vtkAMRBox
   void BuildAMRBox(
       const int ilo, const int jlo, const int klo,
       const int ihi, const int jhi, const int khi );
-};
   //@}
+};
 
 
 //*****************************************************************************
diff --git a/Common/DataModel/vtkVector.h b/Common/DataModel/vtkVector.h
index a6ba202ca1475b220084d8b44a93c82eeb3d5b7b..84df24b19604435a4f725a10e99efd2a87e84a88 100644
--- a/Common/DataModel/vtkVector.h
+++ b/Common/DataModel/vtkVector.h
@@ -143,8 +143,8 @@ public:
     }
     return result;
   }
-};
   //@}
+};
 
 // .NAME vtkVector2 - templated base type for storage of 2D vectors.
 //
@@ -209,8 +209,8 @@ public:
   {
     return (this->Data[0] < v.Data[0]) || (this->Data[0] == v.Data[0] && this->Data[1] < v.Data[1]);
   }
-};
   //@}
+};
 
 // .NAME vtkVector3 - templated base type for storage of 3D vectors.
 //
@@ -302,8 +302,8 @@ public:
     return (this->Data[0] < v.Data[0]) || (this->Data[0] == v.Data[0] && this->Data[1] < v.Data[1]) ||
       (this->Data[0] == v.Data[0] && this->Data[1] == v.Data[1] && this->Data[2] < v.Data[2]);
   }
-};
   //@}
+};
 
 // .NAME vtkVector4 - templated base type for storage of 4D vectors.
 //
@@ -383,8 +383,8 @@ public:
    * Get the w component of the vector, i.e. element 3.
    */
   const T& GetW() const { return this->Data[3]; }
-};
   //@}
+};
 
 /**
  * Some inline functions for the derived types.
diff --git a/Common/Math/vtkQuaternion.h b/Common/Math/vtkQuaternion.h
index 4eff9247123f29695be6fe1863f067276c6d303c..9310281cec368f393615367c79a94721823ef5ec 100644
--- a/Common/Math/vtkQuaternion.h
+++ b/Common/Math/vtkQuaternion.h
@@ -282,8 +282,8 @@ public:
    * Performs in place division of the quaternions by a scalar value.
    */
   void operator/=(const T& scalar);
-};
   //@}
+};
 
 /**
  * Several macros to define the various operator overloads for the quaternions.
diff --git a/Common/Math/vtkTuple.h b/Common/Math/vtkTuple.h
index d28ceea76021d368fb35d084ffdbc6264453b793..c9c49001f9a6951cabc49ebd11fbf67a2bf8140a 100644
--- a/Common/Math/vtkTuple.h
+++ b/Common/Math/vtkTuple.h
@@ -143,8 +143,8 @@ protected:
    * The only thing stored in memory!
    */
   T Data[Size];
-};
   //@}
+};
 
 //@{
 /**
diff --git a/Domains/Chemistry/vtkBlueObeliskDataParser.h b/Domains/Chemistry/vtkBlueObeliskDataParser.h
index 58c236ce60cf02a1431340c73be3333a10976476..971add224520dde06377199930e0db111ac95237 100644
--- a/Domains/Chemistry/vtkBlueObeliskDataParser.h
+++ b/Domains/Chemistry/vtkBlueObeliskDataParser.h
@@ -178,7 +178,7 @@ private:
    * and return the input pointer.
    */
   static vtkStdString * ToLower(vtkStdString *);
-};
   //@}
+};
 
 #endif
diff --git a/Filters/General/vtkBooleanOperationPolyDataFilter.h b/Filters/General/vtkBooleanOperationPolyDataFilter.h
index 5c6d74f3c77b28783be665bb273f4d51d1f28857..e9645d66a017dc2d72bd819038100c077b3a476b 100644
--- a/Filters/General/vtkBooleanOperationPolyDataFilter.h
+++ b/Filters/General/vtkBooleanOperationPolyDataFilter.h
@@ -142,7 +142,7 @@ private:
    * reversed in the difference surface.
    */
   vtkTypeBool ReorientDifferenceCells;
-};
   //@}
+};
 
 #endif
diff --git a/Filters/General/vtkQuadraturePointInterpolator.h b/Filters/General/vtkQuadraturePointInterpolator.h
index 9999312253d5b8b29654805f8095daf4fcd043ea..2c5872f351c4896e0d39143731a515373c18e280 100644
--- a/Filters/General/vtkQuadraturePointInterpolator.h
+++ b/Filters/General/vtkQuadraturePointInterpolator.h
@@ -65,7 +65,7 @@ private:
    * meta data in each data array.
    */
   int InterpolateFields(vtkUnstructuredGrid *usgOut);
-};
   //@}
+};
 
 #endif
diff --git a/Filters/General/vtkQuadratureSchemeDictionaryGenerator.h b/Filters/General/vtkQuadratureSchemeDictionaryGenerator.h
index 3ff9bf6277046dd98fd0931da846b3c27a4a31f5..f7e167ee92476f2d2537160337843ea8321afa88 100644
--- a/Filters/General/vtkQuadratureSchemeDictionaryGenerator.h
+++ b/Filters/General/vtkQuadratureSchemeDictionaryGenerator.h
@@ -63,7 +63,7 @@ private:
    * for all point data arrays.
    */
   int Generate(vtkUnstructuredGrid *usgOut);
-};
   //@}
+};
 
 #endif
diff --git a/Filters/General/vtkTemporalStatistics.h b/Filters/General/vtkTemporalStatistics.h
index 14e1c1b9776748039f911a6997f33e513055540e..a14d86fa4345f1dd53d1a6ea9f0c2159ea1bce68 100644
--- a/Filters/General/vtkTemporalStatistics.h
+++ b/Filters/General/vtkTemporalStatistics.h
@@ -176,7 +176,7 @@ private:
    * between time steps.
    */
   bool GeneratedChangingTopologyWarning;
-};
   //@}
+};
 
 #endif //_vtkTemporalStatistics_h
diff --git a/Filters/Geometry/vtkStructuredAMRNeighbor.h b/Filters/Geometry/vtkStructuredAMRNeighbor.h
index 8611b4b91c7225a1df72ab0e274a601e185ffa94..1ee31365b986d1c5d4a5a4c53efbe9ac8dbf1435 100644
--- a/Filters/Geometry/vtkStructuredAMRNeighbor.h
+++ b/Filters/Geometry/vtkStructuredAMRNeighbor.h
@@ -109,8 +109,8 @@ public:
   void ComputeSendAndReceiveExtent(
       int gridRealExtent[6], int gridGhostedExtent[6], int neiRealExtent[6],
       int WholeExtent[6], const int N) override;
-};
   //@}
+};
 
 #endif /* vtkStructuredAMRNeighbor_h */
 // VTK-HeaderTest-Exclude: vtkStructuredAMRNeighbor.h
diff --git a/Filters/Geometry/vtkStructuredNeighbor.h b/Filters/Geometry/vtkStructuredNeighbor.h
index ca3cf92ccf72267d284b7786ce7c390ef3076f71..909f279a7a887de4896f52bb4378cd18ea5943d5 100644
--- a/Filters/Geometry/vtkStructuredNeighbor.h
+++ b/Filters/Geometry/vtkStructuredNeighbor.h
@@ -126,8 +126,8 @@ public:
   virtual void ComputeSendAndReceiveExtent(
       int gridRealExtent[6], int gridGhostedExtent[6], int neiRealExtent[6],
       int WholeExtent[6], const int N);
-};
   //@}
+};
 
 #endif /* vtkStructuredNeighbor_h */
 // VTK-HeaderTest-Exclude: vtkStructuredNeighbor.h
diff --git a/Filters/Selection/vtkLinearSelector.h b/Filters/Selection/vtkLinearSelector.h
index af085a1557e5bb9c2a115996dfc51fcfa4e200dc..285272dacbfe73d40f4b896b5c0777c5f129c289 100644
--- a/Filters/Selection/vtkLinearSelector.h
+++ b/Filters/Selection/vtkLinearSelector.h
@@ -149,8 +149,8 @@ class VTKFILTERSSELECTION_EXPORT vtkLinearSelector : public vtkSelectionAlgorith
    * Default: 1e-6
    */
   double VertexEliminationTolerance;
-};
   //@}
+};
 
 
 #endif // vtkLinearSelector_h
diff --git a/IO/Exodus/vtkCPExodusIIResultsArrayTemplate.h b/IO/Exodus/vtkCPExodusIIResultsArrayTemplate.h
index 81ca7484bcff784deeb24470a3960e8e1fb43e28..dc0efa3eab02ba9fc6b0ba17e8a35cc464173cf8 100644
--- a/IO/Exodus/vtkCPExodusIIResultsArrayTemplate.h
+++ b/IO/Exodus/vtkCPExodusIIResultsArrayTemplate.h
@@ -129,8 +129,8 @@ private:
    * By default Save is false.
    */
   bool Save;
-};
   //@}
+};
 
 #include "vtkCPExodusIIResultsArrayTemplate.txx"
 
diff --git a/IO/Legacy/vtkPixelExtentIO.h b/IO/Legacy/vtkPixelExtentIO.h
index 1e0c12c462237f65eb8657927638e9d7d39b1e7c..f10b0e306167107e5f20a0e3a97708ea43bebc87 100644
--- a/IO/Legacy/vtkPixelExtentIO.h
+++ b/IO/Legacy/vtkPixelExtentIO.h
@@ -70,8 +70,8 @@ public:
         int commRank,
         const char *fileName,
         const vtkPixelExtent &ext);
-};
   //@}
+};
 
 
 /**
diff --git a/IO/Xdmf2/vtkXdmfReaderInternal.h b/IO/Xdmf2/vtkXdmfReaderInternal.h
index 11a3d9497518cba531410cb239cac9a4a4358775..fd221c464cb0d6d21f3fef5035f79e4bfd1d6a52 100644
--- a/IO/Xdmf2/vtkXdmfReaderInternal.h
+++ b/IO/Xdmf2/vtkXdmfReaderInternal.h
@@ -365,8 +365,8 @@ private:
    */
   bool UpdateGridAttributeInSIL(
     xdmf2::XdmfAttribute* xmfAttribute, vtkIdType gridSILId);
-};
   //@}
+};
 
 #endif
 #endif
diff --git a/Rendering/Annotation/vtkXYPlotActor.h b/Rendering/Annotation/vtkXYPlotActor.h
index 61eacecb865f49a319beb2afc02473ad80a4bdce..2ec46a25f2a12f0a4429cc59470c9edab505423e 100644
--- a/Rendering/Annotation/vtkXYPlotActor.h
+++ b/Rendering/Annotation/vtkXYPlotActor.h
@@ -990,8 +990,8 @@ private:
    * Estimated size of Y axis spacing
    */
   int YTitleDelta;
-};
   //@}
+};
 
 
 #endif
diff --git a/Rendering/Context2D/vtkContextScenePrivate.h b/Rendering/Context2D/vtkContextScenePrivate.h
index 36496d49a059b29d5e01ca1b827e4a5690b90481..328fe6b276f555df0973f1ebe4de7b71e3501346 100644
--- a/Rendering/Context2D/vtkContextScenePrivate.h
+++ b/Rendering/Context2D/vtkContextScenePrivate.h
@@ -178,8 +178,8 @@ public:
    * May be NULL for items in the scene itself.
    */
   vtkAbstractContextItem* Item;
-};
   //@}
+};
 
 #endif //vtkContextScenePrivate_h
 // VTK-HeaderTest-Exclude: vtkContextScenePrivate.h
diff --git a/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2DPrivate.h b/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2DPrivate.h
index fed00b2e8c8fa143bcd3d1063516e959cd6a4df2..ab4e0a94740400e8aff3e539b57b0e8c8327dddc 100644
--- a/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2DPrivate.h
+++ b/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2DPrivate.h
@@ -164,8 +164,8 @@ protected:
    * Maximum size the cache list can be.
    */
   size_t MaxSize;
-};
   //@}
+};
 
 template<class Key>
 typename vtkTextureImageCache<Key>::CacheData& vtkTextureImageCache<Key>
@@ -515,8 +515,8 @@ public:
    */
   mutable vtkTextureImageCache<UTF16TextPropertyKey> TextTextureCache;
   mutable vtkTextureImageCache<UTF8TextPropertyKey> MathTextTextureCache;
-};
   //@}
+};
 
 ///////////////////////////////////////////////////////////////////////////////////
 /**
diff --git a/Rendering/Core/vtkTDxMotionEventInfo.h b/Rendering/Core/vtkTDxMotionEventInfo.h
index 866a249aece9cc69593d7899e49c1718b568b9cd..d4dae6df3bbcf28c78ac96d5876b57d622f979af 100644
--- a/Rendering/Core/vtkTDxMotionEventInfo.h
+++ b/Rendering/Core/vtkTDxMotionEventInfo.h
@@ -58,8 +58,8 @@ public:
   double AxisX;
   double AxisY;
   double AxisZ;
-};
   //@}
+};
 
 #endif
 // VTK-HeaderTest-Exclude: vtkTDxMotionEventInfo.h
diff --git a/Rendering/FreeType/vtkFreeTypeTools.h b/Rendering/FreeType/vtkFreeTypeTools.h
index 79ad8b8525a47075e5cffb8cf5fedb6e72c5dd7c..6fa85e19a42c5560dab1bfe45284f0080fc9bfc8 100644
--- a/Rendering/FreeType/vtkFreeTypeTools.h
+++ b/Rendering/FreeType/vtkFreeTypeTools.h
@@ -531,8 +531,8 @@ private:
   template<typename T>
   void GetLineMetrics(T begin, T end, MetaData &metaData, int &width,
                       int bbox[4]);
-};
   //@}
+};
 
 // This is here to implement the Schwarz counter idiom.
 static vtkFreeTypeToolsCleanup vtkFreeTypeToolsCleanupInstance;
diff --git a/Rendering/FreeType/vtkMathTextUtilities.h b/Rendering/FreeType/vtkMathTextUtilities.h
index d0642e1f6e274b983b5a2d1b8b9008bb8701d811..0f6592118d6c3b7b158b177a27a5c6e52aa54062 100644
--- a/Rendering/FreeType/vtkMathTextUtilities.h
+++ b/Rendering/FreeType/vtkMathTextUtilities.h
@@ -146,7 +146,7 @@ private:
    */
   static vtkMathTextUtilities* Instance;
   static vtkMathTextUtilitiesCleanup Cleanup;
-};
   //@}
+};
 
 #endif
diff --git a/Rendering/LICOpenGL2/vtkTextureIO.h b/Rendering/LICOpenGL2/vtkTextureIO.h
index 79274c886910f878933f910179237c0c41da8891..3ebfa8e45a6784e9db3da9ddd0a78db3168a94cf 100644
--- a/Rendering/LICOpenGL2/vtkTextureIO.h
+++ b/Rendering/LICOpenGL2/vtkTextureIO.h
@@ -89,8 +89,8 @@ public:
   {
       Write(filename.c_str(),texture,exts,origin);
   }
-};
   //@}
+};
 
 #endif
 // VTK-HeaderTest-Exclude: vtkTextureIO.h
diff --git a/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h b/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
index aa2435b83560e09835b48c2761661b3cd9090d90..2e14577963dbd4e440189de1fb62a7c24566e5e5 100644
--- a/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
+++ b/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
@@ -162,7 +162,7 @@ private:
    * Cache the availability of matplotlib in the current python session.
    */
   static Availability MPLMathTextAvailable;
-};
   //@}
+};
 
 #endif
diff --git a/Testing/Core/vtkTestUtilities.h b/Testing/Core/vtkTestUtilities.h
index 6a57551251936180f3128e5b8240d441ef84ceef..681c34099760341c2a2194c98673c0fc76fef21c 100644
--- a/Testing/Core/vtkTestUtilities.h
+++ b/Testing/Core/vtkTestUtilities.h
@@ -74,8 +74,8 @@ struct vtkTestUtilities
                                                           const char* def,
                                                           const char* fname,
                                                           int slash = 0);
-};
   //@}
+};
 
 inline
 char* vtkTestUtilities::GetDataRoot(int argc, char* argv[])
diff --git a/Wrapping/PythonCore/vtkPythonOverload.h b/Wrapping/PythonCore/vtkPythonOverload.h
index aab744417907ddea0c437fc7a1ad306a7171f2fa..4e87cbdd85900e5b714408b9845b9dbd493d550c 100644
--- a/Wrapping/PythonCore/vtkPythonOverload.h
+++ b/Wrapping/PythonCore/vtkPythonOverload.h
@@ -60,8 +60,8 @@ public:
    */
   static PyMethodDef *FindConversionMethod(PyMethodDef *methods,
                                            PyObject *arg);
-};
   //@}
+};
 
 #endif
 // VTK-HeaderTest-Exclude: vtkPythonOverload.h