diff --git a/source4/include/includes.h b/source4/include/includes.h
index c4b8f24397e..c67b3c81955 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -653,8 +653,6 @@ extern int errno;
 
 #include "asn_1.h"
 
-#include "popt.h"
-
 #include "mutex.h"
 
 #include "librpc/rpc/dcerpc.h"
diff --git a/source4/include/rewrite.h b/source4/include/rewrite.h
index 21cc7342d1c..5e2f9bb4bca 100644
--- a/source4/include/rewrite.h
+++ b/source4/include/rewrite.h
@@ -280,6 +280,7 @@ typedef struct {
 	char *from_name, *to_name;
 } *smb_iconv_t;
 
+#include "popt.h"
 #include "popt_common.h"
 
 #endif /* _REWRITE_H */