--- a/src/DLD-FUNCTIONS/fftw.cc	Thu Aug 13 15:51:57 2009 +0200
+++ b/src/DLD-FUNCTIONS/fftw.cc	Thu Aug 13 18:20:31 2009 -0400
@@ -25,13 +25,12 @@
 #endif
 
 #include <algorithm>
-#include "ov.h"
+
+#include "oct-fftw.h"
+
 #include "defun-dld.h"
 #include "error.h"
-
-#if defined (HAVE_FFTW3)
-#include "oct-fftw.h"
-#endif
+#include "ov.h"
 
 DEFUN_DLD (fftw, args, ,
   "-*- texinfo -*-\n\
@@ -122,7 +121,7 @@
       return retval;
     }
 
-#if defined (HAVE_FFTW3)
+#if defined (HAVE_FFTW)
   if (args(0).is_string ())
     {
       std::string arg0 = args(0).string_value ();
@@ -260,7 +259,7 @@
     }
 #else
 
-  warning ("fftw: this copy of Octave was not configured to use FFTW3");
+  warning ("fftw: this copy of Octave was not configured to use the FFTW3 planner");
 
 #endif