diff --git a/lib/check.h b/lib/check.h
index f1d8013fd..c4f74b4b3 100644
--- a/lib/check.h
+++ b/lib/check.h
@@ -155,4 +155,3 @@ inline Check::Check(const std::string &aname)
 /// @}
 
 #endif
-
diff --git a/lib/check64bit.h b/lib/check64bit.h
index 70165697d..7b926a02a 100644
--- a/lib/check64bit.h
+++ b/lib/check64bit.h
@@ -88,4 +88,3 @@ private:
 /// @}
 //---------------------------------------------------------------------------
 #endif
-
diff --git a/lib/checkassignif.h b/lib/checkassignif.h
index 2d4c2242d..e72438ba4 100644
--- a/lib/checkassignif.h
+++ b/lib/checkassignif.h
@@ -95,4 +95,3 @@ private:
 /// @}
 //---------------------------------------------------------------------------
 #endif
-
diff --git a/lib/checkautovariables.h b/lib/checkautovariables.h
index ed3d74f72..57caf66f4 100644
--- a/lib/checkautovariables.h
+++ b/lib/checkautovariables.h
@@ -110,4 +110,3 @@ private:
 /// @}
 //---------------------------------------------------------------------------
 #endif
-
diff --git a/lib/checkboost.h b/lib/checkboost.h
index 9c3ed6e89..f00efeaa0 100644
--- a/lib/checkboost.h
+++ b/lib/checkboost.h
@@ -76,4 +76,3 @@ private:
 /// @}
 //---------------------------------------------------------------------------
 #endif
-
diff --git a/lib/checkbufferoverrun.cpp b/lib/checkbufferoverrun.cpp
index 723879c98..2fb958b77 100644
--- a/lib/checkbufferoverrun.cpp
+++ b/lib/checkbufferoverrun.cpp
@@ -315,7 +315,7 @@ static bool for_condition(const Token *tok2, unsigned int varid, std::string &mi
         while (tok2 && tok2->str() != ";") {
             if (tok2->str() == "(")
                 tok2 = tok2->link();
-            else if (tok2->str() == ")")	// unexpected ")" => break
+            else if (tok2->str() == ")")    // unexpected ")" => break
                 break;
             if (tok2->str() == "&&" || tok2->str() == "||") {
                 if (for_condition(tok2->next(), varid, min_value, max_value, maxMinFlipped))
diff --git a/lib/checkbufferoverrun.h b/lib/checkbufferoverrun.h
index 23d99af01..1f6b530bd 100644
--- a/lib/checkbufferoverrun.h
+++ b/lib/checkbufferoverrun.h
@@ -221,7 +221,7 @@ private:
     void bufferNotZeroTerminatedError(const Token *tok, const std::string &varname, const std::string &function);
     void negativeIndexError(const Token *tok, MathLib::bigint index);
     void cmdLineArgsError(const Token *tok);
-    void pointerOutOfBoundsError(const Token *tok, const std::string &object);	// UB when result of calculation is out of bounds
+    void pointerOutOfBoundsError(const Token *tok, const std::string &object);  // UB when result of calculation is out of bounds
     void arrayIndexThenCheckError(const Token *tok, const std::string &indexName);
     void possibleBufferOverrunError(const Token *tok, const std::string &src, const std::string &dst, bool cat);
     void possibleReadlinkBufferOverrunError(const Token *tok, const std::string &funcname, const std::string &varname);
@@ -258,6 +258,3 @@ private:
 /// @}
 //---------------------------------------------------------------------------
 #endif
-
-
-
diff --git a/lib/checkclass.h b/lib/checkclass.h
index 09e36a4ef..2a9da018a 100644
--- a/lib/checkclass.h
+++ b/lib/checkclass.h
@@ -251,4 +251,3 @@ private:
 /// @}
 //---------------------------------------------------------------------------
 #endif
-
diff --git a/lib/checkexceptionsafety.h b/lib/checkexceptionsafety.h
index 332280047..6ec58eede 100644
--- a/lib/checkexceptionsafety.h
+++ b/lib/checkexceptionsafety.h
@@ -126,4 +126,3 @@ private:
 /// @}
 //---------------------------------------------------------------------------
 #endif
-
diff --git a/lib/checkleakautovar.h b/lib/checkleakautovar.h
index 51a0f5800..687f0461e 100644
--- a/lib/checkleakautovar.h
+++ b/lib/checkleakautovar.h
@@ -134,4 +134,3 @@ private:
 /// @}
 //---------------------------------------------------------------------------
 #endif
-
diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
index a4cd2778e..8e818af9b 100644
--- a/lib/checkmemoryleak.cpp
+++ b/lib/checkmemoryleak.cpp
@@ -2739,4 +2739,3 @@ void CheckMemoryLeakNoVar::functionCallLeak(const Token *loc, const std::string
 {
     reportError(loc, Severity::error, "leakNoVarFunctionCall", "Allocation with " + alloc + ", " + functionCall + " doesn't release it.");
 }
-
diff --git a/lib/checknonreentrantfunctions.cpp b/lib/checknonreentrantfunctions.cpp
index 7fb1946b5..f4a4addcb 100644
--- a/lib/checknonreentrantfunctions.cpp
+++ b/lib/checknonreentrantfunctions.cpp
@@ -66,4 +66,3 @@ void CheckNonReentrantFunctions::nonReentrantFunctions()
     }
 }
 //---------------------------------------------------------------------------
-
diff --git a/lib/checknonreentrantfunctions.h b/lib/checknonreentrantfunctions.h
index 95389a49a..873f99a72 100644
--- a/lib/checknonreentrantfunctions.h
+++ b/lib/checknonreentrantfunctions.h
@@ -108,4 +108,3 @@ private:
 /// @}
 //---------------------------------------------------------------------------
 #endif
-
diff --git a/lib/checknullpointer.h b/lib/checknullpointer.h
index e18c47abb..fc43bbb19 100644
--- a/lib/checknullpointer.h
+++ b/lib/checknullpointer.h
@@ -155,4 +155,3 @@ private:
 /// @}
 //---------------------------------------------------------------------------
 #endif
-
diff --git a/lib/checkobsoletefunctions.cpp b/lib/checkobsoletefunctions.cpp
index eafc89fec..e2d4728b9 100644
--- a/lib/checkobsoletefunctions.cpp
+++ b/lib/checkobsoletefunctions.cpp
@@ -84,4 +84,3 @@ void CheckObsoleteFunctions::obsoleteFunctions()
     }
 }
 //---------------------------------------------------------------------------
-
diff --git a/lib/checkobsoletefunctions.h b/lib/checkobsoletefunctions.h
index d9885d41d..764e47d81 100644
--- a/lib/checkobsoletefunctions.h
+++ b/lib/checkobsoletefunctions.h
@@ -146,4 +146,3 @@ private:
 /// @}
 //---------------------------------------------------------------------------
 #endif
-
diff --git a/lib/checkother.h b/lib/checkother.h
index c08d46b23..91c7a37a3 100644
--- a/lib/checkother.h
+++ b/lib/checkother.h
@@ -479,4 +479,3 @@ private:
 /// @}
 //---------------------------------------------------------------------------
 #endif
-
diff --git a/lib/checkpostfixoperator.h b/lib/checkpostfixoperator.h
index 8d47aba39..ccab4c069 100644
--- a/lib/checkpostfixoperator.h
+++ b/lib/checkpostfixoperator.h
@@ -74,4 +74,3 @@ private:
 /// @}
 //---------------------------------------------------------------------------
 #endif
-
diff --git a/lib/checkstl.h b/lib/checkstl.h
index 7cd5cdc3c..55f370293 100644
--- a/lib/checkstl.h
+++ b/lib/checkstl.h
@@ -232,4 +232,3 @@ private:
 /// @}
 //---------------------------------------------------------------------------
 #endif
-
diff --git a/lib/checkuninitvar.h b/lib/checkuninitvar.h
index 9d025646b..915d5ce7c 100644
--- a/lib/checkuninitvar.h
+++ b/lib/checkuninitvar.h
@@ -108,4 +108,3 @@ private:
 /// @}
 //---------------------------------------------------------------------------
 #endif
-
diff --git a/lib/checkunusedfunctions.h b/lib/checkunusedfunctions.h
index f97f1e574..381a02277 100644
--- a/lib/checkunusedfunctions.h
+++ b/lib/checkunusedfunctions.h
@@ -93,4 +93,3 @@ private:
 /// @}
 //---------------------------------------------------------------------------
 #endif
-
diff --git a/lib/checkunusedvar.h b/lib/checkunusedvar.h
index fde1e011c..f57efd2a2 100644
--- a/lib/checkunusedvar.h
+++ b/lib/checkunusedvar.h
@@ -108,4 +108,3 @@ private:
 /// @}
 //---------------------------------------------------------------------------
 #endif
-
diff --git a/lib/executionpath.cpp b/lib/executionpath.cpp
index dda101cc6..411f3f77f 100644
--- a/lib/executionpath.cpp
+++ b/lib/executionpath.cpp
@@ -483,4 +483,3 @@ void checkExecutionPaths(const SymbolDatabase *symbolDatabase, ExecutionPath *c)
         }
     }
 }
-
diff --git a/lib/path.cpp b/lib/path.cpp
index a2ddafebf..9c0f0fc78 100644
--- a/lib/path.cpp
+++ b/lib/path.cpp
@@ -208,4 +208,3 @@ bool Path::acceptFile(const std::string &filename)
 {
     return(Path::isCPP(filename) || Path::isC(filename));
 }
-
diff --git a/lib/preprocessor.h b/lib/preprocessor.h
index 5c7807f32..6d6c2fbaf 100644
--- a/lib/preprocessor.h
+++ b/lib/preprocessor.h
@@ -271,4 +271,3 @@ private:
 
 //---------------------------------------------------------------------------
 #endif
-
diff --git a/lib/suppressions.cpp b/lib/suppressions.cpp
index ebce78bbe..021beb72a 100644
--- a/lib/suppressions.cpp
+++ b/lib/suppressions.cpp
@@ -290,4 +290,3 @@ std::list<Suppressions::SuppressionEntry> Suppressions::getUnmatchedGlobalSuppre
     }
     return r;
 }
-
diff --git a/lib/symboldatabase.h b/lib/symboldatabase.h
index 7bb6224a1..929007f76 100644
--- a/lib/symboldatabase.h
+++ b/lib/symboldatabase.h
@@ -619,4 +619,3 @@ private:
 };
 
 #endif
-
diff --git a/lib/timer.h b/lib/timer.h
index d69b53b9f..1dd9631cb 100644
--- a/lib/timer.h
+++ b/lib/timer.h
@@ -81,5 +81,4 @@ private:
     bool _stopped;
 };
 
-
 #endif // TIMER_H