diff --git a/demos/device/keyboard/.project b/demos/device/keyboard/.project
index c0f455c5d..ebcb46372 100644
--- a/demos/device/keyboard/.project
+++ b/demos/device/keyboard/.project
@@ -3,7 +3,6 @@
 	<name>device_keyboard</name>
 	<comment></comment>
 	<projects>
-		<project>tinyusb</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
@@ -94,7 +93,7 @@
 	</linkedResources>
 	<filteredResources>
 		<filter>
-			<id>1354876380300</id>
+			<id>1357896068317</id>
 			<name></name>
 			<type>26</type>
 			<matcher>
diff --git a/tinyusb/common/errors.c b/tinyusb/common/errors.c
index 65e4c4e28..58b9e6b8d 100644
--- a/tinyusb/common/errors.c
+++ b/tinyusb/common/errors.c
@@ -39,12 +39,10 @@
 
 #if TUSB_CFG_DEBUG == 3
 
-// TODO X macro to remove define/undefine
-char const* const TUSB_ErrorStr[] = {
-#   define ERROR_ENUM(x) #x,
-#   include "errors_def"
-#   undef ERROR_ENUM
-    0
+char const* const TUSB_ErrorStr[] =
+{
+ ERROR_TABLE(ERROR_STRING)
+ 0
 };
 
 #endif
diff --git a/tinyusb/common/errors.h b/tinyusb/common/errors.h
index d5c372368..469034e72 100644
--- a/tinyusb/common/errors.h
+++ b/tinyusb/common/errors.h
@@ -55,15 +55,19 @@
  extern "C" {
 #endif
 
+#define ERROR_ENUM(x) x,
+#define ERROR_STRING(x) #x,
+
+#define ERROR_TABLE(ENTRY) \
+    ENTRY(tERROR_NONE)\
+    ENTRY(tERROR_FAILED)\
+
+
 /** \enum TUSB_Error_t
  *  \brief Error Code returned
  */
-
-// TODO X macro to remove define/undefine
 typedef enum {
-#   define ERROR_ENUM(x) x,
-#   include "errors_def"
-#   undef ERROR_ENUM
+  ERROR_TABLE(ERROR_ENUM)
   ERROR_COUNT
 }TUSB_Error_t;
 
diff --git a/tinyusb/common/errors_def b/tinyusb/common/errors_def
deleted file mode 100644
index 9a69df2f7..000000000
--- a/tinyusb/common/errors_def
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * errors_def
- *
- *  Created on: Nov 27, 2012
- *      Author: hathach
- */
-
-/*
- * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
- * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
- * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * This file is part of the tinyUSB stack.
- */
-
-ERROR_ENUM(tERROR_NONE)
-ERROR_ENUM(tERROR_FAILED)