diff --git a/client/src/cmdlfhitag.c b/client/src/cmdlfhitag.c
index eb7ab3eac..5f2b5468f 100644
--- a/client/src/cmdlfhitag.c
+++ b/client/src/cmdlfhitag.c
@@ -21,7 +21,6 @@
 #include "comms.h"
 #include "cmdtrace.h"
 #include "commonutil.h"
-#include "hitag.h"
 #include "fileutils.h"  // savefile
 #include "protocols.h"  // defines
 #include "cliparser.h"
diff --git a/client/src/cmdlfhitag.h b/client/src/cmdlfhitag.h
index 049df8aa9..b50cc632c 100644
--- a/client/src/cmdlfhitag.h
+++ b/client/src/cmdlfhitag.h
@@ -20,23 +20,8 @@
 #define CMDLFHITAG_H__
 
 #include "common.h"
+#include "hitag.h"
 
-
-#define HITAG_NRAR_SIZE         8
-#define HITAG_CRYPTOKEY_SIZE    6
-#define HITAG_PASSWORD_SIZE     4
-#define HITAG_UID_SIZE          4
-#define HITAG_BLOCK_SIZE        4
-#define HITAG2_MAX_BLOCKS       8
-#define HITAG2_MAX_BYTE_SIZE    (HITAG2_MAX_BLOCKS * HITAG_BLOCK_SIZE)
-
-// need to see which limits these cards has
-#define HITAG1_MAX_BYTE_SIZE    64
-#define HITAGS_MAX_BYTE_SIZE    64
-#define HITAGU_MAX_BYTE_SIZE    64
-#define HITAG_MAX_BYTE_SIZE    (64 * HITAG_BLOCK_SIZE)
-
-#define HITAG2_CONFIG_BLOCK     3
 #define HITAG2_CONFIG_OFFSET    (HITAG_BLOCK_SIZE * HITAG2_CONFIG_BLOCK)
 #define HITAG_DICTIONARY        "ht2_default"
 
diff --git a/include/hitag.h b/include/hitag.h
index f0450e220..7e0219276 100644
--- a/include/hitag.h
+++ b/include/hitag.h
@@ -22,6 +22,22 @@
 
 #include "common.h"
 
+#define HITAG_NRAR_SIZE         8
+#define HITAG_CRYPTOKEY_SIZE    6
+#define HITAG_PASSWORD_SIZE     4
+#define HITAG_UID_SIZE          4
+#define HITAG_BLOCK_SIZE        4
+#define HITAG2_MAX_BLOCKS       8
+#define HITAG2_MAX_BYTE_SIZE    (HITAG2_MAX_BLOCKS * HITAG_BLOCK_SIZE)
+
+// need to see which limits these cards has
+#define HITAG1_MAX_BYTE_SIZE    64
+#define HITAGS_MAX_BYTE_SIZE    64
+#define HITAGU_MAX_BYTE_SIZE    64
+#define HITAG_MAX_BYTE_SIZE    (64 * HITAG_BLOCK_SIZE)
+
+#define HITAG2_CONFIG_BLOCK     3
+
 typedef enum {
     RHTSF_PLAIN,
     WHTSF_PLAIN,