diff --git a/client/emv/apduinfo.h b/client/emv/apduinfo.h
index b81877366..b2d323e5b 100644
--- a/client/emv/apduinfo.h
+++ b/client/emv/apduinfo.h
@@ -34,6 +34,15 @@ typedef struct {
 const APDUCode *GetAPDUCode(uint8_t sw1, uint8_t sw2);
 const char *GetAPDUCodeDescription(uint8_t sw1, uint8_t sw2);
 
+typedef struct {
+    uint8_t CLA;
+    uint8_t INS;
+    uint8_t P1;
+    uint8_t P2;
+    uint8_t Lc;
+    uint8_t *data;
+} PACKED sAPDU;
+
 typedef struct {
     uint8_t cla;
     uint8_t ins;
diff --git a/client/emv/emvcore.h b/client/emv/emvcore.h
index 219c3f9b5..3faae283d 100644
--- a/client/emv/emvcore.h
+++ b/client/emv/emvcore.h
@@ -45,15 +45,6 @@ enum TransactionType {
 };
 extern const char *TransactionTypeStr[];
 
-typedef struct {
-    uint8_t CLA;
-    uint8_t INS;
-    uint8_t P1;
-    uint8_t P2;
-    uint8_t Lc;
-    uint8_t *data;
-} sAPDU;
-
 enum CardPSVendor {
     CV_NA,
     CV_VISA,