diff --git a/libretro-common/include/fastcpy.h b/libretro-common/include/fastcpy.h
index e1895122d0..13b94d97bd 100644
--- a/libretro-common/include/fastcpy.h
+++ b/libretro-common/include/fastcpy.h
@@ -25,64 +25,70 @@
 #include <string.h>
 #include <retro_inline.h>
 
-static INLINE void* memcpy16(void* dst,void* src,size_t size){
+static INLINE void* memcpy16(void* dst,void* src,size_t size)
+{
    return memcpy(dst,src,size * 2);
 }
 
-static INLINE void* memcpy32(void* dst,void* src,size_t size){
+static INLINE void* memcpy32(void* dst,void* src,size_t size)
+{
    return memcpy(dst,src,size * 4);
 }
 
-static INLINE void* memcpy64(void* dst,void* src,size_t size){
+static INLINE void* memcpy64(void* dst,void* src,size_t size)
+{
    return memcpy(dst,src,size * 8);
 }
 
 #ifdef USECPPSTDFILL
 #include <algorithm>
 
-static INLINE void* memset16(void* dst,uint16_t val,size_t size){
+static INLINE void* memset16(void* dst,uint16_t val,size_t size)
+{
    uint16_t* typedptr = (uint16_t*)dst;
    std::fill(typedptr, typedptr + size, val);
    return dst;
 }
 
-static INLINE void* memset32(void* dst,uint32_t val,size_t size){
+static INLINE void* memset32(void* dst,uint32_t val,size_t size)
+{
    uint32_t* typedptr = (uint32_t*)dst;
    std::fill(typedptr, typedptr + size, val);
    return dst;
 }
 
-static INLINE void* memset64(void* dst,uint64_t val,size_t size){
+static INLINE void* memset64(void* dst,uint64_t val,size_t size)
+{
    uint64_t* typedptr = (uint64_t*)dst;
    std::fill(typedptr, typedptr + size, val);
    return dst;
 }
 #else
 
-static INLINE void* memset16(void* dst,uint16_t val,size_t size){
+static INLINE void* memset16(void* dst,uint16_t val,size_t size)
+{
+   size_t i;
    uint16_t* typedptr = (uint16_t*)dst;
-   size_t i;
-   for(i = 0;i < size;i++){
+   for(i = 0;i < size;i++)
       typedptr[i] = val;
-   }
    return dst;
 }
 
-static INLINE void* memset32(void* dst,uint32_t val,size_t size){
+static INLINE void* memset32(void* dst,uint32_t val,size_t size)
+{
+   size_t i;
    uint32_t* typedptr = (uint32_t*)dst;
-   size_t i;
-   for(i = 0;i < size;i++){
+   for(i = 0;i < size;i++)
       typedptr[i] = val;
-   }
    return dst;
 }
 
-static INLINE void* memset64(void* dst,uint64_t val,size_t size){
-   uint64_t* typedptr = (uint64_t*)dst;
+static INLINE void* memset64(void* dst,uint64_t val,size_t size)
+{
    size_t i;
-   for(i = 0;i < size;i++){
+   uint64_t* typedptr = (uint64_t*)dst;
+   for(i = 0;i < size;i++)
       typedptr[i] = val;
-   }
    return dst;
 }
 #endif