diff --git a/.pick_status.json b/.pick_status.json
index e478d76c59f..32176d8b405 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -76,7 +76,7 @@
         "description": "aco: include <cstddef> in aco_util.h",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "59fdaa1985f9269c40f0ca4704fbeb3fb05c4c2f"
     },
diff --git a/src/amd/compiler/aco_util.h b/src/amd/compiler/aco_util.h
index 88f52182a5f..2b32e94a805 100644
--- a/src/amd/compiler/aco_util.h
+++ b/src/amd/compiler/aco_util.h
@@ -29,6 +29,7 @@
 #include "util/bitscan.h"
 
 #include <cassert>
+#include <cstddef>
 #include <iterator>
 #include <vector>
 
@@ -51,7 +52,7 @@ public:
    using reverse_iterator = std::reverse_iterator<iterator>;
    using const_reverse_iterator = std::reverse_iterator<const_iterator>;
    using size_type = uint16_t;
-   using difference_type = ptrdiff_t;
+   using difference_type = std::ptrdiff_t;
 
    /*! \brief                  Compiler generated default constructor
     */