diff --git a/tools/include/tools/be_byteshift.h b/tools/include/tools/be_byteshift.h
index 84c17d836578..9850c7df2667 100644
--- a/tools/include/tools/be_byteshift.h
+++ b/tools/include/tools/be_byteshift.h
@@ -3,68 +3,50 @@
 
 #include <stdint.h>
 
-static inline uint16_t __get_unaligned_be16(const uint8_t *p)
+static inline uint16_t get_unaligned_be16(const void *_p)
 {
-	return p[0] << 8 | p[1];
-}
+	const uint8_t *p = _p;
 
-static inline uint32_t __get_unaligned_be32(const uint8_t *p)
-{
-	return p[0] << 24 | p[1] << 16 | p[2] << 8 | p[3];
+	return p[0] << 8 | p[1];
 }
 
-static inline uint64_t __get_unaligned_be64(const uint8_t *p)
+static inline uint32_t get_unaligned_be32(const void *_p)
 {
-	return (uint64_t)__get_unaligned_be32(p) << 32 |
-	       __get_unaligned_be32(p + 4);
-}
+	const uint8_t *p = _p;
 
-static inline void __put_unaligned_be16(uint16_t val, uint8_t *p)
-{
-	*p++ = val >> 8;
-	*p++ = val;
+	return p[0] << 24 | p[1] << 16 | p[2] << 8 | p[3];
 }
 
-static inline void __put_unaligned_be32(uint32_t val, uint8_t *p)
+static inline uint64_t get_unaligned_be64(const void *_p)
 {
-	__put_unaligned_be16(val >> 16, p);
-	__put_unaligned_be16(val, p + 2);
-}
+	const uint8_t *p = _p;
 
-static inline void __put_unaligned_be64(uint64_t val, uint8_t *p)
-{
-	__put_unaligned_be32(val >> 32, p);
-	__put_unaligned_be32(val, p + 4);
+	return (uint64_t)get_unaligned_be32(p) << 32 |
+		get_unaligned_be32(p + 4);
 }
 
-static inline uint16_t get_unaligned_be16(const void *p)
+static inline void put_unaligned_be16(uint16_t val, void *_p)
 {
-	return __get_unaligned_be16((const uint8_t *)p);
-}
+	uint8_t *p = _p;
 
-static inline uint32_t get_unaligned_be32(const void *p)
-{
-	return __get_unaligned_be32((const uint8_t *)p);
+	*p++ = val >> 8;
+	*p++ = val;
 }
 
-static inline uint64_t get_unaligned_be64(const void *p)
+static inline void put_unaligned_be32(uint32_t val, void *_p)
 {
-	return __get_unaligned_be64((const uint8_t *)p);
-}
+	uint8_t *p = _p;
 
-static inline void put_unaligned_be16(uint16_t val, void *p)
-{
-	__put_unaligned_be16(val, p);
+	put_unaligned_be16(val >> 16, p);
+	put_unaligned_be16(val, p + 2);
 }
 
-static inline void put_unaligned_be32(uint32_t val, void *p)
+static inline void put_unaligned_be64(uint64_t val, void *_p)
 {
-	__put_unaligned_be32(val, p);
-}
+	uint8_t *p = _p;
 
-static inline void put_unaligned_be64(uint64_t val, void *p)
-{
-	__put_unaligned_be64(val, p);
+	put_unaligned_be32(val >> 32, p);
+	put_unaligned_be32(val, p + 4);
 }
 
 #endif /* _TOOLS_BE_BYTESHIFT_H */
diff --git a/tools/include/tools/le_byteshift.h b/tools/include/tools/le_byteshift.h
index 8fe9f2488ec7..819ba186ede5 100644
--- a/tools/include/tools/le_byteshift.h
+++ b/tools/include/tools/le_byteshift.h
@@ -3,68 +3,50 @@
 
 #include <stdint.h>
 
-static inline uint16_t __get_unaligned_le16(const uint8_t *p)
+static inline uint16_t get_unaligned_le16(const void *_p)
 {
-	return p[0] | p[1] << 8;
-}
+	const uint8_t *p = _p;
 
-static inline uint32_t __get_unaligned_le32(const uint8_t *p)
-{
-	return p[0] | p[1] << 8 | p[2] << 16 | p[3] << 24;
+	return p[0] | p[1] << 8;
 }
 
-static inline uint64_t __get_unaligned_le64(const uint8_t *p)
+static inline uint32_t get_unaligned_le32(const void *_p)
 {
-	return (uint64_t)__get_unaligned_le32(p + 4) << 32 |
-	       __get_unaligned_le32(p);
-}
+	const uint8_t *p = _p;
 
-static inline void __put_unaligned_le16(uint16_t val, uint8_t *p)
-{
-	*p++ = val;
-	*p++ = val >> 8;
+	return p[0] | p[1] << 8 | p[2] << 16 | p[3] << 24;
 }
 
-static inline void __put_unaligned_le32(uint32_t val, uint8_t *p)
+static inline uint64_t get_unaligned_le64(const void *_p)
 {
-	__put_unaligned_le16(val >> 16, p + 2);
-	__put_unaligned_le16(val, p);
-}
+	const uint8_t *p = _p;
 
-static inline void __put_unaligned_le64(uint64_t val, uint8_t *p)
-{
-	__put_unaligned_le32(val >> 32, p + 4);
-	__put_unaligned_le32(val, p);
+	return (uint64_t)get_unaligned_le32(p + 4) << 32 |
+		get_unaligned_le32(p);
 }
 
-static inline uint16_t get_unaligned_le16(const void *p)
+static inline void put_unaligned_le16(uint16_t val, void *_p)
 {
-	return __get_unaligned_le16((const uint8_t *)p);
-}
+	uint8_t *p = _p;
 
-static inline uint32_t get_unaligned_le32(const void *p)
-{
-	return __get_unaligned_le32((const uint8_t *)p);
+	*p++ = val;
+	*p++ = val >> 8;
 }
 
-static inline uint64_t get_unaligned_le64(const void *p)
+static inline void put_unaligned_le32(uint32_t val, void *_p)
 {
-	return __get_unaligned_le64((const uint8_t *)p);
-}
+	uint8_t *p = _p;
 
-static inline void put_unaligned_le16(uint16_t val, void *p)
-{
-	__put_unaligned_le16(val, p);
+	put_unaligned_le16(val, p);
+	put_unaligned_le16(val >> 16, p + 2);
 }
 
-static inline void put_unaligned_le32(uint32_t val, void *p)
+static inline void put_unaligned_le64(uint64_t val, void *_p)
 {
-	__put_unaligned_le32(val, p);
-}
+	uint8_t *p = _p;
 
-static inline void put_unaligned_le64(uint64_t val, void *p)
-{
-	__put_unaligned_le64(val, p);
+	put_unaligned_le32(val, p);
+	put_unaligned_le32(val >> 32, p + 4);
 }
 
 #endif /* _TOOLS_LE_BYTESHIFT_H */
