diff --git a/hipamd/include/hip/amd_detail/amd_device_functions.h b/hipamd/include/hip/amd_detail/amd_device_functions.h
index f2f849db5a..592bf2c4c5 100644
--- a/hipamd/include/hip/amd_detail/amd_device_functions.h
+++ b/hipamd/include/hip/amd_detail/amd_device_functions.h
@@ -33,7 +33,6 @@ THE SOFTWARE.
 
 #include <hip/hip_vector_types.h>
 #include <hip/amd_detail/device_library_decls.h>
-#include <hip/amd_detail/llvm_intrinsics.h>
 
 #if __HIP_CLANG_ONLY__
 extern "C" __device__ int printf(const char *fmt, ...);
@@ -758,7 +757,7 @@ inline
 void* __get_dynamicgroupbaseptr()
 {
     // Get group segment base pointer.
-    return (char*)__local_to_generic((void*)__to_local(__llvm_amdgcn_groupstaticsize()));
+    return (char*)__local_to_generic((void*)__to_local(__builtin_amdgcn_groupstaticsize()));
 }
 #else
 __device__
diff --git a/hipamd/include/hip/amd_detail/llvm_intrinsics.h b/hipamd/include/hip/amd_detail/llvm_intrinsics.h
deleted file mode 100644
index 17841ecde7..0000000000
--- a/hipamd/include/hip/amd_detail/llvm_intrinsics.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-/**
- *  @file  amd_detail/llvm_intrinsics.h
- *  @brief Contains declarations for wrapper functions for llvm intrinsics
- *         like llvm.amdgcn.s.barrier.
- */
-
-#ifndef HIP_INCLUDE_HIP_AMD_DETAIL_LLVM_INTRINSICS_H
-#define HIP_INCLUDE_HIP_AMD_DETAIL_LLVM_INTRINSICS_H
-
-#include "hip/amd_detail/host_defines.h"
-
-// FIXME: These should all be removed and proper builtins used.
-__device__
-unsigned __llvm_amdgcn_groupstaticsize() __asm("llvm.amdgcn.groupstaticsize");
-
-#endif