diff --git a/src/autodiscovery.js b/src/autodiscovery.js
index 24195c671..10f714d24 100644
--- a/src/autodiscovery.js
+++ b/src/autodiscovery.js
@@ -17,7 +17,7 @@ limitations under the License.
 /** @module auto-discovery */
 
 import Promise from 'bluebird';
-const logger = require("./logger");
+import logger from './logger';
 import { URL as NodeURL } from "url";
 
 // Dev note: Auto discovery is part of the spec.
diff --git a/src/crypto/algorithms/megolm.js b/src/crypto/algorithms/megolm.js
index d4b32119b..deeb865ec 100644
--- a/src/crypto/algorithms/megolm.js
+++ b/src/crypto/algorithms/megolm.js
@@ -25,7 +25,6 @@ limitations under the License.
 import Promise from 'bluebird';
 import logger from '../../../src/logger';
 
-const logger = require("../../logger");
 const utils = require("../../utils");
 const olmlib = require("../olmlib");
 const base = require("./base");
diff --git a/src/crypto/algorithms/olm.js b/src/crypto/algorithms/olm.js
index 2ef4bdebb..f233e8f9f 100644
--- a/src/crypto/algorithms/olm.js
+++ b/src/crypto/algorithms/olm.js
@@ -22,7 +22,7 @@ limitations under the License.
  */
 import Promise from 'bluebird';
 
-const logger = require("../../logger");
+import logger from '../../logger';
 const utils = require("../../utils");
 const olmlib = require("../olmlib");
 const DeviceInfo = require("../deviceinfo");
diff --git a/src/crypto/index.js b/src/crypto/index.js
index fd64c48b7..4854ea194 100644
--- a/src/crypto/index.js
+++ b/src/crypto/index.js
@@ -25,7 +25,7 @@ const anotherjson = require('another-json');
 import Promise from 'bluebird';
 import {EventEmitter} from 'events';
 
-const logger = require("../logger");
+import logger from '../logger';
 const utils = require("../utils");
 const OlmDevice = require("./OlmDevice");
 const olmlib = require("./olmlib");
diff --git a/src/crypto/olmlib.js b/src/crypto/olmlib.js
index 481fc799a..5491d3c5a 100644
--- a/src/crypto/olmlib.js
+++ b/src/crypto/olmlib.js
@@ -24,7 +24,7 @@ limitations under the License.
 import Promise from 'bluebird';
 const anotherjson = require('another-json');
 
-const logger = require("../logger");
+import logger from '../logger';
 const utils = require("../utils");
 
 /**