diff --git a/bignum.h b/bignum.h
index cabb4a20d3b69a947e4ef8f8f35526061951c425..ba98db1cad5677ca0a706abd18abb1e66d766159 100644
--- a/bignum.h
+++ b/bignum.h
@@ -26,6 +26,7 @@
 #define _BIGNUM_H_
 
 #include "includes.h"
+#include "dbutil.h"
 
 void m_mp_init(mp_int *mp);
 void m_mp_init_multi(mp_int *mp, ...) ATTRIB_SENTINEL;
diff --git a/options.h b/options.h
index 71d39ccd728ed831bc2d5714e05f228575f94e73..88b17ca6328e85a91bf7644b94604e3ac4cc40f3 100644
--- a/options.h
+++ b/options.h
@@ -153,7 +153,7 @@ much traffic. */
 #endif
 
 /* Whether to do reverse DNS lookups. */
-#define DO_HOST_LOOKUP
+//#define DO_HOST_LOOKUP
 
 /* Whether to print the message of the day (MOTD). This doesn't add much code
  * size */
@@ -174,9 +174,9 @@ much traffic. */
  * PAM challenge/response.
  * You can't enable both PASSWORD and PAM. */
 
-//#define ENABLE_SVR_PASSWORD_AUTH
+#define ENABLE_SVR_PASSWORD_AUTH
 /* PAM requires ./configure --enable-pam */
-#define ENABLE_SVR_PAM_AUTH
+//#define ENABLE_SVR_PAM_AUTH
 #define ENABLE_SVR_PUBKEY_AUTH
 
 /* Whether to take public key options in