diff --git a/easy_profiler_core/current_time.h b/easy_profiler_core/current_time.h
index d7492ae..f6b4bea 100644
--- a/easy_profiler_core/current_time.h
+++ b/easy_profiler_core/current_time.h
@@ -30,8 +30,8 @@ You should have received a copy of the GNU General Public License
 along with this program.If not, see <http://www.gnu.org/licenses/>.
 **/
 
-#ifndef EASY_______CURRENT_TIME_H_____
-#define EASY_______CURRENT_TIME_H_____
+#ifndef EASY_PROFILER_CURRENT_TIME_H
+#define EASY_PROFILER_CURRENT_TIME_H
 
 #include "easy/profiler.h"
 
@@ -142,4 +142,4 @@ static inline profiler::timestamp_t getCurrentTime()
 }
 
 
-#endif // EASY_______CURRENT_TIME_H_____
+#endif // EASY_PROFILER_CURRENT_TIME_H
diff --git a/easy_profiler_core/event_trace_win.h b/easy_profiler_core/event_trace_win.h
index fcce6b2..d568779 100644
--- a/easy_profiler_core/event_trace_win.h
+++ b/easy_profiler_core/event_trace_win.h
@@ -43,8 +43,8 @@
 *                   : along with this program.If not, see <http://www.gnu.org/licenses/>.
 ************************************************************************/
 
-#ifndef EASY_PROFILER__EVENT_TRACE_WINDOWS__H_
-#define EASY_PROFILER__EVENT_TRACE_WINDOWS__H_
+#ifndef EASY_PROFILER_EVENT_TRACE_WINDOWS_H
+#define EASY_PROFILER_EVENT_TRACE_WINDOWS_H
 #ifdef _WIN32
 
 #define INITGUID  // This is to enable using SystemTraceControlGuid in evntrace.h.
@@ -116,4 +116,4 @@ namespace profiler {
 //////////////////////////////////////////////////////////////////////////
 
 #endif // _WIN32
-#endif // EASY_PROFILER__EVENT_TRACE_WINDOWS__H_
+#endif // EASY_PROFILER_EVENT_TRACE_WINDOWS_H
diff --git a/easy_profiler_core/include/easy/easy_compiler_support.h b/easy_profiler_core/include/easy/easy_compiler_support.h
index 7e16279..3122276 100644
--- a/easy_profiler_core/include/easy/easy_compiler_support.h
+++ b/easy_profiler_core/include/easy/easy_compiler_support.h
@@ -38,8 +38,8 @@
 *                   : along with this program.If not, see <http://www.gnu.org/licenses/>.
 ************************************************************************/
 
-#ifndef EASY_PROFILER__COMPILER_SUPPORT__H_______
-#define EASY_PROFILER__COMPILER_SUPPORT__H_______
+#ifndef EASY_PROFILER_COMPILER_SUPPORT_H
+#define EASY_PROFILER_COMPILER_SUPPORT_H
 
 #include <cstddef>
 
@@ -143,4 +143,4 @@
 
 //////////////////////////////////////////////////////////////////////////
 
-#endif // EASY_PROFILER__COMPILER_SUPPORT__H_______
+#endif // EASY_PROFILER_COMPILER_SUPPORT_H
diff --git a/easy_profiler_core/include/easy/profiler.h b/easy_profiler_core/include/easy/profiler.h
index ebeb2af..1bef5ff 100644
--- a/easy_profiler_core/include/easy/profiler.h
+++ b/easy_profiler_core/include/easy/profiler.h
@@ -30,8 +30,8 @@ You should have received a copy of the GNU General Public License
 along with this program.If not, see <http://www.gnu.org/licenses/>.
 **/
 
-#ifndef EASY_PROFILER____H_______
-#define EASY_PROFILER____H_______
+#ifndef EASY_PROFILER_H
+#define EASY_PROFILER_H
 
 #include "easy/profiler_aux.h"
 
@@ -679,4 +679,4 @@ namespace profiler {
 # pragma clang diagnostic pop
 #endif
 
-#endif // EASY_PROFILER____H_______
+#endif // EASY_PROFILER_H
diff --git a/easy_profiler_core/include/easy/profiler_aux.h b/easy_profiler_core/include/easy/profiler_aux.h
index d195d08..164b409 100644
--- a/easy_profiler_core/include/easy/profiler_aux.h
+++ b/easy_profiler_core/include/easy/profiler_aux.h
@@ -42,8 +42,8 @@
 *                   : along with this program.If not, see <http://www.gnu.org/licenses/>.
 ************************************************************************/
 
-#ifndef EASY_PROFILER__AUX__H_______
-#define EASY_PROFILER__AUX__H_______
+#ifndef EASY_PROFILER_AUX_H
+#define EASY_PROFILER_AUX_H
 
 #include <stdint.h>
 #include "easy/easy_compiler_support.h"
@@ -194,4 +194,4 @@ namespace profiler {
 
 //////////////////////////////////////////////////////////////////////////
 
-#endif // EASY_PROFILER__AUX__H_______
+#endif // EASY_PROFILER_AUX_H
diff --git a/easy_profiler_core/include/easy/profiler_colors.h b/easy_profiler_core/include/easy/profiler_colors.h
index b417f21..38d48e5 100644
--- a/easy_profiler_core/include/easy/profiler_colors.h
+++ b/easy_profiler_core/include/easy/profiler_colors.h
@@ -30,8 +30,8 @@ You should have received a copy of the GNU General Public License
 along with this program.If not, see <http://www.gnu.org/licenses/>.
 **/
 
-#ifndef EASY_PROFILER__COLORS__H_______
-#define EASY_PROFILER__COLORS__H_______
+#ifndef EASY_PROFILER_COLORS_H
+#define EASY_PROFILER_COLORS_H
 
 #include <stdint.h>
 
@@ -399,4 +399,4 @@ namespace profiler {
 //////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////
 
-#endif // EASY_PROFILER__COLORS__H_______
+#endif // EASY_PROFILER_COLORS_H
diff --git a/easy_profiler_core/include/easy/serialized_block.h b/easy_profiler_core/include/easy/serialized_block.h
index a1f87f1..4b34db4 100644
--- a/easy_profiler_core/include/easy/serialized_block.h
+++ b/easy_profiler_core/include/easy/serialized_block.h
@@ -30,8 +30,8 @@ You should have received a copy of the GNU General Public License
 along with this program.If not, see <http://www.gnu.org/licenses/>.
 **/
 
-#ifndef EASY_PROFILER_SERIALIZED_BLOCK__H_______
-#define EASY_PROFILER_SERIALIZED_BLOCK__H_______
+#ifndef EASY_PROFILER_SERIALIZED_BLOCK_H
+#define EASY_PROFILER_SERIALIZED_BLOCK_H
 
 #include "easy/profiler.h"
 
@@ -99,4 +99,4 @@ namespace profiler {
 
 } // END of namespace profiler.
 
-#endif // EASY_PROFILER_SERIALIZED_BLOCK__H_______
+#endif // EASY_PROFILER_SERIALIZED_BLOCK_H
diff --git a/easy_profiler_core/profile_manager.h b/easy_profiler_core/profile_manager.h
index 446352c..657d4c8 100644
--- a/easy_profiler_core/profile_manager.h
+++ b/easy_profiler_core/profile_manager.h
@@ -30,8 +30,8 @@ You should have received a copy of the GNU General Public License
 along with this program.If not, see <http://www.gnu.org/licenses/>.
 **/
 
-#ifndef EASY_PROFILER____MANAGER____H______
-#define EASY_PROFILER____MANAGER____H______
+#ifndef EASY_PROFILER_MANAGER_H
+#define EASY_PROFILER_MANAGER_H
 
 #include "easy/profiler.h"
 #include "easy/easy_socket.h"
@@ -452,4 +452,4 @@ private:
     }
 };
 
-#endif // EASY_PROFILER____MANAGER____H______
+#endif // EASY_PROFILER_MANAGER_H
diff --git a/easy_profiler_core/spin_lock.h b/easy_profiler_core/spin_lock.h
index 55c6ff5..a4f8979 100644
--- a/easy_profiler_core/spin_lock.h
+++ b/easy_profiler_core/spin_lock.h
@@ -30,8 +30,8 @@ You should have received a copy of the GNU General Public License
 along with this program.If not, see <http://www.gnu.org/licenses/>.
 **/
 
-#ifndef EASY_PROFILER__SPIN_LOCK__________H______
-#define EASY_PROFILER__SPIN_LOCK__________H______
+#ifndef EASY_PROFILER_SPIN_LOCK_H
+#define EASY_PROFILER_SPIN_LOCK_H
 
 #define EASY_USE_CRITICAL_SECTION // Use CRITICAL_SECTION instead of std::atomic_flag
 
@@ -113,4 +113,4 @@ namespace profiler {
 # undef EASY_USE_CRITICAL_SECTION
 #endif
 
-#endif // EASY_PROFILER__SPIN_LOCK__________H______
+#endif // EASY_PROFILER_SPIN_LOCK_H
diff --git a/profiler_gui/blocks_graphics_view.h b/profiler_gui/blocks_graphics_view.h
index bc98faf..842afad 100644
--- a/profiler_gui/blocks_graphics_view.h
+++ b/profiler_gui/blocks_graphics_view.h
@@ -50,8 +50,8 @@
 *                   : along with this program.If not, see <http://www.gnu.org/licenses/>.
 ************************************************************************/
 
-#ifndef EASY__GRAPHICS_VIEW__H_
-#define EASY__GRAPHICS_VIEW__H_
+#ifndef EASY_GRAPHICS_VIEW_H
+#define EASY_GRAPHICS_VIEW_H
 
 #include <stdlib.h>
 #include <unordered_set>
@@ -321,4 +321,4 @@ private:
 //////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////
 
-#endif // EASY__GRAPHICS_VIEW__H_
+#endif // EASY_GRAPHICS_VIEW_H
diff --git a/profiler_gui/blocks_tree_widget.h b/profiler_gui/blocks_tree_widget.h
index 1b03698..78dc3cc 100644
--- a/profiler_gui/blocks_tree_widget.h
+++ b/profiler_gui/blocks_tree_widget.h
@@ -50,8 +50,8 @@
 *                   : along with this program.If not, see <http://www.gnu.org/licenses/>.
 ************************************************************************/
 
-#ifndef EASY__TREE_WIDGET__H_
-#define EASY__TREE_WIDGET__H_
+#ifndef EASY_TREE_WIDGET_H
+#define EASY_TREE_WIDGET_H
 
 #include <QTreeWidget>
 #include <QTimer>
@@ -201,4 +201,4 @@ private:
 
 //////////////////////////////////////////////////////////////////////////
 
-#endif // EASY__TREE_WIDGET__H_
+#endif // EASY_TREE_WIDGET_H
diff --git a/profiler_gui/descriptors_tree_widget.h b/profiler_gui/descriptors_tree_widget.h
index bdb04eb..49afc52 100644
--- a/profiler_gui/descriptors_tree_widget.h
+++ b/profiler_gui/descriptors_tree_widget.h
@@ -43,8 +43,8 @@
 *                   : along with this program.If not, see <http://www.gnu.org/licenses/>.
 ************************************************************************/
 
-#ifndef EASY__DESCRIPTORS__WIDGET__H_
-#define EASY__DESCRIPTORS__WIDGET__H_
+#ifndef EASY_DESCRIPTORS_WIDGET_H
+#define EASY_DESCRIPTORS_WIDGET_H
 
 #include <QTreeWidget>
 #include <QString>
@@ -196,4 +196,4 @@ private:
 
 //////////////////////////////////////////////////////////////////////////
 
-#endif // EASY__DESCRIPTORS__WIDGET__H_
+#endif // EASY_DESCRIPTORS_WIDGET_H
diff --git a/profiler_gui/easy_chronometer_item.h b/profiler_gui/easy_chronometer_item.h
index 92d8ded..4bd5239 100644
--- a/profiler_gui/easy_chronometer_item.h
+++ b/profiler_gui/easy_chronometer_item.h
@@ -43,8 +43,8 @@
 *                   : along with this program.If not, see <http://www.gnu.org/licenses/>.
 ************************************************************************/
 
-#ifndef EASY__CHRONOMETER_ITEM__H_
-#define EASY__CHRONOMETER_ITEM__H_
+#ifndef EASY_CHRONOMETER_ITEM_H
+#define EASY_CHRONOMETER_ITEM_H
 
 #include <QGraphicsItem>
 #include <QRectF>
@@ -132,4 +132,4 @@ private:
 //////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////
 
-#endif // EASY__CHRONOMETER_ITEM__H_
+#endif // EASY_CHRONOMETER_ITEM_H
diff --git a/profiler_gui/easy_graphics_item.h b/profiler_gui/easy_graphics_item.h
index e0bbf79..d2ef945 100644
--- a/profiler_gui/easy_graphics_item.h
+++ b/profiler_gui/easy_graphics_item.h
@@ -43,8 +43,8 @@
 *                   : along with this program.If not, see <http://www.gnu.org/licenses/>.
 ************************************************************************/
 
-#ifndef EASY__GRAPHICS_ITEM__H_
-#define EASY__GRAPHICS_ITEM__H_
+#ifndef EASY_GRAPHICS_ITEM_H
+#define EASY_GRAPHICS_ITEM_H
 
 #include <stdlib.h>
 #include <QGraphicsItem>
@@ -179,4 +179,4 @@ public:
 //////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////
 
-#endif // EASY__GRAPHICS_ITEM__H_
+#endif // EASY_GRAPHICS_ITEM_H
diff --git a/profiler_gui/globals_qobjects.h b/profiler_gui/globals_qobjects.h
index c5d3f98..5fec429 100644
--- a/profiler_gui/globals_qobjects.h
+++ b/profiler_gui/globals_qobjects.h
@@ -28,8 +28,8 @@
 *                   : along with this program.If not, see <http://www.gnu.org/licenses/>.
 ************************************************************************/
 
-#ifndef EASY__GLOBALS_QOBJECTS_H___
-#define EASY__GLOBALS_QOBJECTS_H___
+#ifndef EASY_GLOBALS_QOBJECTS_H
+#define EASY_GLOBALS_QOBJECTS_H
 
 #include <QObject>
 #include "easy/profiler.h"
@@ -64,4 +64,4 @@ namespace profiler_gui {
 
 } // END of namespace profiler_gui.
 
-#endif // EASY__GLOBALS_QOBJECTS_H___
+#endif // EASY_GLOBALS_QOBJECTS_H
diff --git a/profiler_gui/tree_widget_item.h b/profiler_gui/tree_widget_item.h
index d8b0743..c61343e 100644
--- a/profiler_gui/tree_widget_item.h
+++ b/profiler_gui/tree_widget_item.h
@@ -44,8 +44,8 @@
 *                   : along with this program.If not, see <http://www.gnu.org/licenses/>.
 ************************************************************************/
 
-#ifndef EASY__TREE_WIDGET_ITEM__H_
-#define EASY__TREE_WIDGET_ITEM__H_
+#ifndef EASY_TREE_WIDGET_ITEM_H
+#define EASY_TREE_WIDGET_ITEM_H
 
 #include <stdlib.h>
 #include <QTreeWidget>
@@ -148,4 +148,4 @@ public:
 
 //////////////////////////////////////////////////////////////////////////
 
-#endif // EASY__TREE_WIDGET_ITEM__H_
+#endif // EASY_TREE_WIDGET_ITEM_H
diff --git a/profiler_gui/tree_widget_loader.h b/profiler_gui/tree_widget_loader.h
index 8a8f3f6..e59b2ad 100644
--- a/profiler_gui/tree_widget_loader.h
+++ b/profiler_gui/tree_widget_loader.h
@@ -44,8 +44,8 @@
 *                   : along with this program.If not, see <http://www.gnu.org/licenses/>.
 ************************************************************************/
 
-#ifndef EASY__TREE_WIDGET_LOADER__H_
-#define EASY__TREE_WIDGET_LOADER__H_
+#ifndef EASY_TREE_WIDGET_LOADER_H
+#define EASY_TREE_WIDGET_LOADER_H
 
 #include <stdlib.h>
 #include <vector>
@@ -122,4 +122,4 @@ private:
 
 //////////////////////////////////////////////////////////////////////////
 
-#endif // EASY__TREE_WIDGET_LOADER__H_
+#endif // EASY_TREE_WIDGET_LOADER_H