diff --git a/rocclr/runtime/device/pal/palappprofile.hpp b/rocclr/runtime/device/pal/palappprofile.hpp
index 63f4965d0f..6f079b34c8 100644
--- a/rocclr/runtime/device/pal/palappprofile.hpp
+++ b/rocclr/runtime/device/pal/palappprofile.hpp
@@ -1,9 +1,7 @@
 //
 // Copyright (c) 2015 Advanced Micro Devices, Inc. All rights reserved.
 //
-
-#ifndef PALAPPPROFILE_HPP_
-#define PALAPPPROFILE_HPP_
+#pragma once
 
 #include <string>
 #include <map>
@@ -26,5 +24,3 @@ private:
 };
 
 }
-
-#endif // PALAPPPROFILE_HPP_
diff --git a/rocclr/runtime/device/pal/palbinary.hpp b/rocclr/runtime/device/pal/palbinary.hpp
index 5026663a8f..39da3da2b0 100644
--- a/rocclr/runtime/device/pal/palbinary.hpp
+++ b/rocclr/runtime/device/pal/palbinary.hpp
@@ -1,8 +1,7 @@
 //
 // Copyright (c) 2015 Advanced Micro Devices, Inc. All rights reserved.
 //
-#ifndef PALBINARY_HPP_
-#define PALBINARY_HPP_
+#pragma once
 
 #include "top.hpp"
 #include "device/pal/paldevice.hpp"
@@ -44,5 +43,3 @@ private:
 
 } // namespace pal
 
-#endif // PALBINARY_HPP_
-
diff --git a/rocclr/runtime/device/pal/palblit.hpp b/rocclr/runtime/device/pal/palblit.hpp
index 2a2915f753..462842dd60 100644
--- a/rocclr/runtime/device/pal/palblit.hpp
+++ b/rocclr/runtime/device/pal/palblit.hpp
@@ -1,8 +1,7 @@
 //
 // Copyright (c) 2015 Advanced Micro Devices, Inc. All rights reserved.
 //
-#ifndef PALBLIT_HPP_
-#define PALBLIT_HPP_
+#pragma once
 
 #include "top.hpp"
 #include "platform/command.hpp"
@@ -448,4 +447,3 @@ static const char* BlitName[KernelBlitManager::BlitTotal] = {
 
 /*@}*/} // namespace pal
 
-#endif /*PALBLIT_HPP_*/
diff --git a/rocclr/runtime/device/pal/palconstbuf.hpp b/rocclr/runtime/device/pal/palconstbuf.hpp
index 4d447b084d..ff66c1e176 100644
--- a/rocclr/runtime/device/pal/palconstbuf.hpp
+++ b/rocclr/runtime/device/pal/palconstbuf.hpp
@@ -1,9 +1,7 @@
 //
 // Copyright (c) 2015 Advanced Micro Devices, Inc. All rights reserved.
 //
-
-#ifndef PALCONSTBUF_HPP_
-#define PALCONSTBUF_HPP_
+#pragma once
 
 #include "device/pal/palmemory.hpp"
 
@@ -64,7 +62,5 @@ private:
     void*       wrtAddress_;    //!< Write address in CB
 };
 
-
 /*@}*/} // namespace pal
 
-#endif /*PALCONSTBUF_HPP_*/
diff --git a/rocclr/runtime/device/pal/palcounters.hpp b/rocclr/runtime/device/pal/palcounters.hpp
index 9dc727f069..0d4216e7f8 100644
--- a/rocclr/runtime/device/pal/palcounters.hpp
+++ b/rocclr/runtime/device/pal/palcounters.hpp
@@ -1,8 +1,7 @@
 //
 // Copyright (c) 2015 Advanced Micro Devices, Inc. All rights reserved.
 //
-#ifndef PALCOUNTERS_HPP_
-#define PALCOUNTERS_HPP_
+#pragma once
 
 #include "top.hpp"
 #include "device/device.hpp"
@@ -148,5 +147,4 @@ private:
 
 } // namespace pal
 
-#endif // PALCOUNTERS_HPP_
 
diff --git a/rocclr/runtime/device/pal/paldebugger.hpp b/rocclr/runtime/device/pal/paldebugger.hpp
index 5a96b3f552..162a5c4a6f 100644
--- a/rocclr/runtime/device/pal/paldebugger.hpp
+++ b/rocclr/runtime/device/pal/paldebugger.hpp
@@ -1,8 +1,7 @@
 //
 // Copyright (c) 2015 Advanced Micro Devices, Inc. All rights reserved.
 //
-#ifndef PALDEBGGER_H_
-#define PALDEBGGER_H_
+#pragma once
 
 #include <cstddef>
 #include <cstdint>
@@ -118,4 +117,3 @@ struct AqlCodeInfo
 
 }  // namespace pal
 
-#endif  // PALDEBGGER_H_
diff --git a/rocclr/runtime/device/pal/paldebugmanager.hpp b/rocclr/runtime/device/pal/paldebugmanager.hpp
index dc39d21e33..52a131f2b3 100644
--- a/rocclr/runtime/device/pal/paldebugmanager.hpp
+++ b/rocclr/runtime/device/pal/paldebugmanager.hpp
@@ -1,8 +1,7 @@
 //
 // Copyright (c) 2015 Advanced Micro Devices, Inc. All rights reserved.
 //
-#ifndef PALDEBUGMANAGER_H__
-#define PALDEBUGMANAGER_H__
+#pragma once
 
 #include "device/pal/palvirtual.hpp"
 #include "device/pal/paldebugger.hpp"
@@ -113,5 +112,3 @@ private:
 };
 
 }  // namespace pal
-
-#endif // PALDEBUGMANAGER_H__
diff --git a/rocclr/runtime/device/pal/paldefs.hpp b/rocclr/runtime/device/pal/paldefs.hpp
index 9fe2dec2b5..16f7284913 100644
--- a/rocclr/runtime/device/pal/paldefs.hpp
+++ b/rocclr/runtime/device/pal/paldefs.hpp
@@ -1,8 +1,7 @@
 //
 // Copyright (c) 2015 Advanced Micro Devices, Inc. All rights reserved.
 //
-#ifndef PALDEFS_HPP_
-#define PALDEFS_HPP_
+#pragma once
 
 #include "top.hpp"
 #include "pal.h"
@@ -581,4 +580,3 @@ MemoryFormatMap[] = {
 
 } // namespace pal
 
-#endif // PALDEFS_HPP_
diff --git a/rocclr/runtime/device/pal/paldevice.hpp b/rocclr/runtime/device/pal/paldevice.hpp
index a1c32b595d..c629fcb6c4 100644
--- a/rocclr/runtime/device/pal/paldevice.hpp
+++ b/rocclr/runtime/device/pal/paldevice.hpp
@@ -1,8 +1,7 @@
 //
 // Copyright (c) 2015 Advanced Micro Devices, Inc. All rights reserved.
 //
-#ifndef PALDEVICE_HPP_
-#define PALDEVICE_HPP_
+#pragma once
 
 #include "top.hpp"
 #include "device/device.hpp"
@@ -22,7 +21,6 @@
 #include "acl.h"
 #include "memory"
 
-
 /*! \addtogroup PAL
  *  @{
  */
@@ -559,4 +557,3 @@ private:
 
 /*@}*/} // namespace pal
 
-#endif /*PALDEVICE_HPP_*/
diff --git a/rocclr/runtime/device/pal/palkernel.cpp b/rocclr/runtime/device/pal/palkernel.cpp
index 3b2e7f5617..b0ecebae14 100644
--- a/rocclr/runtime/device/pal/palkernel.cpp
+++ b/rocclr/runtime/device/pal/palkernel.cpp
@@ -10,7 +10,6 @@
 #include "utils/options.hpp"
 
 #include "acl.h"
-#include "SCShadersR678XXCommon.h"
 
 #include <string>
 #include <memory>
diff --git a/rocclr/runtime/device/pal/palkernel.hpp b/rocclr/runtime/device/pal/palkernel.hpp
index 73d9dbddff..93a4609b77 100644
--- a/rocclr/runtime/device/pal/palkernel.hpp
+++ b/rocclr/runtime/device/pal/palkernel.hpp
@@ -1,8 +1,7 @@
 //
 // Copyright (c) 2015 Advanced Micro Devices, Inc. All rights reserved.
 //
-#ifndef GPUKERNEL_HPP_
-#define GPUKERNEL_HPP_
+#pragma once
 
 #include "device/device.hpp"
 #include "utils/macros.hpp"
@@ -33,24 +32,6 @@ class Device;
 class NullDevice;
 class HSAILProgram;
 
-struct HWSHADER_Helper
-{
-    template <typename S, typename T>
-    static T Get(S base, T offset) {
-        return reinterpret_cast<T>(reinterpret_cast<intptr_t>(base)
-            + reinterpret_cast<size_t>(offset));
-    }
-};
-
-#define HWSHADER_Get(shader, field) \
-    HWSHADER_Helper::Get((shader), (shader)->field)
-
-template <typename D, typename S>
-static void CalcPtr(D& dst, const S src, size_t structSize, size_t size) {
-    dst = reinterpret_cast<D>(reinterpret_cast<const intptr_t>(src)
-            + structSize * size);
-}
-
 /*! \addtogroup pal PAL Device Implementation
  *  @{
  */
@@ -260,4 +241,3 @@ private:
 
 /*@}*/} // namespace pal
 
-#endif /*PALKERNEL_HPP_*/
diff --git a/rocclr/runtime/device/pal/palmemory.hpp b/rocclr/runtime/device/pal/palmemory.hpp
index eae4ccfae0..c889472c5c 100644
--- a/rocclr/runtime/device/pal/palmemory.hpp
+++ b/rocclr/runtime/device/pal/palmemory.hpp
@@ -1,8 +1,7 @@
 //
 // Copyright (c) 2015 Advanced Micro Devices, Inc. All rights reserved.
 //
-#ifndef PALMEMORY_HPP_
-#define PALMEMORY_HPP_
+#pragma once
 
 #include "top.hpp"
 #include "thread/atomic.hpp"
@@ -271,5 +270,3 @@ private:
 };
 
 } // namespace pal
-
-#endif // PALMEMORY_HPP_
diff --git a/rocclr/runtime/device/pal/palprintf.hpp b/rocclr/runtime/device/pal/palprintf.hpp
index 1a71af0fa5..ca84bda555 100644
--- a/rocclr/runtime/device/pal/palprintf.hpp
+++ b/rocclr/runtime/device/pal/palprintf.hpp
@@ -1,8 +1,7 @@
 //
 // Copyright (c) 2015 Advanced Micro Devices, Inc. All rights reserved.
 //
-#ifndef PALPRINTFDBG_HPP_
-#define PALPRINTFDBG_HPP_
+#pragma once
 
 #include "device/pal/palmemory.hpp"
 
@@ -188,5 +187,3 @@ private:
 };
 
 /*@}*/} // namespace pal
-
-#endif /*PALPRINTFDBG_HPP_*/
diff --git a/rocclr/runtime/device/pal/palprogram.hpp b/rocclr/runtime/device/pal/palprogram.hpp
index e78782d01e..927ec3e7aa 100644
--- a/rocclr/runtime/device/pal/palprogram.hpp
+++ b/rocclr/runtime/device/pal/palprogram.hpp
@@ -1,8 +1,7 @@
 //
 // Copyright (c) 2015 Advanced Micro Devices, Inc. All rights reserved.
 //
-#ifndef PALPROGRAM_HPP_
-#define PALPROGRAM_HPP_
+#pragma once
 
 #include "device/pal/palkernel.hpp"
 #include "device/pal/palbinary.hpp"
@@ -293,5 +292,3 @@ private:
 };
 
 /*@}*/} // namespace pal
-
-#endif /*PALPROGRAM_HPP_*/
diff --git a/rocclr/runtime/device/pal/palresource.hpp b/rocclr/runtime/device/pal/palresource.hpp
index 8ac50780a6..300a701bc7 100644
--- a/rocclr/runtime/device/pal/palresource.hpp
+++ b/rocclr/runtime/device/pal/palresource.hpp
@@ -1,8 +1,7 @@
 //
 // Copyright (c) 2015 Advanced Micro Devices, Inc. All rights reserved.
 //
-#ifndef PALRESOURCE_HPP_
-#define PALRESOURCE_HPP_
+#pragma once
 
 #include "platform/command.hpp"
 #include "platform/program.hpp"
@@ -504,5 +503,3 @@ private:
 };
 
 /*@}*/} // namespace pal
-
-#endif /*PALRESOURCE_HPP_*/
diff --git a/rocclr/runtime/device/pal/palsched.hpp b/rocclr/runtime/device/pal/palsched.hpp
index 44038dd2c5..1d45cb002b 100644
--- a/rocclr/runtime/device/pal/palsched.hpp
+++ b/rocclr/runtime/device/pal/palsched.hpp
@@ -1,8 +1,7 @@
 //
 // Copyright (c) 2015 Advanced Micro Devices, Inc. All rights reserved.
 //
-#ifndef PALSCHED_HPP_
-#define PALSCHED_HPP_
+#pragma once
 
 #include "hsa.h"
 
@@ -74,5 +73,3 @@ struct SchedulerParam {
 };
 
 } // namespace pal
-
-#endif
diff --git a/rocclr/runtime/device/pal/palsettings.hpp b/rocclr/runtime/device/pal/palsettings.hpp
index ab66cfb541..4aea512f7c 100644
--- a/rocclr/runtime/device/pal/palsettings.hpp
+++ b/rocclr/runtime/device/pal/palsettings.hpp
@@ -1,8 +1,7 @@
 //
 // Copyright (c) 2015 Advanced Micro Devices, Inc. All rights reserved.
 //
-#ifndef PALSETTINGS_HPP_
-#define PALSETTINGS_HPP_
+#pragma once
 
 #include "top.hpp"
 #include "library.hpp"
@@ -124,5 +123,3 @@ private:
 };
 
 /*@}*/} // namespace pal
-
-#endif /*PALSETTINGS_HPP_*/
diff --git a/rocclr/runtime/device/pal/palthreadtrace.hpp b/rocclr/runtime/device/pal/palthreadtrace.hpp
index 19cb958ade..40fcf76df2 100644
--- a/rocclr/runtime/device/pal/palthreadtrace.hpp
+++ b/rocclr/runtime/device/pal/palthreadtrace.hpp
@@ -1,8 +1,7 @@
 //
 // Copyright (c) 2015 Advanced Micro Devices, Inc. All rights reserved.
 //
-#ifndef GPUTHREADTRACE_HPP_
-#define GPUTHREADTRACE_HPP_
+#pragma once
 
 #include "top.hpp"
 #include "device/device.hpp"
@@ -132,5 +131,3 @@ private:
 
 } // namespace pal
 
-#endif // PALTHREADTRACE_HPP_
-
diff --git a/rocclr/runtime/device/pal/paltimestamp.hpp b/rocclr/runtime/device/pal/paltimestamp.hpp
index 99294dace1..6ec10e52e7 100644
--- a/rocclr/runtime/device/pal/paltimestamp.hpp
+++ b/rocclr/runtime/device/pal/paltimestamp.hpp
@@ -1,8 +1,7 @@
 //
 // Copyright (c) 2015 Advanced Micro Devices, Inc. All rights reserved.
 //
-#ifndef PALTIMESTAMP_HPP_
-#define PALTIMESTAMP_HPP_
+#pragma once
 
 #include "device/pal/paldefs.hpp"
 #include "device/pal/palresource.hpp"
@@ -128,5 +127,3 @@ private:
 };
 
 /*@}*/} // namespace pal
-
-#endif /*PALTIMESTAMP_HPP_*/
diff --git a/rocclr/runtime/device/pal/palvirtual.hpp b/rocclr/runtime/device/pal/palvirtual.hpp
index 8183687345..8e6c1c0698 100644
--- a/rocclr/runtime/device/pal/palvirtual.hpp
+++ b/rocclr/runtime/device/pal/palvirtual.hpp
@@ -1,9 +1,7 @@
 //
 // Copyright (c) 2015 Advanced Micro Devices, Inc. All rights reserved.
 //
-
-#ifndef PALVIRTUAL_HPP_
-#define PALVIRTUAL_HPP_
+#pragma once
 
 #include "device/pal/paldefs.hpp"
 #include "device/pal/palconstbuf.hpp"
@@ -573,5 +571,3 @@ private:
 };
 
 /*@}*/} // namespace pal
-
-#endif /*PALVIRTUAL_HPP_*/
diff --git a/rocclr/runtime/device/pal/palwavelimiter.hpp b/rocclr/runtime/device/pal/palwavelimiter.hpp
index b75c49fbe5..09f0cfb0b1 100644
--- a/rocclr/runtime/device/pal/palwavelimiter.hpp
+++ b/rocclr/runtime/device/pal/palwavelimiter.hpp
@@ -1,9 +1,7 @@
 //
 // Copyright (c) 2008 Advanced Micro Devices, Inc. All rights reserved.
 //
-
-#ifndef PALWAVELIMITER_HPP_
-#define PALWAVELIMITER_HPP_
+#pragma once
 
 #include "platform/command.hpp"
 #include "thread/thread.hpp"
@@ -151,4 +149,3 @@ private:
     amd::Monitor monitor_;          //!< The mutex for updating the wave limiter map
 };
 }
-#endif