diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
index 2895857..15cfb05 100644
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -13,7 +13,8 @@ project
 
 lib dl : : <link>shared ;
 lib gcc_s : : <link>shared ;
-lib Dbghelp ;
+lib Dbgeng ;
+lib ole32 ;
 
 
 local LIBBACKTRACE_PATH = [ modules.peek : LIBBACKTRACE_PATH ] ;
@@ -44,7 +45,7 @@ explicit libbacktrace ;
 mp-run-simple has_addr2line.cpp : : : : addr2line ;
 explicit addr2line ;
 
-mp-run-simple has_windbg.cpp : : : : WinDbg ;
+mp-run-simple has_windbg.cpp : : : <library>Dbgeng <library>ole32 : WinDbg ;
 explicit WinDbg ;
 
 lib boost_stacktrace_noop
diff --git a/build/has_windbg.cpp b/build/has_windbg.cpp
index e21f5ec..bffe709 100644
--- a/build/has_windbg.cpp
+++ b/build/has_windbg.cpp
@@ -7,7 +7,7 @@
 
 #include <cstring>
 #include <windows.h>
-#include "Dbgeng.h"
+#include "dbgeng.h"
 
 #pragma comment(lib, "ole32.lib")
 #pragma comment(lib, "Dbgeng.lib")
diff --git a/include/boost/stacktrace/detail/frame_msvc.ipp b/include/boost/stacktrace/detail/frame_msvc.ipp
index 6713fd5..dd6f445 100644
--- a/include/boost/stacktrace/detail/frame_msvc.ipp
+++ b/include/boost/stacktrace/detail/frame_msvc.ipp
@@ -35,7 +35,7 @@
 #endif
 
 // Testing. Remove later
-#   define __uuidof(x) ::IID_ ## x
+//#   define __uuidof(x) ::IID_ ## x
 
 namespace boost { namespace stacktrace { namespace detail {