2 files changed, 10 insertions, 0 deletions

diff --git a/common/report.h b/common/report.h
index 45f5c0b88..a73e0aba1 100644
--- a/common/report.h
+++ b/common/report.h
@@ -78,6 +78,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #   define REPORT_KEYS 6
 #endif
 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct {
     uint8_t mods;
     uint8_t rserved;
@@ -92,4 +97,8 @@ typedef struct {
     int8_t h;
 } __attribute__ ((packed)) report_mouse_t;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/common/usb_keycodes.h b/common/usb_keycodes.h
index 9b6cce153..04b398fa2 100644
--- a/common/usb_keycodes.h
+++ b/common/usb_keycodes.h
@@ -24,6 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #define IS_ERROR(code)           (KB_ROLL_OVER <= (code) && (code) <= KB_UNDEFINED)
+#define IS_ANY(code)             (KB_A         <= (code))
 #define IS_KEY(code)             (KB_A         <= (code) && (code) <= KB_EXSEL)
 #define IS_MOD(code)             (KB_LCTRL     <= (code) && (code) <= KB_RGUI)
 #define IS_FN(code)              (KB_FN0       <= (code) && (code) <= KB_FN7)