From 1d81b4f930857b78168ef6404d0fbb9572898d4b Mon Sep 17 00:00:00 2001
From: Gav Wood <gav@ethcore.io>
Date: Mon, 11 Jan 2016 17:49:49 +0100
Subject: [PATCH] EVMJIT build fixes.

---
 src/evm/jit.rs   | 14 +++++---------
 src/executive.rs | 10 ++--------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/evm/jit.rs b/src/evm/jit.rs
index 711d6fe37..4b99bc655 100644
--- a/src/evm/jit.rs
+++ b/src/evm/jit.rs
@@ -313,7 +313,7 @@ impl<'a> evmjit::Ext for ExtAdapter<'a> {
 pub struct JitEvm;
 
 impl evm::Evm for JitEvm {
-	fn exec(&self, params: &evm::ActionParams, ext: &mut evm::Ext) -> evm::Result {
+	fn exec(&self, params: &ActionParams, ext: &mut evm::Ext) -> evm::Result {
 		let mut optional_err = None;
 		// Dirty hack. This is unsafe, but we interact with ffi, so it's justified.
 		let ext_adapter: ExtAdapter<'static> = unsafe { ::std::mem::transmute(ExtAdapter::new(ext, &mut optional_err)) };
@@ -359,17 +359,13 @@ impl evm::Evm for JitEvm {
 
 #[cfg(test)]
 mod tests {
-	use rustc_serialize::hex::FromHex;
-	use std::str::FromStr;
-	use util::hash::*;
-	use util::uint::*;
-	use evm::*;
-	use evm::jit::{FromJit, IntoJit};
 	use super::*;
+	use common::*;
+	use evm::jit::{FromJit, IntoJit};
+	use evm::{Evm,Schedule};
+	use executive::*;
 	use state::*;
-	use env_info::*;
 	use engine::*;
-	use schedule::*;
 	use spec::*;
 
 	struct TestEngine;
diff --git a/src/executive.rs b/src/executive.rs
index 59c0b0c8a..a0eda47d1 100644
--- a/src/executive.rs
+++ b/src/executive.rs
@@ -447,17 +447,11 @@ impl<'a> Ext for Externalities<'a> {
 
 #[cfg(test)]
 mod tests {
-	use rustc_serialize::hex::FromHex;
-	use std::str::FromStr;
-	use util::hash::*;
-	use util::uint::*;
-	use evm::*;
-	use env_info::*;
+	use super::*;
+	use common::*;
 	use state::*;
-	use super::contract_address;
 	use ethereum;
 	use null_engine::*;
-	use std::ops::*;
 
 	#[test]
 	fn test_contract_address() {