diff --git a/source3/auth/auth_rhosts.c b/source3/auth/auth_rhosts.c
index ffb92122643..b447bed5d12 100644
--- a/source3/auth/auth_rhosts.c
+++ b/source3/auth/auth_rhosts.c
@@ -134,7 +134,7 @@ static BOOL check_user_equiv(char *user, char *remote, char *equiv_file)
 /****************************************************************************
 check for a possible hosts equiv or rhosts entry for the user
 ****************************************************************************/
-BOOL check_hosts_equiv(char *user)
+static BOOL check_hosts_equiv(char *user)
 {
   char *fname = NULL;
   pstring rhostsfile;
diff --git a/source3/smbd/auth_rhosts.c b/source3/smbd/auth_rhosts.c
index ffb92122643..b447bed5d12 100644
--- a/source3/smbd/auth_rhosts.c
+++ b/source3/smbd/auth_rhosts.c
@@ -134,7 +134,7 @@ static BOOL check_user_equiv(char *user, char *remote, char *equiv_file)
 /****************************************************************************
 check for a possible hosts equiv or rhosts entry for the user
 ****************************************************************************/
-BOOL check_hosts_equiv(char *user)
+static BOOL check_hosts_equiv(char *user)
 {
   char *fname = NULL;
   pstring rhostsfile;
diff --git a/source3/smbd/chgpasswd.c b/source3/smbd/chgpasswd.c
index 030c69bd4a7..8dff2f7d817 100644
--- a/source3/smbd/chgpasswd.c
+++ b/source3/smbd/chgpasswd.c
@@ -52,6 +52,12 @@
 extern int DEBUGLEVEL;
 extern struct passdb_ops pdb_ops;
 
+static BOOL check_oem_password(char *user,
+			       uchar * lmdata, uchar * lmhash,
+			       uchar * ntdata, uchar * nthash,
+			       SAM_ACCOUNT **hnd, char *new_passwd,
+			       int new_passwd_size);
+
 #if ALLOW_CHANGE_PASSWORD
 
 static int findpty(char **slave)
@@ -704,11 +710,11 @@ BOOL pass_oem_change(char *user,
  but does use the lm OEM password to check the nt hashed-hash.
 
 ************************************************************/
-BOOL check_oem_password(char *user,
-			uchar * lmdata, uchar * lmhash,
-			uchar * ntdata, uchar * nthash,
-			SAM_ACCOUNT **hnd, char *new_passwd,
-			int new_passwd_size)
+static BOOL check_oem_password(char *user,
+			       uchar * lmdata, uchar * lmhash,
+			       uchar * ntdata, uchar * nthash,
+			       SAM_ACCOUNT **hnd, char *new_passwd,
+			       int new_passwd_size)
 {
 	static uchar null_pw[16];
 	static uchar null_ntpw[16];