Fixed linearization issue - see https://github.com/hysz/SmartContractLinearizer !

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
 {
 

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;
 

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.

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.

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.

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.

contracts/staking/contracts/src/vaults/StakingPoolRewardVault.sol

@@ -26,7 +26,9 @@ import "../immutable/MixinConstants.sol";
 
 
 contract StakingPoolRewardVault is
+    Authorizable,
     IStakingPoolRewardVault,
+    MixinDeploymentConstants,
     MixinConstants,
     MixinVaultCore
 {