diff --git a/source/include/popt_common.h b/source/include/popt_common.h
index 57850bf6826..201245cc3a0 100644
--- a/source/include/popt_common.h
+++ b/source/include/popt_common.h
@@ -21,6 +21,8 @@
 #ifndef _POPT_COMMON_H
 #define _POPT_COMMON_H
 
+#include "popt.h"
+
 /* Common popt structures */
 extern struct poptOption popt_common_samba[];
 extern struct poptOption popt_common_connection[];
diff --git a/source/include/rewrite.h b/source/include/rewrite.h
index 5e2f9bb4bca..21cc7342d1c 100644
--- a/source/include/rewrite.h
+++ b/source/include/rewrite.h
@@ -280,7 +280,6 @@ typedef struct {
 	char *from_name, *to_name;
 } *smb_iconv_t;
 
-#include "popt.h"
 #include "popt_common.h"
 
 #endif /* _REWRITE_H */