diff --git a/hermit/usr/xray/demangle.c b/hermit/usr/xray/demangle.c
index cf3cbc43d..e76dd23b5 100644
--- a/hermit/usr/xray/demangle.c
+++ b/hermit/usr/xray/demangle.c
@@ -2,7 +2,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file. */
 
-#include "xray/xray_priv.h"
+#include "xray_priv.h"
 
 /* Note name demangling requires linking against libstdc++                 */
 /* If your platform does not support __cxa_demangle, re-compile XRay with: */
diff --git a/hermit/usr/xray/hashtable.c b/hermit/usr/xray/hashtable.c
index 45f2aa21c..3fdd2d1c0 100644
--- a/hermit/usr/xray/hashtable.c
+++ b/hermit/usr/xray/hashtable.c
@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "xray/xray_priv.h"
+#include "xray_priv.h"
 
 #if defined(XRAY)
 
diff --git a/hermit/usr/xray/parsesymbols.c b/hermit/usr/xray/parsesymbols.c
index e2afd4413..1320ea59f 100644
--- a/hermit/usr/xray/parsesymbols.c
+++ b/hermit/usr/xray/parsesymbols.c
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include "xray/xray_priv.h"
+#include "xray_priv.h"
 
 #if defined(XRAY)
 
diff --git a/hermit/usr/xray/report.c b/hermit/usr/xray/report.c
index 20e9e84ac..a0a8d5475 100644
--- a/hermit/usr/xray/report.c
+++ b/hermit/usr/xray/report.c
@@ -14,7 +14,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include "xray/xray_priv.h"
+#include "xray_priv.h"
 
 #if defined(XRAY)
 
@@ -199,10 +199,12 @@ void XRaySaveReport(struct XRayTraceCapture* capture,
                     float percent_cutoff,
                     int ticks_cutoff) {
   FILE* f;
-  f = fopen(filename, "wt");
+  f = fopen(filename, "w");
   if (NULL != f) {
     XRayReport(capture, f, percent_cutoff, ticks_cutoff);
     fclose(f);
+  } else {
+	  printf("Cannot open file '%s'\n", filename);
   }
 }
 
diff --git a/hermit/usr/xray/stringpool.c b/hermit/usr/xray/stringpool.c
index bc8ac0956..25ac38f02 100644
--- a/hermit/usr/xray/stringpool.c
+++ b/hermit/usr/xray/stringpool.c
@@ -14,7 +14,7 @@
 #define _GNU_SOURCE
 #include <stdlib.h>
 #include <string.h>
-#include "xray/xray_priv.h"
+#include "xray_priv.h"
 
 #if defined(XRAY)
 
diff --git a/hermit/usr/xray/symtable.c b/hermit/usr/xray/symtable.c
index 1f0584c7f..37edba704 100644
--- a/hermit/usr/xray/symtable.c
+++ b/hermit/usr/xray/symtable.c
@@ -14,7 +14,7 @@
 #include <dlfcn.h>
 #endif
 
-#include "xray/xray_priv.h"
+#include "xray_priv.h"
 #define PNACL_STRING_OFFSET (0x10000000)
 
 #if defined(XRAY)
diff --git a/hermit/usr/xray/xray.c b/hermit/usr/xray/xray.c
index 9e49591fe..dc0fe8cc7 100644
--- a/hermit/usr/xray/xray.c
+++ b/hermit/usr/xray/xray.c
@@ -14,7 +14,7 @@
 #include <string.h>
 #include <sys/time.h>
 #include <unistd.h>
-#include "xray/xray_priv.h"
+#include "xray_priv.h"
 
 #if defined(XRAY)
 
diff --git a/hermit/usr/xray/xray.h b/hermit/usr/xray/xray.h
index 32feed0a0..1d459c4f3 100644
--- a/hermit/usr/xray/xray.h
+++ b/hermit/usr/xray/xray.h
@@ -10,6 +10,11 @@
 
 #include <stdint.h>
 
+// we don't want that
+#ifndef XRAY_DISABLE_BROWSER_INTEGRATION
+#define XRAY_DISABLE_BROWSER_INTEGRATION
+#endif
+
 #ifndef XRAY_DISABLE_BROWSER_INTEGRATION
 #include "ppapi/c/ppb.h"
 #endif
diff --git a/hermit/usr/xray/xray_priv.h b/hermit/usr/xray/xray_priv.h
index 714c91daa..3aa7e5250 100644
--- a/hermit/usr/xray/xray_priv.h
+++ b/hermit/usr/xray/xray_priv.h
@@ -13,7 +13,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "xray/xray.h"
+#include "xray.h"
 
 #ifdef __cplusplus
 extern "C" {