diff --git a/netutils/thttpd/libhttpd.c b/netutils/thttpd/libhttpd.c
index 6c2e5199c..8d9b32031 100644
--- a/netutils/thttpd/libhttpd.c
+++ b/netutils/thttpd/libhttpd.c
@@ -2,7 +2,7 @@
  * netutils/thttpd/libhttpd.c
  * HTTP Protocol Library
  *
- *   Copyright (C) 2009, 2011, 2013, 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2011, 2013, 2015-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Derived from the file of the same name in the original THTTPD package:
@@ -64,11 +64,11 @@
 #include <apps/netutils/thttpd.h>
 
 #include "config.h"
+#include "timers.h"
 #include "libhttpd.h"
 #include "thttpd_alloc.h"
 #include "thttpd_strings.h"
 #include "thttpd_cgi.h"
-#include "timers.h"
 #include "tdate_parse.h"
 #include "fdwatch.h"
 
diff --git a/netutils/thttpd/thttpd_cgi.c b/netutils/thttpd/thttpd_cgi.c
index 260009c54..d88fb6bc2 100644
--- a/netutils/thttpd/thttpd_cgi.c
+++ b/netutils/thttpd/thttpd_cgi.c
@@ -2,7 +2,7 @@
  * netutils/thttpd/thttpd_cgi.c
  * CGI support
  *
- *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2011, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Derived from the file libhttpd.c in the original THTTPD package:
@@ -59,10 +59,10 @@
 #include <apps/netutils/thttpd.h>
 
 #include "config.h"
+#include "timers.h"
 #include "libhttpd.h"
 #include "thttpd_alloc.h"
 #include "thttpd_strings.h"
-#include "timers.h"
 #include "fdwatch.h"
 
 #if defined(CONFIG_THTTPD) && defined(CONFIG_THTTPD_CGI_PATTERN)