From 3e7d344c01eecc8991bcb48f89ea761ba1aa2e29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C5=8Dshin?= <git@wholezero.org>
Date: Sun, 13 Jan 2019 22:40:03 -0800
Subject: [PATCH] Minor file-head cleanup

I removed anything that was in portable.h, specified proper path names,
and removed some now-wrong (?) public domain notices.
---
 vere/ames.c |  8 +-------
 vere/behn.c |  9 +--------
 vere/cttp.c |  7 ++-----
 vere/dawn.c |  2 +-
 vere/http.c | 14 +++++---------
 vere/loop.c |  8 +-------
 vere/main.c | 12 ++----------
 vere/raft.c |  6 +-----
 vere/reck.c |  9 +--------
 vere/save.c |  8 +-------
 vere/sist.c |  6 +-----
 vere/term.c |  9 ++-------
 vere/time.c |  9 +--------
 vere/unix.c | 13 ++-----------
 vere/walk.c |  9 +--------
 15 files changed, 23 insertions(+), 106 deletions(-)

diff --git a/vere/ames.c b/vere/ames.c
index ad9094a790..9c5afb1853 100644
--- a/vere/ames.c
+++ b/vere/ames.c
@@ -1,15 +1,9 @@
-/* v/http.c
+/* vere/ames.c
 **
 */
-#include <stdio.h>
-#include <stdlib.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#include <unistd.h>
-#include <setjmp.h>
-#include <gmp.h>
-#include <stdint.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
diff --git a/vere/behn.c b/vere/behn.c
index 9d7bd8b2d4..6ac41c18a7 100644
--- a/vere/behn.c
+++ b/vere/behn.c
@@ -1,17 +1,10 @@
-/* v/behn.c
+/* vere/behn.c
 **
-**  This file is in the public domain.
 */
-#include <stdio.h>
-#include <stdlib.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#include <unistd.h>
-#include <setjmp.h>
-#include <gmp.h>
 #include <dirent.h>
-#include <stdint.h>
 #include <uv.h>
 #include <curses.h>
 #include <termios.h>
diff --git a/vere/cttp.c b/vere/cttp.c
index 98b463fa4a..2a892cd4bc 100644
--- a/vere/cttp.c
+++ b/vere/cttp.c
@@ -1,19 +1,16 @@
-/* v/cttp.c
+/* vere/cttp.c
 **
 */
-#include <stdio.h>
-#include <stdlib.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#include <unistd.h>
-#include <stdint.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <uv.h>
 #include <errno.h>
 #include <openssl/ssl.h>
 #include <h2o.h>
+
 #include "all.h"
 #include "vere/vere.h"
 
diff --git a/vere/dawn.c b/vere/dawn.c
index 70575f022b..2ca5fbc607 100644
--- a/vere/dawn.c
+++ b/vere/dawn.c
@@ -2,9 +2,9 @@
 **
 ** ethereum-integrated pre-boot validation
 */
-#include <unistd.h>
 #include <curl/curl.h>
 #include <uv.h>
+
 #include "all.h"
 #include "vere/vere.h"
 
diff --git a/vere/http.c b/vere/http.c
index 8baf7f7290..2d72c762be 100644
--- a/vere/http.c
+++ b/vere/http.c
@@ -1,27 +1,23 @@
-/* v/http.c
+/* vere/http.c
 **
 */
-#include <stdio.h>
-#include <stdlib.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#include <unistd.h>
-#include <stdint.h>
 #include <sys/socket.h>
 #include <ifaddrs.h>
 #include <netinet/in.h>
 #include <uv.h>
 #include <errno.h>
 #include <openssl/ssl.h>
- #include <openssl/err.h>
+#include <openssl/err.h>
 #include <h2o.h>
-#include "all.h"
-#include "vere/vere.h"
-
 #include <picohttpparser.h>
 #include <tls.h>
 
+#include "all.h"
+#include "vere/vere.h"
+
 typedef struct _u3_h2o_serv {
   h2o_globalconf_t fig_u;             //  h2o global config
   h2o_context_t    ctx_u;             //  h2o ctx
diff --git a/vere/loop.c b/vere/loop.c
index a8f9a0bdd8..824b2533d4 100644
--- a/vere/loop.c
+++ b/vere/loop.c
@@ -1,17 +1,11 @@
-/* v/loop.c
+/* vere/loop.c
 **
 */
-#include <stdio.h>
-#include <stdlib.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <unistd.h>
-#include <setjmp.h>
-#include <gmp.h>
 #include <sigsegv.h>
-#include <stdint.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <uv.h>
diff --git a/vere/main.c b/vere/main.c
index 727a8525b7..ff23c45b47 100644
--- a/vere/main.c
+++ b/vere/main.c
@@ -1,16 +1,9 @@
-/* v/main.c
+/* vere/main.c
 **
 */
-#include <stdio.h>
-#include <stdlib.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#include <unistd.h>
-#include <setjmp.h>
-#include <signal.h>
-#include <gmp.h>
-#include <stdint.h>
 #include <limits.h>
 #include <uv.h>
 #include <sigsegv.h>
@@ -20,8 +13,7 @@
 #include <dirent.h>
 #include <openssl/ssl.h>
 #include <openssl/rand.h>
-
-#include "h2o.h"
+#include <h2o.h>
 
 #define U3_GLOBAL
 #define C3_GLOBAL
diff --git a/vere/raft.c b/vere/raft.c
index 6bf9d34d4b..63a316fc10 100644
--- a/vere/raft.c
+++ b/vere/raft.c
@@ -1,10 +1,6 @@
-/* v/raft.c
+/* vere/raft.c
 **
 */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 #include <uv.h>
 
 #include "all.h"
diff --git a/vere/reck.c b/vere/reck.c
index 6766b5355f..c0c4e5e34c 100644
--- a/vere/reck.c
+++ b/vere/reck.c
@@ -1,17 +1,10 @@
-/* v/reck.c
+/* vere/reck.c
 **
-**  This file is in the public domain.
 */
-#include <stdio.h>
-#include <stdlib.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#include <unistd.h>
-#include <setjmp.h>
-#include <gmp.h>
 #include <dirent.h>
-#include <stdint.h>
 #include <uv.h>
 #include <curses.h>
 #include <termios.h>
diff --git a/vere/save.c b/vere/save.c
index e4d25fa3ea..0768c2b350 100644
--- a/vere/save.c
+++ b/vere/save.c
@@ -1,16 +1,10 @@
-/* v/save.c
+/* vere/save.c
 **
 */
-#include <stdio.h>
-#include <stdlib.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
-#include <unistd.h>
-#include <setjmp.h>
-#include <gmp.h>
-#include <stdint.h>
 #include <termios.h>
 #include <uv.h>
 
diff --git a/vere/sist.c b/vere/sist.c
index e6c98da073..6a938703cc 100644
--- a/vere/sist.c
+++ b/vere/sist.c
@@ -1,12 +1,8 @@
-/* v/sist.c
+/* vere/sist.c
 **
 */
 #include <errno.h>
 #include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 #include <uv.h>
 
 #include "all.h"
diff --git a/vere/term.c b/vere/term.c
index 3afa308db9..453b4fd434 100644
--- a/vere/term.c
+++ b/vere/term.c
@@ -1,15 +1,9 @@
-/* v/term.c
+/* vere/term.c
 **
 */
-#include <stdio.h>
-#include <stdlib.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#include <unistd.h>
-#include <setjmp.h>
-#include <gmp.h>
-#include <stdint.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <uv.h>
@@ -17,6 +11,7 @@
 #include <curses.h>
 #include <termios.h>
 #include <term.h>
+
 #include "all.h"
 #include "vere/vere.h"
 
diff --git a/vere/time.c b/vere/time.c
index 8c37cbf79e..d39efd9fea 100644
--- a/vere/time.c
+++ b/vere/time.c
@@ -1,17 +1,10 @@
-/* v/time.c
+/* vere/time.c
 **
-**  This file is in the public domain.
 */
-#include <stdio.h>
-#include <stdlib.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#include <unistd.h>
-#include <setjmp.h>
-#include <gmp.h>
 #include <dirent.h>
-#include <stdint.h>
 #include <uv.h>
 #include <curses.h>
 #include <termios.h>
diff --git a/vere/unix.c b/vere/unix.c
index 0b5f9002f7..8bb92ffeeb 100644
--- a/vere/unix.c
+++ b/vere/unix.c
@@ -1,20 +1,10 @@
-/* v/unix.c
+/* vere/unix.c
 **
-**  This file is in the public domain.
 */
-
-#include "all.h"
-
-#include <stdio.h>
-#include <stdlib.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#include <unistd.h>
-#include <setjmp.h>
-#include <gmp.h>
 #include <dirent.h>
-#include <stdint.h>
 #include <uv.h>
 #include <termios.h>
 #include <term.h>
@@ -22,6 +12,7 @@
 #include <libgen.h>
 #include <ftw.h>
 
+#include "all.h"
 #include "vere/vere.h"
 
 /* _unix_down(): descend path.
diff --git a/vere/walk.c b/vere/walk.c
index efe0d90232..9036230856 100644
--- a/vere/walk.c
+++ b/vere/walk.c
@@ -1,17 +1,10 @@
-/* v/walk.c
+/* vere/walk.c
 **
-**  This file is in the public domain.
 */
-#include <stdio.h>
-#include <stdlib.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#include <unistd.h>
-#include <setjmp.h>
-#include <gmp.h>
 #include <dirent.h>
-#include <stdint.h>
 #include <uv.h>
 #include <curses.h>
 #include <termios.h>