diff --git a/stream/cache2.c b/stream/cache2.c
index 1197df9df1..00415ad9fe 100644
--- a/stream/cache2.c
+++ b/stream/cache2.c
@@ -93,13 +93,15 @@ static int min_fill=0;
 
 int cache_fill_status=0;
 
-void cache_stats(cache_vars_t* s){
+static void cache_stats(cache_vars_t *s)
+{
   int newb=s->max_filepos-s->read_filepos; // new bytes in the buffer
   mp_msg(MSGT_CACHE,MSGL_INFO,"0x%06X  [0x%06X]  0x%06X   ",(int)s->min_filepos,(int)s->read_filepos,(int)s->max_filepos);
   mp_msg(MSGT_CACHE,MSGL_INFO,"%3d %%  (%3d%%)\n",100*newb/s->buffer_size,100*min_fill/s->buffer_size);
 }
 
-int cache_read(cache_vars_t* s,unsigned char* buf,int size){
+static int cache_read(cache_vars_t *s, unsigned char *buf, int size)
+{
   int total=0;
   while(size>0){
     int pos,newb,len;
@@ -145,7 +147,8 @@ int cache_read(cache_vars_t* s,unsigned char* buf,int size){
   return total;
 }
 
-int cache_fill(cache_vars_t* s){
+static int cache_fill(cache_vars_t *s)
+{
   int back,back2,newb,space,len,pos;
   off_t read=s->read_filepos;
 
diff --git a/stream/network.c b/stream/network.c
index d6b8079276..f9caf16720 100644
--- a/stream/network.c
+++ b/stream/network.c
@@ -464,7 +464,7 @@ void fixup_network_stream_cache(stream_t *stream) {
 }
 
 
-int
+static int
 streaming_stop( stream_t *stream ) {
 	stream->streaming_ctrl->status = streaming_stopped_e;
 	return 0;
diff --git a/stream/stream.c b/stream/stream.c
index 87b2e02a29..203e2ed291 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -140,9 +140,10 @@ static const stream_info_t* const auto_open_streams[] = {
   NULL
 };
 
-stream_t* open_stream_plugin(const stream_info_t* sinfo,char* filename,int mode,
-			     char** options, int* file_format, int* ret,
-			     char** redirected_url) {
+static stream_t* open_stream_plugin(const stream_info_t* sinfo, char* filename,
+                                    int mode, char** options, int* file_format,
+                                    int* ret, char** redirected_url)
+{
   void* arg = NULL;
   stream_t* s;
   m_struct_t* desc = (m_struct_t*)sinfo->opts;
diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c
index 3747bbaac1..1fee28ad6c 100644
--- a/stream/stream_dvd.c
+++ b/stream/stream_dvd.c
@@ -249,7 +249,8 @@ static int dvd_next_cell(dvd_priv_t *d) {
   return next_cell;
 }
 
-int dvd_read_sector(dvd_priv_t *d,unsigned char* data) {
+static int dvd_read_sector(dvd_priv_t *d, unsigned char *data)
+{
   int len;
 
   if(d->packs_left==0) {
@@ -369,7 +370,8 @@ read_next:
   return d->cur_pack-1;
 }
 
-void dvd_seek(dvd_priv_t *d,int pos) {
+static void dvd_seek(dvd_priv_t *d, int pos)
+{
   d->packs_left=-1;
   d->cur_pack=pos;
 
@@ -407,7 +409,8 @@ void dvd_seek(dvd_priv_t *d,int pos) {
   d->angle_seek=1;
 }
 
-void dvd_close(dvd_priv_t *d) {
+static void dvd_close(dvd_priv_t *d)
+{
   ifoClose(d->vts_file);
   ifoClose(d->vmg_file);
   DVDCloseFile(d->title);
diff --git a/stream/tv.c b/stream/tv.c
index 6c05ac2eb5..e98730f2b6 100644
--- a/stream/tv.c
+++ b/stream/tv.c
@@ -354,7 +354,7 @@ int tv_set_norm(tvi_handle_t *tvh, char* norm)
     return 1;
 }
 
-int tv_set_norm_i(tvi_handle_t *tvh, int norm)
+static int tv_set_norm_i(tvi_handle_t *tvh, int norm)
 {
    tvh->norm = norm;