#include "debug.h"
#include "iroptimize.h"
#include "scalar_replace.h"
-#include "array.h"
+#include "array_t.h"
#include "irprog_t.h"
#include "irgwalk.h"
#include "irgmod.h"
#include "irouts.h"
#include "irhooks.h"
#include "ircons_t.h"
-#include "xmalloc.h"
DEBUG_ONLY(static firm_dbg_module_t *dbg);