diff --git a/src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c b/src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c
index 3fb429f537..54861a76e5 100644
--- a/src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c
+++ b/src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c
@@ -92,7 +92,7 @@ auvia_mem_delete(auvia_mem *mem)
 	free(mem);
 }
 
-void *
+static void *
 auvia_mem_alloc(auvia_dev *card, size_t size)
 {
 	auvia_mem *mem;
@@ -106,7 +106,7 @@ auvia_mem_alloc(auvia_dev *card, size_t size)
 	return mem;
 }
 
-void
+static void
 auvia_mem_free(auvia_dev *card, void *ptr)
 {
 	auvia_mem 		*mem;
@@ -441,7 +441,7 @@ make_device_names(
 }
 
 
-status_t
+static status_t
 auvia_init(auvia_dev * card)
 {
 	uint32 pr;
diff --git a/src/add-ons/kernel/drivers/audio/ac97/auvia/debug.c b/src/add-ons/kernel/drivers/audio/ac97/auvia/debug.c
index 3b99b3d765..4b67b58631 100644
--- a/src/add-ons/kernel/drivers/audio/ac97/auvia/debug.c
+++ b/src/add-ons/kernel/drivers/audio/ac97/auvia/debug.c
@@ -43,7 +43,7 @@ static sem_id loglock;
 
 void debug_printf(const char *text,...);
 void log_printf(const char *text,...);
-void log_create();
+void log_create(void);
 
 void debug_printf(const char *text,...)
 {
diff --git a/src/add-ons/kernel/drivers/audio/ac97/auvia/io.c b/src/add-ons/kernel/drivers/audio/ac97/auvia/io.c
index e032075827..0f882152df 100644
--- a/src/add-ons/kernel/drivers/audio/ac97/auvia/io.c
+++ b/src/add-ons/kernel/drivers/audio/ac97/auvia/io.c
@@ -85,7 +85,7 @@ auvia_reg_write_32(device_config *config, int regno, uint32 value)
 
 #define AUVIA_TIMEOUT 	200
 
-int
+static int
 auvia_codec_waitready(device_config *config)
 {
 	int i;
@@ -101,7 +101,7 @@ auvia_codec_waitready(device_config *config)
 	return B_OK;	
 }
 
-int
+static int
 auvia_codec_waitvalid(device_config *config)
 {
 	int i;
diff --git a/src/add-ons/kernel/drivers/audio/ac97/auvia/multi.c b/src/add-ons/kernel/drivers/audio/ac97/auvia/multi.c
index 911187b066..b43af65f4d 100644
--- a/src/add-ons/kernel/drivers/audio/ac97/auvia/multi.c
+++ b/src/add-ons/kernel/drivers/audio/ac97/auvia/multi.c
@@ -30,6 +30,7 @@
  */
 
 #include <OS.h>
+#include <string.h>
 #include <MediaDefs.h>
 #include "multi_audio.h"
 #include "multi.h"
@@ -661,7 +662,7 @@ auvia_get_description(auvia_dev *card, multi_description *data)
 				strncpy(data->friendly_name, FRIENDLY_NAME_8237, 32);
 				break;
 			default:
-				strncpy(data->friendly_name, FRIENDLY_NAME);
+				strncpy(data->friendly_name, FRIENDLY_NAME, 32);
 		}
 	}
 	strcpy(data->vendor_info, AUTHOR);
@@ -813,7 +814,7 @@ auvia_get_buffers(auvia_dev *card, multi_buffer_list *data)
 }
 
 
-void
+static void
 auvia_play_inth(void* inthparams)
 {
 	auvia_stream *stream = (auvia_stream *)inthparams;
@@ -834,7 +835,7 @@ auvia_play_inth(void* inthparams)
 		release_sem_etc(stream->card->buffer_ready_sem, 1, B_DO_NOT_RESCHEDULE);
 }
 
-void
+static void
 auvia_record_inth(void* inthparams)
 {
 	auvia_stream *stream = (auvia_stream *)inthparams;