diff --git a/src/keyboard/ergodox/layout.h b/src/keyboard/ergodox/layout.h
index b233eeb..2ddad1c 100644
--- a/src/keyboard/ergodox/layout.h
+++ b/src/keyboard/ergodox/layout.h
@@ -15,9 +15,6 @@
 	// --------------------------------------------------------------------
 
 	// include the appropriate keyboard layout header
-	#include "../../lib/variable-include.h"
-	#define INCLUDE EXP_STR( ./layout/MAKEFILE_KEYBOARD_LAYOUT.h )
-	#include INCLUDE
+	#include "./layout/saneo-mod.h"
 
 #endif
-
diff --git a/src/lib/twi.h b/src/lib/twi.h
index 85acccf..366291b 100644
--- a/src/lib/twi.h
+++ b/src/lib/twi.h
@@ -9,8 +9,4 @@
  * Project located at <https://github.com/benblazak/ergodox-firmware>
  * ------------------------------------------------------------------------- */
 
-
-#include "../lib/variable-include.h"
-#define INCLUDE EXP_STR( ./twi/MAKEFILE_BOARD.h )
-#include INCLUDE
-
+#include "./twi/teensy-2-0.h"
diff --git a/src/lib/variable-include.h b/src/lib/variable-include.h
deleted file mode 100644
index 67ff6d5..0000000
--- a/src/lib/variable-include.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* ----------------------------------------------------------------------------
- * Macros to help with conditional includes
- * ----------------------------------------------------------------------------
- * Copyright (c) 2012 Ben Blazak <benblazak.dev@gmail.com>
- * Released under The MIT License (MIT) (see "license.md")
- * Project located at <https://github.com/benblazak/ergodox-firmware>
- * ------------------------------------------------------------------------- */
-
-
-#undef  INCLUDE
-#define  STR(s)  #s          // stringify
-#define  EXP_STR(s)  STR(s)  // expand -> stringify
-