5 files changed, 21 insertions, 5 deletions
diff --git a/source/slang/slang-ast-expr.h b/source/slang/slang-ast-expr.h
index 32c724e10..adbc7a2ba 100644
--- a/source/slang/slang-ast-expr.h
+++ b/source/slang/slang-ast-expr.h
@@ -2,6 +2,8 @@
 #pragma once
 
 #include "slang-ast-base.h"
+
+//
 #include "slang-ast-expr.h.fiddle"
 
 FIDDLE()
diff --git a/source/slang/slang-ast-modifier.h b/source/slang/slang-ast-modifier.h
index b5fa25418..2f9c29d6c 100644
--- a/source/slang/slang-ast-modifier.h
+++ b/source/slang/slang-ast-modifier.h
@@ -2,9 +2,11 @@
 #pragma once
 
 #include "slang-ast-base.h"
-#include "slang-ast-modifier.h.fiddle"
 #include "slang-ir-insts-enum.h"
 
+//
+#include "slang-ast-modifier.h.fiddle"
+
 FIDDLE()
 namespace Slang
 {
diff --git a/source/slang/slang-ast-stmt.h b/source/slang/slang-ast-stmt.h
index f5436a70e..485ddd439 100644
--- a/source/slang/slang-ast-stmt.h
+++ b/source/slang/slang-ast-stmt.h
@@ -2,6 +2,8 @@
 #pragma once
 
 #include "slang-ast-base.h"
+
+//
 #include "slang-ast-stmt.h.fiddle"
 
 FIDDLE()
diff --git a/source/slang/slang-ast-val.h b/source/slang/slang-ast-val.h
index f371d76fe..a381410b6 100644
--- a/source/slang/slang-ast-val.h
+++ b/source/slang/slang-ast-val.h
@@ -3,6 +3,8 @@
 
 #include "slang-ast-base.h"
 #include "slang-ast-decl.h"
+
+//
 #include "slang-ast-val.h.fiddle"
 
 FIDDLE()
diff --git a/tools/slang-fiddle/README.md b/tools/slang-fiddle/README.md
index 2ae57c8e3..0ccb64075 100644
--- a/tools/slang-fiddle/README.md
+++ b/tools/slang-fiddle/README.md
@@ -9,7 +9,7 @@ Invoking Fiddle
 
 Fiddle gets invoked from the command line with a command line like:
 
-```
+```sh
 slang-fiddle -i source/ -o generated/ a.cpp b.h c.h d.cpp ...
 ```
 
@@ -51,7 +51,7 @@ During the scraping step, Fiddle will run the Slang lexer on each of the input f
 
 Putting `FIDDLE()` in front of an ordinary C++ `class`, `struct`, or `namespace` declaration tells Fiddle that it should include that C++ construct in the model of the program that it scrapes. For example, given this input:
 
-```
+```cpp
 FIDDLE()
 namespace MyProgram
 {
@@ -68,7 +68,7 @@ Fiddle will include the `MyProgram` namespace and the `MyProgram::A` type in its
 
 A programmer can place Fiddle-specific modifiers inside the `FIDDLE()` invocation before a type, to apply those modifiers to the model of that type:
 
-```
+```cpp
 FIDDLE(abstract)
 class Thing { /* ... */ };
 
@@ -78,7 +78,7 @@ class ConcreteThing : public Thing { /* ... */ }
 
 One important constraint is that any `struct` or `class` type marked with `FIDDLE()` *must* have an invocation of the form `FIDDLE(...)` (that is, `FIDDLE` applied to an actual ellipsis `...`) as the first item after the opening curly brace for its body:
 
-```
+```cpp
 FIDDLE()
 struct A
 {
@@ -98,6 +98,14 @@ Note again that Fiddle will *ignore* any fields not marked with `FIDDLE()`, so b
 In order for Fiddle to provide the macros that each `FIDDLE()` invocation expands into, any input file that includes invocations of `FIDDLE()` *must* also `#include` the corresponding generated file.
 For example, the input file `a.cpp` should `#include "a.cpp.fiddle"`.
 The `#include` of the generated output file should come *after* any other `#include`s, to make sure that any `.h` files that also use `FIDDLE()` don't cause confusion.
+Because `clang-format` automatically reorders `#include`s, you must separate this one from the others by preceding it with a blank line followed by an empty comment line:
+
+```cpp
+#include "something-else.h"
+
+//
+#include "a.cpp.fiddle"
+```
 
 Text Templates
 --------------