diff --git a/src/kaleidoscope/device/ez/ErgoDox.h b/src/kaleidoscope/device/ez/ErgoDox.h
index 34bee127..d7b35626 100644
--- a/src/kaleidoscope/device/ez/ErgoDox.h
+++ b/src/kaleidoscope/device/ez/ErgoDox.h
@@ -135,7 +135,7 @@ class ErgoDox : public kaleidoscope::device::ATmega32U4Keyboard<ErgoDoxProps> {
 }
 }
 
-typedef kaleidoscope::device::ez::ErgoDox Device;
+EXPORT_DEVICE(kaleidoscope::device::ez::ErgoDox)
 
 }
 
diff --git a/src/kaleidoscope/device/kbdfans/KBD4x.h b/src/kaleidoscope/device/kbdfans/KBD4x.h
index a47c277c..c0a28c68 100644
--- a/src/kaleidoscope/device/kbdfans/KBD4x.h
+++ b/src/kaleidoscope/device/kbdfans/KBD4x.h
@@ -63,7 +63,7 @@ class KBD4x: public kaleidoscope::device::ATmega32U4Keyboard<KBD4xProps> {
 }
 }
 
-typedef kaleidoscope::device::kbdfans::KBD4x Device;
+EXPORT_DEVICE(kaleidoscope::device::kbdfans::KBD4x)
 
 }
 
diff --git a/src/kaleidoscope/device/keyboardio/Imago.h b/src/kaleidoscope/device/keyboardio/Imago.h
index 380afc32..e580cba2 100644
--- a/src/kaleidoscope/device/keyboardio/Imago.h
+++ b/src/kaleidoscope/device/keyboardio/Imago.h
@@ -103,7 +103,7 @@ class Imago: public kaleidoscope::device::ATmega32U4Keyboard<ImagoProps> {
 }
 }
 
-typedef kaleidoscope::device::keyboardio::Imago Device;
+EXPORT_DEVICE(kaleidoscope::device::keyboardio::Imago)
 
 }
 
diff --git a/src/kaleidoscope/device/keyboardio/Model01.h b/src/kaleidoscope/device/keyboardio/Model01.h
index 930fe765..37334359 100644
--- a/src/kaleidoscope/device/keyboardio/Model01.h
+++ b/src/kaleidoscope/device/keyboardio/Model01.h
@@ -115,7 +115,7 @@ class Model01 : public kaleidoscope::device::ATmega32U4Keyboard<Model01Props> {
 }
 }
 
-typedef kaleidoscope::device::keyboardio::Model01 Device;
+EXPORT_DEVICE(kaleidoscope::device::keyboardio::Model01)
 
 }
 
diff --git a/src/kaleidoscope/device/olkb/Planck.h b/src/kaleidoscope/device/olkb/Planck.h
index 687d7323..c56e16b6 100644
--- a/src/kaleidoscope/device/olkb/Planck.h
+++ b/src/kaleidoscope/device/olkb/Planck.h
@@ -48,7 +48,7 @@ ATMEGA32U4_KEYBOARD(
 }
 }
 
-typedef kaleidoscope::device::olkb::Planck Device;
+EXPORT_DEVICE(kaleidoscope::device::olkb::Planck)
 
 }
 
diff --git a/src/kaleidoscope/device/softhruf/Splitography.h b/src/kaleidoscope/device/softhruf/Splitography.h
index 133ee737..19ce037f 100644
--- a/src/kaleidoscope/device/softhruf/Splitography.h
+++ b/src/kaleidoscope/device/softhruf/Splitography.h
@@ -87,7 +87,7 @@ class Splitography: public kaleidoscope::device::ATmega32U4Keyboard<Splitography
 }
 }
 
-typedef kaleidoscope::device::softhruf::Splitography Device;
+EXPORT_DEVICE(kaleidoscope::device::softhruf::Splitography)
 
 }
 
diff --git a/src/kaleidoscope/device/technomancy/Atreus.h b/src/kaleidoscope/device/technomancy/Atreus.h
index 7e7032dd..eda6fac4 100644
--- a/src/kaleidoscope/device/technomancy/Atreus.h
+++ b/src/kaleidoscope/device/technomancy/Atreus.h
@@ -81,7 +81,7 @@ ATMEGA32U4_KEYBOARD(
 }
 }
 
-typedef kaleidoscope::device::technomancy::Atreus Device;
+EXPORT_DEVICE(kaleidoscope::device::technomancy::Atreus)
 
 }
 
diff --git a/src/kaleidoscope/device/technomancy/Atreus2.h b/src/kaleidoscope/device/technomancy/Atreus2.h
index c9ff8324..c9eaa4f6 100644
--- a/src/kaleidoscope/device/technomancy/Atreus2.h
+++ b/src/kaleidoscope/device/technomancy/Atreus2.h
@@ -64,7 +64,7 @@ ATMEGA32U4_KEYBOARD(
 }
 }
 
-typedef kaleidoscope::device::technomancy::Atreus2 Device;
+EXPORT_DEVICE(kaleidoscope::device::technomancy::Atreus2)
 
 }