diff --git a/ChangeLog.txt b/ChangeLog.txt
index 6317dfd02..5fd4f09c9 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1533,3 +1533,7 @@
 	  the relative path is a simpler solution (2016-01-27).
 
 7.15 2016-xx-xx Gregory Nutt <gnutt@nuttx.org>
+
+	* apps/exmaples/chat and apps/netutils/chat:  Contributed by
+	  by Vladimir Komendantskiy (2019-01-29).
+
diff --git a/system/i2c/README.txt b/system/i2c/README.txt
index a47b7eb0e..44547175e 100644
--- a/system/i2c/README.txt
+++ b/system/i2c/README.txt
@@ -356,7 +356,7 @@ The I2C tools requires the following in your NuttX configuration:
    I2C interface and the platform-specific function up_i2cuninitialize()
    to discard instances of the I2C interface.
 
-   NOTE 1: The I2C interface is defined in include/nuttx/i2c.h.
+   NOTE 1: The I2C interface is defined in include/nuttx/i2c/i2c_master.h.
 
    NOTE 2: This I2C tool uses direct I2C device interfaces.  As such, it
    relies on internal OS interfaces that are not normally available to a
diff --git a/system/i2c/i2c_bus.c b/system/i2c/i2c_bus.c
index 3a1d110d7..6669ede77 100644
--- a/system/i2c/i2c_bus.c
+++ b/system/i2c/i2c_bus.c
@@ -39,7 +39,7 @@
 
 #include <nuttx/config.h>
 
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 
 #include "i2ctool.h"
 
diff --git a/system/i2c/i2c_dev.c b/system/i2c/i2c_dev.c
index 43517dff0..839099db0 100644
--- a/system/i2c/i2c_dev.c
+++ b/system/i2c/i2c_dev.c
@@ -41,7 +41,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 
 #include "i2ctool.h"
 
diff --git a/system/i2c/i2c_get.c b/system/i2c/i2c_get.c
index c30fa9a24..e848f0a67 100644
--- a/system/i2c/i2c_get.c
+++ b/system/i2c/i2c_get.c
@@ -41,7 +41,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 
 #include "i2ctool.h"
 
diff --git a/system/i2c/i2c_set.c b/system/i2c/i2c_set.c
index 5e1f90871..0fa790bf6 100644
--- a/system/i2c/i2c_set.c
+++ b/system/i2c/i2c_set.c
@@ -41,7 +41,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 
 #include "i2ctool.h"
 
diff --git a/system/i2c/i2c_verf.c b/system/i2c/i2c_verf.c
index fd9d20ef1..bf538ebe4 100644
--- a/system/i2c/i2c_verf.c
+++ b/system/i2c/i2c_verf.c
@@ -41,7 +41,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 
 #include "i2ctool.h"
 
diff --git a/system/i2c/i2ctool.h b/system/i2c/i2ctool.h
index a27f9aeb7..4b4c84a56 100644
--- a/system/i2c/i2ctool.h
+++ b/system/i2c/i2ctool.h
@@ -49,7 +49,7 @@
 #include <stdbool.h>
 #include <errno.h>
 
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 
 /****************************************************************************
  * Pre-processor Definitions