diff --git a/trunk/src/common/util.c b/trunk/src/common/util.c
index 764930c0eb..2db99d6c05 100644
--- a/trunk/src/common/util.c
+++ b/trunk/src/common/util.c
@@ -54,12 +54,16 @@
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h> /* FreeBSD needs this to know what version it is */
+#endif
 #ifdef HAVE_SYS_LIMITS_H
 #include <sys/limits.h>
 #endif
 #ifdef HAVE_MACHINE_LIMITS_H
 #ifndef __FreeBSD__
-  /* FreeBSD has a bug where it complains that this file is obsolete,                               and I should migrate to using sys/limits. It complaints even when
+  /* FreeBSD has a bug where it complains that this file is obsolete,
+     and I should migrate to using sys/limits. It complains even when
      I include both. */
 #include <machine/limits.h>
 #endif
diff --git a/trunk/src/or/or.h b/trunk/src/or/or.h
index 9714a1d682..6c4c5eff75 100644
--- a/trunk/src/or/or.h
+++ b/trunk/src/or/or.h
@@ -40,13 +40,16 @@
 #endif
 #include "../common/torint.h"
 #include "../common/fakepoll.h"
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h> /* FreeBSD needs this to know what version it is */
+#endif
 #ifdef HAVE_SYS_LIMITS_H
 #include <sys/limits.h>
 #endif
 #ifdef HAVE_MACHINE_LIMITS_H
 #ifndef __FreeBSD__
   /* FreeBSD has a bug where it complains that this file is obsolete,
-     and I should migrate to using sys/limits. It complaints even when
+     and I should migrate to using sys/limits. It complains even when
      I include both. */
 #include <machine/limits.h>
 #endif