Index: firmware/.cproject
===================================================================
diff -u -rf068446fdb7889d320ddb6ffbd58f347ce0501e7 -rdb6b75a5f4ff29cb1cdc4500f3d06b90d82ca386
--- firmware/.cproject	(.../.cproject)	(revision f068446fdb7889d320ddb6ffbd58f347ce0501e7)
+++ firmware/.cproject	(.../.cproject)	(revision db6b75a5f4ff29cb1cdc4500f3d06b90d82ca386)
@@ -134,6 +134,8 @@
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DIAG_WRAP.1373828995" name="Wrap diagnostic messages (--diag_wrap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DIAG_WRAP" useByScannerDiscovery="false" value="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.INCLUDE_PATH.1437810988" name="Add dir to #include search path (--include_path, -I)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.INCLUDE_PATH" valueType="includePath">
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
+									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/Common}"/>
+									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/FWCommon}"/>
 									<listOptionValue builtIn="false" value="${PROJECT_ROOT}"/>
 									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/include}"/>
 									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/App}"/>
@@ -144,7 +146,7 @@
 									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/App/Tasks}"/>
 								</option>
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.LITTLE_ENDIAN.611198143" name="Little endian code [See 'General' page to edit] (--little_endian, -me)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.LITTLE_ENDIAN" useByScannerDiscovery="false" value="true" valueType="boolean"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DEFINE.989925860" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DEFINE" valueType="definedSymbols">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DEFINE.989925860" name="Pre-define NAME (--define, -D)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DEFINE" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="_INLINE"/>
 									<listOptionValue builtIn="false" value="__TI_VIM_128CH__"/>
 								</option>
Index: firmware/.settings/org.eclipse.core.resources.prefs
===================================================================
diff -u -r6b5ac9c89e8454c292d6a74f2c2ba240c1b742c1 -rdb6b75a5f4ff29cb1cdc4500f3d06b90d82ca386
--- firmware/.settings/org.eclipse.core.resources.prefs	(.../org.eclipse.core.resources.prefs)	(revision 6b5ac9c89e8454c292d6a74f2c2ba240c1b742c1)
+++ firmware/.settings/org.eclipse.core.resources.prefs	(.../org.eclipse.core.resources.prefs)	(revision db6b75a5f4ff29cb1cdc4500f3d06b90d82ca386)
@@ -26,6 +26,8 @@
 encoding//Release/App/Services/subdir_vars.mk=UTF-8
 encoding//Release/App/Tasks/subdir_rules.mk=UTF-8
 encoding//Release/App/Tasks/subdir_vars.mk=UTF-8
+encoding//Release/FWCommon/subdir_rules.mk=UTF-8
+encoding//Release/FWCommon/subdir_vars.mk=UTF-8
 encoding//Release/makefile=UTF-8
 encoding//Release/objects.mk=UTF-8
 encoding//Release/source/subdir_rules.mk=UTF-8