header file fixes: multiple include guard consistency and correctness

one file was reusing another file's macro name, and many had
inconsistent underscores and application of SYS prefix, etc.

patch by Szabolcs Nagy (nsz)

include/arpa/nameser.h

@@ -1,5 +1,5 @@
-#ifndef _ARPA_NAMESER_H_
-#define _ARPA_NAMESER_H_
+#ifndef _ARPA_NAMESER_H
+#define _ARPA_NAMESER_H
 
 #define __NAMESER	19991006
 #define NS_PACKETSZ	512

include/elf.h

@@ -1,5 +1,5 @@
 #ifndef _ELF_H
-#define	_ELF_H 1
+#define _ELF_H
 
 #ifdef __cplusplus
 extern "C" {

include/net/ethernet.h

@@ -1,5 +1,5 @@
-#ifndef __NET_ETHERNET_H
-#define __NET_ETHERNET_H 1
+#ifndef _NET_ETHERNET_H
+#define _NET_ETHERNET_H
 
 #ifdef __cplusplus
 extern "C" {

include/paths.h

@@ -1,5 +1,5 @@
-#ifndef _PATHS_H_
-#define	_PATHS_H_
+#ifndef _PATHS_H
+#define _PATHS_H
 
 #define	_PATH_DEFPATH "/usr/local/bin:/bin:/usr/bin"
 #define	_PATH_STDPATH "/bin:/usr/bin:/sbin:/usr/sbin"

include/resolv.h

@@ -1,5 +1,5 @@
-#ifndef _RESOLV_H_
-#define _RESOLV_H_
+#ifndef _RESOLV_H
+#define _RESOLV_H
 
 #include <stdint.h>
 #include <arpa/nameser.h>

include/sys/fsuid.h

@@ -1,5 +1,5 @@
-#ifndef	_FSUID_H
-#define	_FSUID_H
+#ifndef _SYS_FSUID_H
+#define _SYS_FSUID_H
 
 #ifdef __cplusplus
 extern "C" {

include/sys/sendfile.h

@@ -1,5 +1,5 @@
-#ifndef _SYS_INOTIFY_H
-#define _SYS_INOTIFY_H
+#ifndef _SYS_SENDFILE_H
+#define _SYS_SENDFILE_H
 
 #ifdef __cplusplus
 extern "C" {

include/sys/sysmacros.h

@@ -1,5 +1,5 @@
-#ifndef _SYSMACROS_H
-#define _SYSMACROS_H
+#ifndef _SYS_SYSMACROS_H
+#define _SYS_SYSMACROS_H
 
 #define major(x) (((x) >> 8) & 0xff)
 #define minor(x) ((x) & 0xff)

include/syscall.h

@@ -1 +1 @@
-#include <sys/syscall.h>
+#include <sys/syscall.h>

include/syslog.h

@@ -1,5 +1,5 @@
-#ifndef _SYS_SYSLOG_H
-#define _SYS_SYSLOG_H
+#ifndef _SYSLOG_H
+#define _SYSLOG_H
 
 #ifdef __cplusplus
 extern "C" {