diff --git a/Makefile b/Makefile
index 9d5180a60..2ce04a782 100644
--- a/Makefile
+++ b/Makefile
@@ -18,10 +18,9 @@ $(shell (export ROCKSDB_ROOT=$(CURDIR); $(CURDIR)/build_tools/build_detect_platf
 # this file is generated by the previous line to set build flags and sources
 include build_config.mk
 
-WARNING_FLAGS = -Wall -Wmaybe-uninitialized
+WARNING_FLAGS =
 CFLAGS += -g $(WARNING_FLAGS) -I. -I./include $(PLATFORM_CCFLAGS) $(OPT)
 CXXFLAGS += -g $(WARNING_FLAGS) -I. -I./include $(PLATFORM_CXXFLAGS) $(OPT) -std=gnu++0x -Woverloaded-virtual
-
 LDFLAGS += $(PLATFORM_LDFLAGS)
 
 LIBOBJECTS = $(SOURCES:.cc=.o)
diff --git a/build_tools/fbcode_config.sh b/build_tools/fbcode_config.sh
index 5eab3af96..6470c3414 100644
--- a/build_tools/fbcode_config.sh
+++ b/build_tools/fbcode_config.sh
@@ -39,7 +39,6 @@ if test -z $PIC_BUILD; then
   LZ4_LIBS=" $LZ4_BASE/lib/liblz4.a"
   CFLAGS+=" -DLZ4"
 fi
-CFLAGS+=" -DZSTD"
 
 # location of gflags headers and libraries
 GFLAGS_INCLUDE=" -I $GFLAGS_BASE/include/"