diff --git a/ChangeLog b/ChangeLog
index 9434f3afe6..59025bd780 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,6 +37,9 @@ Changes in version 0.2.0.3-alpha - 2007-??-??
     - Add DNSPort connections to the global connection list, so that we
       can time them out correctly. (Bug found by mwenge) [Bugfix on
       0.2.0.2-alpha]
+    - Fix eventdns.c behavior on Solaris: It is critical to include
+      orconfig.h _before_ sys/types.h, so that we can get the expected
+      definition of _FILE_OFFSET_BITS.  [Bugfix on 0.1.2.x]
 
   o Minor bugfixes (hidden services):
     - Stop tearing down the whole circuit when the user asks for a
diff --git a/src/or/eventdns.c b/src/or/eventdns.c
index 46735f28f0..a1a9f2eb62 100644
--- a/src/or/eventdns.c
+++ b/src/or/eventdns.c
@@ -32,10 +32,9 @@
  * Version: 0.1b
  */
 
-#include <sys/types.h>
 #include "eventdns_tor.h"
+#include <sys/types.h>
 //#define NDEBUG
-#include "../common/torint.h"
 
 #ifndef DNS_USE_CPU_CLOCK_FOR_ID
 #ifndef DNS_USE_GETTIMEOFDAY_FOR_ID