diff --git a/[refs] b/[refs]
index b9df212ceffe..b04a88eb308f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 358142dd8cbbfa2abb1090aca1b636b98ed75ef5
+refs/heads/master: ff894e396b4d0b5383127c1bcb2cd3879946526e
diff --git a/trunk/scripts/tags.sh b/trunk/scripts/tags.sh
index 028dc5ca857d..833813a99e7c 100755
--- a/trunk/scripts/tags.sh
+++ b/trunk/scripts/tags.sh
@@ -167,6 +167,8 @@ exuberant()
 	--langdef=dotconfig --language-force=dotconfig          \
 	--regex-dotconfig='/^#?[[:blank:]]*(CONFIG_[[:alnum:]_]+)/\1/'
 
+	# Remove structure forward declarations.
+	LANG=C sed -i -e '/^\([a-zA-Z_][a-zA-Z0-9_]*\)\t.*\t\/\^struct \1;.*\$\/;"\tx$/d' tags
 }
 
 emacs()