4 files changed, 5 insertions, 9 deletions
diff --git a/keyboards/nyquist/rev1/config.h b/keyboards/nyquist/rev1/config.h
index af4f7dbb1..361576887 100644
--- a/keyboards/nyquist/rev1/config.h
+++ b/keyboards/nyquist/rev1/config.h
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef REV1_CONFIG_H
 #define REV1_CONFIG_H
 
-#include "../config.h"
+#include QMK_KEYBOARD_CONFIG_H
 
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0xCEEB
diff --git a/keyboards/nyquist/rev1/rev1.c b/keyboards/nyquist/rev1/rev1.c
index fc984e18c..7b3228fa6 100644
--- a/keyboards/nyquist/rev1/rev1.c
+++ b/keyboards/nyquist/rev1/rev1.c
@@ -1,4 +1,4 @@
-#include "nyquist.h"
+#include QMK_SUBPROJECT_H
 
 #ifdef AUDIO_ENABLE
     float tone_startup[][2] = SONG(STARTUP_SOUND);
@@ -16,7 +16,7 @@ void matrix_init_kb(void) {
 
     #ifdef AUDIO_ENABLE
         _delay_ms(20); // gets rid of tick
-        PLAY_NOTE_ARRAY(tone_startup, false, 0);
+        PLAY_SONG(tone_startup);
     #endif
 
     // // green led on
@@ -32,7 +32,7 @@ void matrix_init_kb(void) {
 
 void shutdown_user(void) {
     #ifdef AUDIO_ENABLE
-        PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
+        PLAY_SONG(tone_goodbye);
 	_delay_ms(150);
 	stop_all_notes();
     #endif
diff --git a/keyboards/nyquist/rev1/rev1.h b/keyboards/nyquist/rev1/rev1.h
index f2d0ece79..cf9bf8020 100644
--- a/keyboards/nyquist/rev1/rev1.h
+++ b/keyboards/nyquist/rev1/rev1.h
@@ -1,7 +1,7 @@
 #ifndef REV1_H
 #define REV1_H
 
-#include "../nyquist.h"
+#include QMK_KEYBOARD_H
 
 //void promicro_bootloader_jmp(bool program);
 #include "quantum.h"
diff --git a/keyboards/nyquist/rev1/rules.mk b/keyboards/nyquist/rev1/rules.mk
index 80a942d06..7b30c0bef 100644
--- a/keyboards/nyquist/rev1/rules.mk
+++ b/keyboards/nyquist/rev1/rules.mk
@@ -1,5 +1 @@
 BACKLIGHT_ENABLE = no
-
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif