diff --git a/drivers/dimmer/driver.ts b/drivers/dimmer/driver.ts
index 139fa67..449792e 100644
--- a/drivers/dimmer/driver.ts
+++ b/drivers/dimmer/driver.ts
@@ -7,7 +7,7 @@ import {
   TuyaDeviceSpecificationResponse,
 } from '../../types/TuyaApiTypes';
 import type { StandardDeviceFlowArgs, StandardFlowArgs } from '../../types/TuyaTypes';
-import TuyaOAuth2DeviceDimmer from './device';
+import type TuyaOAuth2DeviceDimmer from './device';
 import { SIMPLE_DIMMER_CAPABILITIES } from './TuyaDimmerConstants';
 import TRANSLATIONS from './translations.json';
 
diff --git a/drivers/infrared_remote/device.ts b/drivers/infrared_remote/device.ts
index 016d652..022be4f 100644
--- a/drivers/infrared_remote/device.ts
+++ b/drivers/infrared_remote/device.ts
@@ -1,6 +1,6 @@
 import TuyaOAuth2Device from '../../lib/TuyaOAuth2Device';
 
-class TuyaOAuth2DeviceIrController extends TuyaOAuth2Device {
+export default class TuyaOAuth2DeviceIrController extends TuyaOAuth2Device {
   async onOAuth2Init(): Promise<void> {
     await super.onOAuth2Init();
 
@@ -35,5 +35,4 @@ class TuyaOAuth2DeviceIrController extends TuyaOAuth2Device {
   }
 }
 
-export default TuyaOAuth2DeviceIrController;
 module.exports = TuyaOAuth2DeviceIrController;
diff --git a/drivers/infrared_remote/driver.ts b/drivers/infrared_remote/driver.ts
index f68df12..95cf142 100644
--- a/drivers/infrared_remote/driver.ts
+++ b/drivers/infrared_remote/driver.ts
@@ -3,7 +3,7 @@ import TuyaOAuth2Client from '../../lib/TuyaOAuth2Client';
 import { TuyaDeviceResponse, TuyaIrRemoteKeysResponse, TuyaIrRemoteResponse } from '../../types/TuyaApiTypes';
 import * as TuyaOAuth2Util from '../../lib/TuyaOAuth2Util';
 import { StandardDeviceFlowArgs } from '../../types/TuyaTypes';
-import TuyaOAuth2DeviceIrController from './device';
+import type TuyaOAuth2DeviceIrController from './device';
 import { ArgumentAutocompleteResults } from 'homey/lib/FlowCard';
 
 type PairingRemote = TuyaIrRemoteResponse & {