Merge remote-tracking branch 'upstream/master' into develop

keyboards/splitkb/aurora/sweep/rev1/info.json

@@ -6,7 +6,9 @@
     "features": {
         "mousekey": true,
         "bootmagic": true,
-        "extrakey": true
+        "extrakey": true,
+        "oled": true,
+        "rgb_matrix": true
     },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_split_3x5_2"
@@ -60,6 +62,7 @@
         "cols": ["B6", "D4", "C6", "D7", "E6"]
     },
     "encoder": {
+        "enabled": true,
         "rotary": [
             {
                 "pin_a": "B5",

keyboards/splitkb/aurora/sweep/rev1/rev1.c

@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include QMK_KEYBOARD_H
+
 #ifdef SWAP_HANDS_ENABLE
 // clang-format off
     __attribute__ ((weak)) const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {