diff --git a/src/core/ArgumentParser.h b/src/core/ArgumentParser.h
index b03f976bb..6e131ce9d 100644
--- a/src/core/ArgumentParser.h
+++ b/src/core/ArgumentParser.h
@@ -15,8 +15,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef KEEPASSX_ARGUMENT_PARSER_H
-#define KEEPASSX_ARGUMENT_PARSER_H
+#ifndef KEEPASSX_ARGUMENTPARSER_H
+#define KEEPASSX_ARGUMENTPARSER_H
 
 #include "core/Global.h"
 
@@ -25,7 +25,6 @@
 
 class ArgumentParser
 {
-
 public:
     static QHash<QString, QString> parseArguments(const QStringList& args);
 
@@ -35,4 +34,4 @@ private:
     static const QStringList ArgumentKeys;
 };
 
-#endif // KEEPASSX_ARGUMENT_PARSER_H
+#endif // KEEPASSX_ARGUMENTPARSER_H
diff --git a/src/crypto/Random.h b/src/crypto/Random.h
index 813c359b6..038ae7aea 100644
--- a/src/crypto/Random.h
+++ b/src/crypto/Random.h
@@ -48,7 +48,7 @@ public:
     static void createWithBackend(RandomBackend* backend);
 
 private:
-    Random(RandomBackend* backend);
+    explicit Random(RandomBackend* backend);
 
     QScopedPointer<RandomBackend> m_backend;
     static Random* m_instance;
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 390b68752..3f956a638 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -402,7 +402,8 @@ void MainWindow::closeEvent(QCloseEvent* event)
     bool openPreviousDatabasesOnStartup = config()->get("OpenPreviousDatabasesOnStartup").toBool();
 
     if (openPreviousDatabasesOnStartup) {
-        connect(m_ui->tabWidget, SIGNAL(databaseWithFileClosed(QString)), this, SLOT(rememberOpenDatabases(QString)));
+        connect(m_ui->tabWidget, SIGNAL(databaseWithFileClosed(QString)),
+                this, SLOT(rememberOpenDatabases(QString)));
     }
 
     if (!m_ui->tabWidget->closeAllDatabases()) {
@@ -413,7 +414,8 @@ void MainWindow::closeEvent(QCloseEvent* event)
     }
 
     if (openPreviousDatabasesOnStartup) {
-        disconnect(m_ui->tabWidget, SIGNAL(databaseWithFileClosed(QString)), this, SLOT(rememberOpenDatabases(QString)));
+        disconnect(m_ui->tabWidget, SIGNAL(databaseWithFileClosed(QString)),
+                   this, SLOT(rememberOpenDatabases(QString)));
         config()->set("LastOpenedDatabases", m_openDatabases);
     }
 }
diff --git a/src/gui/MessageBox.cpp b/src/gui/MessageBox.cpp
index 643ceb0e5..40912b7e9 100644
--- a/src/gui/MessageBox.cpp
+++ b/src/gui/MessageBox.cpp
@@ -83,4 +83,3 @@ void MessageBox::setNextAnswer(QMessageBox::StandardButton button)
 {
     m_nextAnswer = button;
 }
-
diff --git a/src/gui/SettingsWidget.cpp b/src/gui/SettingsWidget.cpp
index ede6cda95..d052964a4 100644
--- a/src/gui/SettingsWidget.cpp
+++ b/src/gui/SettingsWidget.cpp
@@ -53,7 +53,8 @@ SettingsWidget::~SettingsWidget()
 void SettingsWidget::loadSettings()
 {
     m_generalUi->rememberLastDatabasesCheckBox->setChecked(config()->get("RememberLastDatabases").toBool());
-    m_generalUi->openPreviousDatabasesOnStartupCheckBox->setChecked(config()->get("OpenPreviousDatabasesOnStartup").toBool());
+    m_generalUi->openPreviousDatabasesOnStartupCheckBox->setChecked(
+        config()->get("OpenPreviousDatabasesOnStartup").toBool());
     m_generalUi->modifiedExpandedChangedCheckBox->setChecked(config()->get("ModifiedOnExpandedStateChanges").toBool());
     m_generalUi->autoSaveAfterEveryChangeCheckBox->setChecked(config()->get("AutoSaveAfterEveryChange").toBool());
     m_generalUi->autoSaveOnExitCheckBox->setChecked(config()->get("AutoSaveOnExit").toBool());
diff --git a/tests/TestArgumentParser.cpp b/tests/TestArgumentParser.cpp
index fd8d8fd19..753fa0c40 100644
--- a/tests/TestArgumentParser.cpp
+++ b/tests/TestArgumentParser.cpp
@@ -55,7 +55,8 @@ void TestArgumentParser::testFilename()
 
 void TestArgumentParser::testMultipleArguments()
 {
-    parse(QStringList() << "--config" << "myconfig.ini" << "--filename" << "myfilename" << "--password" << "mypassword");
+    parse(QStringList() << "--config" << "myconfig.ini" << "--filename" << "myfilename"
+          << "--password" << "mypassword");
 
     QCOMPARE(argumentMap.size(), 3);
     QCOMPARE(argumentMap.value("config"), QString("myconfig.ini"));
diff --git a/tests/TestArgumentParser.h b/tests/TestArgumentParser.h
index 9ac8f2a2d..2f00351d3 100644
--- a/tests/TestArgumentParser.h
+++ b/tests/TestArgumentParser.h
@@ -15,8 +15,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef KEEPASSX_TEST_ARGUMENT_PARSER_H
-#define KEEPASSX_TEST_ARGUMENT_PARSER_H
+#ifndef KEEPASSX_TESTARGUMENTPARSER_H
+#define KEEPASSX_TESTARGUMENTPARSER_H
 
 #include <QHash>
 #include <QObject>
@@ -37,7 +37,6 @@ private:
     void parse(const QStringList& arguments);
 
     QHash<QString, QString> argumentMap;
-
 };
 
-#endif // KEEPASSX_TEST_ARGUMENT_PARSER_H
+#endif // KEEPASSX_TESTARGUMENTPARSER_H