diff --git a/include/mapnik/tiff_io.hpp b/include/mapnik/tiff_io.hpp
index 6e818f34f..1d09f84ed 100644
--- a/include/mapnik/tiff_io.hpp
+++ b/include/mapnik/tiff_io.hpp
@@ -207,12 +207,12 @@ struct tag_setter
         TIFFSetField(output_, TIFFTAG_SAMPLESPERPIXEL, 4);
         if (data.get_premultiplied())
         {
-            uint16 extras[] = {EXTRASAMPLE_ASSOCALPHA};
+            std::uint16_t extras[] = {EXTRASAMPLE_ASSOCALPHA};
             TIFFSetField(output_, TIFFTAG_EXTRASAMPLES, 1, extras);
         }
         else
         {
-            uint16 extras[] = {EXTRASAMPLE_UNASSALPHA};
+            std::uint16_t extras[] = {EXTRASAMPLE_UNASSALPHA};
             TIFFSetField(output_, TIFFTAG_EXTRASAMPLES, 1, extras);
         }
         if (config_.compression == COMPRESSION_DEFLATE || config_.compression == COMPRESSION_ADOBE_DEFLATE ||
diff --git a/src/tiff_reader.hpp b/src/tiff_reader.hpp
index edf9124d8..08fe2df92 100644
--- a/src/tiff_reader.hpp
+++ b/src/tiff_reader.hpp
@@ -253,8 +253,8 @@ void tiff_reader<T>::init()
         read_method_ = stripped;
     }
     // TIFFTAG_EXTRASAMPLES
-    uint16 extrasamples = 0;
-    uint16* sampleinfo = nullptr;
+    std::uint16_t extrasamples = 0;
+    std::uint16_t* sampleinfo = nullptr;
     if (TIFFGetField(tif, TIFFTAG_EXTRASAMPLES, &extrasamples, &sampleinfo))
     {
         has_alpha_ = true;
@@ -265,7 +265,7 @@ void tiff_reader<T>::init()
     }
     // Try extracting bounding box from geoTIFF tags
     {
-        uint16 count = 0;
+        std::uint16_t count = 0;
         double* pixelscale;
         double* tilepoint;
         if (TIFFGetField(tif, 33550, &count, &pixelscale) == 1 && count == 3 &&