Index: api/boinc_gl.h
===================================================================
--- api/boinc_gl.h	(revision 12442)
+++ api/boinc_gl.h	(working copy)
@@ -25,7 +25,9 @@
 #  include <GL/gl.h>
 #  include <GL/glu.h>
 #if !defined(__MINGW32__) && !defined(__CYGWIN32__)
+#if !defined(_WIN32_WINNT_LONGHORN)
 #  include <GL/glaux.h>
+#endif
 #else
 #  include <GL/glext.h>
 #endif
Index: lib/stackwalker_win.cpp
===================================================================
--- lib/stackwalker_win.cpp	(revision 12442)
+++ lib/stackwalker_win.cpp	(working copy)
@@ -188,7 +188,7 @@
     return bRetVal;
 }
 
-BOOL CALLBACK SymEnumerateModulesProc(LPSTR /* ModuleName */, DWORD64 BaseOfDll, PVOID /* UserContext */)
+BOOL CALLBACK SymEnumerateModulesProc(PCSTR /* ModuleName */, DWORD64 BaseOfDll, PVOID /* UserContext */)
 {
     IMAGEHLP_MODULE64   Module;
     char                szSymbolType[32];