diff --git a/gdal/keaband.cpp b/gdal/keaband.cpp
index 9434b7f..b96f1d9 100644
--- a/gdal/keaband.cpp
+++ b/gdal/keaband.cpp
@@ -679,7 +679,7 @@ CPLErr KEARasterBand::GetDefaultHistogram( double *pdfMin, double *pdfMax,
 {
     if( bForce )
     {
-        return GDALPamRasterBand::GetDefaultHistogram(pdfMin, pdfMax, pnBuckets, 
+        return GDALRasterBand::GetDefaultHistogram(pdfMin, pdfMax, pnBuckets, 
                         ppanHistogram, bForce, fn, pProgressData);
     }
     else
@@ -1284,7 +1284,7 @@ GDALRasterBand* KEARasterBand::GetMaskBand()
             {
                 // use the base class implementation - GDAL will delete
                 //fprintf( stderr, "returning base GetMaskBand()\n" );
-                m_pMaskBand = GDALPamRasterBand::GetMaskBand();
+                m_pMaskBand = GDALRasterBand::GetMaskBand();
             }
         }
         catch(const kealib::KEAException &e)
@@ -1304,7 +1304,7 @@ int KEARasterBand::GetMaskFlags()
             // need to return the base class one since we are using
             // the base class implementation of GetMaskBand()
             //fprintf( stderr, "returning base GetMaskFlags()\n" );
-            return GDALPamRasterBand::GetMaskFlags();
+            return GDALRasterBand::GetMaskFlags();
         }
     }
     catch(const kealib::KEAException &e)
diff --git a/gdal/keaband.h b/gdal/keaband.h
index 9dcc84a..4e95db9 100644
--- a/gdal/keaband.h
+++ b/gdal/keaband.h
@@ -30,7 +30,7 @@
 #ifndef KEABAND_H
 #define KEABAND_H
 
-#include "gdal_pam.h"
+#include "gdal_priv.h"
 
 #if (GDAL_VERSION_MAJOR > 3) || ((GDAL_VERSION_MAJOR == 3) && (GDAL_VERSION_MINOR >= 5))
     #define HAVE_64BITIMAGES
@@ -52,7 +52,7 @@ class KEAOverview;
 class KEAMaskBand;
 
 // Provides the implementation of a GDAL raster band
-class KEARasterBand : public GDALPamRasterBand
+class KEARasterBand : public GDALRasterBand
 {
 private:
     LockedRefCount      *m_pRefCount; // reference count of m_pImageIO
diff --git a/gdal/keadataset.h b/gdal/keadataset.h
index 56868dc..1961dcf 100644
--- a/gdal/keadataset.h
+++ b/gdal/keadataset.h
@@ -30,14 +30,14 @@
 #ifndef KEADATASET_H
 #define KEADATASET_H
 
-#include "gdal_pam.h"
+#include "gdal_priv.h"
 #include "cpl_multiproc.h"
 #include "libkea/KEAImageIO.h"
 
 class LockedRefCount;
 
 // class that implements a GDAL dataset
-class KEADataset : public GDALPamDataset
+class KEADataset : public GDALDataset
 {
 public:
     // constructor/destructor