diff --git a/UPGRADING.md b/UPGRADING.md
index a2b307b1..af60b3e6 100644
--- a/UPGRADING.md
+++ b/UPGRADING.md
@@ -311,13 +311,10 @@ the state of a keyswitch at a given row and column; or at a given index.
 
 Prior versions of `HostOS` used to include a way to auto-detect the host
 operating system. This code was brittle, unreliable, and rather big too. For
-these reasons, this functionality was removed. The `autoDetect()` method is now
-a no-op, and is deprecated.
+these reasons, this functionality was removed.
 Furthermore, `HostOS` now depends on `Kaleidoscope-EEPROM-Settings`, that plugin
 should be initialized first.
 
-The deprecated `autoDetect()` method will be removed by **2019-01-14**.
-
 ### MagicCombo
 
 To make `MagicCombo` more portable, and easier to use, we had to break the API previously provided, there was no way to maintain backwards compatibility. This document is an attempt at guiding you through the process of migrating from the earlier API to the current one.
@@ -327,8 +324,6 @@ Migration should be a straightforward process, but if you get stuck, please feel
  [gh:issues]: https://github.com/keyboardio/Kaleidoscope/issues
  [forums]: https://community.keyboard.io/
 
-Trying to use the old API errors out with a helpful error message, but as the old API is deprecated, this will be removed by **2019-01-14**.
-
 #### The old API
 
 ```c++
@@ -431,8 +426,6 @@ open an issue, or ask for help on the forums, and we'll help you.
 
 Older versions of the plugin used to provide EEPROM storage for the settings only optionally, when it was explicitly enabled via the `TypingBreaks.enableEEPROM()` method. Similarly, the Focus hooks were optional too.
 
-Both of them are unconditionally enabled now, because they add so much to the plugin. This means that any calls to `TypingBreaks.enableEEPROM()` can be safely removed, the method is deprecated, a no-op by now. The method will be removed by **2019-01-14**.
-
 Storing the settable settings in EEPROM makes it depend on `Kaleidoscope-EEPROM-Settings`, which should be initialized before this plugin is.
 
 ### Redial
@@ -461,11 +454,9 @@ The goal was to have a method name that is a verb, because these are actions we
 
 The [OneShot plugin](doc/plugin/OneShot.md) has much improved stickability control. Instead of only being able to control if one-shot layers should be stickable too, or disabling the sticky feature in general, it is now possible to control stickiness on a per-key basis with the new `OneShot.enableStickability()` and `OneShot.disableStickablity()` methods.
 
-The old method of setting `OneShot.double_tap_sticky` or `OneShot.double_tap_layer_sticky` continue to work, but using them is deprecated, and as such, these will be removed by **2019-01-14**.
-
 ### Source code and namespace rearrangement
 
-With the move towards a monorepo-based source, some headers have moved to a new location, and plenty of plugins moved to a new namespace (`kaleidoscope::plugin`). This means that the old headers, and some old names are deprecated. Unless noted otherwise, the old names still work, but will likely emit a warning, and the compatibility shims will be removed by **2019-01-14**.
+With the move towards a monorepo-based source, some headers have moved to a new location, and plenty of plugins moved to a new namespace (`kaleidoscope::plugin`). This means that the old headers, and some old names are deprecated. The old names no longer work.
 
 The following headers and names have changed:
 
@@ -486,6 +477,28 @@ The following headers and names have changed:
 
 # Removed APIs
 
+### Removed on 2019-01-17
+
+#### Compat headers following the source code and namespace rearrangement
+
+With the move towards a monorepo-based source, some headers have moved to a new location, and plenty of plugins moved to a new namespace (`kaleidoscope::plugin`). This means that the old headers, and some old names are deprecated. The old names no longer work.
+
+#### HostOS.autoDetect()
+
+The `autoDetect()` method has been formerly deprecated, and is now removed.
+
+#### The old MagicCombo API
+
+We've changed the API of the MagicCombo plugin, and while it provided a helpful error message for a while when trying to use the old API, it no longer does so, the error message has been removed.
+
+#### TypingBreaks.enableEEPROM()
+
+`TypingBreaks.enableEEPROM()` has been previously deprecated, and turned into a no-op, and is now removed.
+
+#### `OneShot.double_tap_sticky` and `OneShot.double_tap_layer_sticky`
+
+These were deprecated in favour of a better, finer grained API, and are now removed.
+
 ### Removed on 2018-08-20
 
 We aim at making a new release by mid-July, and APIs we deprecate now, will be
diff --git a/examples/Devices/Keyboardio/Kaleidoscope/Kaleidoscope.ino b/examples/Devices/Keyboardio/Kaleidoscope/Kaleidoscope.ino
index 12bb6e6c..7787aca1 100644
--- a/examples/Devices/Keyboardio/Kaleidoscope/Kaleidoscope.ino
+++ b/examples/Devices/Keyboardio/Kaleidoscope/Kaleidoscope.ino
@@ -1,6 +1,6 @@
 /* -*- mode: c++ -*-
  * Kaleidoscope - A Kaleidoscope example
- * Copyright (C) 2016-2018  Keyboard.io, Inc.
+ * Copyright (C) 2016-2019  Keyboard.io, Inc.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU General Public License as published by the Free Software
@@ -76,13 +76,13 @@ KEYMAPS(
 )
 
 
-static kaleidoscope::LEDSolidColor solidRed(60, 0, 0);
-static kaleidoscope::LEDSolidColor solidOrange(60, 20, 0);
-static kaleidoscope::LEDSolidColor solidYellow(40, 35, 0);
-static kaleidoscope::LEDSolidColor solidGreen(0, 100, 0);
-static kaleidoscope::LEDSolidColor solidBlue(0, 15, 100);
-static kaleidoscope::LEDSolidColor solidIndigo(0, 0, 100);
-static kaleidoscope::LEDSolidColor solidViolet(70, 0, 60);
+static kaleidoscope::plugin::LEDSolidColor solidRed(60, 0, 0);
+static kaleidoscope::plugin::LEDSolidColor solidOrange(60, 20, 0);
+static kaleidoscope::plugin::LEDSolidColor solidYellow(40, 35, 0);
+static kaleidoscope::plugin::LEDSolidColor solidGreen(0, 100, 0);
+static kaleidoscope::plugin::LEDSolidColor solidBlue(0, 15, 100);
+static kaleidoscope::plugin::LEDSolidColor solidIndigo(0, 0, 100);
+static kaleidoscope::plugin::LEDSolidColor solidViolet(70, 0, 60);
 
 const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) {
   if (macroIndex == 1 && keyToggledOn(keyState)) {
diff --git a/examples/Keystrokes/TapDance/TapDance.ino b/examples/Keystrokes/TapDance/TapDance.ino
index be108985..7cd5b0fb 100644
--- a/examples/Keystrokes/TapDance/TapDance.ino
+++ b/examples/Keystrokes/TapDance/TapDance.ino
@@ -1,6 +1,6 @@
 /* -*- mode: c++ -*-
  * Kaleidoscope-TapDance -- Tap-dance keys
- * Copyright (C) 2016, 2017, 2018  Keyboard.io, Inc
+ * Copyright (C) 2016, 2017, 2018, 2019  Keyboard.io, Inc
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU General Public License as published by the Free Software
@@ -40,11 +40,11 @@ KEYMAPS(
 )
 // *INDENT-ON*
 
-static void tapDanceEsc(uint8_t tap_dance_index, uint8_t tap_count, kaleidoscope::TapDance::ActionType tap_dance_action) {
+static void tapDanceEsc(uint8_t tap_dance_index, uint8_t tap_count, kaleidoscope::plugin::TapDance::ActionType tap_dance_action) {
   tapDanceActionKeys(tap_count, tap_dance_action, Key_Escape, Key_Tab);
 }
 
-void tapDanceAction(uint8_t tap_dance_index, byte row, byte col, uint8_t tap_count, kaleidoscope::TapDance::ActionType tap_dance_action) {
+void tapDanceAction(uint8_t tap_dance_index, byte row, byte col, uint8_t tap_count, kaleidoscope::plugin::TapDance::ActionType tap_dance_action) {
   switch (tap_dance_index) {
   case 0:
     return tapDanceActionKeys(tap_count, tap_dance_action, Key_Tab, Key_Escape);
diff --git a/examples/LEDs/LED-Palette-Theme/LED-Palette-Theme.ino b/examples/LEDs/LED-Palette-Theme/LED-Palette-Theme.ino
index d066ca5d..e587ef3b 100644
--- a/examples/LEDs/LED-Palette-Theme/LED-Palette-Theme.ino
+++ b/examples/LEDs/LED-Palette-Theme/LED-Palette-Theme.ino
@@ -23,7 +23,7 @@
 
 namespace example {
 
-class TestLEDMode : public kaleidoscope::LEDMode {
+class TestLEDMode : public kaleidoscope::plugin::LEDMode {
  public:
   TestLEDMode() {}
 
diff --git a/src/LED-Off.h b/src/LED-Off.h
deleted file mode 100644
index eeb13372..00000000
--- a/src/LED-Off.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Kaleidoscope-LEDControl - LED control plugin for Kaleidoscope
- * Copyright (C) 2017-2018  Keyboard.io, Inc.
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#warning The "LED-Off.h" header is deprecated, the mode is included by default when using <Kaleidoscope-LEDControl.h>. It can be safely removed.
-
-#include "kaleidoscope/plugin/LEDControl/LED-Off.h"
diff --git a/src/LEDUtils.h b/src/LEDUtils.h
deleted file mode 100644
index 803e882e..00000000
--- a/src/LEDUtils.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Kaleidoscope-LEDControl - LED control plugin for Kaleidoscope
- * Copyright (C) 2017-2018  Keyboard.io, Inc.
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#warning The "LEDUtils.h" header is deprecated, the mode is included by default when using <Kaleidoscope-LEDControl.h>. It can be safely removed.
-
-#include "kaleidoscope/plugin/LEDControl/LEDUtils.h"
diff --git a/src/MouseWrapper.h b/src/MouseWrapper.h
deleted file mode 100644
index ad127ce7..00000000
--- a/src/MouseWrapper.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Kaleidoscope-MouseKeys - Mouse keys for Kaleidoscope.
- * Copyright (C) 2017-2018  Keyboard.io, Inc.
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#warning The "MouseWrapper.h" header is deprecated, the same functionality is included by default when using <Kaleidoscope-MouseKeys.h>. It can be safely removed.
-
-#include "kaleidoscope/plugin/MouseKeys/MouseWrapper.h"
diff --git a/src/kaleidoscope/plugin/GhostInTheFirmware.h b/src/kaleidoscope/plugin/GhostInTheFirmware.h
index d7eb28d2..823e2f0e 100644
--- a/src/kaleidoscope/plugin/GhostInTheFirmware.h
+++ b/src/kaleidoscope/plugin/GhostInTheFirmware.h
@@ -48,9 +48,6 @@ class GhostInTheFirmware : public kaleidoscope::Plugin {
   static void loopHook(bool is_post_clear);
 };
 }
-
-// For backwards compatibility
-typedef kaleidoscope::plugin::GhostInTheFirmware GhostInTheFirmware;
 }
 
 extern kaleidoscope::plugin::GhostInTheFirmware GhostInTheFirmware;
diff --git a/src/kaleidoscope/plugin/HostOS.h b/src/kaleidoscope/plugin/HostOS.h
index 0668b83e..c959118f 100644
--- a/src/kaleidoscope/plugin/HostOS.h
+++ b/src/kaleidoscope/plugin/HostOS.h
@@ -35,12 +35,6 @@ typedef enum {
 
 }
 
-#define _DEPRECATED_MESSAGE_AUTODETECT                                  \
-  "The auto-detect mechanism of HostOS was removed, because it was\n"   \
-  "too unreliable. As such, the HostOS.autoDetect() method does\n"      \
-  "nothing anymore. Please consider other ways of changing the\n"       \
-  "HostOS type."
-
 class HostOS : public kaleidoscope::Plugin {
  public:
   HostOS() {}
@@ -51,8 +45,6 @@ class HostOS : public kaleidoscope::Plugin {
   }
   void os(hostos::Type new_os);
 
-  void autoDetect() DEPRECATED(AUTODETECT) {}
-
  private:
   hostos::Type os_;
   uint16_t eeprom_slice_;
diff --git a/src/kaleidoscope/plugin/LED-AlphaSquare/Symbols.h b/src/kaleidoscope/plugin/LED-AlphaSquare/Symbols.h
index e829a81d..5dae40b5 100644
--- a/src/kaleidoscope/plugin/LED-AlphaSquare/Symbols.h
+++ b/src/kaleidoscope/plugin/LED-AlphaSquare/Symbols.h
@@ -33,7 +33,4 @@ static constexpr uint16_t Lambda = SYM4x4(1, 0, 0, 0,
 }
 }
 
-// Backwards compatibility
-namespace alpha_square = kaleidoscope::plugin::alpha_square;
-
 }
diff --git a/src/kaleidoscope/plugin/LEDControl.h b/src/kaleidoscope/plugin/LEDControl.h
index ed39fffa..a9faa6ee 100644
--- a/src/kaleidoscope/plugin/LEDControl.h
+++ b/src/kaleidoscope/plugin/LEDControl.h
@@ -171,8 +171,6 @@ class FocusLEDCommand : public Plugin {
 
 }
 
-// Backwards compatibility
-typedef plugin::LEDMode LEDMode;
 }
 
 extern kaleidoscope::plugin::LEDControl LEDControl;
diff --git a/src/kaleidoscope/plugin/LEDEffect-SolidColor.h b/src/kaleidoscope/plugin/LEDEffect-SolidColor.h
index b79bbf72..30ebc14d 100644
--- a/src/kaleidoscope/plugin/LEDEffect-SolidColor.h
+++ b/src/kaleidoscope/plugin/LEDEffect-SolidColor.h
@@ -32,8 +32,4 @@ class LEDSolidColor : public LEDMode {
   uint8_t r, g, b;
 };
 }
-
-// Backwards compatibility
-typedef plugin::LEDSolidColor LEDSolidColor;
-
 }
diff --git a/src/kaleidoscope/plugin/Leader.h b/src/kaleidoscope/plugin/Leader.h
index 2c0dc119..d08e5717 100644
--- a/src/kaleidoscope/plugin/Leader.h
+++ b/src/kaleidoscope/plugin/Leader.h
@@ -58,8 +58,6 @@ class Leader : public kaleidoscope::Plugin {
 };
 }
 
-// Backwards compatibility
-typedef plugin::Leader Leader;
 }
 
 extern kaleidoscope::plugin::Leader Leader;
diff --git a/src/kaleidoscope/plugin/MagicCombo.h b/src/kaleidoscope/plugin/MagicCombo.h
index 35706c26..e195a146 100644
--- a/src/kaleidoscope/plugin/MagicCombo.h
+++ b/src/kaleidoscope/plugin/MagicCombo.h
@@ -33,13 +33,6 @@
   }                                                                       \
   }
 
-#define _MAGICCOMBO_API_CHANGE                                            \
-  "The MagicCombo API changed in an incompatible way, you will need to\n" \
-  "upgrade.\n"                                                            \
-  "\n"                                                                    \
-  "Please see the `UPGRADING.md` document shipped with the source:\n"     \
-  " https://github.com/keyboardio/Kaleidoscope-MagicCombo/blob/master/UPGRADING.md"
-
 namespace kaleidoscope {
 namespace plugin {
 
@@ -50,18 +43,9 @@ class MagicCombo : public kaleidoscope::Plugin {
     ComboAction action;
     int8_t keys[MAX_COMBO_LENGTH + 1];
   } Combo;
-  typedef struct combo_t {
-    uint32_t left_hand, right_hand;
-
-    template <typename T>
-    combo_t(T l, T r) {
-      static_assert(sizeof(T) < 0, _DEPRECATE(_MAGICCOMBO_API_CHANGE));
-    }
-  } combo_t;
 
   MagicCombo(void) {}
 
-  static const combo_t *magic_combos;
   static uint16_t min_interval;
 
   EventHandlerResult beforeReportingState();
@@ -76,9 +60,6 @@ extern const uint8_t combos_length;
 }
 
 }
-
-// Backward compatibility
-typedef plugin::MagicCombo MagicCombo;
 }
 
 extern kaleidoscope::plugin::MagicCombo MagicCombo;
diff --git a/src/kaleidoscope/plugin/OneShot.cpp b/src/kaleidoscope/plugin/OneShot.cpp
index 8a432b0b..19870d77 100644
--- a/src/kaleidoscope/plugin/OneShot.cpp
+++ b/src/kaleidoscope/plugin/OneShot.cpp
@@ -1,6 +1,6 @@
 /* -*- mode: c++ -*-
  * Kaleidoscope-OneShot -- One-shot modifiers and layers
- * Copyright (C) 2016-2018  Keyboard.io, Inc.
+ * Copyright (C) 2016-2019  Keyboard.io, Inc.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU General Public License as published by the Free Software
@@ -30,13 +30,10 @@ OneShot::state_t OneShot::state_ = {0, 0};
 OneShot::state_t OneShot::sticky_state_ = {0, 0};
 OneShot::state_t OneShot::stickable_state_ = {0xFF, 0xFF};
 OneShot::state_t OneShot::pressed_state_ = {0, 0};
-bool OneShot::double_tap_sticky = true;
-bool OneShot::double_tap_sticky_layers = true;
 Key OneShot::prev_key_;
 bool OneShot::should_cancel_ = false;
 bool OneShot::should_cancel_stickies_ = false;
 uint8_t OneShot::positions_[16];
-bool OneShot::use_new_stickies_ = false;
 
 // --- helper macros ------
 
@@ -62,15 +59,7 @@ bool OneShot::use_new_stickies_ = false;
 #define hasTimedOut() (millis () - start_time_ >= time_out)
 
 bool OneShot::isStickable(Key key) {
-  if (use_new_stickies_)
-    return bitRead(stickable_state_.all, key.raw - ranges::OS_FIRST);
-
-  if (key >= ranges::OSM_FIRST && key <= ranges::OSM_LAST)
-    return true;
-  else if (key >= ranges::OSL_FIRST && key <= ranges::OSL_LAST)
-    return double_tap_sticky_layers;
-
-  return false;
+  return bitRead(stickable_state_.all, key.raw - ranges::OS_FIRST);
 }
 
 void OneShot::positionToCoords(uint8_t pos, byte *row, byte *col) {
@@ -264,36 +253,28 @@ void OneShot::cancel(bool with_stickies) {
 }
 
 void OneShot::enableStickability(Key key) {
-  use_new_stickies_ = true;
-
   if (key >= ranges::OS_FIRST && key <= ranges::OS_LAST)
     bitSet(stickable_state_.all, (key.raw - ranges::OS_FIRST));
 }
 
 void OneShot::disableStickability(Key key) {
-  use_new_stickies_ = true;
-
   if (key >= ranges::OS_FIRST && key <= ranges::OS_LAST)
     bitClear(stickable_state_.all, (key.raw - ranges::OS_FIRST));
 }
 
 void OneShot::enableStickabilityForModifiers() {
-  use_new_stickies_ = true;
   stickable_state_.mods = 0xFF;
 }
 
 void OneShot::enableStickabilityForLayers() {
-  use_new_stickies_ = true;
   stickable_state_.layers = 0xFF;
 }
 
 void OneShot::disableStickabilityForModifiers() {
-  use_new_stickies_ = true;
   stickable_state_.mods = 0;
 }
 
 void OneShot::disableStickabilityForLayers() {
-  use_new_stickies_ = true;
   stickable_state_.layers = 0;
 }
 
diff --git a/src/kaleidoscope/plugin/OneShot.h b/src/kaleidoscope/plugin/OneShot.h
index f090ccaf..b474f651 100644
--- a/src/kaleidoscope/plugin/OneShot.h
+++ b/src/kaleidoscope/plugin/OneShot.h
@@ -1,6 +1,6 @@
 /* -*- mode: c++ -*-
  * Kaleidoscope-OneShot -- One-shot modifiers and layers
- * Copyright (C) 2016-2018  Keyboard.io, Inc.
+ * Copyright (C) 2016-2019  Keyboard.io, Inc.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU General Public License as published by the Free Software
@@ -69,9 +69,6 @@ class OneShot : public kaleidoscope::Plugin {
 
   static bool isStickable(Key key);
 
-  static bool double_tap_sticky;
-  static bool double_tap_sticky_layers;
-
   static bool isModifierActive(Key key);
 
   EventHandlerResult beforeReportingState();
@@ -97,7 +94,6 @@ class OneShot : public kaleidoscope::Plugin {
   static bool should_cancel_;
   static bool should_cancel_stickies_;
   static uint8_t positions_[16];
-  static bool use_new_stickies_;
 
   static void positionToCoords(uint8_t pos, byte *row, byte *col);
 
diff --git a/src/kaleidoscope/plugin/Qukeys.h b/src/kaleidoscope/plugin/Qukeys.h
index 77383f8e..40015e59 100644
--- a/src/kaleidoscope/plugin/Qukeys.h
+++ b/src/kaleidoscope/plugin/Qukeys.h
@@ -135,9 +135,6 @@ class Qukeys : public kaleidoscope::Plugin {
 
 } // namespace plugin {
 
-// Backwards compatibility
-typedef plugin::Qukey Qukey;
-
 } // namespace kaleidoscope {
 
 extern kaleidoscope::plugin::Qukeys Qukeys;
diff --git a/src/kaleidoscope/plugin/ShapeShifter.h b/src/kaleidoscope/plugin/ShapeShifter.h
index 59344fb5..116cd3fe 100644
--- a/src/kaleidoscope/plugin/ShapeShifter.h
+++ b/src/kaleidoscope/plugin/ShapeShifter.h
@@ -1,6 +1,6 @@
 /* -*- mode: c++ -*-
  * Kaleidoscope-ShapeShifter -- Change the shifted symbols on any key of your choice
- * Copyright (C) 2016, 2017  Keyboard.io, Inc
+ * Copyright (C) 2016, 2017, 2019  Keyboard.io, Inc
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU General Public License as published by the Free Software
@@ -40,8 +40,6 @@ class ShapeShifter : public kaleidoscope::Plugin {
 };
 }
 
-// Backwards compatibility
-typedef plugin::ShapeShifter ShapeShifter;
 }
 
 extern kaleidoscope::plugin::ShapeShifter ShapeShifter;
diff --git a/src/kaleidoscope/plugin/SpaceCadet.h b/src/kaleidoscope/plugin/SpaceCadet.h
index de1b89af..be2c91b3 100644
--- a/src/kaleidoscope/plugin/SpaceCadet.h
+++ b/src/kaleidoscope/plugin/SpaceCadet.h
@@ -1,6 +1,7 @@
 /* -*- mode: c++ -*-
  * Kaleidoscope-SpaceCadet -- Space Cadet Shift Extended
  * Copyright (C) 2016, 2017, 2018  Keyboard.io, Inc, Ben Gemperline
+ * Copyright (C) 2019  Keyboard.io, Inc
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU General Public License as published by the Free Software
@@ -21,7 +22,7 @@
 #include <Kaleidoscope-Ranges.h>
 
 #ifndef SPACECADET_MAP_END
-#define SPACECADET_MAP_END (kaleidoscope::SpaceCadet::KeyBinding) { Key_NoKey, Key_NoKey, 0 }
+#define SPACECADET_MAP_END (kaleidoscope::plugin::SpaceCadet::KeyBinding) { Key_NoKey, Key_NoKey, 0 }
 #endif
 
 #define Key_SpaceCadetEnable  Key(kaleidoscope::ranges::SC_FIRST)
@@ -72,9 +73,6 @@ class SpaceCadet : public kaleidoscope::Plugin {
 };
 }
 
-// Backwards compatibility
-typedef plugin::SpaceCadet SpaceCadet;
-
 }
 
 extern kaleidoscope::plugin::SpaceCadet SpaceCadet;
diff --git a/src/kaleidoscope/plugin/Syster.cpp b/src/kaleidoscope/plugin/Syster.cpp
index ff96d2fd..e3cecc68 100644
--- a/src/kaleidoscope/plugin/Syster.cpp
+++ b/src/kaleidoscope/plugin/Syster.cpp
@@ -1,6 +1,6 @@
 /* -*- mode: c++ -*-
  * Kaleidoscope-Syster -- Symbolic input system
- * Copyright (C) 2017, 2018  Keyboard.io, Inc
+ * Copyright (C) 2017, 2018, 2019  Keyboard.io, Inc
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU General Public License as published by the Free Software
@@ -116,7 +116,7 @@ __attribute__((weak)) const char keyToChar(Key key) {
   return 0;
 }
 
-__attribute__((weak)) void systerAction(kaleidoscope::Syster::action_t action, const char *symbol) {
+__attribute__((weak)) void systerAction(kaleidoscope::plugin::Syster::action_t action, const char *symbol) {
 }
 
 kaleidoscope::plugin::Syster Syster;
diff --git a/src/kaleidoscope/plugin/Syster.h b/src/kaleidoscope/plugin/Syster.h
index c71205bc..31d38083 100644
--- a/src/kaleidoscope/plugin/Syster.h
+++ b/src/kaleidoscope/plugin/Syster.h
@@ -1,6 +1,6 @@
 /* -*- mode: c++ -*-
  * Kaleidoscope-Syster -- Symbolic input system
- * Copyright (C) 2017, 2018  Keyboard.io, Inc
+ * Copyright (C) 2017, 2018, 2019  Keyboard.io, Inc
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU General Public License as published by the Free Software
@@ -50,9 +50,6 @@ class Syster : public kaleidoscope::Plugin {
 };
 }
 
-// Backwards compatibility
-typedef plugin::Syster Syster;
-
 }
 
 const char keyToChar(Key key);
diff --git a/src/kaleidoscope/plugin/TapDance.h b/src/kaleidoscope/plugin/TapDance.h
index 39c1bf73..d57cb15f 100644
--- a/src/kaleidoscope/plugin/TapDance.h
+++ b/src/kaleidoscope/plugin/TapDance.h
@@ -1,6 +1,6 @@
 /* -*- mode: c++ -*-
  * Kaleidoscope-TapDance -- Tap-dance keys
- * Copyright (C) 2016, 2017, 2018  Keyboard.io, Inc
+ * Copyright (C) 2016, 2017, 2018, 2019  Keyboard.io, Inc
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU General Public License as published by the Free Software
@@ -66,9 +66,6 @@ class TapDance : public kaleidoscope::Plugin {
 };
 }
 
-// Backwards compatibility
-typedef plugin::TapDance TapDance;
-
 }
 
 void tapDanceAction(uint8_t tap_dance_index, byte row, byte col, uint8_t tap_count,
diff --git a/src/kaleidoscope/plugin/TypingBreaks.h b/src/kaleidoscope/plugin/TypingBreaks.h
index 402a42ee..32adac8f 100644
--- a/src/kaleidoscope/plugin/TypingBreaks.h
+++ b/src/kaleidoscope/plugin/TypingBreaks.h
@@ -1,6 +1,6 @@
 /* -*- mode: c++ -*-
  * Kaleidoscope-TypingBreaks -- Enforced typing breaks
- * Copyright (C) 2017, 2018  Keyboard.io, Inc
+ * Copyright (C) 2017, 2018, 2019  Keyboard.io, Inc
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU General Public License as published by the Free Software
@@ -19,10 +19,6 @@
 
 #include <Kaleidoscope.h>
 
-#define _DEPRECATED_MESSAGE_ENABLE_EEPROM                          \
-  "EEPROM is now enabled automatically, and the .enableEEPROM()\n" \
-  "method is therefore obsolete. You can safely remove it."
-
 namespace kaleidoscope {
 namespace plugin {
 
@@ -30,8 +26,6 @@ class TypingBreaks : public kaleidoscope::Plugin {
  public:
   TypingBreaks(void) {}
 
-  static void enableEEPROM(void) DEPRECATED(ENABLE_EEPROM) {}
-
   typedef struct settings_t {
     uint16_t idle_time_limit;
     uint16_t lock_time_out;
diff --git a/src/key_defs_keymaps.h b/src/key_defs_keymaps.h
deleted file mode 100644
index a8386eae..00000000
--- a/src/key_defs_keymaps.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Kaleidoscope - Firmware for computer input devices
- * Copyright (C) 2013-2018  Keyboard.io, Inc.
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#warning Please migrate to including "kaleidoscope/key_defs_keymaps.h" instead of "key_defs_keymaps.h", or even consider dropping the include, because <Kaleidoscope.h> will pull the right header in anyway.
-
-#include "kaleidoscope/key_defs_keymaps.h"
diff --git a/src/layers.h b/src/layers.h
deleted file mode 100644
index 032c3673..00000000
--- a/src/layers.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Kaleidoscope - Firmware for computer input devices
- * Copyright (C) 2013-2018  Keyboard.io, Inc.
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#warning Please migrate to including "kaleidoscope/layers.h" instead of "layers.h", or even consider dropping the include, because <Kaleidoscope.h> will pull the right header in anyway.
-
-#include "kaleidoscope/layers.h"
diff --git a/src/macro_helpers.h b/src/macro_helpers.h
deleted file mode 100644
index 58042886..00000000
--- a/src/macro_helpers.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Kaleidoscope - Firmware for computer input devices
- * Copyright (C) 2013-2018  Keyboard.io, Inc.
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#warning Please migrate to including "kaleidoscope/macro_helpers.h" instead of "macro_helpers.h"!
-
-#include "kaleidoscope/macro_helpers.h"