24 files changed, 44 insertions, 45 deletions

diff --git a/src/node.cc b/src/node.cc
index 9f2ad4342..5daafa8a5 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -10,20 +10,21 @@
 #include <errno.h>
 #include <dlfcn.h> /* dlopen(), dlsym() */
 
-#include <events.h>
-#include <dns.h>
-#include <net.h>
-#include <file.h>
-#include <http.h>
-#include <signal_handler.h>
-#include <timer.h>
-#include <child_process.h>
-#include <constants.h>
+#include <node_events.h>
+#include <node_dns.h>
+#include <node_net.h>
+#include <node_file.h>
+#include <node_http.h>
+#include <node_signal_handler.h>
+#include <node_timer.h>
+#include <node_child_process.h>
+#include <node_constants.h>
 #include <node_stdio.h>
 #include <node_natives.h>
-#include <v8-debug.h>
 #include <node_version.h>
 
+#include <v8-debug.h>
+
 using namespace v8;
 
 extern char **environ;
diff --git a/src/node.h b/src/node.h
index e8499900c..de5b7b3be 100644
--- a/src/node.h
+++ b/src/node.h
@@ -7,7 +7,7 @@
 #include <v8.h>
 #include <evcom.h>
 
-#include <object_wrap.h>
+#include <node_object_wrap.h>
 
 namespace node {
 
diff --git a/src/child_process.cc b/src/node_child_process.cc
index a70d529d1..68373fe9c 100644
--- a/src/child_process.cc
+++ b/src/node_child_process.cc
@@ -1,5 +1,5 @@
 // Copyright 2009 Ryan Dahl <ry@tinyclouds.org>
-#include <child_process.h>
+#include <node_child_process.h>
 
 #include <assert.h>
 #include <string.h>
diff --git a/src/child_process.h b/src/node_child_process.h
index a9c595201..1cdd974d0 100644
--- a/src/child_process.h
+++ b/src/node_child_process.h
@@ -3,7 +3,7 @@
 #define SRC_CHILD_PROCESS_H_
 
 #include <node.h>
-#include <events.h>
+#include <node_events.h>
 
 #include <v8.h>
 #include <ev.h>
diff --git a/src/constants.cc b/src/node_constants.cc
index f486f1150..216c0e49c 100644
--- a/src/constants.cc
+++ b/src/node_constants.cc
@@ -1,5 +1,5 @@
 // Copyright 2009 Ryan Dahl <ry@tinyclouds.org>
-#include <constants.h>
+#include <node_constants.h>
 
 #include <errno.h>
 #include <unistd.h>
diff --git a/src/constants.h b/src/node_constants.h
index 1f02c51be..1f02c51be 100644
--- a/src/constants.h
+++ b/src/node_constants.h
diff --git a/src/dns.cc b/src/node_dns.cc
index 7c4ccef3f..ea069f277 100644
--- a/src/dns.cc
+++ b/src/node_dns.cc
@@ -1,5 +1,5 @@
 // Copyright 2009 Ryan Dahl <ry@tinyclouds.org>
-#include <dns.h>
+#include <node_dns.h>
 
 #include <stdlib.h> /* exit() */
 #include <sys/types.h>
@@ -8,7 +8,7 @@
 #include <arpa/inet.h>
 #include <assert.h>
 
-#include <events.h>
+#include <node_events.h>
 
 #include <v8.h>
 #include <ev.h>
diff --git a/src/dns.h b/src/node_dns.h
index d0da0c9a8..d0da0c9a8 100644
--- a/src/dns.h
+++ b/src/node_dns.h
diff --git a/src/events.cc b/src/node_events.cc
index f323322c4..bff32abdf 100644
--- a/src/events.cc
+++ b/src/node_events.cc
@@ -1,5 +1,5 @@
 // Copyright 2009 Ryan Dahl <ry@tinyclouds.org>
-#include <events.h>
+#include <node_events.h>
 
 #include <assert.h>
 #include <stdlib.h>
diff --git a/src/events.h b/src/node_events.h
index 9e3a8fd64..d6e311127 100644
--- a/src/events.h
+++ b/src/node_events.h
@@ -2,7 +2,7 @@
 #ifndef SRC_EVENTS_H_
 #define SRC_EVENTS_H_
 
-#include <object_wrap.h>
+#include <node_object_wrap.h>
 #include <v8.h>
 
 namespace node {
diff --git a/src/file.cc b/src/node_file.cc
index 5215d07cb..c2c329f6d 100644
--- a/src/file.cc
+++ b/src/node_file.cc
@@ -1,5 +1,5 @@
 // Copyright 2009 Ryan Dahl <ry@tinyclouds.org>
-#include <file.h>
+#include <node_file.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/file.h b/src/node_file.h
index 831cf4a65..b968f2873 100644
--- a/src/file.h
+++ b/src/node_file.h
@@ -3,7 +3,7 @@
 #define SRC_FILE_H_
 
 #include <node.h>
-#include <events.h>
+#include <node_events.h>
 #include <v8.h>
 
 namespace node {
diff --git a/src/http.cc b/src/node_http.cc
index 1c80ceabc..b139796d0 100644
--- a/src/http.cc
+++ b/src/node_http.cc
@@ -1,6 +1,4 @@
-#include "node.h"
-#include "http.h"
-#include <http_parser.h>
+#include <node_http.h>
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/src/http.h b/src/node_http.h
index d1ca4042a..cf70c1237 100644
--- a/src/http.h
+++ b/src/node_http.h
@@ -1,8 +1,8 @@
 #ifndef node_http_h
 #define node_http_h
 
+#include <node_net.h>
 #include <v8.h>
-#include "net.h"
 #include <http_parser.h>
 
 namespace node {
diff --git a/src/net.cc b/src/node_net.cc
index 8c5fad1d8..a5197d0f2 100644
--- a/src/net.cc
+++ b/src/node_net.cc
@@ -1,5 +1,5 @@
 // Copyright 2009 Ryan Dahl <ry@tinyclouds.org>
-#include <net.h>
+#include <node_net.h>
 
 #include <assert.h>
 #include <stdlib.h>
diff --git a/src/net.h b/src/node_net.h
index e1261ab48..4b35444c3 100644
--- a/src/net.h
+++ b/src/node_net.h
@@ -3,7 +3,7 @@
 #define SRC_NET_H_
 
 #include <node.h>
-#include <events.h>
+#include <node_events.h>
 #include <v8.h>
 #include <evcom.h>
 
diff --git a/src/object_wrap.h b/src/node_object_wrap.h
index 686961406..686961406 100644
--- a/src/object_wrap.h
+++ b/src/node_object_wrap.h
diff --git a/src/signal_handler.cc b/src/node_signal_handler.cc
index cd022e6c6..b853f6531 100644
--- a/src/signal_handler.cc
+++ b/src/node_signal_handler.cc
@@ -1,5 +1,5 @@
 // Copyright 2009 Ryan Dahl <ry@tinyclouds.org>
-#include <signal_handler.h>
+#include <node_signal_handler.h>
 #include <assert.h>
 
 namespace node {
diff --git a/src/signal_handler.h b/src/node_signal_handler.h
index 88098b45c..b6f3b892d 100644
--- a/src/signal_handler.h
+++ b/src/node_signal_handler.h
@@ -3,7 +3,7 @@
 #define SRC_SIGNAL_HANDLER_H_
 
 #include <node.h>
-#include <events.h>
+#include <node_events.h>
 
 #include <v8.h>
 #include <ev.h>
diff --git a/src/node_stdio.cc b/src/node_stdio.cc
index 00c83799b..2b1da6c05 100644
--- a/src/node_stdio.cc
+++ b/src/node_stdio.cc
@@ -1,6 +1,6 @@
-#include "node_stdio.h"
-#include "events.h"
-#include "coupling.h"
+#include <node_stdio.h>
+#include <node_events.h>
+#include <coupling.h>
 
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/src/node_stdio.h b/src/node_stdio.h
index cfd473f28..11dd5aedd 100644
--- a/src/node_stdio.h
+++ b/src/node_stdio.h
@@ -1,7 +1,7 @@
 #ifndef node_stdio_h
 #define node_stdio_h
 
-#include "node.h"
+#include <node.h>
 
 #include <v8.h>
 #include <evcom.h>
diff --git a/src/timer.cc b/src/node_timer.cc
index 61f18f745..c9e8e7abf 100644
--- a/src/timer.cc
+++ b/src/node_timer.cc
@@ -1,5 +1,5 @@
-#include "node.h"
-#include "timer.h"
+#include <node.h>
+#include <node_timer.h>
 #include <assert.h>
 
 using namespace v8;
diff --git a/src/timer.h b/src/node_timer.h
index 9d0834b51..d662f9a0f 100644
--- a/src/timer.h
+++ b/src/node_timer.h
@@ -1,8 +1,8 @@
 #ifndef node_timer_h
 #define node_timer_h
 
-#include "node.h"
-#include "events.h"
+#include <node.h>
+#include <node_events.h>
 #include <v8.h>
 #include <ev.h>
 
diff --git a/wscript b/wscript
index 9d7be7484..68c6cf710 100644
--- a/wscript
+++ b/wscript
@@ -310,16 +310,16 @@ def build(bld):
   node.target       = "node"
   node.source = """
     src/node.cc
-    src/events.cc
-    src/http.cc
-    src/net.cc
+    src/node_child_process.cc
+    src/node_constants.cc
+    src/node_dns.cc
+    src/node_events.cc
+    src/node_file.cc
+    src/node_http.cc
+    src/node_net.cc
+    src/node_signal_handler.cc
     src/node_stdio.cc
-    src/dns.cc
-    src/file.cc
-    src/signal_handler.cc
-    src/timer.cc
-    src/child_process.cc
-    src/constants.cc
+    src/node_timer.cc
   """
   node.includes = """
     src/