diff --git a/contracts/exchange/contracts/src/MixinExchangeCore.sol b/contracts/exchange/contracts/src/MixinExchangeCore.sol
index df49a75344..4741bf5240 100644
--- a/contracts/exchange/contracts/src/MixinExchangeCore.sol
+++ b/contracts/exchange/contracts/src/MixinExchangeCore.sol
@@ -246,7 +246,7 @@ contract MixinExchangeCore is
         _assertValidCancel(order, orderInfo);
 
         // Noop if order is already unfillable
-        if (orderInfo.orderStatus != uint8(OrderStatus.FILLABLE)) {
+        if (orderInfo.orderStatus != uint8(LibOrder.OrderStatus.FILLABLE)) {
             return;
         }
 
diff --git a/contracts/exchange/contracts/test/IsolatedExchange.sol b/contracts/exchange/contracts/test/IsolatedExchange.sol
index 90853cd537..7590b8d32c 100644
--- a/contracts/exchange/contracts/test/IsolatedExchange.sol
+++ b/contracts/exchange/contracts/test/IsolatedExchange.sol
@@ -19,6 +19,7 @@
 pragma solidity ^0.5.5;
 pragma experimental ABIEncoderV2;
 
+import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
 import "../src/Exchange.sol";
 
 
@@ -71,7 +72,7 @@ contract IsolatedExchange is
     /// @dev Overriden to simplify signature validation.
     ///      Unfortunately, this is `view`, so it can't log arguments.
     function _isValidOrderWithHashSignature(
-        Order memory order,
+        LibOrder.Order memory order,
         bytes32 orderHash,
         bytes memory signature
     )
diff --git a/contracts/exchange/contracts/test/TestExchangeInternals.sol b/contracts/exchange/contracts/test/TestExchangeInternals.sol
index 0a5d8d6291..fb71b7231d 100644
--- a/contracts/exchange/contracts/test/TestExchangeInternals.sol
+++ b/contracts/exchange/contracts/test/TestExchangeInternals.sol
@@ -44,7 +44,7 @@ contract TestExchangeInternals is
     /// @dev Call `_updateFilledState()` but first set `filled[order]` to
     ///      `orderTakerAssetFilledAmount`.
     function testUpdateFilledState(
-        Order memory order,
+        LibOrder.Order memory order,
         address takerAddress,
         bytes32 orderHash,
         uint256 orderTakerAssetFilledAmount,
@@ -52,7 +52,7 @@ contract TestExchangeInternals is
     )
         public
     {
-        filled[getOrderHash(order)] = orderTakerAssetFilledAmount;
+        filled[LibOrder.getOrderHash(order, EIP712_EXCHANGE_DOMAIN_HASH)] = orderTakerAssetFilledAmount;
         _updateFilledState(
             order,
             takerAddress,