Index: ext/lsm1/lsm-test/lsmtest.h
==================================================================
--- ext/lsm1/lsm-test/lsmtest.h
+++ ext/lsm1/lsm-test/lsmtest.h
@@ -5,22 +5,28 @@
 #include "lsmtest_tdb.h"
 #include "sqlite3.h"
 #include "lsm.h"
 
 #include <assert.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+#ifndef _WIN32
+# include <unistd.h>
+#endif
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <errno.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifndef _O_BINARY
-# define _O_BINARY (0)
-#endif
-
 #ifdef _WIN32
 # include "windows.h"
 # define gettimeofday win32GetTimeOfDay
 # define F_OK  (0)
 # define sleep(sec) Sleep(1000 * (sec))
@@ -53,10 +59,14 @@
 
 #define unused_parameter(x) (void)(x)
 
 #define TESTDB_DEFAULT_PAGE_SIZE   4096
 #define TESTDB_DEFAULT_CACHE_SIZE  2048
+
+#ifndef _O_BINARY
+# define _O_BINARY (0)
+#endif
 
 /*
 ** Ideally, these should be in wrapper.c. But they are here instead so that 
 ** they can be used by the C++ database wrappers in wrapper2.cc.
 */

Index: ext/lsm1/lsm-test/lsmtest6.c
==================================================================
--- ext/lsm1/lsm-test/lsmtest6.c
+++ ext/lsm1/lsm-test/lsmtest6.c
@@ -238,17 +238,10 @@
   }
 }
 
 #define LSMTEST6_TESTDB "testdb.lsm" 
 
-#ifndef _WIN32
-# include <unistd.h>
-#endif
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
 void testDeleteLsmdb(const char *zFile){
   char *zLog = testMallocPrintf("%s-log", zFile);
   char *zShm = testMallocPrintf("%s-shm", zFile);
   unlink(zFile);
   unlink(zLog);

Index: ext/lsm1/lsm-test/lsmtest_io.c
==================================================================
--- ext/lsm1/lsm-test/lsmtest_io.c
+++ ext/lsm1/lsm-test/lsmtest_io.c
@@ -53,18 +53,10 @@
 **
 */
 
 #include "lsmtest.h"
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#ifndef _WIN32
-# include <unistd.h>
-#endif
-#include <ctype.h>
-
 typedef struct IoContext IoContext;
 
 struct IoContext {
   int fd;
   int nWrite;

Index: ext/lsm1/lsm-test/lsmtest_main.c
==================================================================
--- ext/lsm1/lsm-test/lsmtest_main.c
+++ ext/lsm1/lsm-test/lsmtest_main.c
@@ -1,24 +1,8 @@
 
-#include "stdarg.h"
 #include "lsmtest.h"
-#include "stdio.h"
-#include "assert.h"
-#include "string.h"
-#include "stdlib.h"
-
 #include <sqlite3.h>
-
-#ifndef _WIN32
-# include <unistd.h>
-#endif
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-
 
 void test_failed(){ 
   assert( 0 );
   return; 
 }