From: Mark Washenberger <none@none>
Date: Tue, 5 May 2009 15:57:04 +0000 (-0400)
Subject: Renamed headers to prevent collision if they were flattened on an install.
X-Git-Tag: 2.0.alpha1~833
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=08d6658a4e2ec8104cd1307f6baa75fdb07a24f8;p=thirdparty%2Fdovecot%2Fcore.git

Renamed headers to prevent collision if they were flattened on an install.

--HG--
branch : HEAD
---

diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index daa3e9553c..94f7245605 100644
--- a/src/auth/Makefile.am
+++ b/src/auth/Makefile.am
@@ -56,6 +56,8 @@ dovecot_auth_SOURCES = \
 	auth-cache.c \
 	auth-client-connection.c \
 	auth-master-connection.c \
+	mech-otp-skey-common.c \
+	mech-plain-common.c \
 	auth-request.c \
 	auth-request-handler.c \
 	auth-settings.c \
@@ -79,8 +81,6 @@ dovecot_auth_SOURCES = \
 	mech-rpa.c \
 	mech-apop.c \
 	mech-winbind.c \
-	otp-skey-common.c \
-	plain-common.c \
 	passdb.c \
 	passdb-blocking.c \
 	passdb-bsdauth.c \
@@ -109,8 +109,11 @@ headers = \
 	auth.h \
 	auth-cache.h \
 	auth-client-connection.h \
+	auth-common.h \
 	auth-master-interface.h \
 	auth-master-connection.h \
+	mech-otp-skey-common.h \
+	mech-plain-common.h \
 	auth-request.h \
 	auth-request-handler.h \
 	auth-settings.h \
@@ -120,12 +123,9 @@ headers = \
 	db-ldap.h \
 	db-sql.h \
 	db-passwd-file.h \
-	common.h \
 	db-checkpassword.h \
 	mech.h \
 	mycrypt.h \
-	otp-skey-common.h \
-	plain-common.h \
 	passdb.h \
 	passdb-blocking.h \
 	passdb-cache.h \
diff --git a/src/auth/auth-cache.c b/src/auth/auth-cache.c
index 1b1192cee2..6663db642b 100644
--- a/src/auth/auth-cache.c
+++ b/src/auth/auth-cache.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2004-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "lib-signals.h"
 #include "hash.h"
 #include "str.h"
diff --git a/src/auth/auth-client-connection.c b/src/auth/auth-client-connection.c
index f696707285..88d80d1db6 100644
--- a/src/auth/auth-client-connection.c
+++ b/src/auth/auth-client-connection.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "array.h"
 #include "ioloop.h"
 #include "istream.h"
diff --git a/src/auth/common.h b/src/auth/auth-common.h
similarity index 78%
rename from src/auth/common.h
rename to src/auth/auth-common.h
index 5c74989ea5..4d0ee67353 100644
--- a/src/auth/common.h
+++ b/src/auth/auth-common.h
@@ -1,5 +1,5 @@
-#ifndef COMMON_H
-#define COMMON_H
+#ifndef AUTH_COMMON_H
+#define AUTH_COMMON_H
 
 #include "lib.h"
 #include "auth.h"
diff --git a/src/auth/auth-master-connection.c b/src/auth/auth-master-connection.c
index ee53704501..a213dae015 100644
--- a/src/auth/auth-master-connection.c
+++ b/src/auth/auth-master-connection.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "array.h"
 #include "hash.h"
 #include "str.h"
diff --git a/src/auth/auth-request-handler.c b/src/auth/auth-request-handler.c
index 43e19a54b3..7e30470a6c 100644
--- a/src/auth/auth-request-handler.c
+++ b/src/auth/auth-request-handler.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2005-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "ioloop.h"
 #include "array.h"
 #include "aqueue.h"
diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c
index 6092c60667..79eadaff51 100644
--- a/src/auth/auth-request.c
+++ b/src/auth/auth-request.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "ioloop.h"
 #include "buffer.h"
 #include "hash.h"
diff --git a/src/auth/auth-stream.c b/src/auth/auth-stream.c
index d9f64b0f63..3140d82283 100644
--- a/src/auth/auth-stream.c
+++ b/src/auth/auth-stream.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2005-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "str.h"
 #include "ostream.h"
 #include "auth-request.h"
diff --git a/src/auth/auth-worker-client.c b/src/auth/auth-worker-client.c
index 6ae57d7023..7df8b38857 100644
--- a/src/auth/auth-worker-client.c
+++ b/src/auth/auth-worker-client.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2005-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "base64.h"
 #include "ioloop.h"
 #include "network.h"
diff --git a/src/auth/auth-worker-server.c b/src/auth/auth-worker-server.c
index bd975bf006..14484d120b 100644
--- a/src/auth/auth-worker-server.c
+++ b/src/auth/auth-worker-server.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2005-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "ioloop.h"
 #include "array.h"
 #include "aqueue.h"
diff --git a/src/auth/auth.c b/src/auth/auth.c
index d50d70ba85..d60f02012c 100644
--- a/src/auth/auth.c
+++ b/src/auth/auth.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2005-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "network.h"
 #include "array.h"
 #include "str.h"
diff --git a/src/auth/db-checkpassword.c b/src/auth/db-checkpassword.c
index 37531a5e68..8d33011037 100644
--- a/src/auth/db-checkpassword.c
+++ b/src/auth/db-checkpassword.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2004-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 
 #if defined(PASSDB_CHECKPASSWORD) || defined(USERDB_CHECKPASSWORD)
 
diff --git a/src/auth/db-ldap.c b/src/auth/db-ldap.c
index 3bb84c1c1f..e0e8941db4 100644
--- a/src/auth/db-ldap.c
+++ b/src/auth/db-ldap.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 
 #if defined(BUILTIN_LDAP) || defined(PLUGIN_BUILD)
 
diff --git a/src/auth/db-passwd-file.c b/src/auth/db-passwd-file.c
index 370bc1c5f1..9d228cfe43 100644
--- a/src/auth/db-passwd-file.c
+++ b/src/auth/db-passwd-file.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 
 #if defined (USERDB_PASSWD_FILE) || defined(PASSDB_PASSWD_FILE)
 
diff --git a/src/auth/db-sql.c b/src/auth/db-sql.c
index 9a378794fb..3e7cc125f8 100644
--- a/src/auth/db-sql.c
+++ b/src/auth/db-sql.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 
 #if defined(PASSDB_SQL) || defined(USERDB_SQL)
 
diff --git a/src/auth/main.c b/src/auth/main.c
index cd6a5c3651..5112938041 100644
--- a/src/auth/main.c
+++ b/src/auth/main.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "array.h"
 #include "ioloop.h"
 #include "network.h"
diff --git a/src/auth/mech-anonymous.c b/src/auth/mech-anonymous.c
index e214064b30..ad8c8ec036 100644
--- a/src/auth/mech-anonymous.c
+++ b/src/auth/mech-anonymous.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "mech.h"
 
 static void
diff --git a/src/auth/mech-apop.c b/src/auth/mech-apop.c
index 19bf7db2a8..8e2b559658 100644
--- a/src/auth/mech-apop.c
+++ b/src/auth/mech-apop.c
@@ -6,7 +6,7 @@
  * This software is released under the MIT license.
  */
 
-#include "common.h"
+#include "auth-common.h"
 #include "mech.h"
 #include "passdb.h"
 #include "md5.h"
diff --git a/src/auth/mech-cram-md5.c b/src/auth/mech-cram-md5.c
index ca03016277..aa46e33e00 100644
--- a/src/auth/mech-cram-md5.c
+++ b/src/auth/mech-cram-md5.c
@@ -3,7 +3,7 @@
 /* CRAM-MD5 SASL authentication, see RFC-2195
    Joshua Goodall <joshua@roughtrade.net> */
 
-#include "common.h"
+#include "auth-common.h"
 #include "ioloop.h"
 #include "buffer.h"
 #include "hex-binary.h"
diff --git a/src/auth/mech-digest-md5.c b/src/auth/mech-digest-md5.c
index 4856561f68..fc39994cb2 100644
--- a/src/auth/mech-digest-md5.c
+++ b/src/auth/mech-digest-md5.c
@@ -2,7 +2,7 @@
 
 /* Digest-MD5 SASL authentication, see RFC-2831 */
 
-#include "common.h"
+#include "auth-common.h"
 #include "base64.h"
 #include "buffer.h"
 #include "hex-binary.h"
diff --git a/src/auth/mech-gssapi.c b/src/auth/mech-gssapi.c
index cd2847f76b..f8bba6edbb 100644
--- a/src/auth/mech-gssapi.c
+++ b/src/auth/mech-gssapi.c
@@ -12,7 +12,7 @@
  * This software is released under the MIT license.
  */
 
-#include "common.h"
+#include "auth-common.h"
 #include "env-util.h"
 #include "str.h"
 #include "str-sanitize.h"
diff --git a/src/auth/mech-login.c b/src/auth/mech-login.c
index 16de5d9640..4305a6f3fe 100644
--- a/src/auth/mech-login.c
+++ b/src/auth/mech-login.c
@@ -6,11 +6,11 @@
  * This software is released under the MIT license.
  */
 
-#include "common.h"
+#include "auth-common.h"
 #include "mech.h"
 #include "passdb.h"
 #include "safe-memset.h"
-#include "plain-common.h"
+#include "mech-plain-common.h"
 
 
 static void
diff --git a/src/auth/mech-ntlm.c b/src/auth/mech-ntlm.c
index d4c3a4eefb..02199e8359 100644
--- a/src/auth/mech-ntlm.c
+++ b/src/auth/mech-ntlm.c
@@ -6,7 +6,7 @@
  * This software is released under the MIT license.
  */
 
-#include "common.h"
+#include "auth-common.h"
 #include "mech.h"
 #include "passdb.h"
 #include "str.h"
diff --git a/src/auth/otp-skey-common.c b/src/auth/mech-otp-skey-common.c
similarity index 95%
rename from src/auth/otp-skey-common.c
rename to src/auth/mech-otp-skey-common.c
index c1c89049e1..bbfa0cff61 100644
--- a/src/auth/otp-skey-common.c
+++ b/src/auth/mech-otp-skey-common.c
@@ -6,12 +6,12 @@
  * This software is released under the MIT license.
  */
 
-#include "common.h"
+#include "auth-common.h"
 #include "hash.h"
 #include "mech.h"
 
 #include "otp.h"
-#include "otp-skey-common.h"
+#include "mech-otp-skey-common.h"
 
 static struct hash_table *otp_lock_table;
 
diff --git a/src/auth/otp-skey-common.h b/src/auth/mech-otp-skey-common.h
similarity index 86%
rename from src/auth/otp-skey-common.h
rename to src/auth/mech-otp-skey-common.h
index cffa4b0cb6..5cefc7559e 100644
--- a/src/auth/otp-skey-common.h
+++ b/src/auth/mech-otp-skey-common.h
@@ -1,5 +1,5 @@
-#ifndef OTP_SKEY_COMMON_H
-#define OTP_SKEY_COMMON_H
+#ifndef MECH_OTP_SKEY_COMMON_H
+#define MECH_OTP_SKEY_COMMON_H
 
 struct otp_auth_request {
 	struct auth_request auth_request;
diff --git a/src/auth/mech-otp.c b/src/auth/mech-otp.c
index 3a960b4d4d..8ef5decec1 100644
--- a/src/auth/mech-otp.c
+++ b/src/auth/mech-otp.c
@@ -6,14 +6,14 @@
  * This software is released under the MIT license.
  */
 
-#include "common.h"
+#include "auth-common.h"
 #include "safe-memset.h"
 #include "hash.h"
 #include "mech.h"
 #include "passdb.h"
 #include "hex-binary.h"
 #include "otp.h"
-#include "otp-skey-common.h"
+#include "mech-otp-skey-common.h"
 
 static void 
 otp_send_challenge(struct auth_request *auth_request,
diff --git a/src/auth/plain-common.c b/src/auth/mech-plain-common.c
similarity index 86%
rename from src/auth/plain-common.c
rename to src/auth/mech-plain-common.c
index 5830b934af..143edad85c 100644
--- a/src/auth/plain-common.c
+++ b/src/auth/mech-plain-common.c
@@ -1,7 +1,7 @@
-#include "common.h"
+#include "auth-common.h"
 #include "mech.h"
 #include "passdb.h"
-#include "plain-common.h"
+#include "mech-plain-common.h"
 
 void plain_verify_callback(enum passdb_result result,
 			   struct auth_request *request)
diff --git a/src/auth/plain-common.h b/src/auth/mech-plain-common.h
similarity index 64%
rename from src/auth/plain-common.h
rename to src/auth/mech-plain-common.h
index 4c1b97d64f..1dc339c043 100644
--- a/src/auth/plain-common.h
+++ b/src/auth/mech-plain-common.h
@@ -1,5 +1,5 @@
-#ifndef PLAIN_COMMON_H
-#define PLAIN_COMMON_H
+#ifndef MECH_PLAIN_COMMON_H
+#define MECH_PLAIN_COMMON_H
 
 void plain_verify_callback(enum passdb_result result,
 			   struct auth_request *request);
diff --git a/src/auth/mech-plain.c b/src/auth/mech-plain.c
index eda596ffca..82cfe89116 100644
--- a/src/auth/mech-plain.c
+++ b/src/auth/mech-plain.c
@@ -1,10 +1,10 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "safe-memset.h"
 #include "mech.h"
 #include "passdb.h"
-#include "plain-common.h"
+#include "mech-plain-common.h"
 
 static void
 mech_plain_auth_continue(struct auth_request *request,
diff --git a/src/auth/mech-rpa.c b/src/auth/mech-rpa.c
index 3a9f7142cd..d3a1171395 100644
--- a/src/auth/mech-rpa.c
+++ b/src/auth/mech-rpa.c
@@ -6,7 +6,7 @@
  * This software is released under the MIT license.
  */
 
-#include "common.h"
+#include "auth-common.h"
 #include "mech.h"
 #include "passdb.h"
 #include "str.h"
diff --git a/src/auth/mech-skey.c b/src/auth/mech-skey.c
index d4c5d19cad..f2bca22411 100644
--- a/src/auth/mech-skey.c
+++ b/src/auth/mech-skey.c
@@ -6,14 +6,14 @@
  * This software is released under the MIT license.
  */
 
-#include "common.h"
+#include "auth-common.h"
 #include "safe-memset.h"
 #include "hash.h"
 #include "mech.h"
 #include "passdb.h"
 #include "hex-binary.h"
 #include "otp.h"
-#include "otp-skey-common.h"
+#include "mech-otp-skey-common.h"
 
 static void 
 skey_send_challenge(struct auth_request *auth_request,
diff --git a/src/auth/mech-winbind.c b/src/auth/mech-winbind.c
index e6cbc2dada..beb036976b 100644
--- a/src/auth/mech-winbind.c
+++ b/src/auth/mech-winbind.c
@@ -7,7 +7,7 @@
  * This software is released under the MIT license.
  */
 
-#include "common.h"
+#include "auth-common.h"
 #include "lib-signals.h"
 #include "mech.h"
 #include "str.h"
diff --git a/src/auth/mech.c b/src/auth/mech.c
index d7fe325371..8d14122e51 100644
--- a/src/auth/mech.c
+++ b/src/auth/mech.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "ioloop.h"
 #include "mech.h"
 #include "str.h"
diff --git a/src/auth/passdb-blocking.c b/src/auth/passdb-blocking.c
index ac5681b36a..08663007af 100644
--- a/src/auth/passdb-blocking.c
+++ b/src/auth/passdb-blocking.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2005-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "str.h"
 #include "auth-worker-server.h"
 #include "password-scheme.h"
diff --git a/src/auth/passdb-bsdauth.c b/src/auth/passdb-bsdauth.c
index cd35dac906..3985cd16cc 100644
--- a/src/auth/passdb-bsdauth.c
+++ b/src/auth/passdb-bsdauth.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "passdb.h"
 
 #ifdef PASSDB_BSDAUTH
diff --git a/src/auth/passdb-cache.c b/src/auth/passdb-cache.c
index a640b5017d..ef2366a31b 100644
--- a/src/auth/passdb-cache.c
+++ b/src/auth/passdb-cache.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2004-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "password-scheme.h"
 #include "passdb.h"
 #include "passdb-cache.h"
diff --git a/src/auth/passdb-checkpassword.c b/src/auth/passdb-checkpassword.c
index 888a2cf977..2dfa9642dd 100644
--- a/src/auth/passdb-checkpassword.c
+++ b/src/auth/passdb-checkpassword.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2004-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "passdb.h"
 
 #ifdef PASSDB_CHECKPASSWORD 
diff --git a/src/auth/passdb-ldap.c b/src/auth/passdb-ldap.c
index 60bbd8992d..f3e6302b2f 100644
--- a/src/auth/passdb-ldap.c
+++ b/src/auth/passdb-ldap.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "passdb.h"
 
 #if defined(PASSDB_LDAP) && (defined(BUILTIN_LDAP) || defined(PLUGIN_BUILD))
diff --git a/src/auth/passdb-pam.c b/src/auth/passdb-pam.c
index ea6b2b39e9..c343e9dcb1 100644
--- a/src/auth/passdb-pam.c
+++ b/src/auth/passdb-pam.c
@@ -7,7 +7,7 @@
    modified versions are marked as such.  There's absolutely no warranty.
 */
 
-#include "common.h"
+#include "auth-common.h"
 #include "passdb.h"
 
 #ifdef PASSDB_PAM
diff --git a/src/auth/passdb-passwd-file.c b/src/auth/passdb-passwd-file.c
index 9478cd5b09..0b5bdad3b5 100644
--- a/src/auth/passdb-passwd-file.c
+++ b/src/auth/passdb-passwd-file.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "passdb.h"
 
 #ifdef PASSDB_PASSWD_FILE
diff --git a/src/auth/passdb-passwd.c b/src/auth/passdb-passwd.c
index fee8e56861..3e37bf42b9 100644
--- a/src/auth/passdb-passwd.c
+++ b/src/auth/passdb-passwd.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "passdb.h"
 
 #ifdef PASSDB_PASSWD
diff --git a/src/auth/passdb-shadow.c b/src/auth/passdb-shadow.c
index 96d1b54a3d..d29acb7a54 100644
--- a/src/auth/passdb-shadow.c
+++ b/src/auth/passdb-shadow.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "passdb.h"
 
 #ifdef PASSDB_SHADOW
diff --git a/src/auth/passdb-sia.c b/src/auth/passdb-sia.c
index a7ebae7146..5d43420f3e 100644
--- a/src/auth/passdb-sia.c
+++ b/src/auth/passdb-sia.c
@@ -2,7 +2,7 @@
 
 /* Tru64 SIA support */
 
-#include "common.h"
+#include "auth-common.h"
 #include "passdb.h"
 
 #ifdef PASSDB_SIA
diff --git a/src/auth/passdb-sql.c b/src/auth/passdb-sql.c
index 4ee00d064e..d0badbecc9 100644
--- a/src/auth/passdb-sql.c
+++ b/src/auth/passdb-sql.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2004-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "passdb.h"
 
 #ifdef PASSDB_SQL
diff --git a/src/auth/passdb-vpopmail.c b/src/auth/passdb-vpopmail.c
index 292ff3b6ac..9e234bec0e 100644
--- a/src/auth/passdb-vpopmail.c
+++ b/src/auth/passdb-vpopmail.c
@@ -2,7 +2,7 @@
 
 /* Thanks to Courier-IMAP for showing how the vpopmail API should be used */
 
-#include "common.h"
+#include "auth-common.h"
 #include "passdb.h"
 
 #ifdef PASSDB_VPOPMAIL
diff --git a/src/auth/passdb.c b/src/auth/passdb.c
index e7ea725110..09f013ca81 100644
--- a/src/auth/passdb.c
+++ b/src/auth/passdb.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "array.h"
 #include "password-scheme.h"
 #include "auth-worker-server.h"
diff --git a/src/auth/userdb-blocking.c b/src/auth/userdb-blocking.c
index 951168fde6..f18d116d98 100644
--- a/src/auth/userdb-blocking.c
+++ b/src/auth/userdb-blocking.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2005-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "str.h"
 #include "auth-worker-server.h"
 #include "userdb.h"
diff --git a/src/auth/userdb-checkpassword.c b/src/auth/userdb-checkpassword.c
index 6a07a1ea06..926c795d82 100644
--- a/src/auth/userdb-checkpassword.c
+++ b/src/auth/userdb-checkpassword.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2004-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "userdb.h"
 
 #ifdef USERDB_CHECKPASSWORD
diff --git a/src/auth/userdb-ldap.c b/src/auth/userdb-ldap.c
index 9c41fde800..55501a6c49 100644
--- a/src/auth/userdb-ldap.c
+++ b/src/auth/userdb-ldap.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "userdb.h"
 
 #if defined(USERDB_LDAP) && (defined(BUILTIN_LDAP) || defined(PLUGIN_BUILD))
diff --git a/src/auth/userdb-nss.c b/src/auth/userdb-nss.c
index 97a93b6055..00e1dc240f 100644
--- a/src/auth/userdb-nss.c
+++ b/src/auth/userdb-nss.c
@@ -2,7 +2,7 @@
 
 /* Currently supports only GLIBC-compatible NSS modules */
 
-#include "common.h"
+#include "auth-common.h"
 #include "userdb.h"
 
 #ifdef USERDB_NSS
diff --git a/src/auth/userdb-passwd-file.c b/src/auth/userdb-passwd-file.c
index 2fe4f05428..60c9cc2f33 100644
--- a/src/auth/userdb-passwd-file.c
+++ b/src/auth/userdb-passwd-file.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "userdb.h"
 
 #ifdef USERDB_PASSWD_FILE
diff --git a/src/auth/userdb-passwd.c b/src/auth/userdb-passwd.c
index ba1a504e3a..3eb69bcf7e 100644
--- a/src/auth/userdb-passwd.c
+++ b/src/auth/userdb-passwd.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "userdb.h"
 
 #ifdef USERDB_PASSWD
diff --git a/src/auth/userdb-prefetch.c b/src/auth/userdb-prefetch.c
index 5320d14e67..3537014f72 100644
--- a/src/auth/userdb-prefetch.c
+++ b/src/auth/userdb-prefetch.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2004-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "userdb.h"
 
 #ifdef USERDB_PREFETCH
diff --git a/src/auth/userdb-sql.c b/src/auth/userdb-sql.c
index 1e2f15aef5..ac76bd84c8 100644
--- a/src/auth/userdb-sql.c
+++ b/src/auth/userdb-sql.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2004-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "userdb.h"
 
 #ifdef USERDB_SQL
diff --git a/src/auth/userdb-static.c b/src/auth/userdb-static.c
index 0f3e8d23ca..dace7119d8 100644
--- a/src/auth/userdb-static.c
+++ b/src/auth/userdb-static.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 
 #include "array.h"
 #include "str.h"
diff --git a/src/auth/userdb-vpopmail.c b/src/auth/userdb-vpopmail.c
index 5da4f34341..efd1b0d615 100644
--- a/src/auth/userdb-vpopmail.c
+++ b/src/auth/userdb-vpopmail.c
@@ -2,7 +2,7 @@
 
 /* Thanks to Courier-IMAP for showing how the vpopmail API should be used */
 
-#include "common.h"
+#include "auth-common.h"
 #include "userdb.h"
 
 #if defined(PASSDB_VPOPMAIL) || defined(USERDB_VPOPMAIL)
diff --git a/src/auth/userdb.c b/src/auth/userdb.c
index 64d13777f8..ec55a833b4 100644
--- a/src/auth/userdb.c
+++ b/src/auth/userdb.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "array.h"
 #include "auth-worker-server.h"
 #include "userdb.h"
diff --git a/src/imap/Makefile.am b/src/imap/Makefile.am
index a65779a147..5f4d9d9a0b 100644
--- a/src/imap/Makefile.am
+++ b/src/imap/Makefile.am
@@ -62,9 +62,9 @@ cmds = \
 
 imap_SOURCES = \
 	$(cmds) \
-	client.c \
-	commands.c \
-	commands-util.c \
+	imap-client.c \
+	imap-commands.c \
+	imap-commands-util.c \
 	imap-expunge.c \
 	imap-fetch.c \
 	imap-fetch-body.c \
@@ -78,10 +78,10 @@ imap_SOURCES = \
 
 
 headers = \
-	client.h \
-	commands.h \
-	commands-util.h \
-	common.h \
+	imap-client.h \
+	imap-commands.h \
+	imap-commands-util.h \
+	imap-common.h \
 	imap-expunge.h \
 	imap-fetch.h \
 	imap-search.h \
diff --git a/src/imap/cmd-append.c b/src/imap/cmd-append.c
index 2b27608fe1..51b9280095 100644
--- a/src/imap/cmd-append.c
+++ b/src/imap/cmd-append.c
@@ -1,11 +1,11 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "ioloop.h"
 #include "istream.h"
 #include "ostream.h"
 #include "str.h"
-#include "commands.h"
+#include "imap-commands.h"
 #include "imap-parser.h"
 #include "imap-date.h"
 #include "mail-storage.h"
diff --git a/src/imap/cmd-cancelupdate.c b/src/imap/cmd-cancelupdate.c
index aadbeb7ba0..9b66af50c1 100644
--- a/src/imap/cmd-cancelupdate.c
+++ b/src/imap/cmd-cancelupdate.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2008-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
-#include "commands.h"
+#include "imap-common.h"
+#include "imap-commands.h"
 
 static bool client_search_update_cancel(struct client *client, const char *tag)
 {
diff --git a/src/imap/cmd-capability.c b/src/imap/cmd-capability.c
index 62fed7c226..782098b077 100644
--- a/src/imap/cmd-capability.c
+++ b/src/imap/cmd-capability.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
-#include "commands.h"
+#include "imap-common.h"
+#include "imap-commands.h"
 #include "str.h"
 
 bool cmd_capability(struct client_command_context *cmd)
diff --git a/src/imap/cmd-check.c b/src/imap/cmd-check.c
index 8da52593f0..822c36c012 100644
--- a/src/imap/cmd-check.c
+++ b/src/imap/cmd-check.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
-#include "commands.h"
+#include "imap-common.h"
+#include "imap-commands.h"
 
 bool cmd_check(struct client_command_context *cmd)
 {
diff --git a/src/imap/cmd-close.c b/src/imap/cmd-close.c
index 8b73f3b51a..4e5dc31067 100644
--- a/src/imap/cmd-close.c
+++ b/src/imap/cmd-close.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
-#include "commands.h"
+#include "imap-common.h"
+#include "imap-commands.h"
 #include "imap-expunge.h"
 
 bool cmd_close(struct client_command_context *cmd)
diff --git a/src/imap/cmd-copy.c b/src/imap/cmd-copy.c
index 3f0c8f8910..d924907950 100644
--- a/src/imap/cmd-copy.c
+++ b/src/imap/cmd-copy.c
@@ -1,10 +1,10 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "str.h"
 #include "ostream.h"
 #include "imap-resp-code.h"
-#include "commands.h"
+#include "imap-commands.h"
 #include "imap-search-args.h"
 
 #include <time.h>
diff --git a/src/imap/cmd-create.c b/src/imap/cmd-create.c
index 16ec4b0c22..c514f5d4f1 100644
--- a/src/imap/cmd-create.c
+++ b/src/imap/cmd-create.c
@@ -1,8 +1,8 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "mail-namespace.h"
-#include "commands.h"
+#include "imap-commands.h"
 
 bool cmd_create(struct client_command_context *cmd)
 {
diff --git a/src/imap/cmd-delete.c b/src/imap/cmd-delete.c
index 43edb6d230..e4df7ccd43 100644
--- a/src/imap/cmd-delete.c
+++ b/src/imap/cmd-delete.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
-#include "commands.h"
+#include "imap-common.h"
+#include "imap-commands.h"
 
 bool cmd_delete(struct client_command_context *cmd)
 {
diff --git a/src/imap/cmd-enable.c b/src/imap/cmd-enable.c
index acdc7504e5..cf062cd372 100644
--- a/src/imap/cmd-enable.c
+++ b/src/imap/cmd-enable.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "str.h"
 
 bool cmd_enable(struct client_command_context *cmd)
diff --git a/src/imap/cmd-examine.c b/src/imap/cmd-examine.c
index ab39536624..120d728bf1 100644
--- a/src/imap/cmd-examine.c
+++ b/src/imap/cmd-examine.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
-#include "commands.h"
+#include "imap-common.h"
+#include "imap-commands.h"
 
 bool cmd_examine(struct client_command_context *cmd)
 {
diff --git a/src/imap/cmd-expunge.c b/src/imap/cmd-expunge.c
index 8af68b084c..e1c94eb085 100644
--- a/src/imap/cmd-expunge.c
+++ b/src/imap/cmd-expunge.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
-#include "commands.h"
+#include "imap-common.h"
+#include "imap-commands.h"
 #include "imap-search-args.h"
 #include "imap-expunge.h"
 
diff --git a/src/imap/cmd-fetch.c b/src/imap/cmd-fetch.c
index c8a7db0f9d..4d05b40c95 100644
--- a/src/imap/cmd-fetch.c
+++ b/src/imap/cmd-fetch.c
@@ -1,9 +1,9 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "ostream.h"
 #include "imap-resp-code.h"
-#include "commands.h"
+#include "imap-commands.h"
 #include "imap-fetch.h"
 #include "imap-search-args.h"
 #include "mail-search.h"
diff --git a/src/imap/cmd-id.c b/src/imap/cmd-id.c
index 3723ba743a..e80090d1f3 100644
--- a/src/imap/cmd-id.c
+++ b/src/imap/cmd-id.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2008-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "imap-id.h"
 
 bool cmd_id(struct client_command_context *cmd)
diff --git a/src/imap/cmd-idle.c b/src/imap/cmd-idle.c
index f826418dae..3e83a8adcc 100644
--- a/src/imap/cmd-idle.c
+++ b/src/imap/cmd-idle.c
@@ -1,11 +1,11 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "ioloop.h"
 #include "istream.h"
 #include "ostream.h"
 #include "mail-storage-settings.h"
-#include "commands.h"
+#include "imap-commands.h"
 #include "imap-sync.h"
 
 #include <stdlib.h>
diff --git a/src/imap/cmd-list.c b/src/imap/cmd-list.c
index ff1b5909be..5acef37b7b 100644
--- a/src/imap/cmd-list.c
+++ b/src/imap/cmd-list.c
@@ -1,13 +1,13 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "array.h"
 #include "str.h"
 #include "strescape.h"
 #include "imap-quote.h"
 #include "imap-match.h"
 #include "imap-status.h"
-#include "commands.h"
+#include "imap-commands.h"
 #include "mail-namespace.h"
 
 struct cmd_list_context {
diff --git a/src/imap/cmd-logout.c b/src/imap/cmd-logout.c
index 0eea53ff8b..6a213adaaa 100644
--- a/src/imap/cmd-logout.c
+++ b/src/imap/cmd-logout.c
@@ -1,8 +1,8 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "ostream.h"
-#include "commands.h"
+#include "imap-commands.h"
 
 bool cmd_logout(struct client_command_context *cmd)
 {
diff --git a/src/imap/cmd-lsub.c b/src/imap/cmd-lsub.c
index c410b1dc51..ba36136bed 100644
--- a/src/imap/cmd-lsub.c
+++ b/src/imap/cmd-lsub.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
-#include "commands.h"
+#include "imap-common.h"
+#include "imap-commands.h"
 
 bool cmd_lsub(struct client_command_context *cmd)
 {
diff --git a/src/imap/cmd-namespace.c b/src/imap/cmd-namespace.c
index 5a4ebc9daa..2362edc8e6 100644
--- a/src/imap/cmd-namespace.c
+++ b/src/imap/cmd-namespace.c
@@ -1,9 +1,9 @@
 /* Copyright (c) 2003-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "str.h"
 #include "imap-quote.h"
-#include "commands.h"
+#include "imap-commands.h"
 #include "mail-namespace.h"
 
 static void list_namespaces(struct mail_namespace *ns,
diff --git a/src/imap/cmd-noop.c b/src/imap/cmd-noop.c
index b9429f9fa1..31e3ffcbd1 100644
--- a/src/imap/cmd-noop.c
+++ b/src/imap/cmd-noop.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
-#include "commands.h"
+#include "imap-common.h"
+#include "imap-commands.h"
 
 bool cmd_noop(struct client_command_context *cmd)
 {
diff --git a/src/imap/cmd-rename.c b/src/imap/cmd-rename.c
index dcd4ace035..bcbbd745ff 100644
--- a/src/imap/cmd-rename.c
+++ b/src/imap/cmd-rename.c
@@ -1,8 +1,8 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "mail-namespace.h"
-#include "commands.h"
+#include "imap-commands.h"
 
 bool cmd_rename(struct client_command_context *cmd)
 {
diff --git a/src/imap/cmd-search.c b/src/imap/cmd-search.c
index ce77683f21..fc46d81468 100644
--- a/src/imap/cmd-search.c
+++ b/src/imap/cmd-search.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "imap-search-args.h"
 #include "imap-search.h"
 
diff --git a/src/imap/cmd-select.c b/src/imap/cmd-select.c
index 5e9f1638c8..d7d0ae5afa 100644
--- a/src/imap/cmd-select.c
+++ b/src/imap/cmd-select.c
@@ -1,8 +1,8 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "seq-range-array.h"
-#include "commands.h"
+#include "imap-commands.h"
 #include "mail-search-build.h"
 #include "imap-seqset.h"
 #include "imap-fetch.h"
diff --git a/src/imap/cmd-sort.c b/src/imap/cmd-sort.c
index 43e23a804e..47da003e5c 100644
--- a/src/imap/cmd-sort.c
+++ b/src/imap/cmd-sort.c
@@ -1,8 +1,8 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "buffer.h"
-#include "commands.h"
+#include "imap-commands.h"
 #include "imap-search-args.h"
 #include "imap-search.h"
 
diff --git a/src/imap/cmd-status.c b/src/imap/cmd-status.c
index 7542bfd374..68dad356e4 100644
--- a/src/imap/cmd-status.c
+++ b/src/imap/cmd-status.c
@@ -1,8 +1,8 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "imap-resp-code.h"
-#include "commands.h"
+#include "imap-commands.h"
 #include "imap-sync.h"
 #include "imap-status.h"
 
diff --git a/src/imap/cmd-store.c b/src/imap/cmd-store.c
index e98e768eb7..c021f86b1f 100644
--- a/src/imap/cmd-store.c
+++ b/src/imap/cmd-store.c
@@ -1,9 +1,9 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "seq-range-array.h"
 #include "str.h"
-#include "commands.h"
+#include "imap-commands.h"
 #include "imap-search-args.h"
 #include "imap-util.h"
 
diff --git a/src/imap/cmd-subscribe.c b/src/imap/cmd-subscribe.c
index abbb0e9b29..85639092c4 100644
--- a/src/imap/cmd-subscribe.c
+++ b/src/imap/cmd-subscribe.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
-#include "commands.h"
+#include "imap-common.h"
+#include "imap-commands.h"
 #include "mail-namespace.h"
 
 static bool have_listable_namespace_prefix(struct mail_namespace *ns,
diff --git a/src/imap/cmd-thread.c b/src/imap/cmd-thread.c
index 5a12701855..aa806094e5 100644
--- a/src/imap/cmd-thread.c
+++ b/src/imap/cmd-thread.c
@@ -1,9 +1,9 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "str.h"
 #include "ostream.h"
-#include "commands.h"
+#include "imap-commands.h"
 #include "imap-search-args.h"
 #include "mail-thread.h"
 
diff --git a/src/imap/cmd-uid.c b/src/imap/cmd-uid.c
index 4d6c004bcb..21f8346695 100644
--- a/src/imap/cmd-uid.c
+++ b/src/imap/cmd-uid.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
-#include "commands.h"
+#include "imap-common.h"
+#include "imap-commands.h"
 
 bool cmd_uid(struct client_command_context *cmd)
 {
diff --git a/src/imap/cmd-unselect.c b/src/imap/cmd-unselect.c
index f8fc2e7cfc..fb320494fe 100644
--- a/src/imap/cmd-unselect.c
+++ b/src/imap/cmd-unselect.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
-#include "commands.h"
+#include "imap-common.h"
+#include "imap-commands.h"
 
 bool cmd_unselect(struct client_command_context *cmd)
 {
diff --git a/src/imap/cmd-unsubscribe.c b/src/imap/cmd-unsubscribe.c
index ef95c4be32..9872f09299 100644
--- a/src/imap/cmd-unsubscribe.c
+++ b/src/imap/cmd-unsubscribe.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
-#include "commands.h"
+#include "imap-common.h"
+#include "imap-commands.h"
 
 bool cmd_unsubscribe(struct client_command_context *cmd)
 {
diff --git a/src/imap/cmd-x-cancel.c b/src/imap/cmd-x-cancel.c
index 5354d3c93f..5b0c89212e 100644
--- a/src/imap/cmd-x-cancel.c
+++ b/src/imap/cmd-x-cancel.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
-#include "commands.h"
+#include "imap-common.h"
+#include "imap-commands.h"
 
 bool cmd_x_cancel(struct client_command_context *cmd)
 {
diff --git a/src/imap/client.c b/src/imap/imap-client.c
similarity index 99%
rename from src/imap/client.c
rename to src/imap/imap-client.c
index 229d3e9742..c7e89b8f6f 100644
--- a/src/imap/client.c
+++ b/src/imap/imap-client.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "ioloop.h"
 #include "llist.h"
 #include "str.h"
@@ -12,7 +12,7 @@
 #include "imap-resp-code.h"
 #include "imap-util.h"
 #include "mail-namespace.h"
-#include "commands.h"
+#include "imap-commands.h"
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/src/imap/client.h b/src/imap/imap-client.h
similarity index 98%
rename from src/imap/client.h
rename to src/imap/imap-client.h
index 289a32b7e7..6a42be8c3e 100644
--- a/src/imap/client.h
+++ b/src/imap/imap-client.h
@@ -1,7 +1,7 @@
-#ifndef CLIENT_H
-#define CLIENT_H
+#ifndef IMAP_CLIENT_H
+#define IMAP_CLIENT_H
 
-#include "commands.h"
+#include "imap-commands.h"
 
 #define CLIENT_COMMAND_QUEUE_MAX_SIZE 4
 /* Maximum number of CONTEXT=SEARCH UPDATEs. Clients probably won't need more
diff --git a/src/imap/commands-util.c b/src/imap/imap-commands-util.c
similarity index 99%
rename from src/imap/commands-util.c
rename to src/imap/imap-commands-util.c
index c4a9ace5fe..8f81e6adfe 100644
--- a/src/imap/commands-util.c
+++ b/src/imap/imap-commands-util.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "array.h"
 #include "buffer.h"
 #include "str.h"
@@ -11,7 +11,7 @@
 #include "imap-util.h"
 #include "mail-storage.h"
 #include "mail-namespace.h"
-#include "commands-util.h"
+#include "imap-commands-util.h"
 
 /* Maximum length for mailbox name, including it's path. This isn't fully
    exact since the user can create folder hierarchy with small names, then
diff --git a/src/imap/commands-util.h b/src/imap/imap-commands-util.h
similarity index 98%
rename from src/imap/commands-util.h
rename to src/imap/imap-commands-util.h
index f29ddbd3fe..d8830eecd8 100644
--- a/src/imap/commands-util.h
+++ b/src/imap/imap-commands-util.h
@@ -1,5 +1,5 @@
-#ifndef COMMANDS_UTIL_H
-#define COMMANDS_UTIL_H
+#ifndef IMAP_COMMANDS_UTIL_H
+#define IMAP_COMMANDS_UTIL_H
 
 struct msgset_generator_context {
 	string_t *str;
diff --git a/src/imap/commands.c b/src/imap/imap-commands.c
similarity index 98%
rename from src/imap/commands.c
rename to src/imap/imap-commands.c
index 5e173495e3..70855338b0 100644
--- a/src/imap/commands.c
+++ b/src/imap/imap-commands.c
@@ -1,9 +1,9 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "array.h"
 #include "buffer.h"
-#include "commands.h"
+#include "imap-commands.h"
 
 #include <stdlib.h>
 
diff --git a/src/imap/commands.h b/src/imap/imap-commands.h
similarity index 97%
rename from src/imap/commands.h
rename to src/imap/imap-commands.h
index e2fa818e8a..e53202c09d 100644
--- a/src/imap/commands.h
+++ b/src/imap/imap-commands.h
@@ -1,12 +1,12 @@
-#ifndef COMMANDS_H
-#define COMMANDS_H
+#ifndef IMAP_COMMANDS_H
+#define IMAP_COMMANDS_H
 
 struct client_command_context;
 
 #include "mail-storage.h"
 #include "imap-parser.h"
 #include "imap-sync.h"
-#include "commands-util.h"
+#include "imap-commands-util.h"
 
 typedef bool command_func_t(struct client_command_context *cmd);
 
diff --git a/src/imap/common.h b/src/imap/imap-common.h
similarity index 91%
rename from src/imap/common.h
rename to src/imap/imap-common.h
index 5f0665ead1..d8c0caa73b 100644
--- a/src/imap/common.h
+++ b/src/imap/imap-common.h
@@ -1,5 +1,5 @@
-#ifndef COMMON_H
-#define COMMON_H
+#ifndef IMAP_COMMON_H
+#define IMAP_COMMON_H
 
 /* Disconnect client after idling this many milliseconds */
 #define CLIENT_IDLE_TIMEOUT_MSECS (60*30*1000)
@@ -20,7 +20,7 @@ enum client_workarounds {
 };
 
 #include "lib.h"
-#include "client.h"
+#include "imap-client.h"
 #include "imap-settings.h"
 
 extern struct master_service *service;
diff --git a/src/imap/imap-expunge.c b/src/imap/imap-expunge.c
index 884c050968..e31be4adc8 100644
--- a/src/imap/imap-expunge.c
+++ b/src/imap/imap-expunge.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "mail-storage.h"
 #include "mail-search-build.h"
 #include "imap-expunge.h"
diff --git a/src/imap/imap-fetch-body.c b/src/imap/imap-fetch-body.c
index 64425406c4..d8c8a7aec5 100644
--- a/src/imap/imap-fetch-body.c
+++ b/src/imap/imap-fetch-body.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "buffer.h"
 #include "str.h"
 #include "strescape.h"
diff --git a/src/imap/imap-fetch.c b/src/imap/imap-fetch.c
index 29b6e34be8..2a3bc10f69 100644
--- a/src/imap/imap-fetch.c
+++ b/src/imap/imap-fetch.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "array.h"
 #include "buffer.h"
 #include "istream.h"
@@ -10,7 +10,7 @@
 #include "message-size.h"
 #include "imap-date.h"
 #include "mail-search-build.h"
-#include "commands.h"
+#include "imap-commands.h"
 #include "imap-quote.h"
 #include "imap-fetch.h"
 #include "imap-util.h"
diff --git a/src/imap/imap-search-args.c b/src/imap/imap-search-args.c
index 21873a21ae..d0fa03354b 100644
--- a/src/imap/imap-search-args.c
+++ b/src/imap/imap-search-args.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "mail-storage.h"
 #include "mail-search-build.h"
 #include "imap-search-args.h"
diff --git a/src/imap/imap-search.c b/src/imap/imap-search.c
index f40865fb1a..e0b0e07a6d 100644
--- a/src/imap/imap-search.c
+++ b/src/imap/imap-search.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "ostream.h"
 #include "str.h"
 #include "seq-range-array.h"
@@ -9,7 +9,7 @@
 #include "imap-seqset.h"
 #include "imap-util.h"
 #include "mail-search-build.h"
-#include "commands.h"
+#include "imap-commands.h"
 #include "imap-search-args.h"
 #include "imap-search.h"
 
diff --git a/src/imap/imap-status.c b/src/imap/imap-status.c
index d901167b64..275ead45cd 100644
--- a/src/imap/imap-status.c
+++ b/src/imap/imap-status.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "str.h"
 #include "imap-quote.h"
 #include "imap-status.h"
diff --git a/src/imap/imap-sync.c b/src/imap/imap-sync.c
index 35b08294ad..f6429a28fe 100644
--- a/src/imap/imap-sync.c
+++ b/src/imap/imap-sync.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "str.h"
 #include "ostream.h"
 #include "mail-storage.h"
@@ -8,7 +8,7 @@
 #include "imap-quote.h"
 #include "imap-util.h"
 #include "imap-sync.h"
-#include "commands.h"
+#include "imap-commands.h"
 
 struct client_sync_context {
 	/* if multiple commands are in progress, we may need to wait for them
diff --git a/src/imap/mail-storage-callbacks.c b/src/imap/mail-storage-callbacks.c
index 427ef8228f..62a36b4a60 100644
--- a/src/imap/mail-storage-callbacks.c
+++ b/src/imap/mail-storage-callbacks.c
@@ -1,9 +1,9 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "ostream.h"
 #include "mail-storage.h"
-#include "commands-util.h"
+#include "imap-commands-util.h"
 
 static void notify_ok(struct mailbox *mailbox ATTR_UNUSED,
 		      const char *text, void *context)
diff --git a/src/imap/main.c b/src/imap/main.c
index fc39a77e7c..60df1238be 100644
--- a/src/imap/main.c
+++ b/src/imap/main.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "ioloop.h"
 #include "istream.h"
 #include "ostream.h"
@@ -12,7 +12,7 @@
 #include "master-service.h"
 #include "mail-user.h"
 #include "mail-storage-service.h"
-#include "commands.h"
+#include "imap-commands.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/plugins/imap-acl/imap-acl-plugin.c b/src/plugins/imap-acl/imap-acl-plugin.c
index b022c6b699..1fecb06cd1 100644
--- a/src/plugins/imap-acl/imap-acl-plugin.c
+++ b/src/plugins/imap-acl/imap-acl-plugin.c
@@ -1,10 +1,10 @@
 /* Copyright (c) 2008-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "str.h"
 #include "imap-quote.h"
 #include "imap-resp-code.h"
-#include "commands.h"
+#include "imap-commands.h"
 #include "mail-storage.h"
 #include "mail-namespace.h"
 #include "acl-api.h"
diff --git a/src/plugins/imap-quota/imap-quota-plugin.c b/src/plugins/imap-quota/imap-quota-plugin.c
index c5e1c280f2..cb3d9bc988 100644
--- a/src/plugins/imap-quota/imap-quota-plugin.c
+++ b/src/plugins/imap-quota/imap-quota-plugin.c
@@ -1,10 +1,10 @@
 /* Copyright (c) 2005-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "str.h"
 #include "imap-quote.h"
 #include "mail-namespace.h"
-#include "commands.h"
+#include "imap-commands.h"
 #include "quota.h"
 #include "quota-plugin.h"
 #include "imap-quota-plugin.h"
diff --git a/src/pop3-login/client-authenticate.c b/src/pop3-login/client-authenticate.c
index e1480f1e21..13d2e32762 100644
--- a/src/pop3-login/client-authenticate.c
+++ b/src/pop3-login/client-authenticate.c
@@ -11,7 +11,7 @@
 #include "str.h"
 #include "str-sanitize.h"
 #include "auth-client.h"
-#include "../pop3/capability.h"
+#include "../pop3/pop3-capability.h"
 #include "ssl-proxy.h"
 #include "client.h"
 #include "client-authenticate.h"
diff --git a/src/pop3/Makefile.am b/src/pop3/Makefile.am
index 6f99e1a8cc..edd195c794 100644
--- a/src/pop3/Makefile.am
+++ b/src/pop3/Makefile.am
@@ -27,16 +27,16 @@ pop3_LDADD = $(libs) $(MODULE_LIBS)
 pop3_DEPENDENCIES = $(libs)
 
 pop3_SOURCES = \
-	client.c \
-	commands.c \
 	main.c \
+	pop3-client.c \
+	pop3-commands.c \
 	pop3-settings.c
 
 headers = \
-	capability.h \
-	client.h \
-	commands.h \
-	common.h \
+	pop3-capability.h \
+	pop3-client.h \
+	pop3-commands.h \
+	pop3-common.h \
 	pop3-settings.h
 
 if INSTALL_HEADERS
diff --git a/src/pop3/main.c b/src/pop3/main.c
index 8e6b586297..ef4240b91d 100644
--- a/src/pop3/main.c
+++ b/src/pop3/main.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "pop3-common.h"
 #include "ioloop.h"
 #include "istream.h"
 #include "buffer.h"
diff --git a/src/pop3/capability.h b/src/pop3/pop3-capability.h
similarity index 100%
rename from src/pop3/capability.h
rename to src/pop3/pop3-capability.h
diff --git a/src/pop3/client.c b/src/pop3/pop3-client.c
similarity index 99%
rename from src/pop3/client.c
rename to src/pop3/pop3-client.c
index 0c3d8df173..3e32f52d01 100644
--- a/src/pop3/client.c
+++ b/src/pop3/pop3-client.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "pop3-common.h"
 #include "buffer.h"
 #include "ioloop.h"
 #include "network.h"
@@ -10,7 +10,7 @@
 #include "var-expand.h"
 #include "master-service.h"
 #include "mail-storage.h"
-#include "commands.h"
+#include "pop3-commands.h"
 #include "mail-search-build.h"
 #include "mail-namespace.h"
 
diff --git a/src/pop3/client.h b/src/pop3/pop3-client.h
similarity index 97%
rename from src/pop3/client.h
rename to src/pop3/pop3-client.h
index 136fabaf87..a14dcbdacb 100644
--- a/src/pop3/client.h
+++ b/src/pop3/pop3-client.h
@@ -1,5 +1,5 @@
-#ifndef CLIENT_H
-#define CLIENT_H
+#ifndef POP3_CLIENT_H
+#define POP3_CLIENT_H
 
 struct client;
 struct mail_storage;
diff --git a/src/pop3/commands.c b/src/pop3/pop3-commands.c
similarity index 99%
rename from src/pop3/commands.c
rename to src/pop3/pop3-commands.c
index dfda430ea7..e163d0da97 100644
--- a/src/pop3/commands.c
+++ b/src/pop3/pop3-commands.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "pop3-common.h"
 #include "array.h"
 #include "istream.h"
 #include "ostream.h"
@@ -10,8 +10,8 @@
 #include "mail-storage.h"
 #include "mail-storage-settings.h"
 #include "mail-search-build.h"
-#include "capability.h"
-#include "commands.h"
+#include "pop3-capability.h"
+#include "pop3-commands.h"
 
 static const char *get_msgnum(struct client *client, const char *args,
 			      unsigned int *msgnum)
diff --git a/src/pop3/commands.h b/src/pop3/pop3-commands.h
similarity index 68%
rename from src/pop3/commands.h
rename to src/pop3/pop3-commands.h
index b2fed1d270..f13c8b0fb3 100644
--- a/src/pop3/commands.h
+++ b/src/pop3/pop3-commands.h
@@ -1,5 +1,5 @@
-#ifndef COMMANDS_H
-#define COMMANDS_H
+#ifndef POP3_COMMANDS_H
+#define POP3_COMMANDS_H
 
 int client_command_execute(struct client *client,
 			   const char *name, const char *args);
diff --git a/src/pop3/common.h b/src/pop3/pop3-common.h
similarity index 83%
rename from src/pop3/common.h
rename to src/pop3/pop3-common.h
index 45cd93f3a4..9f9a764c6f 100644
--- a/src/pop3/common.h
+++ b/src/pop3/pop3-common.h
@@ -1,5 +1,5 @@
-#ifndef COMMON_H
-#define COMMON_H
+#ifndef POP3_COMMON_H
+#define POP3_COMMON_H
 
 enum client_workarounds {
 	WORKAROUND_OUTLOOK_NO_NULS		= 0x01,
@@ -14,7 +14,7 @@ enum uidl_keys {
 };
 
 #include "lib.h"
-#include "client.h"
+#include "pop3-client.h"
 #include "pop3-settings.h"
 
 extern struct master_service *service;