diff --git a/lib-src/pop.c b/lib-src/pop.c
index 725a9d87cd0..5dd33cf8330 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -18,6 +18,9 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
+#define NO_SHORTNAMES   /* Tell config not to load remap.h */
+#include <../src/config.h>
+
 #ifdef MAIL_USE_POP
 
 #include <sys/types.h>