-#define NEC_HEADER_PULSE PULSE(16)
-#define NECX_HEADER_PULSE PULSE(8) /* Less common NEC variant */
-#define NEC_HEADER_SPACE SPACE(8)
-#define NEC_REPEAT_SPACE SPACE(4)
-#define NEC_BIT_PULSE PULSE(1)
-#define NEC_BIT_0_SPACE SPACE(1)
-#define NEC_BIT_1_SPACE SPACE(3)
+#define NEC_HEADER_PULSE (16 * NEC_UNIT)
+#define NECX_HEADER_PULSE (8 * NEC_UNIT) /* Less common NEC variant */
+#define NEC_HEADER_SPACE (8 * NEC_UNIT)
+#define NEC_REPEAT_SPACE (8 * NEC_UNIT)
+#define NEC_BIT_PULSE (1 * NEC_UNIT)
+#define NEC_BIT_0_SPACE (1 * NEC_UNIT)
+#define NEC_BIT_1_SPACE (3 * NEC_UNIT)
+#define NEC_TRAILER_PULSE (1 * NEC_UNIT)
+#define NEC_TRAILER_SPACE (10 * NEC_UNIT) /* even longer in reality */