r14093@catbus: nickm | 2007-08-08 01:49:54 -0400

Include fewer redundant headers; use the compiler search paths better.


svn:r11060

src/common/aes.h

@@ -14,7 +14,7 @@
  * \brief Headers for aes.c
  */
 
-#include "../common/torint.h"
+#include "torint.h"
 
 struct aes_cnt_cipher;
 typedef struct aes_cnt_cipher aes_cnt_cipher_t;

src/common/container.h

@@ -8,7 +8,6 @@
 #define CONTAINER_H_ID \
   "$Id$"
 
-#include "compat.h"
 #include "util.h"
 
 /** A resizeable list of pointers, with associated helpful functionality.

src/common/log.h

@@ -13,7 +13,7 @@
 #ifndef __LOG_H
 #define LOG_H_ID "$Id$"
 
-#include "../common/compat.h"
+#include "compat.h"
 
 #ifdef HAVE_SYSLOG_H
 #include <syslog.h>

src/common/test.h

@@ -12,8 +12,6 @@
  * \brief Macros used by unit tests.
  */
 
-#include <string.h>
-#include <stdio.h>
 #include "compat.h"
 
 #ifdef __GNUC__

src/common/tortls.h

@@ -12,8 +12,8 @@
  * \brief Headers for tortls.c
  **/
 
-#include "../common/crypto.h"
-#include "../common/compat.h"
+#include "crypto.h"
+#include "compat.h"
 
 /* Opaque structure to hold a TLS connection. */
 typedef struct tor_tls_t tor_tls_t;

src/common/util.h

@@ -17,12 +17,6 @@
 #include "compat.h"
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_TIME_H
-#include <time.h>
-#endif
 
 /* Replace assert() with a variant that sends failures to the log before
  * calling assert() normally.