diff --git a/config/linux2-config.py b/config/linux2-config.py
index 3960a387f1a0fdbb5feb655dc3505ae5561b9461..c1707a02cc4df3b9e6213db2ef5c2f04573309db 100644
--- a/config/linux2-config.py
+++ b/config/linux2-config.py
@@ -14,7 +14,7 @@ BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}.a'
 WITH_BF_OPENAL = True
 WITH_BF_STATICOPENAL = False
 BF_OPENAL = '/usr'
-BF_OPENAL_INC = '${BF_OPENAL}/include/AL'
+BF_OPENAL_INC = '${BF_OPENAL}/include'
 BF_OPENAL_LIB = 'openal'
 BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
 
diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py
index 5bd66ddf1791781f80266ec32ed3b21e84175f5d..1570698d261ed4e000e9759ce77b4ca9f8810e20 100644
--- a/config/win32-mingw-config.py
+++ b/config/win32-mingw-config.py
@@ -21,7 +21,7 @@ BF_OPENAL_INC = '${BF_OPENAL}/include'
 BF_OPENAL_LIB = 'wrap_oal'
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
-WITH_BF_FFMPEG = True
+WITH_BF_FFMPEG = False
 BF_FFMPEG_LIB = 'avformat swscale avcodec avutil avdevice xvidcore x264'
 BF_FFMPEG_LIBPATH = LIBDIR + '/gcc/ffmpeg/lib'
 BF_FFMPEG_INC =  LIBDIR + '/gcc/ffmpeg/include'
diff --git a/config/win64-vc-config.py b/config/win64-vc-config.py
index 3d0aa3666e80fdc19d46d71628196cf1445af110..ed08e578df8a2212265902643bcc7a20ad398eda 100644
--- a/config/win64-vc-config.py
+++ b/config/win64-vc-config.py
@@ -2,7 +2,7 @@ LCGDIR = '#../lib/win64'
 LIBDIR = '${LCGDIR}'
 
 # enable ffmpeg  support
-WITH_BF_FFMPEG = True # -DWITH_FFMPEG
+WITH_BF_FFMPEG = False # -DWITH_FFMPEG
 BF_FFMPEG = LIBDIR +'/ffmpeg'
 BF_FFMPEG_INC = '${BF_FFMPEG}/include'
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 269fe2b325d8b008f4009abf3a7d785e8e91544f..db9bbfcc5e74c989c4425e4f9a164393d7f3b1fb 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -35,7 +35,6 @@ SET(INC
   ../nodes ../../../extern/glew/include ../gpu ../makesrna ../../../intern/smoke/extern
   ../../../intern/bsp/extern
   ../../../intern/audaspace
-  ${SDL_INC}
   ${ZLIB_INC}
 )
 
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 5e2ef5a534bfe46c8ef1bfe5454896bd9a5b86ec..73b7158035a9af7b893287db76460d1e3ce5d8d4 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -2140,8 +2140,6 @@ static void write_sounds(WriteData *wd, ListBase *idbase)
 
 	PackedFile * pf;
 
-	// set all samples to unsaved status
-
 	sound= idbase->first;
 	while(sound) {
 		if(sound->id.us>0 || wd->current) {
diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c
index e27385b3bfb8acee5c91e355452f4ae910f85407..538c1e4fce79f95a30bfc991eb257c18dea29cae 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -848,6 +848,7 @@ void filelist_setfiletypes(struct FileList* filelist, short has_quicktime)
 				||	BLI_testextensie(file->relname, ".ac3")
 				||	BLI_testextensie(file->relname, ".aac")
 				||	BLI_testextensie(file->relname, ".flac")
+				||	BLI_testextensie(file->relname, ".wma")
 				||	BLI_testextensie(file->relname, ".eac3")) {
 				file->flags |= SOUNDFILE;
 			}
@@ -891,6 +892,7 @@ void filelist_setfiletypes(struct FileList* filelist, short has_quicktime)
 				||	BLI_testextensie(file->relname, ".ac3")
 				||	BLI_testextensie(file->relname, ".aac")
 				||	BLI_testextensie(file->relname, ".flac")
+				||	BLI_testextensie(file->relname, ".wma")
 				||	BLI_testextensie(file->relname, ".eac3")) {
 				file->flags |= SOUNDFILE;
 			}
diff --git a/tools/Blender.py b/tools/Blender.py
index 6b07853ac85cb6dd3eba5b9d68b75c0483aafca5..bca9ba4754d4ace8e20c5df678af24f44b46ae68 100644
--- a/tools/Blender.py
+++ b/tools/Blender.py
@@ -198,6 +198,7 @@ def setup_syslibs(lenv):
 	if lenv['WITH_BF_LCMS']:
 		syslibs.append(lenv['BF_LCMS_LIB'])
 
+
 	syslibs += lenv['LLIBS']
 
 	return syslibs