6 files changed, 10 insertions, 8 deletions
diff --git a/keyboards/hhkb/ansi/keymaps/cinaeco/rules.mk b/keyboards/hhkb/ansi/keymaps/cinaeco/rules.mk
index a85669aa2f..4e4deffa12 100644
--- a/keyboards/hhkb/ansi/keymaps/cinaeco/rules.mk
+++ b/keyboards/hhkb/ansi/keymaps/cinaeco/rules.mk
@@ -4,7 +4,7 @@
 #   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 CONSOLE_ENABLE = no         # Console for debug(+400)
diff --git a/keyboards/hhkb/ansi/keymaps/shela/keymap_jis2us.h b/keyboards/hhkb/ansi/keymaps/shela/keymap_jis2us.h
index 916a403eb6..0b811fd03a 100644
--- a/keyboards/hhkb/ansi/keymaps/shela/keymap_jis2us.h
+++ b/keyboards/hhkb/ansi/keymaps/shela/keymap_jis2us.h
@@ -40,10 +40,10 @@ const uint16_t PROGMEM keymap_jis2us[][2] = {
     [KC_BSLS] = { JP_YEN,  JP_PIPE }, /* ] and } -> \ and | */
     [KC_NUHS] = { JP_YEN,  JP_PIPE }, /* ] and } -> \ and | */
     [KC_SCLN] = { JP_SCLN, JP_COLN }, /* ; and + -> ; and : */
-    [KC_QUOT] = { JP_QUOT, JP_DQT  }, /* : and * -> ' and " */
+    [KC_QUOT] = { JP_QUOT, JP_DQUO }, /* : and * -> ' and " */
     [KC_GRV]  = { JP_GRV,  JP_TILD }, /* Han/Zen -> ` and ~ */
-    [KC_COMM] = { JP_COMM, JP_LT   }, /* , and < -> , and < */
-    [KC_DOT]  = { JP_DOT,  JP_GT   }, /* . and > -> . and > */
+    [KC_COMM] = { JP_COMM, JP_LABK }, /* , and < -> , and < */
+    [KC_DOT]  = { JP_DOT,  JP_RABK }, /* . and > -> . and > */
     [KC_SLSH] = { JP_SLSH, JP_QUES }, /* / and ? -> / and ? */
 };
 // clang-format on
diff --git a/keyboards/hhkb/ansi/matrix.c b/keyboards/hhkb/ansi/matrix.c
index 879eb337cf..529ba8b8fc 100644
--- a/keyboards/hhkb/ansi/matrix.c
+++ b/keyboards/hhkb/ansi/matrix.c
@@ -26,6 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "util.h"
 #include "timer.h"
 #include "matrix.h"
+#include "avr/timer_avr.h"
 #include "hhkb_avr.h"
 #include <avr/wdt.h>
 #include "suspend.h"
diff --git a/keyboards/hhkb/ansi/rules.mk b/keyboards/hhkb/ansi/rules.mk
index 3ff7170e0d..56c7fd7719 100644
--- a/keyboards/hhkb/ansi/rules.mk
+++ b/keyboards/hhkb/ansi/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = yes  # Mouse keys
 EXTRAKEY_ENABLE = yes  # Audio control and System control
 CONSOLE_ENABLE = yes   # Console for debug
@@ -24,7 +24,7 @@ CUSTOM_MATRIX = yes    # Custom matrix file for the HHKB
 # SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
 # NKRO_ENABLE = yes       # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 # BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
-# MIDI_ENABLE = yes       # MIDI controls
+MIDI_ENABLE = no              # MIDI support
 # UNICODE_ENABLE = yes    # Unicode
 # BLUETOOTH_ENABLE = yes  # Enable Bluetooth with the Adafruit EZ-Key HID
 
diff --git a/keyboards/hhkb/jp/matrix.c b/keyboards/hhkb/jp/matrix.c
index fed2b3c3a9..c0dca6a990 100644
--- a/keyboards/hhkb/jp/matrix.c
+++ b/keyboards/hhkb/jp/matrix.c
@@ -26,6 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "util.h"
 #include "timer.h"
 #include "matrix.h"
+#include "avr/timer_avr.h"
 #include "hhkb_avr.h"
 #include <avr/wdt.h>
 #include "suspend.h"
diff --git a/keyboards/hhkb/jp/rules.mk b/keyboards/hhkb/jp/rules.mk
index f1294ed611..1902cf4325 100644
--- a/keyboards/hhkb/jp/rules.mk
+++ b/keyboards/hhkb/jp/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = yes  # Mouse keys
 EXTRAKEY_ENABLE = yes  # Audio control and System control
 CONSOLE_ENABLE = yes   # Console for debug
@@ -24,7 +24,7 @@ CUSTOM_MATRIX = yes    # Custom matrix file for the HHKB
 # SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
 # NKRO_ENABLE = yes       # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 # BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
-# MIDI_ENABLE = yes       # MIDI controls
+MIDI_ENABLE = no              # MIDI support
 # UNICODE_ENABLE = yes    # Unicode
 # BLUETOOTH_ENABLE = yes  # Enable Bluetooth with the Adafruit EZ-Key HID