10 files changed, 10 insertions, 20 deletions
diff --git a/lib/csapi/definitions/auth_data.h b/lib/csapi/definitions/auth_data.h
index 0c206e2c..0ad72b87 100644
--- a/lib/csapi/definitions/auth_data.h
+++ b/lib/csapi/definitions/auth_data.h
@@ -4,10 +4,9 @@
 
 #pragma once
 
-
-
 #include "converters.h"
 
+
 namespace QMatrixClient
 {
     // Data structures
diff --git a/lib/csapi/definitions/client_device.h b/lib/csapi/definitions/client_device.h
index 4ed46a52..ba65483d 100644
--- a/lib/csapi/definitions/client_device.h
+++ b/lib/csapi/definitions/client_device.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-
 #include "converters.h"
 
 #include "converters.h"
diff --git a/lib/csapi/definitions/device_keys.h b/lib/csapi/definitions/device_keys.h
index d74c9259..4b223609 100644
--- a/lib/csapi/definitions/device_keys.h
+++ b/lib/csapi/definitions/device_keys.h
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "converters.h"
 
 #include <QtCore/QHash>
 
-#include "converters.h"
-
 namespace QMatrixClient
 {
     // Data structures
diff --git a/lib/csapi/definitions/event_filter.h b/lib/csapi/definitions/event_filter.h
index 4f5b00f9..76f08319 100644
--- a/lib/csapi/definitions/event_filter.h
+++ b/lib/csapi/definitions/event_filter.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-
 #include "converters.h"
 
 #include "converters.h"
diff --git a/lib/csapi/definitions/push_condition.h b/lib/csapi/definitions/push_condition.h
index 83f63183..99d7083c 100644
--- a/lib/csapi/definitions/push_condition.h
+++ b/lib/csapi/definitions/push_condition.h
@@ -4,10 +4,9 @@
 
 #pragma once
 
-
-
 #include "converters.h"
 
+
 namespace QMatrixClient
 {
     // Data structures
diff --git a/lib/csapi/definitions/push_rule.h b/lib/csapi/definitions/push_rule.h
index d7f93e41..c6542aa6 100644
--- a/lib/csapi/definitions/push_rule.h
+++ b/lib/csapi/definitions/push_rule.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include "converters.h"
 
 #include "csapi/definitions/push_condition.h"
 #include "converters.h"
@@ -11,8 +12,6 @@
 #include <QtCore/QVariant>
 #include <QtCore/QJsonObject>
 
-#include "converters.h"
-
 namespace QMatrixClient
 {
     // Data structures
diff --git a/lib/csapi/definitions/push_ruleset.h b/lib/csapi/definitions/push_ruleset.h
index 5e8bc02d..a5e9ff2c 100644
--- a/lib/csapi/definitions/push_ruleset.h
+++ b/lib/csapi/definitions/push_ruleset.h
@@ -4,13 +4,12 @@
 
 #pragma once
 
+#include "converters.h"
 
 #include <QtCore/QVector>
 #include "converters.h"
 #include "csapi/definitions/push_rule.h"
 
-#include "converters.h"
-
 namespace QMatrixClient
 {
     // Data structures
diff --git a/lib/csapi/definitions/room_event_filter.h b/lib/csapi/definitions/room_event_filter.h
index 38b3e50f..3252af30 100644
--- a/lib/csapi/definitions/room_event_filter.h
+++ b/lib/csapi/definitions/room_event_filter.h
@@ -4,10 +4,9 @@
 
 #pragma once
 
-
-#include "csapi/definitions/event_filter.h"
 #include "converters.h"
 
+#include "csapi/definitions/event_filter.h"
 #include "converters.h"
 
 namespace QMatrixClient
diff --git a/lib/csapi/definitions/sync_filter.h b/lib/csapi/definitions/sync_filter.h
index c4393596..7f48f02c 100644
--- a/lib/csapi/definitions/sync_filter.h
+++ b/lib/csapi/definitions/sync_filter.h
@@ -4,13 +4,12 @@
 
 #pragma once
 
+#include "converters.h"
 
 #include "csapi/definitions/room_event_filter.h"
 #include "converters.h"
 #include "csapi/definitions/event_filter.h"
 
-#include "converters.h"
-
 namespace QMatrixClient
 {
     // Data structures
diff --git a/lib/csapi/{{base}}.h.mustache b/lib/csapi/{{base}}.h.mustache
index 7e2ca9d4..0b7de817 100644
--- a/lib/csapi/{{base}}.h.mustache
+++ b/lib/csapi/{{base}}.h.mustache
@@ -2,11 +2,10 @@
 #pragma once
 
 {{#operations}}#include "jobs/basejob.h"
-{{/operations}}
-{{#imports}}#include {{_}}
-{{/imports}}{{#models}}
-#include "converters.h"
+{{/operations}}{{#models}}#include "converters.h"
 {{/models}}
+{{#imports}}#include {{_}}
+{{/imports}}
 namespace QMatrixClient
 {
 {{#models}}    // Data structures