diff --git a/include/SQLiteCpp/Database.h b/include/SQLiteCpp/Database.h
index 850e93eb..cc158115 100644
--- a/include/SQLiteCpp/Database.h
+++ b/include/SQLiteCpp/Database.h
@@ -14,7 +14,7 @@
 
 // c++17: MinGW GCC version > 8
 // c++17: Visual Studio 2017 version 15.7
-#if ((__cplusplus >= 201703L) && ((!defined(__MINGW32__) && !defined(__MINGW64__)) || (__GNUC__ > 8))) || (defined(_MSVC_LANG) && (_MSVC_LANG >= 201703L))
+#if ((__cplusplus >= 201703L) && ((!defined(__MINGW32__) && !defined(__MINGW64__)) || (__GNUC__ > 8))) || (defined(_MSVC_LANG) && (_MSVC_LANG >= 201703L)) // NOLINT
 #include  <filesystem>
 #endif // c++17
 
@@ -169,7 +169,7 @@ class Database
 
     // c++17: MinGW GCC version > 8
     // c++17: Visual Studio 2017 version 15.7
-    #if ((__cplusplus >= 201703L) && ((!defined(__MINGW32__) && !defined(__MINGW64__)) || (__GNUC__ > 8))) || (defined(_MSVC_LANG) && (_MSVC_LANG >= 201703L))
+    #if ((__cplusplus >= 201703L) && ((!defined(__MINGW32__) && !defined(__MINGW64__)) || (__GNUC__ > 8))) || (defined(_MSVC_LANG) && (_MSVC_LANG >= 201703L)) // NOLINT
 
     /**
      * @brief Open the provided database std::filesystem::path.
diff --git a/src/Database.cpp b/src/Database.cpp
index e47b9132..eb76c885 100644
--- a/src/Database.cpp
+++ b/src/Database.cpp
@@ -154,12 +154,12 @@ bool Database::tableExists(const char* apTableName)
 long long Database::getLastInsertRowid() const noexcept
 {
     return sqlite3_last_insert_rowid(getHandle());
-}
-
+}
+
 // Get number of rows modified by last INSERT, UPDATE or DELETE statement (not DROP table).
-int Database::getChanges() const noexcept
-{
-    return sqlite3_changes(getHandle());
+int Database::getChanges() const noexcept
+{
+    return sqlite3_changes(getHandle());
 }
 
 // Get total number of rows modified by all INSERT, UPDATE or DELETE statement since connection.
diff --git a/src/Statement.cpp b/src/Statement.cpp
index 150a7d9e..0b9b3e5b 100644
--- a/src/Statement.cpp
+++ b/src/Statement.cpp
@@ -308,12 +308,12 @@ const char * Statement::getColumnDeclaredType(const int aIndex) const
     {
         return result;
     }
-}
-
+}
+
 // Get number of rows modified by last INSERT, UPDATE or DELETE statement (not DROP table).
-int Statement::getChanges() const noexcept
-{
-    return sqlite3_changes(mStmtPtr);
+int Statement::getChanges() const noexcept
+{
+    return sqlite3_changes(mStmtPtr);
 }
 
 int Statement::getBindParameterCount() const noexcept