* src/vmcore/annotation.c

(annotation_bytearrays_resize): Removed unused variables.

* src/vmcore/annotation.h: Sorted includes.
(vmcore/utf8.h): Removed include.

diff --cc src/vmcore/annotation.c
index 1807653fa8ada71b2d8865a73b51631318f87782,81ec65ede6bd9eaadbef0ab814cd7b022ded911d..ae22acb638a4cf6678f597c117cf3acb605dcca5
--- 1/src/vmcore/annotation.c
--- 2/src/vmcore/annotation.c
+++ b/src/vmcore/annotation.c
@@@ -54,14 -100,12 +54,12 @@@
  
  *******************************************************************************/
  
 -bool annotation_bytearrays_resize(annotation_bytearrays_t **bas,
 +static bool annotation_bytearrays_resize(java_handle_objectarray_t **bas,
        uint32_t size)
  {
 -      annotation_bytearrays_t *newbas = NULL;
 -      uint32_t i;
 +      java_handle_objectarray_t *newbas = NULL;
-       java_handle_t             *o;
-       uint32_t i;
        uint32_t minsize;
 +      uint32_t oldsize;
        
        assert(bas != NULL);
        

diff --cc src/vmcore/annotation.h
index b33a78fd99d1ec8987f0fd9464bcd8cb85e50f32,c224ebe8494fd97782b7f4da4f85b76eeea95f37..7ec071d3dfc98a73bdc652ebddec69fe512f8883
--- 1/src/vmcore/annotation.h
--- 2/src/vmcore/annotation.h
+++ b/src/vmcore/annotation.h
@@@ -28,17 -28,39 +28,16 @@@
  #ifndef _ANNOTATION_H
  #define _ANNOTATION_H
  
 -/* forward typedefs ***********************************************************/
 -
 -typedef struct annotation_bytearray_t annotation_bytearray_t;
 -typedef struct annotation_t           annotation_t;
 -typedef struct element_value_t        element_value_t;
 -typedef struct annotation_bytearrays_t annotation_bytearrays_t;
  
  #include "config.h"
--#include "vm/types.h"
  
++#include "vm/types.h"
  #include "vm/global.h"
  
  #include "vmcore/class.h"
  #include "vmcore/field.h"
--#include "vmcore/method.h"
  #include "vmcore/loader.h"
--#include "vmcore/utf8.h"
 -
 -
 -/* annotation_bytearray *******************************************************/
 -
 -struct annotation_bytearray_t {
 -      uint32_t size;
 -      uint8_t  data[1];
 -};
 -
 -
 -/* annotation_bytearrays ******************************************************/
 -
 -struct annotation_bytearrays_t {
 -      uint32_t size;
 -      annotation_bytearray_t *data[1];
 -};
++#include "vmcore/method.h"
  
  
  /* function prototypes ********************************************************/