diff --git a/workspace_tools/targets.py b/workspace_tools/targets.py
index ddb92f39e8..b40b238bca 100755
--- a/workspace_tools/targets.py
+++ b/workspace_tools/targets.py
@@ -1,6 +1,6 @@
 """
 mbed SDK
-Copyright (c) 2011-2015 ARM Limited
+Copyright (c) 2011-2016 ARM Limited
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,16 +16,16 @@ limitations under the License.
 """
 
 CORE_LABELS = {
-    "ARM7TDMI-S": ["ARM7"],
-    "Cortex-M0" : ["M0", "CORTEX_M"],
-    "Cortex-M0+": ["M0P", "CORTEX_M"],
-    "Cortex-M1" : ["M1", "CORTEX_M"],
-    "Cortex-M3" : ["M3", "CORTEX_M"],
-    "Cortex-M4" : ["M4", "CORTEX_M", "RTOS_M4_M7"],
-    "Cortex-M4F" : ["M4", "CORTEX_M", "RTOS_M4_M7"],
-    "Cortex-M7" : ["M7", "CORTEX_M", "RTOS_M4_M7"],
-    "Cortex-M7F" : ["M7", "CORTEX_M", "RTOS_M4_M7"],
-    "Cortex-A9" : ["A9", "CORTEX_A"]
+    "ARM7TDMI-S": ["ARM7", "LIKE_CORTEX_ARM7"],
+    "Cortex-M0" : ["M0", "CORTEX_M", "LIKE_CORTEX_M0"],
+    "Cortex-M0+": ["M0P", "CORTEX_M", "LIKE_CORTEX_M0"],
+    "Cortex-M1" : ["M1", "CORTEX_M", "LIKE_CORTEX_M1"],
+    "Cortex-M3" : ["M3", "CORTEX_M", "LIKE_CORTEX_M3"],
+    "Cortex-M4" : ["M4", "CORTEX_M", "RTOS_M4_M7", "LIKE_CORTEX_M4"],
+    "Cortex-M4F" : ["M4", "CORTEX_M", "RTOS_M4_M7", "LIKE_CORTEX_M4"],
+    "Cortex-M7" : ["M7", "CORTEX_M", "RTOS_M4_M7", "LIKE_CORTEX_M7"],
+    "Cortex-M7F" : ["M7", "CORTEX_M", "RTOS_M4_M7", "LIKE_CORTEX_M7"],
+    "Cortex-A9" : ["A9", "CORTEX_A", "LIKE_CORTEX_A9"]
 }
 
 import os
diff --git a/workspace_tools/toolchains/__init__.py b/workspace_tools/toolchains/__init__.py
index 6e9e8c53b8..e8156bbe70 100644
--- a/workspace_tools/toolchains/__init__.py
+++ b/workspace_tools/toolchains/__init__.py
@@ -292,7 +292,7 @@ class mbedToolchain:
                 self.symbols.extend(mbedToolchain.CORTEX_SYMBOLS[self.target.core])
 
             # Symbols defined by the on-line build.system
-            self.symbols.extend(['MBED_BUILD_TIMESTAMP=%s' % self.timestamp, '__MBED__=1'])
+            self.symbols.extend(['MBED_BUILD_TIMESTAMP=%s' % self.timestamp, 'TARGET_LIKE_MBED', '__MBED__=1'])
             if MBED_ORG_USER:
                 self.symbols.append('MBED_USERNAME=' + MBED_ORG_USER)