diff --git a/plugins/Bookmarks/BookmarkWidget.cpp b/plugins/Bookmarks/BookmarkWidget.cpp
index 7b22ecf63..882d054d8 100644
--- a/plugins/Bookmarks/BookmarkWidget.cpp
+++ b/plugins/Bookmarks/BookmarkWidget.cpp
@@ -19,8 +19,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "BookmarkWidget.h"
 #include "BookmarksModel.h"
 #include "Expression.h"
-#include "edb.h"
 #include "IBreakpoint.h"
+#include "edb.h"
 #include <QInputDialog>
 #include <QMenu>
 #include <QMessageBox>
@@ -146,14 +146,14 @@ void BookmarkWidget::toggleBreakpoint() {
  * @brief BookmarkWidget::addConditionalBreakpoint
  */
 void BookmarkWidget::addConditionalBreakpoint() {
-	
+
 	const QItemSelectionModel *const selModel = ui.tableView->selectionModel();
 	const QModelIndexList selections          = selModel->selectedRows();
 
 	if (selections.size() == 1) {
 		bool ok;
 		const QString condition = QInputDialog::getText(this, tr("Set Breakpoint Condition"), tr("Expression:"), QLineEdit::Normal, QString(), &ok);
-		auto item = static_cast<BookmarksModel::Bookmark *>(selections[0].internalPointer());
+		auto item               = static_cast<BookmarksModel::Bookmark *>(selections[0].internalPointer());
 
 		if (ok) {
 			if (std::shared_ptr<IBreakpoint> bp = edb::v1::create_breakpoint(item->address)) {
@@ -165,7 +165,6 @@ void BookmarkWidget::addConditionalBreakpoint() {
 	}
 }
 
-
 /**
  * @brief BookmarkWidget::addAddress
  * @param address
@@ -230,7 +229,7 @@ void BookmarkWidget::on_tableView_customContextMenuRequested(const QPoint &pos)
 	QAction *const actionType    = menu.addAction(tr("Set &Type"));
 	menu.addAction(toggleBreakpointAction_);
 	menu.addAction(conditionalBreakpointAction_);
-	QAction *const chosen        = menu.exec(ui.tableView->mapToGlobal(pos));
+	QAction *const chosen = menu.exec(ui.tableView->mapToGlobal(pos));
 
 	if (chosen == actionAdd) {
 		buttonAddClicked();
diff --git a/plugins/Bookmarks/BookmarksModel.cpp b/plugins/Bookmarks/BookmarksModel.cpp
index 5aa7bc755..b29f141d6 100644
--- a/plugins/Bookmarks/BookmarksModel.cpp
+++ b/plugins/Bookmarks/BookmarksModel.cpp
@@ -75,7 +75,7 @@ QVariant BookmarksModel::data(const QModelIndex &index, int role) const {
 			// Return the address with symbol name, if there is one
 			const QString symname = edb::v1::find_function_symbol(bookmark.address);
 			const QString address = edb::v1::format_pointer(bookmark.address);
-			
+
 			if (!symname.isEmpty()) {
 				return tr("%1 <%2>").arg(address, symname);
 			}
@@ -107,7 +107,7 @@ QVariant BookmarksModel::data(const QModelIndex &index, int role) const {
 			// TODO: This is mostly copied from QDisassemblyView::drawSidebarElements, and both
 			// should really be factored out into a common location (although this uses icons
 			// and the other uses SVG renderers and painting).
-			const bool is_eip = (bookmark.address == edb::v1::instruction_pointer_address());
+			const bool is_eip         = (bookmark.address == edb::v1::instruction_pointer_address());
 			const bool has_breakpoint = (edb::v1::find_breakpoint(bookmark.address) != nullptr);
 
 			const QIcon *icon = nullptr;
diff --git a/plugins/Bookmarks/BookmarksModel.h b/plugins/Bookmarks/BookmarksModel.h
index 89a537966..ff7d309fe 100644
--- a/plugins/Bookmarks/BookmarksModel.h
+++ b/plugins/Bookmarks/BookmarksModel.h
@@ -21,8 +21,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "Types.h"
 #include <QAbstractItemModel>
-#include <QVector>
 #include <QIcon>
+#include <QVector>
 
 namespace BookmarksPlugin {
 
diff --git a/plugins/DebuggerCore/unix/Unix.cpp b/plugins/DebuggerCore/unix/Unix.cpp
index e26192176..85474fbb8 100644
--- a/plugins/DebuggerCore/unix/Unix.cpp
+++ b/plugins/DebuggerCore/unix/Unix.cpp
@@ -209,7 +209,7 @@ Status Unix::execute_process(const QString &path, const QString &cwd, const QLis
 
 		p = argv_pointers;
 		while (*p) {
-			delete[] * p++;
+			delete[] *p++;
 		}
 		delete[] argv_pointers;
 	}
diff --git a/plugins/FasLoader/Fas/Core.cpp b/plugins/FasLoader/Fas/Core.cpp
index e1913b1c4..3cdedd779 100644
--- a/plugins/FasLoader/Fas/Core.cpp
+++ b/plugins/FasLoader/Fas/Core.cpp
@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-
 #include "Core.hpp"
 #include "Exception.hpp"
 #include <QtDebug>
diff --git a/plugins/FasLoader/Fas/Core.hpp b/plugins/FasLoader/Fas/Core.hpp
index c63314740..6ab426741 100644
--- a/plugins/FasLoader/Fas/Core.hpp
+++ b/plugins/FasLoader/Fas/Core.hpp
@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-
 #ifndef FAS_CORE_H_
 #define FAS_CORE_H_
 
diff --git a/plugins/FasLoader/Fas/Header.hpp b/plugins/FasLoader/Fas/Header.hpp
index 9f6482366..4a8b172e9 100644
--- a/plugins/FasLoader/Fas/Header.hpp
+++ b/plugins/FasLoader/Fas/Header.hpp
@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-
 #ifndef FAS_HEADER_H_
 #define FAS_HEADER_H_
 
diff --git a/plugins/FasLoader/Fas/PluginSymbol.hpp b/plugins/FasLoader/Fas/PluginSymbol.hpp
index bae78829b..499b6895b 100644
--- a/plugins/FasLoader/Fas/PluginSymbol.hpp
+++ b/plugins/FasLoader/Fas/PluginSymbol.hpp
@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-
 #ifndef FAS_PLUGIN_SYMBOL_H_
 #define FAS_PLUGIN_SYMBOL_H_
 
diff --git a/plugins/FasLoader/Fas/Symbol.hpp b/plugins/FasLoader/Fas/Symbol.hpp
index 6c34eabc7..e377c2684 100644
--- a/plugins/FasLoader/Fas/Symbol.hpp
+++ b/plugins/FasLoader/Fas/Symbol.hpp
@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-
 #ifndef FAS_SYMBOL_H_
 #define FAS_SYMBOL_H_