diff --git a/armsrc/Makefile b/armsrc/Makefile
index 7e7822433..9199051ef 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -24,6 +24,7 @@ APP_CFLAGS = -DWITH_CRC \
 			 -fno-strict-aliasing -ffunction-sections -fdata-sections
 ### IMPORTANT -  move the commented variable below this line
 #			 -DWITH_LCD \
+#			 -DWITH_EMV \
 #
 # Standalone Mods
 #-------------------------------------------------------
@@ -34,6 +35,7 @@ APP_CFLAGS = -DWITH_CRC \
 # -DWITH_HF_YOUNG
 # -DWITH_HF_MATTYRUN
 
+
 SRC_LCD = fonts.c LCD.c
 SRC_LF = lfops.c hitag2.c hitagS.c lfsampling.c pcf7931.c lfdemod.c
 SRC_ISO15693 = iso15693.c iso15693tools.c
@@ -85,12 +87,18 @@ ARMSRC = fpgaloader.c \
 	$(SRC_ISO14443b) \
 	$(SRC_CRAPTO1) \
 	$(SRC_CRC) \
-	$(SRC_ICLASS) \
-	$(SRC_EMV) \
 	parity.c \
 	usb_cdc.c \
 	cmd.c
-
+	
+ifneq ($(WITH_ICLASS),"")
+ARMSRC += $(SRC_ICLASS)
+endif	
+	
+ifneq ($(WITH_EMV),"")
+ARMSRC += $(SRC_EMV)
+endif
+	
 # Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC
 include ../common/Makefile.common
 
diff --git a/armsrc/apps.h b/armsrc/apps.h
index 01b58c4ff..3ec8a7d65 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -234,20 +234,20 @@ void HfSnoop(int , int);
 
 //EMV functions
 // emvcmd.h
-void EMVTransaction(void);
-void EMVgetUDOL(void);
-void EMVloadvalue(uint32_t tag, uint8_t* datain);
-void EMVdumpcard(void);
-//void EMVSelect(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *data);
-void EMVFuzz_RATS(uint8_t ratslen, uint8_t* RATS);
-void EMVReadRecord(uint8_t arg0, uint8_t arg1,emvcard* inputcard);
-void EMVSelectPPSE();
-void EMVSelectAID(uint8_t *AID, uint8_t AIDlen, emvcard* inputcard);
-void EMVTransaction();
-void EMVClone(uint8_t maxsfi, uint8_t maxrecord);
-void EMVSim();
-void EMVTest();
-void SimulateEMVcard();
+extern void EMVTransaction(void);
+extern void EMVgetUDOL(void);
+extern void EMVloadvalue(uint32_t tag, uint8_t* datain);
+extern void EMVdumpcard(void);
+//extern void EMVSelect(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *data);
+extern void EMVFuzz_RATS(uint8_t ratslen, uint8_t* RATS);
+extern void EMVReadRecord(uint8_t arg0, uint8_t arg1,emvcard* inputcard);
+extern void EMVSelectPPSE();
+extern void EMVSelectAID(uint8_t *AID, uint8_t AIDlen, emvcard* inputcard);
+extern void EMVTransaction();
+extern void EMVClone(uint8_t maxsfi, uint8_t maxrecord);
+extern void EMVSim();
+extern void EMVTest();
+extern void SimulateEMVcard();
 
 #ifdef __cplusplus
 }