diff --git a/src/Makefile b/src/Makefile
index 4f57354a755..6137d417b51 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -49,6 +49,8 @@ LIBRARIES+= \
 ifeq ($(OS_CHOICE),windows)
 #Does not support parallel builds for files in src.
 .NOTPARALLEL:;
+#Do not build the dynamic libraries.
+LIBRARIES=
 ifeq ($(DEBUG),0)
 WINYDB = $(IPO_YDB)
 else
@@ -60,7 +62,7 @@ endif
 
 INSTALL_LIBRARIES= $(patsubst %,%.install,$(LIBRARIES))
 ifeq ($(OS_CHOICE),windows)
-    INSTALL_LIBRARIES += libtokudb.pdb.install
+    #INSTALL_LIBRARIES += libtokudb.pdb.install #Disabled dynamic libraries
 endif
 
 
@@ -96,6 +98,7 @@ buildlocktrees: $(LOCKTREE) $(RANGETREE) ;
 
 $(YDB):  $(OBJS) 
 
+
 $(LIBRARY):  $(YDB)  $(LOCKTREE) $(RANGETREE) $(NEWBRT) $(DEPEND_COMPILE) $(DEPEND_LINK) 
 
 $(LIBRARY):  LINK_FILES=ydb_lib.$(OEXT) $(YDB)  $(LOCKTREE) $(RANGETREE) $(NEWBRT)
@@ -106,7 +109,10 @@ $(LIBRARY_S):  $(patsubst %.$(AEXT),%.bundle, $(YDB) $(LOCKTREE) $(RANGETREE) $(
 else ifneq ($(CC),icc)
 $(LIBRARY_S):  $(YDB)  $(LOCKTREE) $(RANGETREE) $(NEWBRT) $(LIBPORTABILITY)
 else
-$(LIBRARY_S):  $(LIBRARY)  ;
+$(LIBRARY) $(LIBRARY_S):
+	echo "Dynamic tokudb in windows is deprecated"
+	test 1 = 0
+#$(LIBRARY_S):  $(LIBRARY)  ;
 #$(LIBRARY_S):  $(YDB)  $(LOCKTREE) $(RANGETREE) $(NEWBRT) $(LIBPORTABILITY)
 #$(TLIBRARY_S): $(TYDB) $(LOCKTREE) $(RANGETREE) $(NEWBRT) $(LIBPORTABILITY)
 endif
diff --git a/src/tests/Makefile b/src/tests/Makefile
index bb9c8ffa0b5..8e0e45e3da8 100644
--- a/src/tests/Makefile
+++ b/src/tests/Makefile
@@ -11,22 +11,25 @@ DEPEND_COMPILE += \
 #end
 include $(TOKUROOT)toku_include/Makefile.include
 CPPFLAGS+=-D_GNU_SOURCE
-LIBTDB=../libtokudb.$(SOEXT)
-TLIBTDB=../libtokudbtrace.$(SOEXT)
 
 ifeq ($(CC),icc)
 SKIP_WARNING += $(ICC_NOWARN)1418 #Non static functions do not need prototypes.
 endif
 BDBVGRIND=
 
-$(LIBTDB) $(TLIBTDB):
-	cd $(@D) && $(MAKE) $(@F)
+TDB_EXTRA_NEEDED=
+ifeq ($(OS_CHOICE),windows)
+LIBTDB=$(WIN_YDB)
+%.tdb$(BINSUF):  $(WIN_YDB)
+%.tdb$(BINSUF):  LINK_FILES+=$(WIN_YDB)
+TDB_EXTRA_NEEDED=$(WIN_YDB)
+else
+LIBTDB=../libtokudb.$(SOEXT)
+TLIBTDB=../libtokudbtrace.$(SOEXT)
+%.tdb$(BINSUF):  DLINK_FILES+=$(LIBTDB)
+%.tdb$(BINSUF):  RPATH_DIRS+=$(dir $(LIBTDB))
+endif
 
-$(notdir $(LIBTDB)): $(LIBTDB)
-	cp $< $@
-
-$(notdir $(TLIBTDB)): $(TLIBTDB)
-	cp $< $@
 
 SRCS = $(sort $(wildcard *.c))
 RECOVER_SRCS = $(wildcard recover-*.c)
@@ -262,7 +265,7 @@ tests: tests.bdb tests.tdb ;
 tests.bdb: $(BDB_BINS) ;
 check.bdb: $(RUN_BDB_TESTS) ;
 tests.tdb: $(TDB_BINS) ;
-check.tdb: $(notdir $(LIBTDB)) $(PTHREAD_LOCAL) $(RUN_TDB_TESTS) ;
+check.tdb: $(LIBTDB) $(PTHREAD_LOCAL) $(RUN_TDB_TESTS) ;
 check.tdb.extra: $(EXTRA_TDB_TESTS) ;
 check.abortrecover: $(RECOVER_TESTS) ;
 
@@ -320,7 +323,7 @@ endif
 # Use -s on the command line to make things quiet.
 %.bdbrun: %.bdb$(BINSUF) $(DEPEND_COMPILE) $(DEPEND_LINK) $(WINDOWS_BDB_LIB_NAME)
 	$(BDBVGRIND) ./$< $(VERBVERBOSE) $(MAYBEINVERTER) $(SUMMARIZE_CMD)
-%.tdbrun: %.tdb$(BINSUF) $(DEPEND_COMPILE) $(DEPEND_LINK) $(notdir $(LIBTDB)) $(PTHREAD_LOCAL)
+%.tdbrun: %.tdb$(BINSUF) $(DEPEND_COMPILE) $(DEPEND_LINK) $(LIBTDB) $(PTHREAD_LOCAL)
 	$(TDBVGRIND) ./$< $(VERBVERBOSE) $(MAYBEINVERTER) $(SUMMARIZE_CMD)
 
 ifeq ($(OS_CHOICE),windows)
@@ -373,21 +376,6 @@ $(patsubst %,test_log%.tdbrun,$(TLRECOVER)): ;
 %.bdb$(BINSUF): %.c $(DEPEND_COMPILE) $(DEPEND_LINK)
 	$(CC) $< $(BIN_FROM_C_FLAGS) $(LINK_MUST_BE_LAST)
 
-TDB_EXTRA_NEEDED=
-ifeq ($(CYGWIN),)
-%.tdb$(BINSUF):  DLINK_FILES+=$(LIBTDB)
-%.tdb$(BINSUF):  RPATH_DIRS+=$(dir $(LIBTDB))
-else ifneq ($(CC),icc)
-%.tdb$(BINSUF):  DLINK_FILES+=$(LIBTDB)
-%.tdb$(BINSUF):  RPATH_DIRS+=$(dir $(LIBTDB))
-else ifeq  ($(DEBUG),0)
-%.tdb$(BINSUF):  LINK_FILES+=$(IPO_YDB)
-TDB_EXTRA_NEEDED=$(IPO_YDB)
-else
-%.tdb$(BINSUF):  LINK_FILES+=$(NOIPO_YDB)
-TDB_EXTRA_NEEDED=$(NOIPO_YDB)
-endif
-
 %.tdbt$(BINSUF): DLINK_FILES+=$(TLIBTDB)
 %.tdbt$(BINSUF): RPATH_DIRS+=$(dir $(TLIBTDB))
 %.tdb$(BINSUF) %.tdbt$(BINSUF): CFLAGS+= -DENVDIR=\"dir.$<.tdb\" -DUSE_TDB -DIS_TDB=1
diff --git a/toku_include/Makefile.include b/toku_include/Makefile.include
index b98b61278bd..9742ef52599 100644
--- a/toku_include/Makefile.include
+++ b/toku_include/Makefile.include
@@ -450,6 +450,11 @@ IPO_YDB       = $(TOKUROOT)src/ipo_libtokudb.$(AEXT)
 NOIPO_YDB     = $(TOKUROOT)src/static_libtokudb.$(AEXT)
 $(NOIPO_YDB) $(IPO_YDB): $(@D)*.[ch]
 	cd $(@D) && $(MAKE) $(@F)
+ifeq  ($(DEBUG),0)
+    WIN_YDB   = $(IPO_YDB)
+else
+    WIN_YDB   = $(NOIPO_YDB)
+endif
 endif
 
 ifeq ($(OS_CHOICE),windows)