9 files changed, 16 insertions, 20 deletions
diff --git a/core/fpdfapi/parser/cpdf_read_validator.h b/core/fpdfapi/parser/cpdf_read_validator.h
index 31c33fa36a..281a2ea194 100644
--- a/core/fpdfapi/parser/cpdf_read_validator.h
+++ b/core/fpdfapi/parser/cpdf_read_validator.h
@@ -10,9 +10,6 @@
 
 class CPDF_ReadValidator : public IFX_SeekableReadStream {
  public:
-  template <typename T, typename... Args>
-  friend RetainPtr<T> pdfium::MakeRetain(Args&&... args);
-
   class Session {
    public:
     explicit Session(CPDF_ReadValidator* validator);
@@ -28,6 +25,9 @@ class CPDF_ReadValidator : public IFX_SeekableReadStream {
     hints_ = hints;
   }
 
+  template <typename T, typename... Args>
+  friend RetainPtr<T> pdfium::MakeRetain(Args&&... args);
+
   bool read_error() const { return read_error_; }
   bool has_unavailable_data() const { return has_unavailable_data_; }
 
diff --git a/core/fpdfapi/render/cpdf_dibsource.h b/core/fpdfapi/render/cpdf_dibsource.h
index 4646bf2fe9..50d9c6ef9c 100644
--- a/core/fpdfapi/render/cpdf_dibsource.h
+++ b/core/fpdfapi/render/cpdf_dibsource.h
@@ -41,12 +41,10 @@ struct DIB_COMP_DATA {
 
 class CPDF_DIBSource : public CFX_DIBSource {
  public:
-  template <typename T, typename... Args>
-  friend RetainPtr<T> pdfium::MakeRetain(Args&&... args);
-
   enum class LoadState : uint8_t { kFail, kSuccess, kContinue };
 
-  ~CPDF_DIBSource() override;
+  template <typename T, typename... Args>
+  friend RetainPtr<T> pdfium::MakeRetain(Args&&... args);
 
   bool Load(CPDF_Document* pDoc, const CPDF_Stream* pStream);
 
@@ -80,6 +78,7 @@ class CPDF_DIBSource : public CFX_DIBSource {
 
  private:
   CPDF_DIBSource();
+  ~CPDF_DIBSource() override;
 
   LoadState StartLoadMask();
   LoadState StartLoadMaskDIB();
diff --git a/core/fpdfapi/render/cpdf_dibtransferfunc.h b/core/fpdfapi/render/cpdf_dibtransferfunc.h
index 34f5bb1abe..61abd2e23c 100644
--- a/core/fpdfapi/render/cpdf_dibtransferfunc.h
+++ b/core/fpdfapi/render/cpdf_dibtransferfunc.h
@@ -20,8 +20,6 @@ class CPDF_DIBTransferFunc : public CFX_FilteredDIB {
   template <typename T, typename... Args>
   friend RetainPtr<T> pdfium::MakeRetain(Args&&... args);
 
-  ~CPDF_DIBTransferFunc() override;
-
   // CFX_FilteredDIB
   FXDIB_Format GetDestFormat() override;
   FX_ARGB* GetDestPalette() override;
@@ -35,6 +33,7 @@ class CPDF_DIBTransferFunc : public CFX_FilteredDIB {
  private:
   explicit CPDF_DIBTransferFunc(
       const RetainPtr<CPDF_TransferFunc>& pTransferFunc);
+  ~CPDF_DIBTransferFunc() override;
 
   RetainPtr<CPDF_TransferFunc> m_pTransferFunc;
   const uint8_t* m_RampR;
diff --git a/core/fpdfdoc/cpdf_occontext.h b/core/fpdfdoc/cpdf_occontext.h
index 07b41cc552..c47b93311d 100644
--- a/core/fpdfdoc/cpdf_occontext.h
+++ b/core/fpdfdoc/cpdf_occontext.h
@@ -19,11 +19,11 @@ class CPDF_PageObject;
 
 class CPDF_OCContext : public Retainable {
  public:
+  enum UsageType { View = 0, Design, Print, Export };
+
   template <typename T, typename... Args>
   friend RetainPtr<T> pdfium::MakeRetain(Args&&... args);
 
-  enum UsageType { View = 0, Design, Print, Export };
-
   bool CheckOCGVisible(const CPDF_Dictionary* pOCGDict);
   bool CheckObjectVisible(const CPDF_PageObject* pObj);
 
diff --git a/core/fxcrt/cfx_seekablestreamproxy.h b/core/fxcrt/cfx_seekablestreamproxy.h
index d389baf13f..9b6b3a11c9 100644
--- a/core/fxcrt/cfx_seekablestreamproxy.h
+++ b/core/fxcrt/cfx_seekablestreamproxy.h
@@ -23,6 +23,7 @@ class CFX_SeekableStreamProxy : public IFX_SeekableReadStream {
   template <typename T, typename... Args>
   friend RetainPtr<T> pdfium::MakeRetain(Args&&... args);
 
+  // IFX_SeekableReadStream:
   FX_FILESIZE GetSize() override;
   FX_FILESIZE GetPosition() override;
   bool IsEOF() override;
diff --git a/core/fxcrt/css/cfx_csscomputedstyle.h b/core/fxcrt/css/cfx_csscomputedstyle.h
index 4b44a6d87c..5080a7a3c2 100644
--- a/core/fxcrt/css/cfx_csscomputedstyle.h
+++ b/core/fxcrt/css/cfx_csscomputedstyle.h
@@ -55,6 +55,9 @@ class CFX_CSSComputedStyle : public Retainable {
     bool m_bHasPadding;
   };
 
+  template <typename T, typename... Args>
+  friend RetainPtr<T> pdfium::MakeRetain(Args&&... args);
+
   int32_t CountFontFamilies() const;
   const WideString GetFontFamily(int32_t index) const;
   uint16_t GetFontWeight() const;
@@ -97,9 +100,6 @@ class CFX_CSSComputedStyle : public Retainable {
   NonInheritedData m_NonInheritedData;
 
  private:
-  template <typename T, typename... Args>
-  friend RetainPtr<T> pdfium::MakeRetain(Args&&... args);
-
   CFX_CSSComputedStyle();
   ~CFX_CSSComputedStyle() override;
 
diff --git a/core/fxge/dib/cfx_dibitmap.h b/core/fxge/dib/cfx_dibitmap.h
index 105a22d76e..008a549bac 100644
--- a/core/fxge/dib/cfx_dibitmap.h
+++ b/core/fxge/dib/cfx_dibitmap.h
@@ -18,8 +18,6 @@ class CFX_DIBitmap : public CFX_DIBSource {
   template <typename T, typename... Args>
   friend RetainPtr<T> pdfium::MakeRetain(Args&&... args);
 
-  ~CFX_DIBitmap() override;
-
   bool Create(int width,
               int height,
               FXDIB_Format format,
@@ -111,6 +109,7 @@ class CFX_DIBitmap : public CFX_DIBSource {
  protected:
   CFX_DIBitmap();
   CFX_DIBitmap(const CFX_DIBitmap& src);
+  ~CFX_DIBitmap() override;
 
 #if defined _SKIA_SUPPORT_PATHS_
   enum class Format { kCleared, kPreMultiplied, kUnPreMultiplied };
diff --git a/core/fxge/dib/cfx_filtereddib.h b/core/fxge/dib/cfx_filtereddib.h
index e998c7169a..9c1efa544d 100644
--- a/core/fxge/dib/cfx_filtereddib.h
+++ b/core/fxge/dib/cfx_filtereddib.h
@@ -17,8 +17,6 @@ class CFX_FilteredDIB : public CFX_DIBSource {
   template <typename T, typename... Args>
   friend RetainPtr<T> pdfium::MakeRetain(Args&&... args);
 
-  ~CFX_FilteredDIB() override;
-
   virtual FXDIB_Format GetDestFormat() = 0;
   virtual uint32_t* GetDestPalette() = 0;
   virtual void TranslateScanline(const uint8_t* src_buf,
@@ -32,6 +30,7 @@ class CFX_FilteredDIB : public CFX_DIBSource {
 
  protected:
   CFX_FilteredDIB();
+  ~CFX_FilteredDIB() override;
 
   // CFX_DIBSource
   const uint8_t* GetScanline(int line) const override;
diff --git a/core/fxge/win32/cfx_windowsdib.h b/core/fxge/win32/cfx_windowsdib.h
index 7c2447ded2..3120b8f543 100644
--- a/core/fxge/win32/cfx_windowsdib.h
+++ b/core/fxge/win32/cfx_windowsdib.h
@@ -32,8 +32,6 @@ class CFX_WindowsDIB : public CFX_DIBitmap {
   template <typename T, typename... Args>
   friend RetainPtr<T> pdfium::MakeRetain(Args&&... args);
 
-  ~CFX_WindowsDIB() override;
-
   static ByteString GetBitmapInfo(const RetainPtr<CFX_DIBitmap>& pBitmap);
   static HBITMAP GetDDBitmap(const RetainPtr<CFX_DIBitmap>& pBitmap, HDC hDC);
 
@@ -49,6 +47,7 @@ class CFX_WindowsDIB : public CFX_DIBitmap {
 
  protected:
   CFX_WindowsDIB(HDC hDC, int width, int height);
+  ~CFX_WindowsDIB() override;
 
   HDC m_hMemDC;
   HBITMAP m_hBitmap;