diff --git a/CHANGELOG b/CHANGELOG
index a645a5449..3e9c91fa7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,8 @@
 # Nmap Changelog ($Id$); -*-text-*-
+
+o Compatibility with systems that have the pcre.h header file in its
+  own pcre directory should now be fixed for real. [Fyodor]
+
 4.23RC3
 
 o Zenmap now has a man page!  It isn't very long yet, but covers the
diff --git a/nse_pcrelib.cc b/nse_pcrelib.cc
index 1e42f6a87..0e4894503 100644
--- a/nse_pcrelib.cc
+++ b/nse_pcrelib.cc
@@ -13,15 +13,16 @@ extern "C" {
 }
 
 #include <locale.h>
+
+#include "nbase.h"
+#include "nmap_error.h"
+
 #ifdef HAVE_PCRE_PCRE_H
 # include <pcre/pcre.h>
 #else
 # include <pcre.h>
 #endif
 
-#include "nbase.h"
-#include "nmap_error.h"
-
 #include "nse_pcrelib.h"
 
 static void L_lua_error(lua_State *L, const char *message)