diff --git a/src/Makefile.sources b/src/Makefile.sources
index f72abcc47..aef03248c 100644
--- a/src/Makefile.sources
+++ b/src/Makefile.sources
@@ -118,8 +118,8 @@ HB_BASE_sources = \
 	OT/Layout/GSUB/ExtensionSubst.hh \
 	OT/Layout/GSUB/SubstLookupSubTable.hh \
 	OT/Layout/GSUB/SubstLookup.hh \
-	OT/Layout/GSUB.hh \
-	OT/Layout/GPOS.hh \
+	OT/Layout/GSUB/GSUB.hh \
+	OT/Layout/GPOS/GPOS.hh \
 	OT/Layout/GPOS/CursivePosFormat1.hh \
 	OT/Layout/GPOS/MarkLigPos.hh \
 	OT/Layout/GPOS/PairPos.hh \
diff --git a/src/OT/Layout/GPOS.hh b/src/OT/Layout/GPOS/GPOS.hh
similarity index 95%
rename from src/OT/Layout/GPOS.hh
rename to src/OT/Layout/GPOS/GPOS.hh
index 224d6b746..7fb97d756 100644
--- a/src/OT/Layout/GPOS.hh
+++ b/src/OT/Layout/GPOS/GPOS.hh
@@ -1,10 +1,10 @@
-#ifndef OT_LAYOUT_GPOS_HH
-#define OT_LAYOUT_GPOS_HH
+#ifndef OT_LAYOUT_GPOS_GPOS_HH
+#define OT_LAYOUT_GPOS_GPOS_HH
 
-#include "../../hb-ot-layout-common.hh"
-#include "../../hb-ot-layout-gsubgpos.hh"
-#include "GPOS/Common.hh"
-#include "GPOS/PosLookup.hh"
+#include "../../../hb-ot-layout-common.hh"
+#include "../../../hb-ot-layout-gsubgpos.hh"
+#include "Common.hh"
+#include "PosLookup.hh"
 
 namespace OT {
 namespace Layout {
@@ -162,4 +162,4 @@ struct GPOS_accelerator_t : Layout::GPOS::accelerator_t {
 
 }
 
-#endif  /* OT_LAYOUT_GPOS_HH */
+#endif  /* OT_LAYOUT_GPOS_GPOS_HH */
diff --git a/src/OT/Layout/GSUB.hh b/src/OT/Layout/GSUB/GSUB.hh
similarity index 87%
rename from src/OT/Layout/GSUB.hh
rename to src/OT/Layout/GSUB/GSUB.hh
index d274b26fc..372862e2b 100644
--- a/src/OT/Layout/GSUB.hh
+++ b/src/OT/Layout/GSUB/GSUB.hh
@@ -1,9 +1,9 @@
-#ifndef OT_LAYOUT_GSUB_HH
-#define OT_LAYOUT_GSUB_HH
+#ifndef OT_LAYOUT_GSUB_GSUB_HH
+#define OT_LAYOUT_GSUB_GSUB_HH
 
-#include "../../hb-ot-layout-gsubgpos.hh"
-#include "GSUB/Common.hh"
-#include "GSUB/SubstLookup.hh"
+#include "../../../hb-ot-layout-gsubgpos.hh"
+#include "Common.hh"
+#include "SubstLookup.hh"
 
 using OT::Layout::GSUB_impl::SubstLookup;
 
@@ -54,4 +54,4 @@ struct GSUB_accelerator_t : Layout::GSUB::accelerator_t {
 
 }
 
-#endif  /* OT_LAYOUT_GSUB_HH */
+#endif  /* OT_LAYOUT_GSUB_GSUB_HH */
diff --git a/src/hb-ot-layout-gpos-table.hh b/src/hb-ot-layout-gpos-table.hh
index 064d31cdf..f5059cfa8 100644
--- a/src/hb-ot-layout-gpos-table.hh
+++ b/src/hb-ot-layout-gpos-table.hh
@@ -29,7 +29,7 @@
 #ifndef HB_OT_LAYOUT_GPOS_TABLE_HH
 #define HB_OT_LAYOUT_GPOS_TABLE_HH
 
-#include "OT/Layout/GPOS.hh"
+#include "OT/Layout/GPOS/GPOS.hh"
 
 namespace OT {
 
diff --git a/src/hb-ot-layout-gsub-table.hh b/src/hb-ot-layout-gsub-table.hh
index d6e53d13d..1eca613b6 100644
--- a/src/hb-ot-layout-gsub-table.hh
+++ b/src/hb-ot-layout-gsub-table.hh
@@ -29,7 +29,7 @@
 #ifndef HB_OT_LAYOUT_GSUB_TABLE_HH
 #define HB_OT_LAYOUT_GSUB_TABLE_HH
 
-#include "OT/Layout/GSUB.hh"
+#include "OT/Layout/GSUB/GSUB.hh"
 
 namespace OT {
 
diff --git a/src/meson.build b/src/meson.build
index f9934c86b..ace0df244 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -122,8 +122,8 @@ hb_base_sources = files(
   'OT/Layout/GSUB/ExtensionSubst.hh',
   'OT/Layout/GSUB/SubstLookupSubTable.hh',
   'OT/Layout/GSUB/SubstLookup.hh',
-  'OT/Layout/GSUB.hh',
-  'OT/Layout/GPOS.hh',
+  'OT/Layout/GSUB/GSUB.hh',
+  'OT/Layout/GPOS/GPOS.hh',
   'OT/Layout/GPOS/CursivePosFormat1.hh',
   'OT/Layout/GPOS/MarkLigPos.hh',
   'OT/Layout/GPOS/PairPos.hh',