diff --git a/libretro-common/include/retro_endianness.h b/libretro-common/include/retro_endianness.h
index d07227eca2..b88b6eedc5 100644
--- a/libretro-common/include/retro_endianness.h
+++ b/libretro-common/include/retro_endianness.h
@@ -58,6 +58,25 @@ static INLINE uint8_t is_little_endian(void)
    return u.y[0];
 }
 
+static INLINE uint32_t swap_little32(uint32_t val)
+{
+   return 
+         (val >> 24) 
+      | ((val >> 8) & 0xFF00)
+      | ((val << 8) & 0xFF0000)
+      |  (val << 24);
+}
+
+static INLINE uint16_t swap_big16(uint16_t val)
+{
+   return (val >> 8) | (val << 8);
+}
+
+static INLINE uint16_t swap_little16(uint16_t val)
+{
+   return (val >> 8) | (val << 8);
+}
+
 /**
  * swap_if_big32:
  * @val        : unsigned 32-bit value
@@ -71,17 +90,7 @@ static INLINE uint32_t swap_if_big32(uint32_t val)
 {
    if (is_little_endian())
       return val;
-   return (val >> 24) | ((val >> 8) & 0xFF00) |
-      ((val << 8) & 0xFF0000) | (val << 24);
-}
-
-static INLINE uint32_t swap_little32(uint32_t val)
-{
-   return 
-         (val >> 24) 
-      | ((val >> 8) & 0xFF00)
-      | ((val << 8) & 0xFF0000)
-      |  (val << 24);
+   return swap_little32(val);
 }
 
 /**
@@ -100,11 +109,6 @@ static INLINE uint32_t swap_if_little32(uint32_t val)
    return val;
 }
 
-static INLINE uint16_t swap_big16(uint16_t val)
-{
-   return (val >> 8) | (val << 8);
-}
-
 /**
  * swap_if_big16:
  * @val        : unsigned 16-bit value
@@ -121,10 +125,6 @@ static INLINE uint16_t swap_if_big16(uint16_t val)
    return swap_big16(val);
 }
 
-static INLINE uint16_t swap_little16(uint16_t val)
-{
-   return (val >> 8) | (val << 8);
-}
 
 /**
  * swap_if_little16: