diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index ba99743f8d2c..6221a249252c 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-4ba387176e8a826dd5dd6cad4caa2f93434d0b14
+ca5b64137f013e3104fd74ee7d07ba556a501187
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
diff --git a/gcc/go/gofrontend/escape.cc b/gcc/go/gofrontend/escape.cc
index dfe6eb230fc3..433477eec3bd 100644
--- a/gcc/go/gofrontend/escape.cc
+++ b/gcc/go/gofrontend/escape.cc
@@ -4,6 +4,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#include "go-system.h"
+
 #include <limits>
 #include <stack>
 #include <sstream>