diff --git a/include/hash.h b/include/hash.h
index 63adb96..1c3106d 100644
--- a/include/hash.h
+++ b/include/hash.h
@@ -9,9 +9,8 @@
  *
  * @(#)$Id$
  */
-
-#ifndef _HASH_H_
-#define _HASH_H_
+#ifndef HASH_H_
+#define HASH_H_
 
 #define NICKLIST_HASHSIZE 79
 #define WHOWASLIST_HASHSIZE 271
@@ -20,13 +19,10 @@
 # define REMOVE_FROM_LIST 1
 #endif
 
-
-#include "struct.h"
-
 /* hashentry: structure for all hash lists we make. 
  * quite generic, but powerful.
  */
-typedef	struct	hashentry
+typedef	struct hashentry
 {
 	void *list;		/* our linked list, generic void * */
 	unsigned short hits;	/* how many hits this spot has gotten */