diff --git a/mozilla/modules/plugin/base/public/nptypes.h b/mozilla/modules/plugin/base/public/nptypes.h
index 88031e91c9f..0af43e085f2 100644
--- a/mozilla/modules/plugin/base/public/nptypes.h
+++ b/mozilla/modules/plugin/base/public/nptypes.h
@@ -58,18 +58,28 @@
   #ifndef __cplusplus
     typedef int bool;
   #endif
-#elif defined(bsdi)
+#elif defined(bsdi) || defined(FREEBSD)
   /*
-   * BSD/OS ships sys/types.h that define int32_t and u_int32_t, but
-   * no header that defines uint32_t, nor bool (for C)
+   * BSD/OS and FreeBSD ship sys/types.h that define int32_t and u_int32_t.
    */
   #include <sys/types.h>
 
+  /*
+   * BSD/OS ships no header that defines uint32_t, nor bool (for C)
+   */
+  #if defined(bsdi)
   typedef u_int32_t uint32_t;
 
   #if !defined(__cplusplus)
     typedef int bool;
   #endif
+  #else
+  /*
+   * FreeBSD defines uint32_t and bool.
+   */
+    #include <inttypes.h>
+    #include <stdbool.h>
+  #endif
 #else
   /*
    * For those that ship a standard C99 stdint.h header file, include