diff --git a/AStatement.h b/AStatement.h
index a1b2085ef..0b1b60396 100644
--- a/AStatement.h
+++ b/AStatement.h
@@ -22,6 +22,7 @@
 # include  <map>
 # include  "StringHeap.h"
 # include  "LineInfo.h"
+# include  "PExpr.h"
 
 class PExpr;
 
diff --git a/dup_expr.cc b/dup_expr.cc
index ad4bb7b0a..c6bf13416 100644
--- a/dup_expr.cc
+++ b/dup_expr.cc
@@ -21,6 +21,7 @@
 
 # include  "netlist.h"
 # include  <cassert>
+# include  <stdlib.h>
 # include  "ivl_assert.h"
 
 NetEAccess* NetEAccess::dup_expr() const
diff --git a/eval_tree.cc b/eval_tree.cc
index 3b82d99f6..9ed5ba649 100644
--- a/eval_tree.cc
+++ b/eval_tree.cc
@@ -574,7 +574,7 @@ NetEConst* NetEBComp::eval_eqeq_real_(NetExpr*le, NetExpr*ri, bool ne_flag)
 	    assert(0);
       }
 
-      verinum result((lv == rv ^ ne_flag) ? verinum::V1 : verinum::V0, 1);
+      verinum result(((lv == rv) ^ ne_flag) ? verinum::V1 : verinum::V0, 1);
       vtmp = new NetEConst(result);
       vtmp->set_line(*this);