| Index: celt/os_support.h
 | 
| diff --git a/celt/os_support.h b/celt/os_support.h
 | 
| index 2484f0b2f751d8a859c4d53af9e4296e6e6fbec2..5e47e3cff9abec0b7813c90538736ab184b0ba09 100644
 | 
| --- a/celt/os_support.h
 | 
| +++ b/celt/os_support.h
 | 
| @@ -35,13 +35,16 @@
 | 
|  #  include "custom_support.h"
 | 
|  #endif
 | 
|  
 | 
| +#include "opus_types.h"
 | 
| +#include "opus_defines.h"
 | 
| +
 | 
|  #include <string.h>
 | 
|  #include <stdio.h>
 | 
|  #include <stdlib.h>
 | 
|  
 | 
|  /** Opus wrapper for malloc(). To do your own dynamic allocation, all you need to do is replace this function and opus_free */
 | 
|  #ifndef OVERRIDE_OPUS_ALLOC
 | 
| -static inline void *opus_alloc (size_t size)
 | 
| +static OPUS_INLINE void *opus_alloc (size_t size)
 | 
|  {
 | 
|     return malloc(size);
 | 
|  }
 | 
| @@ -49,7 +52,7 @@ static inline void *opus_alloc (size_t size)
 | 
|  
 | 
|  /** Same as celt_alloc(), except that the area is only needed inside a CELT call (might cause problem with wideband though) */
 | 
|  #ifndef OVERRIDE_OPUS_ALLOC_SCRATCH
 | 
| -static inline void *opus_alloc_scratch (size_t size)
 | 
| +static OPUS_INLINE void *opus_alloc_scratch (size_t size)
 | 
|  {
 | 
|     /* Scratch space doesn't need to be cleared */
 | 
|     return opus_alloc(size);
 | 
| @@ -58,7 +61,7 @@ static inline void *opus_alloc_scratch (size_t size)
 | 
|  
 | 
|  /** Opus wrapper for free(). To do your own dynamic allocation, all you need to do is replace this function and opus_alloc */
 | 
|  #ifndef OVERRIDE_OPUS_FREE
 | 
| -static inline void opus_free (void *ptr)
 | 
| +static OPUS_INLINE void opus_free (void *ptr)
 | 
|  {
 | 
|     free(ptr);
 | 
|  }
 | 
| 
 |