diff --git a/driver/cfparse.y b/driver/cfparse.y
index db2759e61..40f20c5a8 100644
--- a/driver/cfparse.y
+++ b/driver/cfparse.y
@@ -1,6 +1,6 @@
 %{
 /*
- * Copyright (c) 2001-2010 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2001-2011 Stephen Williams (steve@icarus.com)
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -24,6 +24,7 @@
 # include  <stdlib.h>
 # include  <stdio.h>
 # include  <string.h>
+# include "ivl_alloc.h"
 
 
 /*
diff --git a/tgt-vlog95/udp.c b/tgt-vlog95/udp.c
index e95d44135..34feb356d 100644
--- a/tgt-vlog95/udp.c
+++ b/tgt-vlog95/udp.c
@@ -20,6 +20,7 @@
 # include <string.h>
 # include "config.h"
 # include "vlog95_priv.h"
+# include "ivl_alloc.h"
 
 static void emit_entry(ivl_udp_t udp, char entry, unsigned *rerun)
 {
diff --git a/vhdlpp/expression.cc b/vhdlpp/expression.cc
index be69247ac..14286759a 100644
--- a/vhdlpp/expression.cc
+++ b/vhdlpp/expression.cc
@@ -201,8 +201,8 @@ Expression*ExpAggregate::choice_t::simple_expression(bool detach_flag)
 ExpAggregate::element_t::element_t(list<choice_t*>*fields, Expression*val)
 : fields_(fields? fields->size() : 0), val_(val)
 {
-      size_t idx = 0;
       if (fields) {
+	    size_t idx = 0;
 	    while (! fields->empty()) {
 		  assert(idx < fields_.size());
 		  fields_[idx++] = fields->front();