diff --git a/ChangeLog b/ChangeLog
index 43e154b0e..95c9bee5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,6 +37,8 @@
      [ssh-agent.c]
      restore umask around listener socket creation (dropped in streamlocal patch
      merge)
+ - (dtucker) [auth2-gss.c gss-serv-krb5.c] Include misc.h for fwd_opts, used
+   in servconf.h.
 
 20140717
  - (djm) [digest-openssl.c] Preserve array order when disabling digests.
diff --git a/auth2-gss.c b/auth2-gss.c
index c28a705cb..447f896f2 100644
--- a/auth2-gss.c
+++ b/auth2-gss.c
@@ -40,6 +40,7 @@
 #include "log.h"
 #include "dispatch.h"
 #include "buffer.h"
+#include "misc.h"
 #include "servconf.h"
 #include "packet.h"
 #include "ssh-gss.h"
diff --git a/gss-serv-krb5.c b/gss-serv-krb5.c
index 759fa104f..795992d9f 100644
--- a/gss-serv-krb5.c
+++ b/gss-serv-krb5.c
@@ -39,6 +39,7 @@
 #include "hostfile.h"
 #include "auth.h"
 #include "log.h"
+#include "misc.h"
 #include "servconf.h"
 
 #include "buffer.h"