summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2016-07-08 08:09:31 +0200
committerFred Sundvik <fsundvik@gmail.com>2016-07-29 19:48:19 +0200
commitb0376687f4cc2dc0b5ffd89f3bcb33c873b1f4d3 (patch)
tree87080086b2c43cd86916b161838b2bbcf7e15849
parent9af995c59b2655fa347e43b1eab2122e72ef7fe3 (diff)
downloadqmk_firmware-b0376687f4cc2dc0b5ffd89f3bcb33c873b1f4d3.tar.gz
qmk_firmware-b0376687f4cc2dc0b5ffd89f3bcb33c873b1f4d3.tar.xz
All Ez keymaps compiles
-rw-r--r--keyboards/ergodox/config.h12
-rw-r--r--keyboards/ergodox/keymaps/ab/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/adnw_k_o_y/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/alexjj/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/algernon/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/andrew_osx/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/bepo/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/coderkun_neo2/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/colemak/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/colemak_osx_pc_no/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/csharp_dev/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/dave/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/default_osx/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/dragon788/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/dvorak/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/dvorak_intl_squisher/keymap.c2
-rwxr-xr-xkeyboards/ergodox/keymaps/dvorak_spanish/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/emacs_osx_dk/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/erez_experimental/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/german-kinergo/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/german-manuneo/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/german-manuneo/keymap.md2
-rw-r--r--keyboards/ergodox/keymaps/german/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/j3rn/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/jack/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/jacobono/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/jgarr/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/josh/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/kastyle/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/kines-ish/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/maz/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/mpiechotka/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/msc/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/naps62/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/ordinary/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/osx_de/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/osx_de_adnw_koy/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/osx_de_experimental/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/osx_fr/keymap.c4
-rw-r--r--keyboards/ergodox/keymaps/osx_kinesis_pnut/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/plover/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/plums/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/romanzolotarev-norman-osx/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx-hjkl/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/romanzolotarev-norman-qwerty-osx/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/sneako/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/software_neo2/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/supercoder/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/techtomas/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/teckinesis/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/tkuichooseyou/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/tm2030/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/tonyabra_osx/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/townk_osx/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/twey/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/workman_osx_mdw/keymap.c2
-rw-r--r--keyboards/ergodox/keymaps/zweihander-osx/keymap.c2
58 files changed, 70 insertions, 58 deletions
diff --git a/keyboards/ergodox/config.h b/keyboards/ergodox/config.h
new file mode 100644
index 000000000..c37c10e93
--- /dev/null
+++ b/keyboards/ergodox/config.h
@@ -0,0 +1,12 @@
+#ifndef KEYBOARDS_ERGODOX_CONFIG_H_
+#define KEYBOARDS_ERGODOX_CONFIG_H_
+
+#ifdef SUBPROJECT_ez
+ #include "ez/config.h"
+#endif
+#ifdef SUBPROJECT_infinity
+ #include "infinity/config.h"
+#endif
+
+
+#endif /* KEYBOARDS_ERGODOX_CONFIG_H_ */
diff --git a/keyboards/ergodox/keymaps/ab/keymap.c b/keyboards/ergodox/keymaps/ab/keymap.c
index df6f33460..7938c9da3 100644
--- a/keyboards/ergodox/keymaps/ab/keymap.c
+++ b/keyboards/ergodox/keymaps/ab/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/adnw_k_o_y/keymap.c b/keyboards/ergodox/keymaps/adnw_k_o_y/keymap.c
index 052517d70..31ae4262b 100644
--- a/keyboards/ergodox/keymaps/adnw_k_o_y/keymap.c
+++ b/keyboards/ergodox/keymaps/adnw_k_o_y/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
#include "keymap_german.h"
diff --git a/keyboards/ergodox/keymaps/alexjj/keymap.c b/keyboards/ergodox/keymaps/alexjj/keymap.c
index 448f62da0..ac954ba5b 100644
--- a/keyboards/ergodox/keymaps/alexjj/keymap.c
+++ b/keyboards/ergodox/keymaps/alexjj/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/algernon/keymap.c b/keyboards/ergodox/keymaps/algernon/keymap.c
index c12087292..1ebcf528b 100644
--- a/keyboards/ergodox/keymaps/algernon/keymap.c
+++ b/keyboards/ergodox/keymaps/algernon/keymap.c
@@ -2,7 +2,7 @@
* algernon's ErgoDox EZ layout, please see the readme.md file!
*/
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "led.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/andrew_osx/keymap.c b/keyboards/ergodox/keymaps/andrew_osx/keymap.c
index 48257d23a..750155d98 100644
--- a/keyboards/ergodox/keymaps/andrew_osx/keymap.c
+++ b/keyboards/ergodox/keymaps/andrew_osx/keymap.c
@@ -1,7 +1,7 @@
// Netable differences vs. the default firmware for the ErgoDox EZ:
// 1. The Cmd key is now on the right side, making Cmd+Space easier.
// 2. The media keys work on OSX (But not on Windows).
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/bepo/keymap.c b/keyboards/ergodox/keymaps/bepo/keymap.c
index 921a94d63..2d88fc10e 100644
--- a/keyboards/ergodox/keymaps/bepo/keymap.c
+++ b/keyboards/ergodox/keymaps/bepo/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
#include "keymap_bepo.h"
diff --git a/keyboards/ergodox/keymaps/coderkun_neo2/keymap.c b/keyboards/ergodox/keymaps/coderkun_neo2/keymap.c
index 8a2ba26d2..2ac06eef8 100644
--- a/keyboards/ergodox/keymaps/coderkun_neo2/keymap.c
+++ b/keyboards/ergodox/keymaps/coderkun_neo2/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
#include "led.h"
diff --git a/keyboards/ergodox/keymaps/colemak/keymap.c b/keyboards/ergodox/keymaps/colemak/keymap.c
index 9601726f7..7ef81ab4b 100644
--- a/keyboards/ergodox/keymaps/colemak/keymap.c
+++ b/keyboards/ergodox/keymaps/colemak/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/colemak_osx_pc_no/keymap.c b/keyboards/ergodox/keymaps/colemak_osx_pc_no/keymap.c
index a909ed3a4..eb0156c45 100644
--- a/keyboards/ergodox/keymaps/colemak_osx_pc_no/keymap.c
+++ b/keyboards/ergodox/keymaps/colemak_osx_pc_no/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
#include "keymap_norwegian.h"
diff --git a/keyboards/ergodox/keymaps/csharp_dev/keymap.c b/keyboards/ergodox/keymaps/csharp_dev/keymap.c
index e9648ede7..e0c66f487 100644
--- a/keyboards/ergodox/keymaps/csharp_dev/keymap.c
+++ b/keyboards/ergodox/keymaps/csharp_dev/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/dave/keymap.c b/keyboards/ergodox/keymaps/dave/keymap.c
index e9480af3e..32c70097b 100644
--- a/keyboards/ergodox/keymaps/dave/keymap.c
+++ b/keyboards/ergodox/keymaps/dave/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/default_osx/keymap.c b/keyboards/ergodox/keymaps/default_osx/keymap.c
index c57ffbb88..e9a242e07 100644
--- a/keyboards/ergodox/keymaps/default_osx/keymap.c
+++ b/keyboards/ergodox/keymaps/default_osx/keymap.c
@@ -1,7 +1,7 @@
// Netable differences vs. the default firmware for the ErgoDox EZ:
// 1. The Cmd key is now on the right side, making Cmd+Space easier.
// 2. The media keys work on OSX (But not on Windows).
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/dragon788/keymap.c b/keyboards/ergodox/keymaps/dragon788/keymap.c
index 3aec8c6cf..d33bc6a25 100644
--- a/keyboards/ergodox/keymaps/dragon788/keymap.c
+++ b/keyboards/ergodox/keymaps/dragon788/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/dvorak/keymap.c b/keyboards/ergodox/keymaps/dvorak/keymap.c
index 22947327d..d3609c673 100644
--- a/keyboards/ergodox/keymaps/dvorak/keymap.c
+++ b/keyboards/ergodox/keymaps/dvorak/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/dvorak_intl_squisher/keymap.c b/keyboards/ergodox/keymaps/dvorak_intl_squisher/keymap.c
index 82f55b4bc..89eae5208 100644
--- a/keyboards/ergodox/keymaps/dvorak_intl_squisher/keymap.c
+++ b/keyboards/ergodox/keymaps/dvorak_intl_squisher/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/dvorak_spanish/keymap.c b/keyboards/ergodox/keymaps/dvorak_spanish/keymap.c
index 6eb864b44..6d7adf907 100755
--- a/keyboards/ergodox/keymaps/dvorak_spanish/keymap.c
+++ b/keyboards/ergodox/keymaps/dvorak_spanish/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/emacs_osx_dk/keymap.c b/keyboards/ergodox/keymaps/emacs_osx_dk/keymap.c
index 1d8e66a08..e80f08d73 100644
--- a/keyboards/ergodox/keymaps/emacs_osx_dk/keymap.c
+++ b/keyboards/ergodox/keymaps/emacs_osx_dk/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/erez_experimental/keymap.c b/keyboards/ergodox/keymaps/erez_experimental/keymap.c
index 04ad2a816..47e40aa55 100644
--- a/keyboards/ergodox/keymaps/erez_experimental/keymap.c
+++ b/keyboards/ergodox/keymaps/erez_experimental/keymap.c
@@ -1,5 +1,5 @@
#include <keymap_extras/keymap_colemak.h>
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/german-kinergo/keymap.c b/keyboards/ergodox/keymaps/german-kinergo/keymap.c
index b1cecf0dd..971318d87 100644
--- a/keyboards/ergodox/keymaps/german-kinergo/keymap.c
+++ b/keyboards/ergodox/keymaps/german-kinergo/keymap.c
@@ -1,7 +1,7 @@
// German keymap derived from "german", but more closely resembling the German layout of the Kinesis Ergo Elan.
//
// chschmitz, 2016-01-27
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
#include "keymap_german.h"
diff --git a/keyboards/ergodox/keymaps/german-manuneo/keymap.c b/keyboards/ergodox/keymaps/german-manuneo/keymap.c
index 5fcc14d51..16e92bc23 100644
--- a/keyboards/ergodox/keymaps/german-manuneo/keymap.c
+++ b/keyboards/ergodox/keymaps/german-manuneo/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "action_layer.h"
#include "keymap.h"
#include "keymap_german.h"
diff --git a/keyboards/ergodox/keymaps/german-manuneo/keymap.md b/keyboards/ergodox/keymaps/german-manuneo/keymap.md
index 2c9e0a837..837b25446 100644
--- a/keyboards/ergodox/keymaps/german-manuneo/keymap.md
+++ b/keyboards/ergodox/keymaps/german-manuneo/keymap.md
@@ -12,7 +12,7 @@ Tested with python 2.7 and python 3.4
{
"layout": "ergodox_ez",
"keymaps_includes": [
- "ergodox_ez.h",
+ "ergodox.h",
"action_layer.h",
"keymap_common.h",
"keymap_extras/keymap_german.h",
diff --git a/keyboards/ergodox/keymaps/german/keymap.c b/keyboards/ergodox/keymaps/german/keymap.c
index 3eab51f0e..9b2f6ffa2 100644
--- a/keyboards/ergodox/keymaps/german/keymap.c
+++ b/keyboards/ergodox/keymaps/german/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
#include "keymap_german.h"
diff --git a/keyboards/ergodox/keymaps/j3rn/keymap.c b/keyboards/ergodox/keymaps/j3rn/keymap.c
index 6e271321d..43c8f30a3 100644
--- a/keyboards/ergodox/keymaps/j3rn/keymap.c
+++ b/keyboards/ergodox/keymaps/j3rn/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/jack/keymap.c b/keyboards/ergodox/keymaps/jack/keymap.c
index 80bf9d535..dda253fa4 100644
--- a/keyboards/ergodox/keymaps/jack/keymap.c
+++ b/keyboards/ergodox/keymaps/jack/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/jacobono/keymap.c b/keyboards/ergodox/keymaps/jacobono/keymap.c
index 6b19800af..dc7382bfe 100644
--- a/keyboards/ergodox/keymaps/jacobono/keymap.c
+++ b/keyboards/ergodox/keymaps/jacobono/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/jgarr/keymap.c b/keyboards/ergodox/keymaps/jgarr/keymap.c
index a3ad2040f..42d58421d 100644
--- a/keyboards/ergodox/keymaps/jgarr/keymap.c
+++ b/keyboards/ergodox/keymaps/jgarr/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/josh/keymap.c b/keyboards/ergodox/keymaps/josh/keymap.c
index de5664a25..488b21427 100644
--- a/keyboards/ergodox/keymaps/josh/keymap.c
+++ b/keyboards/ergodox/keymaps/josh/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/kastyle/keymap.c b/keyboards/ergodox/keymaps/kastyle/keymap.c
index 3982e0a19..a92085003 100644
--- a/keyboards/ergodox/keymaps/kastyle/keymap.c
+++ b/keyboards/ergodox/keymaps/kastyle/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/kines-ish/keymap.c b/keyboards/ergodox/keymaps/kines-ish/keymap.c
index 5063c99f2..83f5b0e2b 100644
--- a/keyboards/ergodox/keymaps/kines-ish/keymap.c
+++ b/keyboards/ergodox/keymaps/kines-ish/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/maz/keymap.c b/keyboards/ergodox/keymaps/maz/keymap.c
index 7b8f0df74..6378f874b 100644
--- a/keyboards/ergodox/keymaps/maz/keymap.c
+++ b/keyboards/ergodox/keymaps/maz/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/mpiechotka/keymap.c b/keyboards/ergodox/keymaps/mpiechotka/keymap.c
index 5bfef5995..67aca4479 100644
--- a/keyboards/ergodox/keymaps/mpiechotka/keymap.c
+++ b/keyboards/ergodox/keymaps/mpiechotka/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
#include "keymap_colemak.h"
diff --git a/keyboards/ergodox/keymaps/msc/keymap.c b/keyboards/ergodox/keymaps/msc/keymap.c
index e567e513f..c43aecf6b 100644
--- a/keyboards/ergodox/keymaps/msc/keymap.c
+++ b/keyboards/ergodox/keymaps/msc/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/naps62/keymap.c b/keyboards/ergodox/keymaps/naps62/keymap.c
index d8c28423c..9064053fc 100644
--- a/keyboards/ergodox/keymaps/naps62/keymap.c
+++ b/keyboards/ergodox/keymaps/naps62/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/ordinary/keymap.c b/keyboards/ergodox/keymaps/ordinary/keymap.c
index 778cbc63c..bf0574ea2 100644
--- a/keyboards/ergodox/keymaps/ordinary/keymap.c
+++ b/keyboards/ergodox/keymaps/ordinary/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "led.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/osx_de/keymap.c b/keyboards/ergodox/keymaps/osx_de/keymap.c
index 554813d7e..e3b9e11f4 100644
--- a/keyboards/ergodox/keymaps/osx_de/keymap.c
+++ b/keyboards/ergodox/keymaps/osx_de/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
#include "keymap_german_osx.h"
diff --git a/keyboards/ergodox/keymaps/osx_de_adnw_koy/keymap.c b/keyboards/ergodox/keymaps/osx_de_adnw_koy/keymap.c
index 687a5cb8b..6c4312a32 100644
--- a/keyboards/ergodox/keymaps/osx_de_adnw_koy/keymap.c
+++ b/keyboards/ergodox/keymaps/osx_de_adnw_koy/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/osx_de_experimental/keymap.c b/keyboards/ergodox/keymaps/osx_de_experimental/keymap.c
index 21d695894..61b6a4fdb 100644
--- a/keyboards/ergodox/keymaps/osx_de_experimental/keymap.c
+++ b/keyboards/ergodox/keymaps/osx_de_experimental/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
#include "keymap_neo2.h"
diff --git a/keyboards/ergodox/keymaps/osx_fr/keymap.c b/keyboards/ergodox/keymaps/osx_fr/keymap.c
index de951666d..7dee284fa 100644
--- a/keyboards/ergodox/keymaps/osx_fr/keymap.c
+++ b/keyboards/ergodox/keymaps/osx_fr/keymap.c
@@ -1,5 +1,5 @@
// French AZERTY version of the default_osx file
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
#include "keymap_french_osx.h"
@@ -184,4 +184,4 @@ void matrix_scan_user(void) {
break;
}
-}; \ No newline at end of file
+};
diff --git a/keyboards/ergodox/keymaps/osx_kinesis_pnut/keymap.c b/keyboards/ergodox/keymaps/osx_kinesis_pnut/keymap.c
index 1032be549..11281df8a 100644
--- a/keyboards/ergodox/keymaps/osx_kinesis_pnut/keymap.c
+++ b/keyboards/ergodox/keymaps/osx_kinesis_pnut/keymap.c
@@ -5,7 +5,7 @@
// Only default layer was remapped all others layers are standard Ergodox EZ
// Very personal mapping of-course, but who knows a starting point for others.
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/plover/keymap.c b/keyboards/ergodox/keymaps/plover/keymap.c
index 8a58a37f6..12b3aa212 100644
--- a/keyboards/ergodox/keymaps/plover/keymap.c
+++ b/keyboards/ergodox/keymaps/plover/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/plums/keymap.c b/keyboards/ergodox/keymaps/plums/keymap.c
index 46eb2e42b..2853455e3 100644
--- a/keyboards/ergodox/keymaps/plums/keymap.c
+++ b/keyboards/ergodox/keymaps/plums/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/romanzolotarev-norman-osx/keymap.c b/keyboards/ergodox/keymaps/romanzolotarev-norman-osx/keymap.c
index a66971bef..24d0c4ecb 100644
--- a/keyboards/ergodox/keymaps/romanzolotarev-norman-osx/keymap.c
+++ b/keyboards/ergodox/keymaps/romanzolotarev-norman-osx/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx-hjkl/keymap.c b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx-hjkl/keymap.c
index 7c9f67381..9f41e5189 100644
--- a/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx-hjkl/keymap.c
+++ b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx-hjkl/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx/keymap.c b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx/keymap.c
index 9971b834c..563e24872 100644
--- a/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx/keymap.c
+++ b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/romanzolotarev-norman-qwerty-osx/keymap.c b/keyboards/ergodox/keymaps/romanzolotarev-norman-qwerty-osx/keymap.c
index dedac694e..5569f5c74 100644
--- a/keyboards/ergodox/keymaps/romanzolotarev-norman-qwerty-osx/keymap.c
+++ b/keyboards/ergodox/keymaps/romanzolotarev-norman-qwerty-osx/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/sneako/keymap.c b/keyboards/ergodox/keymaps/sneako/keymap.c
index 0c6863102..08cadd685 100644
--- a/keyboards/ergodox/keymaps/sneako/keymap.c
+++ b/keyboards/ergodox/keymaps/sneako/keymap.c
@@ -1,7 +1,7 @@
// Based on `default_osx`
// Replace left Bksp with Ctrl/Esc
// Remove the Ctrl from Z and /
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/software_neo2/keymap.c b/keyboards/ergodox/keymaps/software_neo2/keymap.c
index 2eaba0d7d..41ace403d 100644
--- a/keyboards/ergodox/keymaps/software_neo2/keymap.c
+++ b/keyboards/ergodox/keymaps/software_neo2/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
#include "keymap_neo2.h"
diff --git a/keyboards/ergodox/keymaps/supercoder/keymap.c b/keyboards/ergodox/keymaps/supercoder/keymap.c
index ca21d30fd..775acf2c9 100644
--- a/keyboards/ergodox/keymaps/supercoder/keymap.c
+++ b/keyboards/ergodox/keymaps/supercoder/keymap.c
@@ -2,7 +2,7 @@
* SuperCoder 2000 layout
*/
-#include "ergodox_ez.h"
+#include "ergodox.h"
/* Layers */
diff --git a/keyboards/ergodox/keymaps/techtomas/keymap.c b/keyboards/ergodox/keymaps/techtomas/keymap.c
index 1ff6618b9..93d59d487 100644
--- a/keyboards/ergodox/keymaps/techtomas/keymap.c
+++ b/keyboards/ergodox/keymaps/techtomas/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/teckinesis/keymap.c b/keyboards/ergodox/keymaps/teckinesis/keymap.c
index ec6ceb96b..2837874f7 100644
--- a/keyboards/ergodox/keymaps/teckinesis/keymap.c
+++ b/keyboards/ergodox/keymaps/teckinesis/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "led.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/tkuichooseyou/keymap.c b/keyboards/ergodox/keymaps/tkuichooseyou/keymap.c
index 87b77e42e..d1c779186 100644
--- a/keyboards/ergodox/keymaps/tkuichooseyou/keymap.c
+++ b/keyboards/ergodox/keymaps/tkuichooseyou/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/tm2030/keymap.c b/keyboards/ergodox/keymaps/tm2030/keymap.c
index ca8075226..1d861ee7c 100644
--- a/keyboards/ergodox/keymaps/tm2030/keymap.c
+++ b/keyboards/ergodox/keymaps/tm2030/keymap.c
@@ -1,5 +1,5 @@
/* TypeMatrix-2030-like keymap */
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
#include "led.h"
diff --git a/keyboards/ergodox/keymaps/tonyabra_osx/keymap.c b/keyboards/ergodox/keymaps/tonyabra_osx/keymap.c
index 87b9fb676..2a15fcb8d 100644
--- a/keyboards/ergodox/keymaps/tonyabra_osx/keymap.c
+++ b/keyboards/ergodox/keymaps/tonyabra_osx/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
diff --git a/keyboards/ergodox/keymaps/townk_osx/keymap.c b/keyboards/ergodox/keymaps/townk_osx/keymap.c
index 07e58a491..5043d49a0 100644
--- a/keyboards/ergodox/keymaps/townk_osx/keymap.c
+++ b/keyboards/ergodox/keymaps/townk_osx/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
#include "action_util.h"
diff --git a/keyboards/ergodox/keymaps/twey/keymap.c b/keyboards/ergodox/keymaps/twey/keymap.c
index 019930f2a..5deacd63f 100644
--- a/keyboards/ergodox/keymaps/twey/keymap.c
+++ b/keyboards/ergodox/keymaps/twey/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
#include "keymap_plover.h"
diff --git a/keyboards/ergodox/keymaps/workman_osx_mdw/keymap.c b/keyboards/ergodox/keymaps/workman_osx_mdw/keymap.c
index 8effa53b2..c05a1018d 100644
--- a/keyboards/ergodox/keymaps/workman_osx_mdw/keymap.c
+++ b/keyboards/ergodox/keymaps/workman_osx_mdw/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
// readme
diff --git a/keyboards/ergodox/keymaps/zweihander-osx/keymap.c b/keyboards/ergodox/keymaps/zweihander-osx/keymap.c
index 3444152bc..40b1d7d6d 100644
--- a/keyboards/ergodox/keymaps/zweihander-osx/keymap.c
+++ b/keyboards/ergodox/keymaps/zweihander-osx/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"