8 files changed, 13 insertions, 13 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7a91f13a..504930d4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -51,7 +51,7 @@ if(USE_AUDIO)
 else()
   MESSAGE(STATUS "Audio Backend: None (-DUSE_AUDIO=OFF)")
   set(INCLUDE_AUDIO_MODULE 0)
-  list(REMOVE_ITEM raylib_sources ${CMAKE_CURRENT_SOURCE_DIR}/audio.c)
+  list(REMOVE_ITEM raylib_sources ${CMAKE_CURRENT_SOURCE_DIR}/raudio.c)
   set(sources ${raylib_sources})
 endif()
 
@@ -250,7 +250,7 @@ file(COPY "raylib.h" DESTINATION ".")
 file(COPY "rlgl.h" DESTINATION ".")
 file(COPY "physac.h" DESTINATION ".")
 file(COPY "raymath.h" DESTINATION ".")
-file(COPY "audio.h" DESTINATION ".")
+file(COPY "raudio.h" DESTINATION ".")
 
 # Print the flags for the user
 message(STATUS "Compiling with the flags:")
diff --git a/src/CMakeOptions.txt b/src/CMakeOptions.txt
index ee63c5b4..b69c443f 100644
--- a/src/CMakeOptions.txt
+++ b/src/CMakeOptions.txt
@@ -61,7 +61,7 @@ option(SUPPORT_FILEFORMAT_OBJ "Support loading OBJ file format" ON)
 option(SUPPORT_FILEFORMAT_MTL "Support loading MTL file format" ON)
 option(SUPPORT_MESH_GENERATION "Support procedural mesh generation functions, uses external par_shapes.h library. NOTE: Some generated meshes DO NOT include generated texture coordinates" ON)
 
-# audio.c
+# raudio.c
 option(SUPPORT_FILEFORMAT_WAV  "Support loading WAV for sound" ON)
 option(SUPPORT_FILEFORMAT_OGG  "Support loading OGG for sound" ON)
 option(SUPPORT_FILEFORMAT_XM   "Support loading XM for sound" ON)
diff --git a/src/Makefile b/src/Makefile
index 2c2bfb27..b99ff711 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -403,7 +403,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
 endif
 
 ifeq ($(INCLUDE_AUDIO_MODULE),TRUE)
-    OBJS += audio.o
+    OBJS += raudio.o
     OBJS += mini_al.o
 endif
 
@@ -529,7 +529,7 @@ models.o : models.c raylib.h rlgl.h raymath.h
 	$(CC) -c $< $(CFLAGS) $(INCLUDE_PATHS) -D$(PLATFORM) -D$(GRAPHICS)
 
 # Compile audio module
-audio.o : audio.c raylib.h
+raudio.o : raudio.c raylib.h
 	$(CC) -c $< $(CFLAGS) $(INCLUDE_PATHS) -D$(PLATFORM)
 
 # Compile mini_al audio library
diff --git a/src/config.h b/src/config.h
index 6d16207c..d45ff707 100644
--- a/src/config.h
+++ b/src/config.h
@@ -25,7 +25,7 @@
 *
 **********************************************************************************************/
 
-#define RAYLIB_VERSION  "2.3-dev"
+#define RAYLIB_VERSION  "2.4-dev"
 
 // Edit to control what features Makefile'd raylib is compiled with
 #if defined(RAYLIB_CMAKE)
diff --git a/src/config.h.in b/src/config.h.in
index 928405cd..b1c524f7 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -65,7 +65,7 @@
  * NOTE: Some generated meshes DO NOT include generated texture coordinates */
 #cmakedefine SUPPORT_MESH_GENERATION 1
 
-// audio.c
+// raudio.c
 /* Desired fileformats to be supported for loading. */
 #cmakedefine SUPPORT_FILEFORMAT_WAV 1
 #cmakedefine SUPPORT_FILEFORMAT_OGG 1
diff --git a/src/libraylib.a b/src/libraylib.a
new file mode 100644
index 00000000..5aa7099d
--- /dev/null
+++ b/src/libraylib.a
diff --git a/src/audio.c b/src/raudio.c
index a76481b4..3510acd5 100644
--- a/src/audio.c
+++ b/src/raudio.c
@@ -12,7 +12,7 @@
 *
 *   CONFIGURATION:
 *
-*   #define AUDIO_STANDALONE
+*   #define RAUDIO_STANDALONE
 *       Define to use the module as standalone library (independently of raylib).
 *       Required types and functions are defined in the same module.
 *
@@ -70,8 +70,8 @@
 *
 **********************************************************************************************/
 
-#if defined(AUDIO_STANDALONE)
-    #include "audio.h"
+#if defined(RAUDIO_STANDALONE)
+    #include "raudio.h"
     #include <stdarg.h>         // Required for: va_list, va_start(), vfprintf(), va_end()
 #else
     #include "raylib.h"         // Declares module functions
@@ -169,7 +169,7 @@ typedef struct MusicData {
     unsigned int samplesLeft;           // Number of samples left to end
 } MusicData;
 
-#if defined(AUDIO_STANDALONE)
+#if defined(RAUDIO_STANDALONE)
 typedef enum {
     LOG_INFO = 0,
     LOG_ERROR,
@@ -201,7 +201,7 @@ static Wave LoadFLAC(const char *fileName);             // Load FLAC file
 static Wave LoadMP3(const char *fileName);              // Load MP3 file
 #endif
 
-#if defined(AUDIO_STANDALONE)
+#if defined(RAUDIO_STANDALONE)
 bool IsFileExtension(const char *fileName, const char *ext);    // Check file extension
 void TraceLog(int msgType, const char *text, ...);              // Show trace log messages (LOG_INFO, LOG_WARNING, LOG_ERROR, LOG_DEBUG)
 #endif
@@ -1918,7 +1918,7 @@ static Wave LoadMP3(const char *fileName)
 #endif
 
 // Some required functions for audio standalone module version
-#if defined(AUDIO_STANDALONE)
+#if defined(RAUDIO_STANDALONE)
 // Check file extension
 bool IsFileExtension(const char *fileName, const char *ext)
 {
diff --git a/src/audio.h b/src/raudio.h
index 01c93741..01c93741 100644
--- a/src/audio.h
+++ b/src/raudio.h