diff --git a/intern/audaspace/intern/Makefile b/intern/audaspace/intern/Makefile
index a99f44c54d7..4bdca04c1cb 100644
--- a/intern/audaspace/intern/Makefile
+++ b/intern/audaspace/intern/Makefile
@@ -47,7 +47,7 @@ endif
 
 ifeq ($(WITH_JACK),true)
 	CPPFLAGS += -DWITH_JACK
-	CPPFLAGS += -I$(NAN_JACKCFLAGS)
+	CPPFLAGS += $(NAN_JACKCFLAGS)
 	CPPFLAGS += -I../jack
 endif
 
@@ -58,6 +58,7 @@ endif
 
 ifeq ($(WITH_SNDFILE),true)
 	CPPFLAGS += -DWITH_SNDFILE
+	CPPFLAGS += -I../sndfile
 endif
 
 CPPFLAGS += -I$(LCGDIR)/samplerate/include/
diff --git a/source/blender/render/intern/source/Makefile b/source/blender/render/intern/source/Makefile
index 5d4a224002e..c313549f9b9 100644
--- a/source/blender/render/intern/source/Makefile
+++ b/source/blender/render/intern/source/Makefile
@@ -50,6 +50,7 @@ CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
 # not very neat: the rest of blender..
 CPPFLAGS += -I../../../editors/include 
 CPPFLAGS += $(NAN_SDLCFLAGS)
+CPPFLAGS += -I../../../../../intern/smoke/extern
 
 ifeq ($(WITH_QUICKTIME), true)
 	CPPFLAGS += -DWITH_QUICKTIME
diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c
index ff076579788..f1f01f873a5 100644
--- a/source/blender/render/intern/source/voxeldata.c
+++ b/source/blender/render/intern/source/voxeldata.c
@@ -42,6 +42,7 @@
 #include "BKE_global.h"
 #include "BKE_image.h"
 #include "BKE_main.h"
+#include "BKE_modifier.h"
 
 #include "smoke_API.h"
 
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index 50a606496f5..f8afc7f3fa6 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -134,7 +134,7 @@ ifndef CONFIG_GUESS
   ifeq ($(WITH_SNDFILE),true)
     export NAN_SNDFILE ?= /usr
     export NAN_SNDFILECFLAGS ?= -I$(NAN_SNDFILE)/include
-    export NAN_SNDFILELIBS ?= $(NAN_SNDFILE)/lib/libsndfile.a
+    export NAN_SNDFILELIBS ?= $(NAN_SNDFILE)/lib/libsndfile.a $(NAN_SNDFILE)/lib/libFLAC.a $(NAN_SNDFILE)/lib/libogg.a
   endif
 
   ifeq ($(NAN_USE_FFMPEG_CONFIG), true)