diff --git a/firmware/simtrace_src/cciddriver.h b/firmware/simtrace_src/cciddriver.h
index d71af866..ee5e0286 100644
--- a/firmware/simtrace_src/cciddriver.h
+++ b/firmware/simtrace_src/cciddriver.h
@@ -48,13 +48,7 @@
 #ifndef CCID_DRIVER_H
 #define CCID_DRIVER_H
 
-// FIXME: This is dirty! Typedef copied from USBD.h
-typedef void (*TransferCallback)(void *pArg,
-                                 uint8_t status,
-                                 uint32_t transferred,
-                                 uint32_t remaining);
-
-
+#include "USBD.h"
 
 /// For reference, the absolute maximum block size 
 /// for a TPDU T=0 block is 260 bytes (5 bytes command; 255 bytes data), or