diff --git a/Global.h b/Global.h
index ecd9a7efd..4b8542302 100644
--- a/Global.h
+++ b/Global.h
@@ -40,12 +40,12 @@ static_assert(sizeof(bool) == 1, "Bool needs to be 1 byte in size.");
 #endif
 
 //nullptr -  only msvc and gcc-4.6 or later, othervice define it  as NULL
-#if !defined(_MSC_VER) && !(defined(__GNUC__) && (GCC_VERSION >= 460))
+#if !defined(_MSC_VER) && !(defined(__GNUC__) && (GCC_VERSION >= 460)) && !(defined(__clang__))
 #define nullptr NULL
 #endif
 
 //override keyword - only msvc and gcc-4.7 or later.
-#if !defined(_MSC_VER) && !(defined(__GNUC__) && (GCC_VERSION >= 470))
+#if !defined(_MSC_VER) && !(defined(__GNUC__) && (GCC_VERSION >= 470)) && !(defined(__clang__))
 #define override
 #endif
 
diff --git a/lib/Logging/CLogConsoleTarget.h b/lib/Logging/CLogConsoleTarget.h
index f4c27d95d..7ed6365c4 100644
--- a/lib/Logging/CLogConsoleTarget.h
+++ b/lib/Logging/CLogConsoleTarget.h
@@ -16,7 +16,7 @@
 #include "CLogFormatter.h"
 #include "CConsoleHandler.h"
 
-class LogRecord;
+struct LogRecord;
 
 /**
  * The color mapping maps a logger name and a level to a specific color.
diff --git a/lib/Logging/CLogFormatter.h b/lib/Logging/CLogFormatter.h
index dfde3f5c7..0671ef449 100644
--- a/lib/Logging/CLogFormatter.h
+++ b/lib/Logging/CLogFormatter.h
@@ -11,7 +11,7 @@
 
 #pragma once
 
-class LogRecord;
+struct LogRecord;
 
 /**
  * The log formatter formats log records.
diff --git a/lib/Logging/CLogger.h b/lib/Logging/CLogger.h
index 77571caa0..2174216cf 100644
--- a/lib/Logging/CLogger.h
+++ b/lib/Logging/CLogger.h
@@ -12,7 +12,7 @@
 #pragma once
 
 class CGLogger;
-class LogRecord;
+struct LogRecord;
 class ILogTarget;
 
 namespace ELogLevel
diff --git a/lib/Logging/ILogTarget.h b/lib/Logging/ILogTarget.h
index 47ec0ab53..b861f5578 100644
--- a/lib/Logging/ILogTarget.h
+++ b/lib/Logging/ILogTarget.h
@@ -11,7 +11,7 @@
 
 #pragma once
 
-class LogRecord;
+struct LogRecord;
 
 /**
  * The interface log target is used by all log target implementations. It holds