diff --git a/npc/csrc_nvboard/Keyboard/main.cpp b/npc/csrc_nvboard/Keyboard/main.cpp
index d2f2a28..0218bd1 100644
--- a/npc/csrc_nvboard/Keyboard/main.cpp
+++ b/npc/csrc_nvboard/Keyboard/main.cpp
@@ -10,8 +10,9 @@
 
 #define CLASS_SYSTEM_HEADER_NAME(name) CLASS_SYSTEM_HEADER_NAME_IMPL(name)
 #define CLASS_SYSTEM_HEADER_NAME_IMPL(name) <name.h>
-
 #include CLASS_SYSTEM_HEADER_NAME(VERILATOR_TOPMODULE)
+#undef CLASS_SYSTEM_HEADER_NAME
+#undef CLASS_SYSTEM_HEADER_NAME_IMPL
 
 const int MAX_SIM_TIME = 100;
 int keycode = 0;
@@ -49,8 +50,8 @@ int main(int argc, char **argv, char **env) {
   while (true) {
     nvboard_update();
     cycle(top, [&] {
-      if (keycode != top->io_keycode_bits){
-        keycode = top->io_keycode_bits;
+      if (keycode != top->io_ps2_data){
+        keycode = top->io_ps2_data;
         printf("%d\n", keycode);
       }
     });