Index: firmware/.cproject
===================================================================
diff -u -r414926670899f626810b758dd43f2fe875098519 -r814ca4e0484661cbc2be03f50cfc11155abdc803
--- firmware/.cproject	(.../.cproject)	(revision 414926670899f626810b758dd43f2fe875098519)
+++ firmware/.cproject	(.../.cproject)	(revision 814ca4e0484661cbc2be03f50cfc11155abdc803)
@@ -126,6 +126,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="${PROJECT_ROOT}"/>
+									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/Common}"/>
+									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/FWCommon}"/>
 									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/App}"/>
 									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/App/Controllers}"/>
 									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/App/Drivers}"/>
Index: firmware/.settings/org.eclipse.core.resources.prefs
===================================================================
diff -u -r414926670899f626810b758dd43f2fe875098519 -r814ca4e0484661cbc2be03f50cfc11155abdc803
--- firmware/.settings/org.eclipse.core.resources.prefs	(.../org.eclipse.core.resources.prefs)	(revision 414926670899f626810b758dd43f2fe875098519)
+++ firmware/.settings/org.eclipse.core.resources.prefs	(.../org.eclipse.core.resources.prefs)	(revision 814ca4e0484661cbc2be03f50cfc11155abdc803)
@@ -28,6 +28,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