9 files changed, 42 insertions, 39 deletions
diff --git a/src/or/Makefile.am b/src/or/Makefile.am
index fd86aa21eb..fea5fcfea8 100644
--- a/src/or/Makefile.am
+++ b/src/or/Makefile.am
@@ -1,3 +1,5 @@
+CPPFLAGS += -I../common
+
 TESTS = test
 
 noinst_PROGRAMS = test
@@ -40,7 +42,7 @@ noinst_HEADERS = or.h eventdns.h eventdns_tor.h micro-revision.i
 
 tor_main.o: micro-revision.i
 
-micro-revision.i: FORCE
+micro-revision.i:
 	@svkdir=$$SVKROOT; \
 	if test "x$$svkdir" = x ; then \
 	  svkdir=$$HOME/.svk; \
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 5c48c6159a..f199af2062 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -12,8 +12,7 @@ const char circuitlist_c_id[] =
  **/
 
 #include "or.h"
-
-#include "../common/ht.h"
+#include "ht.h"
 
 /********* START VARIABLES **********/
 
diff --git a/src/or/config.c b/src/or/config.c
index 732bb0d784..e1260e96a2 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -17,7 +17,6 @@ const char config_c_id[] = \
 #ifdef MS_WINDOWS
 #include <shlobj.h>
 #endif
-#include "../common/aes.h"
 
 /** Enumeration of types which option values can take */
 typedef enum config_type_t {
@@ -4556,8 +4555,9 @@ getinfo_helper_config(control_connection_t *conn,
   return 0;
 }
 
-#include "../common/ht.h"
-#include "../common/test.h"
+#include "aes.h"
+#include "ht.h"
+#include "test.h"
 
 extern const char aes_c_id[];
 extern const char compat_c_id[];
diff --git a/src/or/dns.c b/src/or/dns.c
index 2a8048a340..b03cbb5aad 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -14,7 +14,7 @@ const char dns_c_id[] =
  **/
 
 #include "or.h"
-#include "../common/ht.h"
+#include "ht.h"
 #include "eventdns.h"
 
 /** Longest hostname we're willing to resolve. */
diff --git a/src/or/eventdns.c b/src/or/eventdns.c
index 2ecdfc0d09..1fb458118e 100644
--- a/src/or/eventdns.c
+++ b/src/or/eventdns.c
@@ -123,8 +123,8 @@ typedef int socklen_t;
 #endif
 
 /* XXXX020 These are for debugging possible memory leaks. */
-#include "../common/util.h"
-#include "../common/compat.h"
+#include "util.h"
+#include "compat.h"
 #define malloc(x) tor_malloc(x)
 #define realloc(x,y) tor_realloc((x),(y))
 #define free(x) tor_free(x)
diff --git a/src/or/eventdns_tor.h b/src/or/eventdns_tor.h
index d1acfe275e..03807065fc 100644
--- a/src/or/eventdns_tor.h
+++ b/src/or/eventdns_tor.h
@@ -10,7 +10,7 @@ typedef unsigned char u_char;
 #ifdef MS_WINDOWS
 #define inline __inline
 #endif
-#include "../common/torint.h"
+#include "torint.h"
 
 #if defined(MS_WINDOWS) && !defined(WIN32)
 /* How did _this_ happen? */
diff --git a/src/or/or.h b/src/or/or.h
index 3bad879491..5d41658d6d 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -20,27 +20,27 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
+// #include <stdio.h>
+// #include <stdlib.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
+//#ifdef HAVE_STRING_H
+//#include <string.h>
+//#endif
 #ifdef HAVE_SIGNAL_H
 #include <signal.h>
 #endif
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
-#ifdef HAVE_CTYPE_H
-#include <ctype.h>
-#endif
+//#ifdef HAVE_CTYPE_H
+//#include <ctype.h>
+//#endif
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h> /* FreeBSD needs this to know what version it is */
 #endif
-#include "../common/torint.h"
+#include "torint.h"
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif
@@ -53,21 +53,21 @@
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
+//#ifdef HAVE_SYS_SOCKET_H
+//#include <sys/socket.h>
+//#endif
 #ifdef HAVE_SYS_UN_H
 #include <sys/un.h>
 #endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
+//#ifdef HAVE_SYS_TIME_H
+//#include <sys/time.h>
+//#endif
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
+//#ifdef HAVE_NETINET_IN_H
+//#include <netinet/in.h>
+//#endif
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
@@ -91,6 +91,7 @@
 #define MAXCONNECTIONS 15000
 #endif
 
+#if 0
 #ifdef MS_WINDOWS
 /* No, we don't need to redefine FD_SETSIZE before including winsock:
  * we use libevent now, and libevent handles the select() stuff.  Yes,
@@ -107,6 +108,7 @@
 #include <ws2tcpip.h>
 #endif
 #endif
+#endif
 
 #ifdef MS_WINDOWS
 #include <io.h>
@@ -118,13 +120,13 @@
 
 #include <event.h>
 
-#include "../common/crypto.h"
-#include "../common/tortls.h"
-#include "../common/log.h"
-#include "../common/compat.h"
-#include "../common/container.h"
-#include "../common/util.h"
-#include "../common/torgzip.h"
+#include "crypto.h"
+#include "tortls.h"
+#include "log.h"
+#include "compat.h"
+#include "container.h"
+#include "util.h"
+#include "torgzip.h"
 
 /* These signals are defined to help control_signal_act work.
  */
diff --git a/src/or/relay.c b/src/or/relay.c
index 364b976b5c..68b8a5f82d 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -13,7 +13,7 @@ const char relay_c_id[] =
  **/
 
 #include "or.h"
-#include "../common/mempool.h"
+#include "mempool.h"
 
 static int relay_crypt(circuit_t *circ, cell_t *cell, int cell_direction,
                 crypt_path_t **layer_hint, char *recognized);
diff --git a/src/or/test.c b/src/or/test.c
index e678d0f7b6..e082bbfa9c 100644
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -36,9 +36,9 @@ const char tor_svn_revision[] = "";
 #define ROUTER_PRIVATE
 
 #include "or.h"
-#include "../common/test.h"
-#include "../common/torgzip.h"
-#include "../common/mempool.h"
+#include "test.h"
+#include "torgzip.h"
+#include "mempool.h"
 
 int have_failed = 0;