branches/zip:

Do not include univ.i in mysql_addons.h, it was included for the sole
purpose of innodb_redefine.h to work and now innodb_redefine.h has been
removed. See r2251 and r2288.

include/mysql_addons.h

@@ -19,8 +19,6 @@ Created November 07, 2007 Vasil Dimov
 extern "C" {
 #endif /* __cplusplus */
 
-#include "univ.i"
-
 /***********************************************************************
 Retrieve THD::thread_id
 http://bugs.mysql.com/30930 */