1 files changed, 4 insertions, 6 deletions
diff --git a/packages/contracts/src/2.0.0/forwarder/Forwarder.sol b/packages/contracts/src/2.0.0/forwarder/Forwarder.sol
index 38128d93e..0542736a3 100644
--- a/packages/contracts/src/2.0.0/forwarder/Forwarder.sol
+++ b/packages/contracts/src/2.0.0/forwarder/Forwarder.sol
@@ -19,9 +19,8 @@
 pragma solidity 0.4.24;
 pragma experimental ABIEncoderV2;
 
-import "./MixinWethFees.sol";
-import "./MixinMarketSellTokens.sol";
-import "./MixinMarketBuyTokens.sol";
+import "./MixinFees.sol";
+import "./MixinForwarderCore.sol";
 import "./MixinConstants.sol";
 import "../utils/Ownable/Ownable.sol";
 
@@ -29,10 +28,9 @@ import "../utils/Ownable/Ownable.sol";
 contract Forwarder is
     Ownable,
     MixinConstants,
-    MixinWethFees,
+    MixinFees,
     MixinMarketBuyZrx,
-    MixinMarketBuyTokens,
-    MixinMarketSellTokens
+    MixinForwarderCore
 {
     uint256 constant internal MAX_UINT = 2**256 - 1;