diff --git a/src/browser/browserApi.ts b/src/browser/browserApi.ts
index b6c56ee3204..5e28c736e16 100644
--- a/src/browser/browserApi.ts
+++ b/src/browser/browserApi.ts
@@ -1,4 +1,4 @@
-class BrowserApi {
+export class BrowserApi {
     static isSafariApi: boolean = (typeof safari !== 'undefined') &&
         navigator.userAgent.indexOf(' Safari/') !== -1 && navigator.userAgent.indexOf('Chrome') === -1;
     static isChromeApi: boolean = !BrowserApi.isSafariApi && (typeof chrome !== 'undefined');
@@ -250,6 +250,3 @@ class BrowserApi {
         };
     }
 }
-
-export { BrowserApi };
-(window as any).BrowserApi = BrowserApi;
diff --git a/src/popup/app/app.js b/src/popup/app/app.js
index 8aa66b9a222..12745bb7b8a 100644
--- a/src/popup/app/app.js
+++ b/src/popup/app/app.js
@@ -18,7 +18,10 @@ require('../../scripts/duo.js');
 require('../less/libs.less');
 require('../less/popup.less');
 
-import U2f from '../../scripts/u2f';
+import { BrowserApi } from '../../browser/browserApi';
+window.BrowserApi = BrowserApi;
+import { U2f } from '../../scripts/u2f';
+window.U2f = U2f;
 
 import Analytics from '../../scripts/analytics';
 new Analytics(window);
diff --git a/src/scripts/u2f.ts b/src/scripts/u2f.ts
index cbd482a0297..cb1696c62f4 100644
--- a/src/scripts/u2f.ts
+++ b/src/scripts/u2f.ts
@@ -1,4 +1,4 @@
-class U2f {
+export class U2f {
     private iframe: HTMLIFrameElement = null;
     private connectorLink: HTMLAnchorElement;
 
@@ -71,6 +71,3 @@ class U2f {
             event.data.indexOf('info|') === 0;
     }
 }
-
-export { U2f };
-(window as any).U2f = U2f;