diff --git a/boards/Board.mk b/boards/Board.mk
index 2bcdcbae3b..8d501a59f8 100644
--- a/boards/Board.mk
+++ b/boards/Board.mk
@@ -121,12 +121,12 @@ endif
 
 .depend: Makefile $(SRCS) $(CXXSRCS)
 ifneq ($(ZDSVERSION),)
-	$(Q) $(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) $(MKDEP) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 else
-	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) $(MKDEP) $(DEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
 endif
 ifneq ($(CXXSRCS),)
-	$(Q) $(MKDEP) "$(CXX)" -- $(CXXFLAGS) -- $(CXXSRCS) >>Make.dep
+	$(Q) $(MKDEP) $(DEPPATH) "$(CXX)" -- $(CXXFLAGS) -- $(CXXSRCS) >>Make.dep
 endif
 	$(Q) touch $@
 
diff --git a/boards/arm/cxd56xx/common/Makefile b/boards/arm/cxd56xx/common/Makefile
index 0326d1849d..f86cb24067 100644
--- a/boards/arm/cxd56xx/common/Makefile
+++ b/boards/arm/cxd56xx/common/Makefile
@@ -1,7 +1,7 @@
 ############################################################################
-# boards/arm/cxd56x/spresense/src/Makefile
+# boards/arm/cxd56x/common/Makefile
 #
-#   Copyright 2018 Sony Semiconductor Solutions Corporation
+#   Copyright 2019 Sony Semiconductor Solutions Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -37,4 +37,7 @@
 include board$(DELIM)Make.defs
 include src$(DELIM)Make.defs
 
+DEPPATH += --dep-path board
+DEPPATH += --dep-path src
+
 include $(TOPDIR)/boards/Board.mk
diff --git a/include/nuttx/net/net.h b/include/nuttx/net/net.h
index e383386d54..325bb8bfa9 100644
--- a/include/nuttx/net/net.h
+++ b/include/nuttx/net/net.h
@@ -213,6 +213,8 @@ struct socket_conn_s
    */
 
   FAR struct devif_callback_s *list;
+
+  /* Connection-specific content may follow */
 };
 
 /* This is the internal representation of a socket reference by a file