diff --git a/SConstruct b/SConstruct
index 48163ca9e..df1dd3e0f 100644
--- a/SConstruct
+++ b/SConstruct
@@ -63,7 +63,7 @@ simu.add_headers ([
 	'scheduler-list.h'
 	])
 simu.add_inst_headers ([
-	'time.h',
+	'nstime.h',
 	'event-id.h',
 	'event-impl.h',
 	'simulator.h',
diff --git a/samples/main-simulator.cc b/samples/main-simulator.cc
index f5d146d71..bf693d502 100644
--- a/samples/main-simulator.cc
+++ b/samples/main-simulator.cc
@@ -1,6 +1,6 @@
 /* -*-    Mode:C++; c-basic-offset:4; tab-width:4; indent-tabs-mode:f -*- */
 #include "ns3/simulator.h"
-#include "ns3/time.h"
+#include "ns3/nstime.h"
 #include <iostream>
 
 using namespace ns3;
diff --git a/src/simulator/time.h b/src/simulator/nstime.h
similarity index 100%
rename from src/simulator/time.h
rename to src/simulator/nstime.h
diff --git a/src/simulator/simulator.h b/src/simulator/simulator.h
index 13dd324a7..4ff631abe 100644
--- a/src/simulator/simulator.h
+++ b/src/simulator/simulator.h
@@ -25,7 +25,7 @@
 #include <stdint.h>
 #include "event-id.h"
 #include "event-impl.h"
-#include "time.h"
+#include "nstime.h"
 
 namespace ns3 {