diff --git a/ChangeLog b/ChangeLog
index 519fc28770f384808362df5d53609ea2fb04f4f5..b23a599c80736f17a1892c3c58287fadd2401bd4 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11263,3 +11263,4 @@
 	  struct sigevent.  This initial implementation will only work in the
 	  FLAT build.  See the top-level TODO file for additional details
 	  (2015-12-30).
+
diff --git a/include/pthread.h b/include/pthread.h
index 9cc2b44a41fc8ac60acc8279509c9164180ec0c1..00cd95772da723a68b009581269c8bac4c0de003 100644
--- a/include/pthread.h
+++ b/include/pthread.h
@@ -50,7 +50,7 @@
 #include <stdbool.h>        /* C99 boolean types */
 #include <unistd.h>         /* For getpid */
 #include <semaphore.h>      /* Needed for sem_t */
-#include <signal.h>         /* Needed for sigset_t */
+#include <signal.h>         /* Needed for sigset_t, includes this file */
 #include <time.h>           /* Needed for struct timespec */
 
 /********************************************************************************
@@ -441,8 +441,8 @@ int pthread_sigmask(int how, FAR const sigset_t *set, FAR sigset_t *oset);
 #include <sys/types.h>
 #include <stdbool.h>
 
-/* Avoid a circular dependencies by assuring that simple type definitions
- * are avaiable in any inclusion ordering.
+/* Avoid circular dependencies by assuring that simple type definitions are
+ * available in any inclusion ordering.
  */
 
 #ifndef __PTHREAD_KEY_T_DEFINED
diff --git a/include/signal.h b/include/signal.h
index 742720cf6b88ce0f513e7c3ca25628aa864d8c83..57c5742d838a211421731f1bf10b573561e39d8c 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -45,8 +45,9 @@
 
 #include <stdint.h>
 #include <time.h>
+
 #ifdef CONFIG_SIG_EVTHREAD
-#  include <pthread.h>  /* Needed for pthread_attr_t */
+#  include <pthread.h>  /* Needed for pthread_attr_t, includes this file */
 #endif
 
 /********************************************************************************
@@ -320,8 +321,8 @@ int sigqueue(int pid, int signo, FAR void *sival_ptr);
 
 #include <stdint.h>
 
-/* Avoid a circular dependencies by assuring that simple type definitions
- * are avaiable in any inclusion ordering.
+/* Avoid circular dependencies by assuring that simple type definitions are
+ * available in any inclusion ordering.
  */
 
 #ifndef __SIGSET_T_DEFINED
diff --git a/include/sys/time.h b/include/sys/time.h
index ecc2fc8401b0e54ae0990fe1ea7909f9f68ee1ab..b36e30fca9a46e4c65775feb8b6200f6e5d10159 100644
--- a/include/sys/time.h
+++ b/include/sys/time.h
@@ -78,12 +78,12 @@
   do \
     { \
       (vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec; \
-      (vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec; \
-      if ((vvp)->tv_usec < 0) \
+      if ((uvp)->tv_usec > (tvp)->tv_usec) \
         { \
           (vvp)->tv_sec--; \
-          (vvp)->tv_usec += 1000000; \
+          (tvp)->tv_usec += 1000000; \
         } \
+      (vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec; \
     } \
   while (0)