4 files changed, 18 insertions, 14 deletions
diff --git a/src/acl.h b/src/acl.h
index 9a4cc2b..73ea83c 100644
--- a/src/acl.h
+++ b/src/acl.h
@@ -1,4 +1,4 @@
-/* $Id: acl.h,v 1.1 2000-09-12 00:08:48 rjkaes Exp $
+/* $Id: acl.h,v 1.2 2001-06-02 02:07:34 rjkaes Exp $
  *
  * See 'acl.c' for detailed information.
  *
@@ -15,8 +15,8 @@
  * General Public License for more details.
  */
 
-#ifndef _TINYPROXY_ACL_H_
-#define _TINYPROXY_ACL_H_
+#ifndef TINYPROXY_ACL_H
+#define TINYPROXY_ACL_H
 
 typedef enum { ACL_ALLOW, ACL_DENY } acl_access_t;
 
diff --git a/src/log.h b/src/log.h
index 5e3c80e..2932e30 100644
--- a/src/log.h
+++ b/src/log.h
@@ -1,4 +1,4 @@
-/* $Id: log.h,v 1.4 2001-05-27 02:26:11 rjkaes Exp $
+/* $Id: log.h,v 1.5 2001-06-02 02:07:34 rjkaes Exp $
  *
  * See 'log.c' for a detailed description.
  *
@@ -16,11 +16,11 @@
  * General Public License for more details.
  */
 
-#ifndef _TINYPROXY_LOG_H_
-#define _TINYPROXY_LOG_H_	
+#ifndef TINYPROXY_LOG_H
+#define TINYPROXY_LOG_H
 
 #ifdef HAVE_CONFIG_H
-#  include "../config.h"
+#  include <config.h>
 #endif
 
 /*
diff --git a/src/sock.h b/src/sock.h
index 1a2ba91..61b3fc0 100644
--- a/src/sock.h
+++ b/src/sock.h
@@ -1,4 +1,4 @@
-/* $Id: sock.h,v 1.3 2001-05-27 02:31:20 rjkaes Exp $
+/* $Id: sock.h,v 1.4 2001-06-02 02:07:34 rjkaes Exp $
  *
  * See 'sock.c' for a detailed description.
  *
@@ -16,8 +16,12 @@
  * General Public License for more details.
  */
 
-#ifndef _TINYPROXY_SOCK_H_
-#define _TINYPROXY_SOCK_H_
+#ifndef TINYPROXY_SOCK_H
+#define TINYPROXY_SOCK_H
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #define PEER_IP_LENGTH		16
 #define PEER_STRING_LENGTH	256
diff --git a/src/tinyproxy.h b/src/tinyproxy.h
index 4cb6930..426cf6a 100644
--- a/src/tinyproxy.h
+++ b/src/tinyproxy.h
@@ -1,4 +1,4 @@
-/* $Id: tinyproxy.h,v 1.8 2001-05-27 02:36:22 rjkaes Exp $
+/* $Id: tinyproxy.h,v 1.9 2001-06-02 02:07:34 rjkaes Exp $
  *
  * See 'tinyproxy.c' for a detailed description.
  *
@@ -16,11 +16,11 @@
  * General Public License for more details.
  */
 
-#ifndef _TINYPROXY_TINYPROXY_H_
-#define _TINYPROXY_TINYPROXY_H_
+#ifndef TINYPROXY_TINYPROXY_H
+#define TINYPROXY_TINYPROXY_H
 
 #ifdef HAVE_CONFIG_H
-#  include "../config.h"
+#  include <config.h>
 #endif
 
 /*