diff --git a/Makefile.msc b/Makefile.msc
index f13418ffb7..1c3adc59a1 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -140,6 +140,13 @@ MEMDEBUG = 0
 WIN32HEAP = 0
 !ENDIF
 
+# Set this to non-0 to enable OSTRACE() macros, which can be useful when
+# debugging.
+#
+!IFNDEF OSTRACE
+OSTRACE = 0
+!ENDIF
+
 # Set this to one of the following values to enable various debugging
 # features.  Each level includes the debugging options from the previous
 # levels.  Currently, the recognized values for DEBUG are:
@@ -481,9 +488,9 @@ TCC = $(TCC) -DSQLITE_DEBUG
 RCC = $(RCC) -DSQLITE_DEBUG
 !ENDIF
 
-!IF $(DEBUG)>4
-TCC = $(TCC) -DSQLITE_DEBUG_OS_TRACE=1
-RCC = $(RCC) -DSQLITE_DEBUG_OS_TRACE=1
+!IF $(DEBUG)>4 || $(OSTRACE)!=0
+TCC = $(TCC) -DSQLITE_FORCE_OS_TRACE=1 -DSQLITE_DEBUG_OS_TRACE=1
+RCC = $(RCC) -DSQLITE_FORCE_OS_TRACE=1 -DSQLITE_DEBUG_OS_TRACE=1
 !ENDIF
 
 !IF $(DEBUG)>5
diff --git a/manifest b/manifest
index 0109903b5e..d72c37561f 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Move\sOSTRACE\sdefines\sso\sthey\sare\svisible\sto\sall\ssource\sfiles\sthat\sneed\sthem.
-D 2015-04-16T03:56:32.316
+C Restore\sSQLITE_FORCE_OS_TRACE\sto\sthe\sMSVC\smakefile,\swhich\swas\sremoved\sduring\sa\smerge.
+D 2015-04-16T16:27:29.786
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5f78b1ab81b64e7c57a75d170832443e66c0880a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc 11cb5361e34b80e9c5b417ed6a6deee099c5b5f3
+F Makefile.msc 29e11e91c4abf13c522b983552fac18422519321
 F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
 F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
 F VERSION 2e244662b71e6e68a5c29b014ebc5b7564f4cc5a
@@ -235,7 +235,7 @@ F src/shell.c 72b61a9d41ba12b67ea06fe9267abcc012c6c5bb
 F src/sqlite.h.in ca27603a36fcacdaac5a19d8ee35aaff8ce8516f
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
-F src/sqliteInt.h 0c5881204cfbba739fa5c859a6acb3219a70f42e
+F src/sqliteInt.h 1b6087a8e82c3e5bf3acfbf0fe144519df7cecc8
 F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
 F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
 F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
@@ -1250,7 +1250,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P ae5af70427e0df960a54c48cd27a6288500b1f31
-R 947eabea0fc8e6e24a4dbedb3eb276a4
+P 72485c97c6de47b8bba63b2a307e7bdeea114040
+R 59a3cad2ebc56d9746b8d39612e405b8
 U mistachkin
-Z 9274684aadef583df5fc51a559e8c418
+Z ed5465cd174207b2ad19d34d3cae09df
diff --git a/manifest.uuid b/manifest.uuid
index fb0a24b48a..9949a6e131 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-72485c97c6de47b8bba63b2a307e7bdeea114040
\ No newline at end of file
+c37f4d492f98ac5c07c08705a3826a3e86107306
\ No newline at end of file
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 3bea7335da..56fd2e14fa 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -365,8 +365,8 @@
 /*
 ** Declarations used for tracing the operating system interfaces.
 */
-#if (defined(SQLITE_DEBUG) && SQLITE_OS_WIN) || \
-    defined(SQLITE_TEST) || defined(SQLITE_FORCE_OS_TRACE)
+#if defined(SQLITE_FORCE_OS_TRACE) || defined(SQLITE_TEST) || \
+    (defined(SQLITE_DEBUG) && SQLITE_OS_WIN)
   extern int sqlite3OSTrace;
 # define OSTRACE(X)          if( sqlite3OSTrace ) sqlite3DebugPrintf X
 # define SQLITE_HAVE_OS_TRACE