diff --git a/toonz/sources/image/ffmpeg/tiio_gif.h b/toonz/sources/image/ffmpeg/tiio_gif.h
index 59587fa..2380b76 100644
--- a/toonz/sources/image/ffmpeg/tiio_gif.h
+++ b/toonz/sources/image/ffmpeg/tiio_gif.h
@@ -92,6 +92,6 @@ public:
 // Tiio::Reader *makeGifReader();
 // Tiio::Writer *makeGifWriter();
 
-}  // namespace
+}  // namespace Tiio
 
 #endif
diff --git a/toonz/sources/image/ffmpeg/tiio_mp4.h b/toonz/sources/image/ffmpeg/tiio_mp4.h
index 718faec..d7caae1 100644
--- a/toonz/sources/image/ffmpeg/tiio_mp4.h
+++ b/toonz/sources/image/ffmpeg/tiio_mp4.h
@@ -88,6 +88,6 @@ public:
 // Tiio::Reader *makeMp4Reader();
 // Tiio::Writer *makeMp4Writer();
 
-}  // namespace
+}  // namespace Tiio
 
 #endif
diff --git a/toonz/sources/image/ffmpeg/tiio_webm.h b/toonz/sources/image/ffmpeg/tiio_webm.h
index a3c4af7..cfee346 100644
--- a/toonz/sources/image/ffmpeg/tiio_webm.h
+++ b/toonz/sources/image/ffmpeg/tiio_webm.h
@@ -87,6 +87,6 @@ public:
 // Tiio::Reader *makeWebmReader();
 // Tiio::Writer *makeWebmWriter();
 
-}  // namespace
+}  // namespace Tiio
 
 #endif
diff --git a/toonz/sources/image/sprite/tiio_sprite.h b/toonz/sources/image/sprite/tiio_sprite.h
index e555e06..ae4d3b1 100644
--- a/toonz/sources/image/sprite/tiio_sprite.h
+++ b/toonz/sources/image/sprite/tiio_sprite.h
@@ -65,6 +65,6 @@ public:
 
 //===========================================================================
 
-}  // namespace
+}  // namespace Tiio
 
 #endif
diff --git a/toonz/sources/include/toonz/stagevisitor.h b/toonz/sources/include/toonz/stagevisitor.h
index 781491e..f5cbdf4 100644
--- a/toonz/sources/include/toonz/stagevisitor.h
+++ b/toonz/sources/include/toonz/stagevisitor.h
@@ -343,7 +343,7 @@ public:
 
   void onImage(const Stage::Player &data) override;
   void onVectorImage(TVectorImage *vi, const Stage::Player &data);
-  void onRasterImage(TRasterImage *ri, const Stage::Player &data) override;
+  void onRasterImage(TRasterImage *ri, const Stage::Player &data);
   void onToonzImage(TToonzImage *ti, const Stage::Player &data);
 
   void beginMask() override;
diff --git a/toonz/sources/stdfx/ino_line_blur.cpp b/toonz/sources/stdfx/ino_line_blur.cpp
index dbe9632..9da636a 100644
--- a/toonz/sources/stdfx/ino_line_blur.cpp
+++ b/toonz/sources/stdfx/ino_line_blur.cpp
@@ -6536,7 +6536,8 @@ public:
       bBox = bBox.enlarge(static_cast<double>(margin));
     }
   }
-  bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override {
+  bool doGetBBox(double frame, TRectD &bBox,
+                 const TRenderSettings &info) override {
     if (false == this->m_input.isConnected()) {
       bBox = TRectD();
       return false;
@@ -6562,7 +6563,8 @@ public:
     // return true;/* geometry処理済の画像に加工することになる */
     return false; /* ここでの処理後にgeometryがかかる */
   }
-  void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override;
+  void doCompute(TTile &tile, double frame,
+                 const TRenderSettings &rend_sets) override;
 };
 
 FX_PLUGIN_IDENTIFIER(ino_line_blur, "inoLineBlurFx");
diff --git a/toonz/sources/stdfx/iwa_bokehfx.h b/toonz/sources/stdfx/iwa_bokehfx.h
index 9d3b6f7..8fc309a 100644
--- a/toonz/sources/stdfx/iwa_bokehfx.h
+++ b/toonz/sources/stdfx/iwa_bokehfx.h
@@ -139,9 +139,11 @@ protected:
 public:
   Iwa_BokehFx();
 
-  void doCompute(TTile &tile, double frame, const TRenderSettings &settings) override;
+  void doCompute(TTile &tile, double frame,
+                 const TRenderSettings &settings) override;
 
-  bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override;
+  bool doGetBBox(double frame, TRectD &bBox,
+                 const TRenderSettings &info) override;
 
   bool canHandle(const TRenderSettings &info, double frame) override;
 };
diff --git a/toonz/sources/stdfx/iwa_bokehreffx.h b/toonz/sources/stdfx/iwa_bokehreffx.h
index 88b99e7..0aa8893 100644
--- a/toonz/sources/stdfx/iwa_bokehreffx.h
+++ b/toonz/sources/stdfx/iwa_bokehreffx.h
@@ -176,9 +176,11 @@ protected:
 public:
   Iwa_BokehRefFx();
 
-  void doCompute(TTile& tile, double frame, const TRenderSettings& settings) override;
+  void doCompute(TTile& tile, double frame,
+                 const TRenderSettings& settings) override;
 
-  bool doGetBBox(double frame, TRectD& bBox, const TRenderSettings& info) override;
+  bool doGetBBox(double frame, TRectD& bBox,
+                 const TRenderSettings& info) override;
 
   bool canHandle(const TRenderSettings& info, double frame) override;
 
diff --git a/toonz/sources/stdfx/iwa_glarefx.h b/toonz/sources/stdfx/iwa_glarefx.h
index 1ad79e3..51b9ddb 100644
--- a/toonz/sources/stdfx/iwa_glarefx.h
+++ b/toonz/sources/stdfx/iwa_glarefx.h
@@ -89,9 +89,11 @@ protected:
 public:
   Iwa_GlareFx();
 
-  void doCompute(TTile &tile, double frame, const TRenderSettings &settings) override;
+  void doCompute(TTile &tile, double frame,
+                 const TRenderSettings &settings) override;
 
-  bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override;
+  bool doGetBBox(double frame, TRectD &bBox,
+                 const TRenderSettings &info) override;
 
   bool canHandle(const TRenderSettings &info, double frame) override;
 
diff --git a/toonz/sources/tnztools/skeletontool.h b/toonz/sources/tnztools/skeletontool.h
index 98fc5f3..9e8f754 100644
--- a/toonz/sources/tnztools/skeletontool.h
+++ b/toonz/sources/tnztools/skeletontool.h
@@ -35,7 +35,7 @@ public:
       : m_h0(h0), m_h1(h1), m_dist2(dist2) {}
   bool operator<(const MagicLink &link) const { return m_dist2 < link.m_dist2; }
 };
-}
+}  // namespace SkeletonSubtools
 
 class SkeletonTool : public TTool {
   Q_DECLARE_TR_FUNCTIONS(SkeletonTool)
diff --git a/toonz/sources/toonzlib/imagebuilders.h b/toonz/sources/toonzlib/imagebuilders.h
index 55a4271..5284666 100644
--- a/toonz/sources/toonzlib/imagebuilders.h
+++ b/toonz/sources/toonzlib/imagebuilders.h
@@ -60,7 +60,7 @@ public:
                                   bool cacheImagesAsWell) override;
 
   /* Exposed to allow Fid to be updated due to a renumber operation
-  */
+   */
   void setFid(const TFrameId &fid) override;
 
 protected: