diff --git a/ChangeLog b/ChangeLog
index 884db5402..3cf5056a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,11 @@ Changes in version 0.1.2.15 - 2007-0?-??
       correctly.  Previously, we were under-counting by 1.
     - Fix a crash bug in directory authorities when we re-number the
       routerlist while inserting a new router.
+    - Backport miscellaneous cosmetic bugfixes.
+    - 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]
+
 
 Changes in version 0.1.2.14 - 2007-05-25
   o Directory authority changes:
diff --git a/src/or/eventdns.c b/src/or/eventdns.c
index 0aba4dbfb..bde976981 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