[1.5] Sync with trunk and remove uneeded include headers

diff --git a/libopenjpeg/cidx_manager.c b/libopenjpeg/cidx_manager.c
index 6131b938ea6acc3bbc14f93b896c811ddeb01ade..f3b251ffa09bf938ce8842c8e271ff56c852e871 100644 (file)
--- a/libopenjpeg/cidx_manager.c
+++ b/libopenjpeg/cidx_manager.c
@@ -29,8 +29,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
 #include "opj_includes.h"