Index: firmware/App/Services/NVDataMgmt.c
===================================================================
diff -u -r84f337383202622f14cd6148e26bab8f68333847 -rf100557efc2f7916054a63bbafb187d8017914d0
--- firmware/App/Services/NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 84f337383202622f14cd6148e26bab8f68333847)
+++ firmware/App/Services/NVDataMgmt.c	(.../NVDataMgmt.c)	(revision f100557efc2f7916054a63bbafb187d8017914d0)
@@ -5,16 +5,16 @@
  *      Author: fw
  */
 
-#include "F021.h"
-#include "string.h"
+#include <string.h>      // For memcpy and memset
+
+#include "F021.h"        // For fapi operations
 #include "system.h"      // For fapi operations
 
 #include "NVDataMgmt.h"
 
 /*
  * TODO
  * 1. Clean up the flash with the bad data packets
- * 2. Reset the counter to start the write from 0x10000
  */
 
 #define BANK0_NUM_OF_SECTORS            16