diff --git a/cockatrice/src/filters/deck_filter_string.cpp b/cockatrice/src/filters/deck_filter_string.cpp
index 4d5266c38..f45115edd 100644
--- a/cockatrice/src/filters/deck_filter_string.cpp
+++ b/cockatrice/src/filters/deck_filter_string.cpp
@@ -1,9 +1,9 @@
 #include "deck_filter_string.h"
 
-#include <libcockatrice/utility/peglib.h>
 #include "filter_string.h"
 
 #include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/utility/peglib.h>
 
 static peg::parser search(R"(
 Start <- QueryPartList
diff --git a/cockatrice/src/filters/filter_string.cpp b/cockatrice/src/filters/filter_string.cpp
index fab359d9c..3615729f0 100644
--- a/cockatrice/src/filters/filter_string.cpp
+++ b/cockatrice/src/filters/filter_string.cpp
@@ -1,12 +1,11 @@
 #include "filter_string.h"
 
-#include <libcockatrice/utility/peglib.h>
-
 #include <QByteArray>
 #include <QDebug>
 #include <QRegularExpression>
 #include <QString>
 #include <functional>
+#include <libcockatrice/utility/peglib.h>
 
 static peg::parser search(R"(
 Start <- QueryPartList
diff --git a/cockatrice/src/game/zones/view_zone.cpp b/cockatrice/src/game/zones/view_zone.cpp
index b57689447..d5eea9dfe 100644
--- a/cockatrice/src/game/zones/view_zone.cpp
+++ b/cockatrice/src/game/zones/view_zone.cpp
@@ -112,7 +112,7 @@ void ZoneViewZone::zoneDumpReceived(const Response &r)
 
     qobject_cast<ZoneViewZoneLogic *>(getLogic())->updateCardIds(ZoneViewZoneLogic::INITIALIZE);
     reorganizeCards();
-    emit getLogic() -> cardCountChanged();
+    emit getLogic()->cardCountChanged();
 }
 
 // Because of boundingRect(), this function must not be called before the zone was added to a scene.
diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp
index e61d60b3d..14b824eb3 100644
--- a/cockatrice/src/main.cpp
+++ b/cockatrice/src/main.cpp
@@ -29,7 +29,6 @@
 #include "interface/window_main.h"
 #include "version_string.h"
 
-#include <libcockatrice/protocol/featureset.h>
 #include <QApplication>
 #include <QCryptographicHash>
 #include <QDateTime>
@@ -42,6 +41,7 @@
 #include <QTextStream>
 #include <QTranslator>
 #include <QtPlugin>
+#include <libcockatrice/protocol/featureset.h>
 #include <libcockatrice/rng/rng_sfmt.h>
 #include <libcockatrice/settings/cache_settings.h>
 #include <libcockatrice/utility/logger.h>