[aat] Move contents of hb-aat.h to hb-aat-layout.h

Since it was pages and pages...

src/Makefile.sources

@@ -182,6 +182,7 @@ HB_OT_RAGEL_sources = \
 
 HB_OT_headers = \
 	hb-aat.h \
+	hb-aat-layout.h \
 	hb-ot.h \
 	hb-ot-color.h \
 	hb-ot-font.h \

src/hb-aat-layout.cc

@@ -28,7 +28,6 @@
 #include "hb-open-type.hh"
 
 #include "hb-ot-face.hh"
-#include "hb-aat.h"
 #include "hb-aat-layout.hh"
 #include "hb-aat-layout-ankr-table.hh"
 #include "hb-aat-layout-bsln-table.hh" // Just so we compile it; unused otherwise.

src/hb-aat-layout.hh

@@ -29,7 +29,6 @@
 
 #include "hb.hh"
 
-#include "hb-aat.h"
 #include "hb-ot-shape.hh"
 
 

src/hb-aat-map.hh

@@ -28,7 +28,6 @@
 #define HB_AAT_MAP_HH
 
 #include "hb.hh"
-#include "hb-aat.h"
 
 
 struct hb_aat_map_t

src/hb.hh

@@ -47,6 +47,8 @@
 #define HB_H_IN
 #include "hb-ot.h"
 #define HB_OT_H_IN
+#include "hb-aat.h"
+#define HB_AAT_H_IN
 
 #include "hb-aat.h"