diff --git a/pub/config.h.in b/pub/config.h.in
index 8a7be85a67da248daa80f8774dcaa5130b19849e..d1fab7d7c0ccb413444d60c724146df7d85ad82d 100644
--- a/pub/config.h.in
+++ b/pub/config.h.in
@@ -188,16 +188,6 @@
 /* File offset bits */
 #undef _FILE_OFFSET_BITS
 
-/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
-   #define below would cause a syntax error. */
-#undef _UINT32_T
-
-/* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
-   #define below would cause a syntax error. */
-#undef _UINT8_T
-
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
@@ -207,18 +197,6 @@
 #undef inline
 #endif
 
-/* Define to the type of a signed integer type of width exactly 16 bits if
-   such a type exists and the standard includes do not define it. */
-#undef int16_t
-
-/* Define to the type of a signed integer type of width exactly 32 bits if
-   such a type exists and the standard includes do not define it. */
-#undef int32_t
-
-/* Define to the type of a signed integer type of width exactly 8 bits if such
-   a type exists and the standard includes do not define it. */
-#undef int8_t
-
 /* Define to rpl_malloc if the replacement function should be used. */
 #undef malloc
 
@@ -227,15 +205,3 @@
 
 /* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef size_t
-
-/* Define to the type of an unsigned integer type of width exactly 16 bits if
-   such a type exists and the standard includes do not define it. */
-#undef uint16_t
-
-/* Define to the type of an unsigned integer type of width exactly 32 bits if
-   such a type exists and the standard includes do not define it. */
-#undef uint32_t
-
-/* Define to the type of an unsigned integer type of width exactly 8 bits if
-   such a type exists and the standard includes do not define it. */
-#undef uint8_t
diff --git a/pub/configure b/pub/configure
index 93a5978d30efe1ffd7f5d55cdd3420158979b7ed..06d44e3067241efa038d79d82a6d81bfba70b29e 100755
--- a/pub/configure
+++ b/pub/configure
@@ -586,6 +586,7 @@ PACKAGE_BUGREPORT='j.wuttke@fz-juelich.de'
 PACKAGE_URL=''
 
 ac_unique_file="src/frida2.cpp"
+ac_unique_file="man/frida.pod"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1591,6 +1592,60 @@ fi
 
 } # ac_fn_c_try_link
 
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+	 return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+	    return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_type
+
 # ac_fn_c_try_cpp LINENO
 # ----------------------
 # Try to preprocess conftest.$ac_ext, and return whether this succeeded.
@@ -1701,189 +1756,72 @@ $as_echo "$ac_res" >&6; }
 
 } # ac_fn_c_check_header_compile
 
-# ac_fn_c_find_intX_t LINENO BITS VAR
-# -----------------------------------
-# Finds a signed integer type with width BITS, setting cache variable VAR
-# accordingly.
-ac_fn_c_find_intX_t ()
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5
-$as_echo_n "checking for int$2_t... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
 if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  eval "$3=no"
-     # Order is important - never check a type that is potentially smaller
-     # than half of the expected target width.
-     for ac_type in int$2_t 'int' 'long int' \
-	 'long long int' 'short int' 'signed char'; do
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-	     enum { N = $2 / 2 - 1 };
-int
-main ()
-{
-static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))];
-test_array [0] = 0;
-return test_array [0];
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_includes_default
-	        enum { N = $2 / 2 - 1 };
-int
-main ()
-{
-static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
-		 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))];
-test_array [0] = 0;
-return test_array [0];
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
 
-else
-  case $ac_type in #(
-  int$2_t) :
-    eval "$3=yes" ;; #(
-  *) :
-    eval "$3=\$ac_type" ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-       if eval test \"x\$"$3"\" = x"no"; then :
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 
-else
-  break
-fi
-     done
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+#undef $2
 
-} # ac_fn_c_find_intX_t
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
 
-# ac_fn_c_find_uintX_t LINENO BITS VAR
-# ------------------------------------
-# Finds an unsigned integer type with width BITS, setting cache variable VAR
-# accordingly.
-ac_fn_c_find_uintX_t ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5
-$as_echo_n "checking for uint$2_t... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=no"
-     # Order is important - never check a type that is potentially smaller
-     # than half of the expected target width.
-     for ac_type in uint$2_t 'unsigned int' 'unsigned long int' \
-	 'unsigned long long int' 'unsigned short int' 'unsigned char'; do
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
 int
 main ()
 {
-static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)];
-test_array [0] = 0;
-return test_array [0];
-
+return $2 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  case $ac_type in #(
-  uint$2_t) :
-    eval "$3=yes" ;; #(
-  *) :
-    eval "$3=\$ac_type" ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-       if eval test \"x\$"$3"\" = x"no"; then :
-
-else
-  break
-fi
-     done
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_find_uintX_t
-
-# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
-# -------------------------------------------
-# Tests whether TYPE exists after having included INCLUDES, setting cache
-# variable VAR accordingly.
-ac_fn_c_check_type ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
 else
   eval "$3=no"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof ($2))
-	 return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof (($2)))
-	    return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  eval "$3=yes"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
-} # ac_fn_c_check_type
+} # ac_fn_c_check_func
 
 # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
@@ -1976,73 +1914,6 @@ fi
 
 } # ac_fn_c_check_header_mongrel
 
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_func
-
 # ac_fn_cxx_try_cpp LINENO
 # ------------------------
 # Try to preprocess conftest.$ac_ext, and return whether this succeeded.
@@ -4647,7 +4518,8 @@ $as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
 ##  Check for headers, defs needed at compile time                            ##
 ################################################################################
 
-# consistency check: is source code present?
+# Consistency check: is source code present?
+
 
 
 # Checks for typedefs, structures, and compiler characteristics
@@ -4774,7 +4646,6 @@ _ACEOF
     ;;
 esac
 
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5172,79 +5043,6 @@ fi
 done
 
 
-ac_fn_c_find_intX_t "$LINENO" "8" "ac_cv_c_int8_t"
-case $ac_cv_c_int8_t in #(
-  no|yes) ;; #(
-  *)
-
-cat >>confdefs.h <<_ACEOF
-#define int8_t $ac_cv_c_int8_t
-_ACEOF
-;;
-esac
-
-ac_fn_c_find_intX_t "$LINENO" "16" "ac_cv_c_int16_t"
-case $ac_cv_c_int16_t in #(
-  no|yes) ;; #(
-  *)
-
-cat >>confdefs.h <<_ACEOF
-#define int16_t $ac_cv_c_int16_t
-_ACEOF
-;;
-esac
-
-ac_fn_c_find_intX_t "$LINENO" "32" "ac_cv_c_int32_t"
-case $ac_cv_c_int32_t in #(
-  no|yes) ;; #(
-  *)
-
-cat >>confdefs.h <<_ACEOF
-#define int32_t $ac_cv_c_int32_t
-_ACEOF
-;;
-esac
-
-ac_fn_c_find_uintX_t "$LINENO" "8" "ac_cv_c_uint8_t"
-case $ac_cv_c_uint8_t in #(
-  no|yes) ;; #(
-  *)
-
-$as_echo "#define _UINT8_T 1" >>confdefs.h
-
-
-cat >>confdefs.h <<_ACEOF
-#define uint8_t $ac_cv_c_uint8_t
-_ACEOF
-;;
-  esac
-
-ac_fn_c_find_uintX_t "$LINENO" "16" "ac_cv_c_uint16_t"
-case $ac_cv_c_uint16_t in #(
-  no|yes) ;; #(
-  *)
-
-
-cat >>confdefs.h <<_ACEOF
-#define uint16_t $ac_cv_c_uint16_t
-_ACEOF
-;;
-  esac
-
-ac_fn_c_find_uintX_t "$LINENO" "32" "ac_cv_c_uint32_t"
-case $ac_cv_c_uint32_t in #(
-  no|yes) ;; #(
-  *)
-
-$as_echo "#define _UINT32_T 1" >>confdefs.h
-
-
-cat >>confdefs.h <<_ACEOF
-#define uint32_t $ac_cv_c_uint32_t
-_ACEOF
-;;
-  esac
-
 ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
 if test "x$ac_cv_type_size_t" = xyes; then :
 
@@ -5291,7 +5089,6 @@ $as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
 
 fi
 
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
 $as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
 if ${ac_cv_header_stdbool_h+:} false; then :
@@ -5478,174 +5275,27 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-
-for ac_header in fcntl.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default"
-if test "x$ac_cv_header_fcntl_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_FCNTL_H 1
-_ACEOF
-
-else
-  as_fn_error $? "Cannot find fcntl.h." "$LINENO" 5
-fi
-
-done
-
-for ac_header in math.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "math.h" "ac_cv_header_math_h" "$ac_includes_default"
-if test "x$ac_cv_header_math_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_MATH_H 1
-_ACEOF
-
-else
-  as_fn_error $? "Cannot find math.h." "$LINENO" 5
-fi
-
-done
-
-
-# the following headers are needed for code produced by lexx and yacc
-for ac_header in inttypes.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default"
-if test "x$ac_cv_header_inttypes_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_INTTYPES_H 1
-_ACEOF
-
-else
-  as_fn_error $? "Cannot find inttypes.h." "$LINENO" 5
-fi
-
-done
-
-for ac_header in libintl.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
-if test "x$ac_cv_header_libintl_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBINTL_H 1
-_ACEOF
-
-else
-  as_fn_error $? "Cannot find libintl.h." "$LINENO" 5
-fi
-
-done
-
-for ac_header in malloc.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "malloc.h" "ac_cv_header_malloc_h" "$ac_includes_default"
-if test "x$ac_cv_header_malloc_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_MALLOC_H 1
-_ACEOF
-
-else
-  as_fn_error $? "Cannot find malloc.h." "$LINENO" 5
-fi
-
-done
-
-for ac_header in unistd.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
-if test "x$ac_cv_header_unistd_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_UNISTD_H 1
-_ACEOF
-
-else
-  as_fn_error $? "Cannot find unistd.h." "$LINENO" 5
-fi
-
-done
-
-for ac_header in stddef.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "stddef.h" "ac_cv_header_stddef_h" "$ac_includes_default"
-if test "x$ac_cv_header_stddef_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STDDEF_H 1
-_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
 
 else
-  as_fn_error $? "Cannot find stddef.h." "$LINENO" 5
+  ac_cv_header_stdc=no
 fi
-
-done
-
-
-for ac_header in gsl/gsl_rng.h gsl/gsl_randist.h gsl/gsl_math.h \
-                  gsl/gsl_errno.h gsl/gsl_integration.h gsl/gsl_roots.h \
-                  gsl/gsl_sf.h gsl/gsl_sf_debye.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-else
-  as_fn_error $? "Cannot find required gsl headers." "$LINENO" 5
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-done
-
-
-for ac_header in kww.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "kww.h" "ac_cv_header_kww_h" "$ac_includes_default"
-if test "x$ac_cv_header_kww_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_KWW_H 1
-_ACEOF
-
-else
-  as_fn_error $? "Cannot find kww.h." "$LINENO" 5
 fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
 
-done
-
-for ac_header in cerf.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "cerf.h" "ac_cv_header_cerf_h" "$ac_includes_default"
-if test "x$ac_cv_header_cerf_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_CERF_H 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
-else
-  as_fn_error $? "Cannot find cerf.h." "$LINENO" 5
 fi
 
-done
-
 
+# Checks for standard includes
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
@@ -6373,12 +6023,161 @@ fi
 done
 
 
+for ac_header in fcntl.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default"
+if test "x$ac_cv_header_fcntl_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_FCNTL_H 1
+_ACEOF
+
+else
+  as_fn_error $? "Cannot find fcntl.h." "$LINENO" 5
+fi
+
+done
+
+for ac_header in math.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "math.h" "ac_cv_header_math_h" "$ac_includes_default"
+if test "x$ac_cv_header_math_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_MATH_H 1
+_ACEOF
+
+else
+  as_fn_error $? "Cannot find math.h." "$LINENO" 5
+fi
+
+done
+
+
+# The following headers are needed for code produced by lexx and yacc
+for ac_header in inttypes.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default"
+if test "x$ac_cv_header_inttypes_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_INTTYPES_H 1
+_ACEOF
+
+else
+  as_fn_error $? "Cannot find inttypes.h." "$LINENO" 5
+fi
+
+done
+
+for ac_header in libintl.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
+if test "x$ac_cv_header_libintl_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBINTL_H 1
+_ACEOF
+
+else
+  as_fn_error $? "Cannot find libintl.h." "$LINENO" 5
+fi
+
+done
+
+for ac_header in malloc.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "malloc.h" "ac_cv_header_malloc_h" "$ac_includes_default"
+if test "x$ac_cv_header_malloc_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_MALLOC_H 1
+_ACEOF
+
+else
+  as_fn_error $? "Cannot find malloc.h." "$LINENO" 5
+fi
+
+done
+
+for ac_header in unistd.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
+if test "x$ac_cv_header_unistd_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_UNISTD_H 1
+_ACEOF
+
+else
+  as_fn_error $? "Cannot find unistd.h." "$LINENO" 5
+fi
+
+done
+
+for ac_header in stddef.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "stddef.h" "ac_cv_header_stddef_h" "$ac_includes_default"
+if test "x$ac_cv_header_stddef_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_STDDEF_H 1
+_ACEOF
+
+else
+  as_fn_error $? "Cannot find stddef.h." "$LINENO" 5
+fi
+
+done
+
+
+# Check for non-standard includes
+for ac_header in gsl/gsl_rng.h gsl/gsl_randist.h gsl/gsl_math.h \
+                  gsl/gsl_errno.h gsl/gsl_integration.h gsl/gsl_roots.h \
+                  gsl/gsl_sf.h gsl/gsl_sf_debye.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+else
+  as_fn_error $? "Cannot find required gsl headers." "$LINENO" 5
+fi
+
+done
+
+
+# Check for C includes of our own [C++ includes are checked after AC_LANG(C++)]
+for ac_header in kww.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "kww.h" "ac_cv_header_kww_h" "$ac_includes_default"
+if test "x$ac_cv_header_kww_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_KWW_H 1
+_ACEOF
+
+else
+  as_fn_error $? "Cannot find kww.h." "$LINENO" 5
+fi
+
+done
+
+for ac_header in cerf.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "cerf.h" "ac_cv_header_cerf_h" "$ac_includes_default"
+if test "x$ac_cv_header_cerf_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_CERF_H 1
+_ACEOF
+
+else
+  as_fn_error $? "Cannot find cerf.h." "$LINENO" 5
+fi
+
+done
+
 
 ################################################################################
 ##  Check for libraries, needed at link time                                  ##
 ################################################################################
 
-# from standard packages
+# From standard packages
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing cos" >&5
 $as_echo_n "checking for library containing cos... " >&6; }
 if ${ac_cv_search_cos+:} false; then :
@@ -6670,7 +6469,7 @@ else
 fi
 
 
-# written or adapted by JWu
+# From our own packages
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lmmin in -llmfit" >&5
 $as_echo_n "checking for lmmin in -llmfit... " >&6; }
 if ${ac_cv_lib_lmfit_lmmin+:} false; then :
@@ -6875,7 +6674,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
-# headers:
+# Headers:
 
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -7031,6 +6830,17 @@ else
   as_fn_error $? "Cannot find boost/shared_ptr.hpp." "$LINENO" 5
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include<trivia/file_ops.hpp>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+else
+  as_fn_error $? "Cannot find trivia/file_ops.hpp." "$LINENO" 5
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include<readplus/readln.hpp>
@@ -7038,7 +6848,7 @@ _ACEOF
 if ac_fn_cxx_try_cpp "$LINENO"; then :
 
 else
-  as_fn_error $? "Cannot find readln.hpp." "$LINENO" 5
+  as_fn_error $? "Cannot find readplus/readln.hpp." "$LINENO" 5
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7052,14 +6862,14 @@ else
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
-# no idea how to check for cpp libraries
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lyamlfreeze" >&5
-$as_echo_n "checking for main in -lyamlfreeze... " >&6; }
-if ${ac_cv_lib_yamlfreeze_main+:} false; then :
+# No idea how to check for cpp libraries
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ltrivia" >&5
+$as_echo_n "checking for main in -ltrivia... " >&6; }
+if ${ac_cv_lib_trivia_main+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lyamlfreeze  $LIBS"
+LIBS="-ltrivia  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -7073,25 +6883,25 @@ return main ();
 }
 _ACEOF
 if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_yamlfreeze_main=yes
+  ac_cv_lib_trivia_main=yes
 else
-  ac_cv_lib_yamlfreeze_main=no
+  ac_cv_lib_trivia_main=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_yamlfreeze_main" >&5
-$as_echo "$ac_cv_lib_yamlfreeze_main" >&6; }
-if test "x$ac_cv_lib_yamlfreeze_main" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_trivia_main" >&5
+$as_echo "$ac_cv_lib_trivia_main" >&6; }
+if test "x$ac_cv_lib_trivia_main" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBYAMLFREEZE 1
+#define HAVE_LIBTRIVIA 1
 _ACEOF
 
-  LIBS="-lyamlfreeze $LIBS"
+  LIBS="-ltrivia $LIBS"
 
 else
-  as_fn_error $? "library yamlfreeze not found" "$LINENO" 5
+  as_fn_error $? "libtrivia not found or out of sync" "$LINENO" 5
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lreadplus" >&5
@@ -7135,13 +6945,13 @@ else
   as_fn_error $? "library readplus not found" "$LINENO" 5
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ltrivia" >&5
-$as_echo_n "checking for main in -ltrivia... " >&6; }
-if ${ac_cv_lib_trivia_main+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lyamlfreeze" >&5
+$as_echo_n "checking for main in -lyamlfreeze... " >&6; }
+if ${ac_cv_lib_yamlfreeze_main+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-ltrivia  $LIBS"
+LIBS="-lyamlfreeze  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -7155,25 +6965,25 @@ return main ();
 }
 _ACEOF
 if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_trivia_main=yes
+  ac_cv_lib_yamlfreeze_main=yes
 else
-  ac_cv_lib_trivia_main=no
+  ac_cv_lib_yamlfreeze_main=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_trivia_main" >&5
-$as_echo "$ac_cv_lib_trivia_main" >&6; }
-if test "x$ac_cv_lib_trivia_main" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_yamlfreeze_main" >&5
+$as_echo "$ac_cv_lib_yamlfreeze_main" >&6; }
+if test "x$ac_cv_lib_yamlfreeze_main" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBTRIVIA 1
+#define HAVE_LIBYAMLFREEZE 1
 _ACEOF
 
-  LIBS="-ltrivia $LIBS"
+  LIBS="-lyamlfreeze $LIBS"
 
 else
-  as_fn_error $? "libtrivia not found or out of sync" "$LINENO" 5
+  as_fn_error $? "library yamlfreeze not found" "$LINENO" 5
 fi
 
 
diff --git a/pub/configure.ac b/pub/configure.ac
index c55b65a0c2b0832a884ee62b08a5ff3309fd3c16..2a76eaa8cdd112e1a062e88b9242c3e8bf362f92 100644
--- a/pub/configure.ac
+++ b/pub/configure.ac
@@ -44,60 +44,55 @@ AC_DEFINE([_FILE_OFFSET_BITS],64,[File offset bits])
 ##  Check for headers, defs needed at compile time                            ##
 ################################################################################
 
-# consistency check: is source code present?
+# Consistency check: is source code present?
 AC_CONFIG_SRCDIR([src/frida2.cpp])
+AC_CONFIG_SRCDIR([man/frida.pod])
 
 # Checks for typedefs, structures, and compiler characteristics
 AC_C_CONST
 AC_C_INLINE
-
-AC_TYPE_INT8_T
-AC_TYPE_INT16_T
-AC_TYPE_INT32_T
-AC_TYPE_UINT8_T
-AC_TYPE_UINT16_T
-AC_TYPE_UINT32_T
 AC_TYPE_SIZE_T
 AC_STRUCT_TM
-
 AC_HEADER_STDBOOL
 AC_HEADER_STDC
 
+# Checks for standard includes
+AC_FUNC_ALLOCA
+AC_FUNC_MALLOC
+AC_FUNC_REALLOC
+AC_FUNC_MKTIME
+AC_FUNC_STRFTIME
+
+AC_CHECK_FUNCS([gettimeofday],,AC_MSG_ERROR([Cannot find gettimeofday.]))
+AC_CHECK_FUNCS([memset],      ,AC_MSG_ERROR([Cannot find memset.]))
+AC_CHECK_FUNCS([mkfifo],      ,AC_MSG_ERROR([Cannot find mkfifo.]))
+AC_CHECK_FUNCS([strchr],      ,AC_MSG_ERROR([Cannot find strchr.]))
+
 AC_CHECK_HEADERS([fcntl.h],    	   ,AC_MSG_ERROR([Cannot find fcntl.h.]))
 AC_CHECK_HEADERS([math.h],   	   ,AC_MSG_ERROR([Cannot find math.h.]))
 
-# the following headers are needed for code produced by lexx and yacc
+# The following headers are needed for code produced by lexx and yacc
 AC_CHECK_HEADERS([inttypes.h], 	   ,AC_MSG_ERROR([Cannot find inttypes.h.]))
 AC_CHECK_HEADERS([libintl.h],  	   ,AC_MSG_ERROR([Cannot find libintl.h.]))
 AC_CHECK_HEADERS([malloc.h],   	   ,AC_MSG_ERROR([Cannot find malloc.h.]))
 AC_CHECK_HEADERS([unistd.h],   	   ,AC_MSG_ERROR([Cannot find unistd.h.]))
 AC_CHECK_HEADERS([stddef.h],   	   ,AC_MSG_ERROR([Cannot find stddef.h.]))
 
+# Check for non-standard includes
 AC_CHECK_HEADERS([gsl/gsl_rng.h gsl/gsl_randist.h gsl/gsl_math.h \
                   gsl/gsl_errno.h gsl/gsl_integration.h gsl/gsl_roots.h \
                   gsl/gsl_sf.h gsl/gsl_sf_debye.h],,
                  AC_MSG_ERROR([Cannot find required gsl headers.]))
 
+# Check for C includes of our own [C++ includes are checked after AC_LANG(C++)]
 AC_CHECK_HEADERS([kww.h],,  AC_MSG_ERROR([Cannot find kww.h.]))
 AC_CHECK_HEADERS([cerf.h],, AC_MSG_ERROR([Cannot find cerf.h.]))
 
-AC_FUNC_ALLOCA
-AC_FUNC_MALLOC
-AC_FUNC_REALLOC
-AC_FUNC_MKTIME
-AC_FUNC_STRFTIME
-
-AC_CHECK_FUNCS([gettimeofday],,AC_MSG_ERROR([Cannot find gettimeofday.]))
-AC_CHECK_FUNCS([memset],      ,AC_MSG_ERROR([Cannot find memset.]))
-AC_CHECK_FUNCS([mkfifo],      ,AC_MSG_ERROR([Cannot find mkfifo.]))
-AC_CHECK_FUNCS([strchr],      ,AC_MSG_ERROR([Cannot find strchr.]))
-
-
 ################################################################################
 ##  Check for libraries, needed at link time                                  ##
 ################################################################################
 
-# from standard packages
+# From standard packages
 AC_SEARCH_LIBS([cos], [m],, [AC_MSG_ERROR(libm not found or corrupted)])
 AC_SEARCH_LIBS([cblas_dgemm], [gslcblas],,
 			 [AC_MSG_ERROR(libgslcblas not found or out of sync)])
@@ -108,7 +103,7 @@ AC_SEARCH_LIBS([fftw_plan_r2r_1d], [fftw3],,
 AC_SEARCH_LIBS([rl_completion_matches], [readline],,
 			 [AC_MSG_ERROR(libreadline not found or corrupted)])
 
-# written or adapted by JWu
+# From our own packages
 AC_CHECK_LIB([lmfit], [lmmin], ,
 		      [AC_MSG_ERROR(liblmfit not found or out of sync)])
 AC_CHECK_LIB([kww], [kwwp], ,
@@ -131,23 +126,26 @@ fi
 
 AC_LANG(C++)
 
-# headers:
+# Headers:
 AC_TRY_CPP([#include<boost/format.hpp>],,
 	AC_MSG_ERROR([Cannot find boost/format.hpp.]))
 AC_TRY_CPP([#include<boost/shared_ptr.hpp>],,
 	AC_MSG_ERROR([Cannot find boost/shared_ptr.hpp.]))
+
+AC_TRY_CPP([#include<trivia/file_ops.hpp>],,
+	AC_MSG_ERROR([Cannot find trivia/file_ops.hpp.]))
 AC_TRY_CPP([#include<readplus/readln.hpp>],,
-	AC_MSG_ERROR([Cannot find readln.hpp.]))
+	AC_MSG_ERROR([Cannot find readplus/readln.hpp.]))
 AC_TRY_CPP([#include<yamlfreeze/yaml.hpp>],,
         AC_MSG_ERROR([Cannot find yamlfreeze/yaml.hpp.]))
 
-# no idea how to check for cpp libraries
-AC_CHECK_LIB([yamlfreeze], [main],,
-		    	 [AC_MSG_ERROR(library yamlfreeze not found)])
-AC_CHECK_LIB([readplus], [main],,
-		    	 [AC_MSG_ERROR(library readplus not found)])
+# No idea how to check for cpp libraries
 AC_CHECK_LIB([trivia], [main], ,
                        [AC_MSG_ERROR(libtrivia not found or out of sync)])
+AC_CHECK_LIB([readplus], [main],,
+		    	 [AC_MSG_ERROR(library readplus not found)])
+AC_CHECK_LIB([yamlfreeze], [main],,
+		    	 [AC_MSG_ERROR(library yamlfreeze not found)])
 
 ################################################################################
 ##  make Makefiles                                                            ##