diff --git a/include/coordinate b/include/coordinate
index 882f7a1e4bf..959e6d624e0 100644
--- a/include/coordinate
+++ b/include/coordinate
@@ -186,7 +186,7 @@ public:
     }
 };
  
-extern "C" __attribute__((const)) __int64_t amp_get_global_id(unsigned int n) restrict(amp);
+extern "C" __attribute__((const)) uint32_t amp_get_global_id(unsigned int n) restrict(amp);
 
 template<size_t N> class offset;
 
diff --git a/include/hc_defines.h b/include/hc_defines.h
index 1f283b8c0ab..15e933aaf22 100644
--- a/include/hc_defines.h
+++ b/include/hc_defines.h
@@ -30,19 +30,19 @@ namespace hc {
 //
 // work-item related builtin functions
 //
-extern "C" __attribute__((const,hc)) int64_t hc_get_grid_size(unsigned int n);
-extern "C" __attribute__((const,hc)) int64_t hc_get_workitem_absolute_id(unsigned int n);
-extern "C" __attribute__((const,hc)) int64_t hc_get_group_size(unsigned int n);
-extern "C" __attribute__((const,hc)) int64_t hc_get_workitem_id(unsigned int n);
-extern "C" __attribute__((const,hc)) int64_t hc_get_num_groups(unsigned int n);
-extern "C" __attribute__((const,hc)) int64_t hc_get_group_id(unsigned int n);
+extern "C" __attribute__((const,hc)) uint32_t hc_get_grid_size(unsigned int n);
+extern "C" __attribute__((const,hc)) uint32_t hc_get_workitem_absolute_id(unsigned int n);
+extern "C" __attribute__((const,hc)) uint32_t hc_get_group_size(unsigned int n);
+extern "C" __attribute__((const,hc)) uint32_t hc_get_workitem_id(unsigned int n);
+extern "C" __attribute__((const,hc)) uint32_t hc_get_num_groups(unsigned int n);
+extern "C" __attribute__((const,hc)) uint32_t hc_get_group_id(unsigned int n);
 
-extern "C" __attribute__((const,amp)) int64_t amp_get_global_size(unsigned int n);
-extern "C" __attribute__((const,amp)) int64_t amp_get_global_id(unsigned int n); 
-extern "C" __attribute__((const,amp)) int64_t amp_get_local_size(unsigned int n);
-extern "C" __attribute__((const,amp)) int64_t amp_get_local_id(unsigned int n);
-extern "C" __attribute__((const,amp)) int64_t amp_get_num_groups(unsigned int n);
-extern "C" __attribute__((const,amp)) int64_t amp_get_group_id(unsigned int n);
+extern "C" __attribute__((const,amp)) uint32_t amp_get_global_size(unsigned int n);
+extern "C" __attribute__((const,amp)) uint32_t amp_get_global_id(unsigned int n);
+extern "C" __attribute__((const,amp)) uint32_t amp_get_local_size(unsigned int n);
+extern "C" __attribute__((const,amp)) uint32_t amp_get_local_id(unsigned int n);
+extern "C" __attribute__((const,amp)) uint32_t amp_get_num_groups(unsigned int n);
+extern "C" __attribute__((const,amp)) uint32_t amp_get_group_id(unsigned int n);
 
 #if __KALMAR_ACCELERATOR__ == 2
 #define tile_static thread_local
diff --git a/rocdl b/rocdl
index 6f09e8f173a..a57dee34eb4 160000
--- a/rocdl
+++ b/rocdl
@@ -1 +1 @@
-Subproject commit 6f09e8f173a155ace913d19d48891fa6c7fb83b5
+Subproject commit a57dee34eb478e660646929b1d1261577493d458