diff --git a/firmware/apps/cardem/Makefile b/firmware/apps/cardem/Makefile
index 8129b87..fc48e37 100644
--- a/firmware/apps/cardem/Makefile
+++ b/firmware/apps/cardem/Makefile
@@ -1,3 +1,3 @@
 C_FILES += $(C_LIBUSB_RT)
 
-C_FILES += card_emu.c ccid.c iso7816_4.c iso7816_fidi.c mitm.c mode_cardemu.c simtrace_iso7816.c sniffer.c tc_etu.c usb.c
+C_FILES += card_emu.c ccid.c cciddriver.c iso7816_4.c iso7816_fidi.c mitm.c mode_cardemu.c simtrace_iso7816.c sniffer.c tc_etu.c usb.c
diff --git a/firmware/libboard/simtrace/include/board.h b/firmware/libboard/simtrace/include/board.h
index 53877b3..8fadb72 100644
--- a/firmware/libboard/simtrace/include/board.h
+++ b/firmware/libboard/simtrace/include/board.h
@@ -82,6 +82,6 @@
 #define BOARD_USB_RELEASE	0x000
 
 //#define HAVE_SNIFFER
-//#define HAVE_CCID
+#define HAVE_CCID
 #define HAVE_CARDEM
 //#define HAVE_MITM
diff --git a/firmware/libcommon/include/simtrace.h b/firmware/libcommon/include/simtrace.h
index b9589f3..348cc57 100644
--- a/firmware/libcommon/include/simtrace.h
+++ b/firmware/libcommon/include/simtrace.h
@@ -3,6 +3,7 @@
 
 #include "ringbuffer.h"
 #include "board.h"
+#include <usb/device/dfu/dfu.h>
 
 /* Endpoint numbers */
 #define DATAOUT     1
@@ -71,6 +72,7 @@
     USBEndpointDescriptor      bulkIn;
     /// Interrupt OUT endpoint descriptor
     USBEndpointDescriptor      interruptIn;
+    DFURT_IF_DESCRIPTOR_STRUCT
 } __attribute__ ((packed)) CCIDDriverConfigurationDescriptors;
 
 extern const USBConfigurationDescriptor *configurationDescriptorsArr[];
diff --git a/firmware/libcommon/source/ccid.c b/firmware/libcommon/source/ccid.c
index 770e296..ff068c4 100644
--- a/firmware/libcommon/source/ccid.c
+++ b/firmware/libcommon/source/ccid.c
@@ -27,14 +27,15 @@
  * ----------------------------------------------------------------------------
  */
 
+#include "board.h"
+#include "simtrace.h"
+
 #ifdef HAVE_CCID
 
 /*------------------------------------------------------------------------------
  *          Headers
  *------------------------------------------------------------------------------*/
 
-#include "board.h"
-
 #include <string.h>
 
 /*------------------------------------------------------------------------------