diff --git a/contracts/staking/contracts/src/Staking.sol b/contracts/staking/contracts/src/Staking.sol
index e67acbc347..382df7bd67 100644
--- a/contracts/staking/contracts/src/Staking.sol
+++ b/contracts/staking/contracts/src/Staking.sol
@@ -44,12 +44,12 @@ contract Staking is
     MixinExchangeManager,
     MixinScheduler,
     MixinStakingPoolRewardVault,
-    MixinStakeBalances,
     MixinStakingPool,
     MixinTimelockedStake,
+    MixinStakeBalances,
+    MixinStake,
     MixinStakingPoolRewards,
     MixinExchangeFees,
-    MixinStake,
     MixinDelegatedStake
 {
 
diff --git a/contracts/staking/contracts/src/StakingProxy.sol b/contracts/staking/contracts/src/StakingProxy.sol
index 7035b8f905..d3ffd77eee 100644
--- a/contracts/staking/contracts/src/StakingProxy.sol
+++ b/contracts/staking/contracts/src/StakingProxy.sol
@@ -23,8 +23,10 @@ import "./interfaces/IStakingProxy.sol";
 
 
 contract StakingProxy is
-    MixinStorage,
-    IStakingProxy
+    IStakingProxy,
+    MixinDeploymentConstants,
+    MixinConstants,
+    MixinStorage
 {
     address constant internal NIL_ADDRESS = 0x0000000000000000000000000000000000000000;
 
diff --git a/contracts/staking/contracts/src/core/MixinDelegatedStake.sol b/contracts/staking/contracts/src/core/MixinDelegatedStake.sol
index 75252da96c..f325089132 100644
--- a/contracts/staking/contracts/src/core/MixinDelegatedStake.sol
+++ b/contracts/staking/contracts/src/core/MixinDelegatedStake.sol
@@ -41,11 +41,11 @@ contract MixinDelegatedStake is
     MixinOwnable,
     MixinScheduler,
     MixinStakingPoolRewardVault,
-    MixinStakeBalances,
     MixinStakingPool,
     MixinTimelockedStake,
-    MixinStakingPoolRewards,
-    MixinStake
+    MixinStakeBalances,
+    MixinStake,
+    MixinStakingPoolRewards
 {
 
     /// @dev This mixin contains logic for managing delegated stake.
diff --git a/contracts/staking/contracts/src/core/MixinExchangeFees.sol b/contracts/staking/contracts/src/core/MixinExchangeFees.sol
index 716efaa9b2..d6bf2e3c94 100644
--- a/contracts/staking/contracts/src/core/MixinExchangeFees.sol
+++ b/contracts/staking/contracts/src/core/MixinExchangeFees.sol
@@ -41,8 +41,9 @@ contract MixinExchangeFees is
     MixinExchangeManager,
     MixinScheduler,
     MixinStakingPoolRewardVault,
-    MixinStakeBalances,
-    MixinStakingPool
+    MixinStakingPool,
+    MixinTimelockedStake,
+    MixinStakeBalances
 {
 
     /// @dev This mixin contains the logic for 0x protocol fees.
diff --git a/contracts/staking/contracts/src/core/MixinStake.sol b/contracts/staking/contracts/src/core/MixinStake.sol
index 6bd5713c37..fc5009ae9d 100644
--- a/contracts/staking/contracts/src/core/MixinStake.sol
+++ b/contracts/staking/contracts/src/core/MixinStake.sol
@@ -40,8 +40,8 @@ contract MixinStake is
     MixinOwnable,
     MixinScheduler,
     MixinStakingPoolRewardVault,
-    MixinStakeBalances,
-    MixinTimelockedStake
+    MixinTimelockedStake,
+    MixinStakeBalances
 {
 
     /// @dev This mixin contains logic for managing ZRX tokens and Stake.
diff --git a/contracts/staking/contracts/src/core/MixinStakingPoolRewards.sol b/contracts/staking/contracts/src/core/MixinStakingPoolRewards.sol
index 27d7ea4d25..62de5cd8d4 100644
--- a/contracts/staking/contracts/src/core/MixinStakingPoolRewards.sol
+++ b/contracts/staking/contracts/src/core/MixinStakingPoolRewards.sol
@@ -36,8 +36,9 @@ contract MixinStakingPoolRewards is
     MixinOwnable,
     MixinScheduler,
     MixinStakingPoolRewardVault,
-    MixinStakeBalances,
-    MixinStakingPool
+    MixinStakingPool,
+    MixinTimelockedStake,
+    MixinStakeBalances
 {
 
     /// @dev This mixin contains logic for staking pool rewards.
diff --git a/contracts/staking/contracts/src/vaults/StakingPoolRewardVault.sol b/contracts/staking/contracts/src/vaults/StakingPoolRewardVault.sol
index fa4ac18d41..e228c7a195 100644
--- a/contracts/staking/contracts/src/vaults/StakingPoolRewardVault.sol
+++ b/contracts/staking/contracts/src/vaults/StakingPoolRewardVault.sol
@@ -26,7 +26,9 @@ import "../immutable/MixinConstants.sol";
 
 
 contract StakingPoolRewardVault is
+    Authorizable,
     IStakingPoolRewardVault,
+    MixinDeploymentConstants,
     MixinConstants,
     MixinVaultCore
 {