diff --git a/Makefile.mk b/Makefile.mk
index cbd33bf..48c1f67 100644
--- a/Makefile.mk
+++ b/Makefile.mk
@@ -65,12 +65,12 @@ CXXFLAGS   += -fvisibility-inlines-hidden
 endif
 
 BUILD_C_FLAGS   = $(BASE_FLAGS) -std=c99 -std=gnu99 $(CFLAGS)
-BUILD_CXX_FLAGS = $(BASE_FLAGS) -std=c++0x -std=gnu++0x $(CXXFLAGS)
+BUILD_CXX_FLAGS = $(BASE_FLAGS) -std=c++0x -std=gnu++0x $(CXXFLAGS) $(CPPFLAGS)
 LINK_FLAGS      = $(LINK_OPTS) -Wl,--no-undefined $(LDFLAGS)
 
 ifeq ($(MACOS),true)
 # No C++11 support
-BUILD_CXX_FLAGS = $(BASE_FLAGS) $(CXXFLAGS)
+BUILD_CXX_FLAGS = $(BASE_FLAGS) $(CXXFLAGS) $(CPPFLAGS)
 LINK_FLAGS      = $(LINK_OPTS) $(LDFLAGS)
 endif
 
diff --git a/dpf b/dpf
index 2029ad2..a8be008 160000
--- a/dpf
+++ b/dpf
@@ -1 +1 @@
-Subproject commit 2029ad2977562d54e8e214a50cf319b3ce4a41c5
+Subproject commit a8be0083a2b0c308a15f29d39929d5125ca623fc