Fix build after addition of -Wmissing-variable-declarations to WARNS=6 in HEAD