diff --git a/hw/application_fpga/fw/tk1/lib.c b/hw/application_fpga/fw/tk1/lib.c
index 7db4421..eccab57 100644
--- a/hw/application_fpga/fw/tk1/lib.c
+++ b/hw/application_fpga/fw/tk1/lib.c
@@ -7,33 +7,7 @@
 #include "assert.h"
 #include "types.h"
 
-#if NOCONSOLE
-void htif_putc(int ch)
-{
-}
-
-void htif_lf()
-{
-}
-
-void htif_puthex(uint8_t c)
-{
-}
-
-void htif_putinthex(const uint32_t n)
-{
-}
-
-int htif_puts(const char *s)
-{
-	return 0;
-}
-
-void htif_hexdump(uint8_t *buf, int len)
-{
-}
-
-#else
+#ifndef NOCONSOLE
 struct {
 	uint32_t arr[2];
 } volatile tohost __attribute__((section(".htif")));
diff --git a/hw/application_fpga/fw/tk1/lib.h b/hw/application_fpga/fw/tk1/lib.h
index 580bbe4..57a8dc0 100644
--- a/hw/application_fpga/fw/tk1/lib.h
+++ b/hw/application_fpga/fw/tk1/lib.h
@@ -8,12 +8,22 @@
 
 #include "types.h"
 
+#ifdef NOCONSOLE
+#define htif_putc(ch)
+#define htif_lf()
+#define htif_puthex(c)
+#define htif_putinthex(n)
+#define htif_puts(s) ((int)0)
+#define htif_hexdump(buf, len)
+#else
 void htif_putc(int ch);
 void htif_lf();
 void htif_puthex(uint8_t c);
 void htif_putinthex(const uint32_t n);
 int htif_puts(const char *s);
 void htif_hexdump(uint8_t *buf, int len);
+#endif
+
 void *memset(void *dest, int c, unsigned n);
 void memcpy_s(void *dest, size_t destsize, const void *src, size_t n);
 void wordcpy_s(void *dest, size_t destsize, const void *src, size_t n);