Index: trunk/CMakeModules/FindTidy.cmake
===================================================================
--- trunk.orig/CMakeModules/FindTidy.cmake
+++ trunk/CMakeModules/FindTidy.cmake
@@ -32,7 +32,7 @@ if (_TIDY_SEARCHES)
     if (MSVC)
         foreach(search ${_TIDY_SEARCHES})
           find_path(TIDY_INCLUDE_DIR
-            NAMES tidy.h
+            NAMES tidy/tidy.h
             PATHS ${search}
             PATH_SUFFIXES include
             )
@@ -59,7 +59,7 @@ if (_TIDY_SEARCHES)
         if (NOT TIDY_LIBRARY)
             foreach(search ${_TIDY_SEARCHES})
               find_path(TIDY_INCLUDE_DIR
-                NAMES tidy.h
+                NAMES tidy/tidy.h
                 PATHS ${search}
                 PATH_SUFFIXES include
                 )
@@ -72,7 +72,7 @@ if (_TIDY_SEARCHES)
         endif ()
     else ()
         find_path(TIDY_INCLUDE_DIR
-          NAMES tidy.h
+          NAMES tidy/tidy.h
           PATHS ${_TIDY_SEARCHES}
           PATH_SUFFIXES include
           NO_DEFAULT_PATH)
@@ -87,7 +87,7 @@ endif ()
 if (NOT TIDY_LIBRARY OR NOT TIDY_INCLUDE_DIR)
     message(STATUS "+++ Default search with no search paths")
     find_path(TIDY_INCLUDE_DIR
-        NAMES tidy.h
+        NAMES tidy/tidy.h
         PATH_SUFFIXES include
     )
     find_library(TIDY_LIBRARY
Index: trunk/src/html-tidy.c
===================================================================
--- trunk.orig/src/html-tidy.c
+++ trunk/src/html-tidy.c
@@ -11,8 +11,8 @@ edbrowse bool true false.
 
 #include "eb.h"
 
-#include <tidy.h>
-#include <tidybuffio.h>
+#include <tidy/tidy.h>
+#include <tidy/buffio.h>
 
 /*********************************************************************
 This routine preprocesses the html text to work around
