diff --git a/solend-sdk/src/instructions/borrowObligationLiquidity.ts b/solend-sdk/src/instructions/borrowObligationLiquidity.ts
index 2f636b9a..284be0cb 100644
--- a/solend-sdk/src/instructions/borrowObligationLiquidity.ts
+++ b/solend-sdk/src/instructions/borrowObligationLiquidity.ts
@@ -1,10 +1,11 @@
 import { PublicKey, TransactionInstruction } from "@solana/web3.js";
 import BN from "bn.js";
-import * as BufferLayout from "buffer-layout";
 import { TOKEN_PROGRAM_ID } from "@solana/spl-token";
 import * as Layout from "../utils/layout";
 import { LendingInstruction } from "./instruction";
 
+const BufferLayout = require('buffer-layout');
+
 /// Borrow liquidity from a reserve by depositing collateral tokens. Requires a refreshed
 /// obligation and reserve.
 ///
diff --git a/solend-sdk/src/instructions/depositObligationCollateral.ts b/solend-sdk/src/instructions/depositObligationCollateral.ts
index e7f965b7..705f385c 100644
--- a/solend-sdk/src/instructions/depositObligationCollateral.ts
+++ b/solend-sdk/src/instructions/depositObligationCollateral.ts
@@ -1,10 +1,11 @@
 import { PublicKey, TransactionInstruction } from "@solana/web3.js";
 import BN from "bn.js";
-import * as BufferLayout from "buffer-layout";
 import { TOKEN_PROGRAM_ID } from "@solana/spl-token";
 import * as Layout from "../utils/layout";
 import { LendingInstruction } from "./instruction";
 
+const BufferLayout = require('buffer-layout');
+
 /// Deposit collateral to an obligation. Requires a refreshed reserve.
 ///
 /// Accounts expected by this instruction:
diff --git a/solend-sdk/src/instructions/depositReserveLiquidity.ts b/solend-sdk/src/instructions/depositReserveLiquidity.ts
index 0a48d6bd..3637be57 100644
--- a/solend-sdk/src/instructions/depositReserveLiquidity.ts
+++ b/solend-sdk/src/instructions/depositReserveLiquidity.ts
@@ -1,10 +1,11 @@
 import { TOKEN_PROGRAM_ID } from "@solana/spl-token";
 import { PublicKey, TransactionInstruction } from "@solana/web3.js";
 import BN from "bn.js";
-import * as BufferLayout from "buffer-layout";
 import * as Layout from "../utils/layout";
 import { LendingInstruction } from "./instruction";
 
+const BufferLayout = require('buffer-layout');
+
 /// Deposit liquidity into a reserve in exchange for collateral. Collateral represents a share
 /// of the reserve liquidity pool.
 ///
diff --git a/solend-sdk/src/instructions/depositReserveLiquidityAndObligationCollateral.ts b/solend-sdk/src/instructions/depositReserveLiquidityAndObligationCollateral.ts
index c35bf62c..8fc32c86 100644
--- a/solend-sdk/src/instructions/depositReserveLiquidityAndObligationCollateral.ts
+++ b/solend-sdk/src/instructions/depositReserveLiquidityAndObligationCollateral.ts
@@ -1,10 +1,11 @@
 import { TOKEN_PROGRAM_ID } from "@solana/spl-token";
 import { PublicKey, TransactionInstruction } from "@solana/web3.js";
 import BN from "bn.js";
-import * as BufferLayout from "buffer-layout";
 import * as Layout from "../utils/layout";
 import { LendingInstruction } from "./instruction";
 
+const BufferLayout = require('buffer-layout');
+
 /// Deposit liquidity into a reserve in exchange for collateral, and deposit the collateral as well.
 export const depositReserveLiquidityAndObligationCollateralInstruction = (
   liquidityAmount: number | BN,
diff --git a/solend-sdk/src/instructions/flashBorrowReserveLiquidity.ts b/solend-sdk/src/instructions/flashBorrowReserveLiquidity.ts
index b5c7a109..998d0758 100644
--- a/solend-sdk/src/instructions/flashBorrowReserveLiquidity.ts
+++ b/solend-sdk/src/instructions/flashBorrowReserveLiquidity.ts
@@ -5,11 +5,12 @@ import {
   TransactionInstruction,
 } from "@solana/web3.js";
 import { findProgramAddressSync } from "@project-serum/anchor/dist/cjs/utils/pubkey";
-import * as BufferLayout from "buffer-layout";
 import BN from "bn.js";
 import * as Layout from "../utils/layout";
 import { LendingInstruction } from "./instruction";
 
+const BufferLayout = require('buffer-layout');
+
 export const flashBorrowReserveLiquidityInstruction = (
   liquidityAmount: number | BN,
   sourceLiquidity: PublicKey,
diff --git a/solend-sdk/src/instructions/flashRepayReserveLiquidity.ts b/solend-sdk/src/instructions/flashRepayReserveLiquidity.ts
index 7640f09e..64865dff 100644
--- a/solend-sdk/src/instructions/flashRepayReserveLiquidity.ts
+++ b/solend-sdk/src/instructions/flashRepayReserveLiquidity.ts
@@ -4,11 +4,12 @@ import {
   SYSVAR_INSTRUCTIONS_PUBKEY,
   TransactionInstruction,
 } from "@solana/web3.js";
-import * as BufferLayout from "buffer-layout";
 import BN from "bn.js";
 import * as Layout from "../utils/layout";
 import { LendingInstruction } from "./instruction";
 
+const BufferLayout = require('buffer-layout');
+
 export const flashRepayReserveLiquidityInstruction = (
   liquidityAmount: number | BN,
   borrowInstructionIndex: number,
diff --git a/solend-sdk/src/instructions/initLendingMarket.ts b/solend-sdk/src/instructions/initLendingMarket.ts
index 750213cd..53c25bcf 100644
--- a/solend-sdk/src/instructions/initLendingMarket.ts
+++ b/solend-sdk/src/instructions/initLendingMarket.ts
@@ -4,10 +4,11 @@ import {
   SYSVAR_RENT_PUBKEY,
   TransactionInstruction,
 } from "@solana/web3.js";
-import * as BufferLayout from "buffer-layout";
 import * as Layout from "../utils/layout";
 import { LendingInstruction } from "./instruction";
 
+const BufferLayout = require('buffer-layout');
+
 export const initLendingMarketInstruction = (
   owner: PublicKey,
   quoteCurrency: Buffer,
diff --git a/solend-sdk/src/instructions/initObligation.ts b/solend-sdk/src/instructions/initObligation.ts
index e96ea771..def35640 100644
--- a/solend-sdk/src/instructions/initObligation.ts
+++ b/solend-sdk/src/instructions/initObligation.ts
@@ -4,9 +4,10 @@ import {
   SYSVAR_RENT_PUBKEY,
   TransactionInstruction,
 } from "@solana/web3.js";
-import * as BufferLayout from "buffer-layout";
 import { LendingInstruction } from "./instruction";
 
+const BufferLayout = require('buffer-layout');
+
 /// Initializes a new lending market obligation.
 ///
 /// Accounts expected by this instruction:
diff --git a/solend-sdk/src/instructions/initReserve.ts b/solend-sdk/src/instructions/initReserve.ts
index 11c1f495..97014c83 100644
--- a/solend-sdk/src/instructions/initReserve.ts
+++ b/solend-sdk/src/instructions/initReserve.ts
@@ -4,12 +4,13 @@ import {
   SYSVAR_RENT_PUBKEY,
   TransactionInstruction,
 } from "@solana/web3.js";
-import * as BufferLayout from "buffer-layout";
 import BN from "bn.js";
 import * as Layout from "../utils/layout";
 import { ReserveConfig, ReserveConfigLayout } from "../state";
 import { LendingInstruction } from "./instruction";
 
+const BufferLayout = require('buffer-layout');
+
 export const initReserveInstruction = (
   liquidityAmount: number | BN,
   config: ReserveConfig,
diff --git a/solend-sdk/src/instructions/redeemReserveCollateral.ts b/solend-sdk/src/instructions/redeemReserveCollateral.ts
index 3f15d91b..a3aaa263 100644
--- a/solend-sdk/src/instructions/redeemReserveCollateral.ts
+++ b/solend-sdk/src/instructions/redeemReserveCollateral.ts
@@ -1,10 +1,11 @@
 import { TOKEN_PROGRAM_ID } from "@solana/spl-token";
 import { PublicKey, TransactionInstruction } from "@solana/web3.js";
 import BN from "bn.js";
-import * as BufferLayout from "buffer-layout";
 import * as Layout from "../utils/layout";
 import { LendingInstruction } from "./instruction";
 
+const BufferLayout = require('buffer-layout');
+
 /// Redeem collateral from a reserve in exchange for liquidity.
 ///
 /// Accounts expected by this instruction:
diff --git a/solend-sdk/src/instructions/refreshReserve.ts b/solend-sdk/src/instructions/refreshReserve.ts
index ad9544f1..2a892cbb 100644
--- a/solend-sdk/src/instructions/refreshReserve.ts
+++ b/solend-sdk/src/instructions/refreshReserve.ts
@@ -1,7 +1,8 @@
 import { PublicKey, TransactionInstruction } from "@solana/web3.js";
-import * as BufferLayout from "buffer-layout";
 import { LendingInstruction } from "./instruction";
 
+const BufferLayout = require('buffer-layout');
+
 /// Accrue interest and update market price of liquidity on a reserve.
 ///
 /// Accounts expected by this instruction:
diff --git a/solend-sdk/src/instructions/repayObligationLiquidity.ts b/solend-sdk/src/instructions/repayObligationLiquidity.ts
index bc42ce31..3706ec2a 100644
--- a/solend-sdk/src/instructions/repayObligationLiquidity.ts
+++ b/solend-sdk/src/instructions/repayObligationLiquidity.ts
@@ -1,10 +1,11 @@
 import { PublicKey, TransactionInstruction } from "@solana/web3.js";
 import BN from "bn.js";
-import * as BufferLayout from "buffer-layout";
 import { TOKEN_PROGRAM_ID } from "@solana/spl-token";
 import * as Layout from "../utils/layout";
 import { LendingInstruction } from "./instruction";
 
+const BufferLayout = require('buffer-layout');
+
 /// Repay borrowed liquidity to a reserve. Requires a refreshed obligation and reserve.
 ///
 /// Accounts expected by this instruction:
diff --git a/solend-sdk/src/instructions/syncNative.ts b/solend-sdk/src/instructions/syncNative.ts
index ba7a0333..9003a75d 100644
--- a/solend-sdk/src/instructions/syncNative.ts
+++ b/solend-sdk/src/instructions/syncNative.ts
@@ -1,8 +1,9 @@
-import * as BufferLayout from "buffer-layout";
 import { PublicKey, TransactionInstruction } from "@solana/web3.js";
 import { TOKEN_PROGRAM_ID } from "@solana/spl-token";
 import { TokenInstruction } from "./instruction";
 
+const BufferLayout = require('buffer-layout');
+
 const dataLayout = BufferLayout.struct([BufferLayout.u8("instruction")]);
 
 /**
diff --git a/solend-sdk/src/instructions/updateReserveConfig.ts b/solend-sdk/src/instructions/updateReserveConfig.ts
index e207ba45..e94d692e 100644
--- a/solend-sdk/src/instructions/updateReserveConfig.ts
+++ b/solend-sdk/src/instructions/updateReserveConfig.ts
@@ -1,9 +1,10 @@
 import { PublicKey, TransactionInstruction } from "@solana/web3.js";
-import * as BufferLayout from "buffer-layout";
 import { ReserveConfig } from "../state/reserve";
 import * as Layout from "../utils/layout";
 import { LendingInstruction } from "./instruction";
 
+const BufferLayout = require('buffer-layout');
+
 /// Updates a reserves config and a reserve price oracle pubkeys
 ///
 /// Accounts expected by this instruction:
diff --git a/solend-sdk/src/instructions/withdrawObligationCollateral.ts b/solend-sdk/src/instructions/withdrawObligationCollateral.ts
index 6c2b06e7..1b60e5e8 100644
--- a/solend-sdk/src/instructions/withdrawObligationCollateral.ts
+++ b/solend-sdk/src/instructions/withdrawObligationCollateral.ts
@@ -1,10 +1,11 @@
 import { TOKEN_PROGRAM_ID } from "@solana/spl-token";
 import { PublicKey, TransactionInstruction } from "@solana/web3.js";
 import BN from "bn.js";
-import * as BufferLayout from "buffer-layout";
 import * as Layout from "../utils/layout";
 import { LendingInstruction } from "./instruction";
 
+const BufferLayout = require('buffer-layout');
+
 /// Withdraw collateral from an obligation. Requires a refreshed obligation and reserve.
 ///
 /// Accounts expected by this instruction:
diff --git a/solend-sdk/src/instructions/withdrawObligationCollateralAndRedeemReserveLiquidity.ts b/solend-sdk/src/instructions/withdrawObligationCollateralAndRedeemReserveLiquidity.ts
index 3226125b..2cf37c5b 100644
--- a/solend-sdk/src/instructions/withdrawObligationCollateralAndRedeemReserveLiquidity.ts
+++ b/solend-sdk/src/instructions/withdrawObligationCollateralAndRedeemReserveLiquidity.ts
@@ -1,10 +1,11 @@
 import { TOKEN_PROGRAM_ID } from "@solana/spl-token";
 import { PublicKey, TransactionInstruction } from "@solana/web3.js";
 import BN from "bn.js";
-import * as BufferLayout from "buffer-layout";
 import * as Layout from "../utils/layout";
 import { LendingInstruction } from "./instruction";
 
+const BufferLayout = require('buffer-layout');
+
 /// Redeem collateral from a reserve in exchange for liquidity.
 export const withdrawObligationCollateralAndRedeemReserveLiquidity = (
   collateralAmount: number | BN,
diff --git a/solend-sdk/src/state/lastUpdate.ts b/solend-sdk/src/state/lastUpdate.ts
index 61a4dc1b..0d3af033 100644
--- a/solend-sdk/src/state/lastUpdate.ts
+++ b/solend-sdk/src/state/lastUpdate.ts
@@ -1,7 +1,8 @@
 import BN from "bn.js";
-import * as BufferLayout from "buffer-layout";
 import * as Layout from "../utils/layout";
 
+const BufferLayout = require('buffer-layout');
+
 export const LastUpdateLayout: typeof BufferLayout.Structure =
   BufferLayout.struct(
     [Layout.uint64("slot"), BufferLayout.u8("stale")],
diff --git a/solend-sdk/src/state/lendingMarket.ts b/solend-sdk/src/state/lendingMarket.ts
index 1bdf9800..dad9f807 100644
--- a/solend-sdk/src/state/lendingMarket.ts
+++ b/solend-sdk/src/state/lendingMarket.ts
@@ -1,7 +1,8 @@
 import { AccountInfo, PublicKey } from "@solana/web3.js";
-import * as BufferLayout from "buffer-layout";
 import * as Layout from "../utils/layout";
 
+const BufferLayout = require('buffer-layout');
+
 export interface LendingMarket {
   version: number;
   bumpSeed: number;
diff --git a/solend-sdk/src/state/obligation.ts b/solend-sdk/src/state/obligation.ts
index f5a24966..b5aee05b 100644
--- a/solend-sdk/src/state/obligation.ts
+++ b/solend-sdk/src/state/obligation.ts
@@ -1,9 +1,10 @@
 import { AccountInfo, PublicKey } from "@solana/web3.js";
 import BN from "bn.js";
-import * as BufferLayout from "buffer-layout";
 import * as Layout from "../utils/layout";
 import { LastUpdate, LastUpdateLayout } from "./lastUpdate";
 
+const BufferLayout = require('buffer-layout');
+
 export interface Obligation {
   version: number;
   lastUpdate: LastUpdate;
diff --git a/solend-sdk/src/state/reserve.ts b/solend-sdk/src/state/reserve.ts
index 94471e3f..f211a075 100644
--- a/solend-sdk/src/state/reserve.ts
+++ b/solend-sdk/src/state/reserve.ts
@@ -1,10 +1,11 @@
 import { AccountInfo, PublicKey } from "@solana/web3.js";
 import BN from "bn.js";
-import * as BufferLayout from "buffer-layout";
 import { Buffer } from "buffer";
 import * as Layout from "../utils/layout";
 import { LastUpdate, LastUpdateLayout } from "./lastUpdate";
 
+const BufferLayout = require('buffer-layout');
+
 export interface Reserve {
   version: number;
   lastUpdate: LastUpdate;
diff --git a/solend-sdk/src/utils/layout.ts b/solend-sdk/src/utils/layout.ts
index 2e8b4aa8..2d964cd4 100644
--- a/solend-sdk/src/utils/layout.ts
+++ b/solend-sdk/src/utils/layout.ts
@@ -1,6 +1,7 @@
 import { PublicKey } from "@solana/web3.js";
 import BN from "bn.js";
-import * as BufferLayout from "buffer-layout";
+
+const BufferLayout = require('buffer-layout');
 
 /**
  * Layout for a public key