diff --git a/MANIFEST b/MANIFEST
index 12b5452750..36010cdd3b 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -507,6 +507,8 @@
 ./src/H5FDstdio.h
 ./src/H5FDstream.c
 ./src/H5FDstream.h
+./src/H5FDwindows.c
+./src/H5FDwindows.h
 ./src/H5FL.c
 ./src/H5FLprivate.h
 ./src/H5FO.c
@@ -1743,8 +1745,6 @@
 #windows src
 ./windows/src/H5pubconf.h
 ./windows/src/H5Tinit.c
-./windows/src/H5FDwindows.c
-./windows/src/H5FDwindows.h
 
 #windows test
 ./windows/test/big/big.dsp
diff --git a/src/H5F.c b/src/H5F.c
index 6f8796b478..b17598223f 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -41,6 +41,7 @@
 #include "H5FDmulti.h"		/*multiple files partitioned by mem usage */
 #include "H5FDsec2.h"		/*Posix unbuffered I/O			*/
 #include "H5FDstdio.h"		/* Standard C buffered I/O		*/
+#include "H5FDwindows.h"        /* Windows buffered I/O     */
 #include "H5FDstream.h"         /*in-memory files streamed via sockets  */
 #include "H5FDdirect.h"         /*Linux direct I/O			*/
 
diff --git a/src/H5FD.c b/src/H5FD.c
index 198757b5a4..2a69e47de5 100644
--- a/src/H5FD.c
+++ b/src/H5FD.c
@@ -43,6 +43,7 @@
 #include "H5FDmulti.h"		/* Usage-partitioned file family	*/
 #include "H5FDsec2.h"		/* POSIX unbuffered file I/O		*/
 #include "H5FDstdio.h"		/* Standard C buffered I/O		*/
+#include "H5FDwindows.h"        /* Windows buffered I/O     */
 #include "H5FDstream.h"     	/* In-memory files streamed via sockets */
 #include "H5FDdirect.h"		/* Direct file I/O			*/
 #include "H5FLprivate.h"	/* Free lists                           */
@@ -169,6 +170,9 @@ H5FD_term_interface(void)
 #endif           
                 H5FD_log_term();
                 H5FD_stdio_term();
+#ifdef H5_HAVE_WINDOWS
+                H5FD_windows_term();
+#endif
                 H5FD_family_term();
                 H5FD_core_term();
                 H5FD_multi_term();
diff --git a/windows/src/H5FDwindows.c b/src/H5FDwindows.c
similarity index 100%
rename from windows/src/H5FDwindows.c
rename to src/H5FDwindows.c
diff --git a/windows/src/H5FDwindows.h b/src/H5FDwindows.h
similarity index 100%
rename from windows/src/H5FDwindows.h
rename to src/H5FDwindows.h
diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c
index dcb249c2f2..d2e80f2752 100644
--- a/src/H5Pfapl.c
+++ b/src/H5Pfapl.c
@@ -41,8 +41,10 @@
 #include "H5Iprivate.h"		/* IDs			  		*/
 #include "H5Ppkg.h"		/* Property lists		  	*/
 
-/* Default file driver - see H5Pget_driver() */
+/* Includes needed to set as default file driver */
 #include "H5FDsec2.h"		/* Posix unbuffered I/O	file driver	*/
+#include "H5FDstdio.h"		/* Standard C buffered I/O		*/
+#include "H5FDwindows.h"        /* Windows buffered I/O     */
 
 
 /****************/
diff --git a/src/hdf5.h b/src/hdf5.h
index fe35a3e5ff..7b9e268151 100644
--- a/src/hdf5.h
+++ b/src/hdf5.h
@@ -47,6 +47,7 @@
 #include "H5FDmulti.h"		/* Usage-partitioned file family	*/
 #include "H5FDsec2.h"		/* POSIX unbuffered file I/O		*/
 #include "H5FDstdio.h"		/* Standard C buffered I/O		*/
+#include "H5FDwindows.h"        /* Windows buffered I/O     */
 #include "H5FDstream.h"     	/* In-memory files streamed via sockets */
 #include "H5FDdirect.h"     	/* Linux direct I/O			*/
 
diff --git a/windows/copy_hdf.bat b/windows/copy_hdf.bat
index c7b7686cbf..74f58eb1f8 100755
--- a/windows/copy_hdf.bat
+++ b/windows/copy_hdf.bat
@@ -20,8 +20,6 @@
 
 copy src\H5Tinit.c ..\src
 copy src\H5pubconf.h ..\src
-copy src\H5FDwindows.c ..\src
-copy src\H5FDwindows.h ..\src
 copy fortran\src\H5f90i_gen.h ..\fortran\src
 copy fortran\src\H5fortran_types.f90 ..\fortran\src
 xcopy /e/i/Y *.bat ..\
diff --git a/windows/src/H5pubconf.h b/windows/src/H5pubconf.h
index 6942fc1322..ea44bca7c0 100755
--- a/windows/src/H5pubconf.h
+++ b/windows/src/H5pubconf.h
@@ -118,6 +118,13 @@ in the file file_io.win32.c and including it on the projects
 #define H5_HAVE_SZLIB_H 1
 #define H5_HAVE_FILTER_SZIP 1
 
+/* comment the following line out if you don't want to build the windows file
+   driver */
+#define H5_HAVE_WINDOWS
+
+/* change the following line if you would like to change the default file driver */
+#define H5_DEFAULT_VFD H5FD_SEC2
+
 /* comment the following line out if you are not using N-bit filter*/
 /* #define H5_HAVE_FILTER_NBIT 1*/