5 files changed, 7 insertions, 5 deletions
diff --git a/keyboards/torn/bongocat.c b/keyboards/torn/bongocat.c
index 9d6d9a85f5..8ca5e512f8 100644
--- a/keyboards/torn/bongocat.c
+++ b/keyboards/torn/bongocat.c
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include QMK_KEYBOARD_H
+#include "torn.h"
 
 #ifdef OLED_ENABLE
 
diff --git a/keyboards/torn/info.json b/keyboards/torn/info.json
index 44b2f9a5dd..32b7c90d44 100644
--- a/keyboards/torn/info.json
+++ b/keyboards/torn/info.json
@@ -56,10 +56,10 @@
         {"label":"SW40", "x":14, "y":2.375},
         {"label":"SW19", "x":3, "y":3.1},
         {"label":"SW20", "x":4, "y":3.25},
-        {"label":"SW21", "x":5, "y":3.40},
+        {"label":"SW21", "x":5, "y":3.4},
         {"label":"SW22", "x":6, "y":3.55},
         {"label":"SW41", "x":8, "y":3.55},
-        {"label":"SW42", "x":9, "y":3.40},
+        {"label":"SW42", "x":9, "y":3.4},
         {"label":"SW43", "x":10, "y":3.25},
         {"label":"SW44", "x":11, "y":3.1}
       ]
diff --git a/keyboards/torn/matrix.c b/keyboards/torn/matrix.c
index dd7fa1e2e1..b674f21d57 100644
--- a/keyboards/torn/matrix.c
+++ b/keyboards/torn/matrix.c
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "matrix.h"
 #include "mcp23018.h"
 
 #define SPLIT_MATRIX_COLS (MATRIX_COLS / 2)
diff --git a/keyboards/torn/mcp23018.c b/keyboards/torn/mcp23018.c
index c180f1dae5..12c4f9bc7f 100644
--- a/keyboards/torn/mcp23018.c
+++ b/keyboards/torn/mcp23018.c
@@ -16,7 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
 #include "i2c_master.h"
 #include "mcp23018.h"
 
diff --git a/keyboards/torn/mcp23018.h b/keyboards/torn/mcp23018.h
index 17ecaa5a7c..af5dbc7b25 100644
--- a/keyboards/torn/mcp23018.h
+++ b/keyboards/torn/mcp23018.h
@@ -17,6 +17,9 @@
 
 #pragma once
 
+#include <stdbool.h>
+#include <stdint.h>
+
 #define IODIRA 0x00
 #define IODIRB 0x01
 #define GPPUA 0x0C