diff --git a/armsrc/epa.c b/armsrc/epa.c
index 16d900145..246393b74 100644
--- a/armsrc/epa.c
+++ b/armsrc/epa.c
@@ -10,11 +10,7 @@
 // the card (with iso14443a_select_card etc.). If You want to use these
 // functions, You need to do the setup before calling them!
 //-----------------------------------------------------------------------------
-
-#include "iso14443a.h"
-#include "iso14443b.h"
 #include "epa.h"
-#include "cmd.h"
 
 // Protocol and Parameter Selection Request for ISO 14443 type A cards
 // use regular (1x) speed in both directions
diff --git a/armsrc/epa.h b/armsrc/epa.h
index d2ebed57a..550af8200 100644
--- a/armsrc/epa.h
+++ b/armsrc/epa.h
@@ -11,6 +11,10 @@
 #ifndef __EPA_H
 #define __EPA_H
 
+#include "cmd.h"
+#include "iso14443a.h"
+#include "iso14443b.h"
+
 // this struct is used by EPA_Parse_CardAccess and contains info about the
 // PACE protocol supported by the chip
 typedef struct {