diff --git a/elf/reader.cpp b/elf/reader.cpp
index db9b37c68b..693cd1d4de 100644
--- a/elf/reader.cpp
+++ b/elf/reader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -251,4 +251,4 @@ const char *CElfReader::getSectionName(
     return pName;
 }
 
-} // namespace OclElfLib
+} // namespace CLElfLib
diff --git a/elf/types.h b/elf/types.h
index de1ca92ed3..1ad4ea546e 100644
--- a/elf/types.h
+++ b/elf/types.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -198,4 +198,4 @@ struct SElf64SectionHeader {
     Elf64_Xword EntrySize;
 };
 
-} // namespace ELFlib
+} // namespace CLElfLib
diff --git a/elf/writer.cpp b/elf/writer.cpp
index e5aa25b508..17afb30f11 100644
--- a/elf/writer.cpp
+++ b/elf/writer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -201,7 +201,7 @@ bool CElfWriter::resolveBinary(
                     memcpy_s(pCurString, pNode->Name.size(), pNode->Name.c_str(), pNode->Name.size());
                     pCurString += pNode->Name.size();
                 }
-                *(pCurString++) = '\0';
+                *(pCurString++) = '\0'; // NOLINT
 
                 // delete the node and it's data
                 if (pNode->pData) {
@@ -282,4 +282,4 @@ bool CElfWriter::patchElfHeader(char *const pBinary) {
     return false;
 }
 
-} // namespace OclElfLib
+} // namespace CLElfLib
diff --git a/elf/writer.h b/elf/writer.h
index 7161730f5d..7907c8c329 100644
--- a/elf/writer.h
+++ b/elf/writer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -102,4 +102,4 @@ class CElfWriter {
     size_t m_stringTableSize = 0U;
     size_t m_totalBinarySize = 0U;
 };
-} // namespace ELFLib
+} // namespace CLElfLib
diff --git a/manifests/manifest.yml b/manifests/manifest.yml
index f1e88402d6..2637ee169e 100644
--- a/manifests/manifest.yml
+++ b/manifests/manifest.yml
@@ -17,7 +17,7 @@ components:
     branch: infra
     clean_on_sync: true
     dest_dir: infra
-    revision: 3579cc63a0d9ec2666c7ed58d2b624ff0f4692f3
+    revision: 8abea2b4f36cb427643575a3127ea3c9c8c157d5
     type: git
   internal:
     branch: master
diff --git a/runtime/accelerators/intel_accelerator.cpp b/runtime/accelerators/intel_accelerator.cpp
index 017037b894..8c3d8f8153 100644
--- a/runtime/accelerators/intel_accelerator.cpp
+++ b/runtime/accelerators/intel_accelerator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -78,4 +78,4 @@ cl_int IntelAccelerator::getInfo(cl_accelerator_info_intel paramName,
 
     return result;
 }
-}
+} // namespace OCLRT
diff --git a/runtime/accelerators/intel_motion_estimation.cpp b/runtime/accelerators/intel_motion_estimation.cpp
index f21998b7de..9ebd19ac58 100644
--- a/runtime/accelerators/intel_motion_estimation.cpp
+++ b/runtime/accelerators/intel_motion_estimation.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -76,4 +76,4 @@ cl_int VmeAccelerator::validateVmeArgs(Context *context,
 
     return CL_SUCCESS;
 }
-}
+} // namespace OCLRT
diff --git a/runtime/accelerators/intel_motion_estimation.h b/runtime/accelerators/intel_motion_estimation.h
index 734dc5cd17..24197464c4 100644
--- a/runtime/accelerators/intel_motion_estimation.h
+++ b/runtime/accelerators/intel_motion_estimation.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -69,4 +69,4 @@ class VmeAccelerator : public IntelAccelerator {
                                   size_t descriptorSize,
                                   const void *descriptor);
 };
-}
+} // namespace OCLRT
diff --git a/runtime/aub_mem_dump/aub_mem_dump.cpp b/runtime/aub_mem_dump/aub_mem_dump.cpp
index dd70a1a89c..e6882abe09 100644
--- a/runtime/aub_mem_dump/aub_mem_dump.cpp
+++ b/runtime/aub_mem_dump/aub_mem_dump.cpp
@@ -186,4 +186,4 @@ void LrcaHelper::initialize(void *pLRCIn) const {
     setPDP2(pLRCIn, 0);
     setPDP3(pLRCIn, 0);
 }
-}
+} // namespace AubMemDump
diff --git a/runtime/built_ins/vme_dispatch_builder.h b/runtime/built_ins/vme_dispatch_builder.h
index 2b58b5a8ac..efb950ee0b 100644
--- a/runtime/built_ins/vme_dispatch_builder.h
+++ b/runtime/built_ins/vme_dispatch_builder.h
@@ -490,4 +490,4 @@ class BuiltInOp<HWFamily, EBuiltInOps::VmeBlockAdvancedMotionEstimateBidirection
         return true;
     }
 };
-}
+} // namespace OCLRT
diff --git a/runtime/builtin_kernels_simulation/gen8/scheduler_simulation.cpp b/runtime/builtin_kernels_simulation/gen8/scheduler_simulation.cpp
index d1a92bfe41..8d059a0484 100644
--- a/runtime/builtin_kernels_simulation/gen8/scheduler_simulation.cpp
+++ b/runtime/builtin_kernels_simulation/gen8/scheduler_simulation.cpp
@@ -45,7 +45,7 @@ float __intel__getProfilingTimerResolution() {
 #include "runtime/gen8/scheduler_definitions.h"
 #include "runtime/gen8/scheduler_igdrcl_built_in.inl"
 #include "runtime/scheduler/scheduler.cl"
-}
+} // namespace Gen8SchedulerSimulation
 
 namespace BuiltinKernelsSimulation {
 
diff --git a/runtime/builtin_kernels_simulation/gen9/scheduler_simulation.cpp b/runtime/builtin_kernels_simulation/gen9/scheduler_simulation.cpp
index bd7219fede..418b07fd5b 100644
--- a/runtime/builtin_kernels_simulation/gen9/scheduler_simulation.cpp
+++ b/runtime/builtin_kernels_simulation/gen9/scheduler_simulation.cpp
@@ -47,7 +47,7 @@ float __intel__getProfilingTimerResolution() {
 #include "runtime/gen9/scheduler_definitions.h"
 #include "runtime/gen9/scheduler_igdrcl_built_in.inl"
 #include "runtime/scheduler/scheduler.cl"
-}
+} // namespace Gen9SchedulerSimulation
 
 namespace BuiltinKernelsSimulation {
 
diff --git a/runtime/builtin_kernels_simulation/opencl_c.cpp b/runtime/builtin_kernels_simulation/opencl_c.cpp
index 38dce0edae..5b25bc6c33 100644
--- a/runtime/builtin_kernels_simulation/opencl_c.cpp
+++ b/runtime/builtin_kernels_simulation/opencl_c.cpp
@@ -138,7 +138,7 @@ uint4 write_imageui(image *im, uint4 coord, uint4 color) {
         temp += im->bytesPerChannel;
         colorSrc += 4;
     }
-    return *(uint4 *)temp;
+    return *(uint4 *)temp; // NOLINT
 }
 
 uchar convert_uchar_sat(uint c) {
diff --git a/runtime/builtin_kernels_simulation/opencl_c.h b/runtime/builtin_kernels_simulation/opencl_c.h
index 63060c7fe1..78bc603c28 100644
--- a/runtime/builtin_kernels_simulation/opencl_c.h
+++ b/runtime/builtin_kernels_simulation/opencl_c.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -301,4 +301,4 @@ TYPE atomic_min(TYPE *first, TYPE2 second) {
     gMutex.unlock();
     return temp;
 }
-}
+} // namespace BuiltinKernelsSimulation
diff --git a/runtime/command_queue/enqueue_barrier.h b/runtime/command_queue/enqueue_barrier.h
index 2e373cdbd9..4cd255c4a6 100644
--- a/runtime/command_queue/enqueue_barrier.h
+++ b/runtime/command_queue/enqueue_barrier.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -52,4 +52,4 @@ cl_int CommandQueueHw<GfxFamily>::enqueueBarrierWithWaitList(
 
     return CL_SUCCESS;
 }
-}
+} // namespace OCLRT
diff --git a/runtime/command_queue/enqueue_copy_buffer.h b/runtime/command_queue/enqueue_copy_buffer.h
index 348d2d6b2e..f83d565af6 100644
--- a/runtime/command_queue/enqueue_copy_buffer.h
+++ b/runtime/command_queue/enqueue_copy_buffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -74,4 +74,4 @@ cl_int CommandQueueHw<GfxFamily>::enqueueCopyBuffer(
 
     return CL_SUCCESS;
 }
-}
+} // namespace OCLRT
diff --git a/runtime/command_queue/enqueue_fill_buffer.h b/runtime/command_queue/enqueue_fill_buffer.h
index 1b13b461a7..c314bc7a87 100644
--- a/runtime/command_queue/enqueue_fill_buffer.h
+++ b/runtime/command_queue/enqueue_fill_buffer.h
@@ -93,4 +93,4 @@ cl_int CommandQueueHw<GfxFamily>::enqueueFillBuffer(
 
     return CL_SUCCESS;
 }
-}
+} // namespace OCLRT
diff --git a/runtime/command_queue/enqueue_svm.h b/runtime/command_queue/enqueue_svm.h
index 1a71b026c9..1413262b61 100644
--- a/runtime/command_queue/enqueue_svm.h
+++ b/runtime/command_queue/enqueue_svm.h
@@ -319,4 +319,4 @@ cl_int CommandQueueHw<GfxFamily>::enqueueSVMMigrateMem(cl_uint numSvmPointers,
                                                    event);
     return CL_SUCCESS;
 }
-}
+} // namespace OCLRT
diff --git a/runtime/command_queue/local_id_gen.h b/runtime/command_queue/local_id_gen.h
index 28836e6026..2884bd0834 100644
--- a/runtime/command_queue/local_id_gen.h
+++ b/runtime/command_queue/local_id_gen.h
@@ -76,4 +76,4 @@ template <typename Vec, int simd>
 void generateLocalIDsSimd(void *b, size_t lwsX, size_t lwsY, size_t threadsPerWorkGroup);
 
 void generateLocalIDs(void *buffer, uint32_t simd, size_t lwsX, size_t lwsY, size_t lwsZ);
-}
\ No newline at end of file
+} // namespace OCLRT
\ No newline at end of file
diff --git a/runtime/command_queue/local_id_gen.inl b/runtime/command_queue/local_id_gen.inl
index 390d660c3d..ba35aaf261 100644
--- a/runtime/command_queue/local_id_gen.inl
+++ b/runtime/command_queue/local_id_gen.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -157,4 +157,4 @@ inline void generateLocalIDsSimd(void *b, size_t lwsX, size_t lwsY, size_t threa
 
     } while (++pass < passes);
 }
-}
+} // namespace OCLRT
diff --git a/runtime/command_queue/local_id_gen_avx2.cpp b/runtime/command_queue/local_id_gen_avx2.cpp
index ee0ec6c5de..c0b262b66c 100644
--- a/runtime/command_queue/local_id_gen_avx2.cpp
+++ b/runtime/command_queue/local_id_gen_avx2.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -27,5 +27,5 @@
 namespace OCLRT {
 template void generateLocalIDsSimd<uint16x16_t, 32>(void *b, size_t lwsX, size_t lwsY, size_t threadsPerWorkGroup);
 template void generateLocalIDsSimd<uint16x16_t, 16>(void *b, size_t lwsX, size_t lwsY, size_t threadsPerWorkGroup);
-}
+} // namespace OCLRT
 #endif
\ No newline at end of file
diff --git a/runtime/command_queue/local_id_gen_sse4.cpp b/runtime/command_queue/local_id_gen_sse4.cpp
index 6f4d2ddecc..56c1e6bdb2 100644
--- a/runtime/command_queue/local_id_gen_sse4.cpp
+++ b/runtime/command_queue/local_id_gen_sse4.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -27,4 +27,4 @@ namespace OCLRT {
 template void generateLocalIDsSimd<uint16x8_t, 32>(void *b, size_t lwsX, size_t lwsY, size_t threadsPerWorkGroup);
 template void generateLocalIDsSimd<uint16x8_t, 16>(void *b, size_t lwsX, size_t lwsY, size_t threadsPerWorkGroup);
 template void generateLocalIDsSimd<uint16x8_t, 8>(void *b, size_t lwsX, size_t lwsY, size_t threadsPerWorkGroup);
-}
+} // namespace OCLRT
diff --git a/runtime/command_stream/aub_command_stream_receiver.h b/runtime/command_stream/aub_command_stream_receiver.h
index dd07367328..326e903033 100644
--- a/runtime/command_stream/aub_command_stream_receiver.h
+++ b/runtime/command_stream/aub_command_stream_receiver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -35,4 +35,4 @@ struct AUBCommandStreamReceiver {
 };
 
 typedef CommandStreamReceiver *(*AubCommandStreamReceiverCreateFunc)(const HardwareInfo &hwInfoIn, const std::string &fileName, bool standalone);
-}
+} // namespace OCLRT
diff --git a/runtime/command_stream/create_command_stream_impl.h b/runtime/command_stream/create_command_stream_impl.h
index 117c391efc..508724048d 100644
--- a/runtime/command_stream/create_command_stream_impl.h
+++ b/runtime/command_stream/create_command_stream_impl.h
@@ -27,4 +27,4 @@
 namespace OCLRT {
 extern CommandStreamReceiver *createCommandStreamImpl(const HardwareInfo *pHwInfo);
 extern bool getDevicesImpl(HardwareInfo **hwInfo, size_t &numDevicesReturned);
-}
+} // namespace OCLRT
diff --git a/runtime/command_stream/device_command_stream.h b/runtime/command_stream/device_command_stream.h
index 26b4e2daf1..ce94d41aea 100644
--- a/runtime/command_stream/device_command_stream.h
+++ b/runtime/command_stream/device_command_stream.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -38,4 +38,4 @@ class DeviceCommandStreamReceiver : public CommandStreamReceiverHw<GfxFamily> {
   public:
     static CommandStreamReceiver *create(const HardwareInfo &hwInfo, bool withAubDump);
 };
-}
+} // namespace OCLRT
diff --git a/runtime/command_stream/linear_stream.cpp b/runtime/command_stream/linear_stream.cpp
index 9431737501..d92ae87fce 100644
--- a/runtime/command_stream/linear_stream.cpp
+++ b/runtime/command_stream/linear_stream.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -43,4 +43,4 @@ LinearStream::LinearStream(GraphicsAllocation *gfxAllocation)
 LinearStream::LinearStream()
     : LinearStream(nullptr) {
 }
-}
+} // namespace OCLRT
diff --git a/runtime/command_stream/tbx_command_stream_receiver.cpp b/runtime/command_stream/tbx_command_stream_receiver.cpp
index 09c38d67ad..b8ff6f0c67 100644
--- a/runtime/command_stream/tbx_command_stream_receiver.cpp
+++ b/runtime/command_stream/tbx_command_stream_receiver.cpp
@@ -40,4 +40,4 @@ CommandStreamReceiver *TbxCommandStreamReceiver::create(const HardwareInfo &hwIn
 
     return pCreate ? pCreate(hwInfo, withAubDump) : nullptr;
 }
-}
+} // namespace OCLRT
diff --git a/runtime/compiler_interface/binary_cache.cpp b/runtime/compiler_interface/binary_cache.cpp
index e49126b656..fe29ee2e7e 100644
--- a/runtime/compiler_interface/binary_cache.cpp
+++ b/runtime/compiler_interface/binary_cache.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -110,4 +110,4 @@ bool BinaryCache::loadCachedBinary(const std::string kernelFileHash, Program &pr
     return true;
 }
 
-} // namesapce OCLRT
+} // namespace OCLRT
diff --git a/runtime/compiler_interface/binary_cache.h b/runtime/compiler_interface/binary_cache.h
index 196b542cc6..dd246d7442 100644
--- a/runtime/compiler_interface/binary_cache.h
+++ b/runtime/compiler_interface/binary_cache.h
@@ -46,4 +46,4 @@ class BinaryCache {
     static std::mutex cacheAccessMtx;
 };
 
-} // namesapce OCLRT
+} // namespace OCLRT
diff --git a/runtime/compiler_interface/compiler_interface.inl b/runtime/compiler_interface/compiler_interface.inl
index 8c9dbeaf04..e959108ec7 100644
--- a/runtime/compiler_interface/compiler_interface.inl
+++ b/runtime/compiler_interface/compiler_interface.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -54,7 +54,7 @@ CIF::CIFMain *createMainNoSanitize(CIF::CreateCIFMainFunc_t createFunc);
 
 template <template <CIF::Version_t> class EntryPointT>
 inline bool loadCompiler(const char *libName, std::unique_ptr<OsLibrary> &outLib,
-                  CIF::RAII::UPtr_t<CIF::CIFMain> &outLibMain) {
+                         CIF::RAII::UPtr_t<CIF::CIFMain> &outLibMain) {
     auto lib = std::unique_ptr<OsLibrary>(OsLibrary::load(libName));
     if (lib == nullptr) {
         DEBUG_BREAK_IF(true); // could not load library
@@ -81,5 +81,4 @@ inline bool loadCompiler(const char *libName, std::unique_ptr<OsLibrary> &outLib
     return true;
 }
 
-}
-
+} // namespace OCLRT
diff --git a/runtime/compiler_interface/create_main.cpp b/runtime/compiler_interface/create_main.cpp
index f51a3a7219..e099712268 100644
--- a/runtime/compiler_interface/create_main.cpp
+++ b/runtime/compiler_interface/create_main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -31,4 +31,4 @@ CIF::CIFMain *
 createMainNoSanitize(CIF::CreateCIFMainFunc_t createFunc) {
     return createFunc();
 }
-}
+} // namespace OCLRT
diff --git a/runtime/context/context.inl b/runtime/context/context.inl
index d30f94c9ac..362d94a8e4 100644
--- a/runtime/context/context.inl
+++ b/runtime/context/context.inl
@@ -37,4 +37,4 @@ Sharing *Context::getSharing() {
 
     return reinterpret_cast<Sharing *>(sharingFunctions[Sharing::sharingId].get());
 }
-}
+} // namespace OCLRT
diff --git a/runtime/device/device_info_map.h b/runtime/device/device_info_map.h
index 0f34c9f3c6..50223b85ef 100644
--- a/runtime/device/device_info_map.h
+++ b/runtime/device/device_info_map.h
@@ -149,4 +149,4 @@ template<> struct Map<CL_DEVICE_VERSION                                   > : pu
 template<> struct Map<CL_DRIVER_VERSION                                   > : public MapBase<CL_DRIVER_VERSION,                                   const char *,                       &DeviceInfo::driverVersion> {};
 template<> struct Map<CL_DEVICE_DRIVER_VERSION_INTEL                      > : public MapBase<CL_DEVICE_DRIVER_VERSION_INTEL,                      uint32_t,                           &DeviceInfo::internalDriverVersion> {};
 // clang-format on
-}
+} // namespace DeviceInfoTable
diff --git a/runtime/dll/linux/options.cpp b/runtime/dll/linux/options.cpp
index 699f08c3f4..0e3ba6b40b 100644
--- a/runtime/dll/linux/options.cpp
+++ b/runtime/dll/linux/options.cpp
@@ -31,4 +31,4 @@ const char *libvaDllName = "libva.so.2";
 
 const char *sysFsPciPath = "/sys/bus/pci/devices/";
 const char *tbxLibName = "libtbxAccess.so";
-}
+} // namespace Os
diff --git a/runtime/event/event_builder.h b/runtime/event/event_builder.h
index be3fb9e64d..c68f06bdb0 100644
--- a/runtime/event/event_builder.h
+++ b/runtime/event/event_builder.h
@@ -76,4 +76,4 @@ class EventBuilder {
     StackVec<Event *, 16> parentEvents;
     bool doNotRegister = false;
 };
-}
+} // namespace OCLRT
diff --git a/runtime/event/hw_timestamps.h b/runtime/event/hw_timestamps.h
index 78d5856b4e..8d2663be3b 100644
--- a/runtime/event/hw_timestamps.h
+++ b/runtime/event/hw_timestamps.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -34,4 +34,4 @@ struct HwTimeStamps {
     uint64_t GlobalCompleteTS;
     uint64_t ContextCompleteTS;
 };
-}
+} // namespace OCLRT
diff --git a/runtime/gen8/aub_mapper.h b/runtime/gen8/aub_mapper.h
index 614204c8fc..03bb8e07a0 100644
--- a/runtime/gen8/aub_mapper.h
+++ b/runtime/gen8/aub_mapper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -39,4 +39,4 @@ struct AUBFamilyMapper<BDWFamily> {
 
     typedef AubMemDump::AubDump<AubTraits> AUB;
 };
-}
+} // namespace OCLRT
diff --git a/runtime/gen8/buffer_gen8.cpp b/runtime/gen8/buffer_gen8.cpp
index 78e8d73d03..2892ff1fbb 100644
--- a/runtime/gen8/buffer_gen8.cpp
+++ b/runtime/gen8/buffer_gen8.cpp
@@ -29,4 +29,4 @@ typedef BDWFamily Family;
 static auto gfxCore = IGFX_GEN8_CORE;
 
 #include "runtime/mem_obj/buffer_factory_init.inl"
-}
+} // namespace OCLRT
diff --git a/runtime/gen8/hw_cmds.h b/runtime/gen8/hw_cmds.h
index e9fb16a4c8..b9414919e7 100644
--- a/runtime/gen8/hw_cmds.h
+++ b/runtime/gen8/hw_cmds.h
@@ -360,4 +360,4 @@ class BDW_2x3x8 : public BDW {
   private:
     static GT_SYSTEM_INFO gtSystemInfo;
 };
-}
+} // namespace OCLRT
diff --git a/runtime/gen8/image_gen8.cpp b/runtime/gen8/image_gen8.cpp
index ad60b91699..b28fd3b53e 100644
--- a/runtime/gen8/image_gen8.cpp
+++ b/runtime/gen8/image_gen8.cpp
@@ -57,4 +57,4 @@ size_t ImageHw<BDWFamily>::getHostPtrSlicePitchForMap(uint32_t mipLevel) {
 }
 
 #include "runtime/mem_obj/image_factory_init.inl"
-}
+} // namespace OCLRT
diff --git a/runtime/gen8/kernel_commands_gen8.cpp b/runtime/gen8/kernel_commands_gen8.cpp
index f40a3e29cf..1469568591 100644
--- a/runtime/gen8/kernel_commands_gen8.cpp
+++ b/runtime/gen8/kernel_commands_gen8.cpp
@@ -45,4 +45,4 @@ uint32_t KernelCommandsHelper<BDWFamily>::computeSlmValues(uint32_t valueIn) {
 
 // Explicitly instantiate KernelCommandsHelper for BDW device family
 template struct KernelCommandsHelper<BDWFamily>;
-}
+} // namespace OCLRT
diff --git a/runtime/gen8/linux/command_stream_receiver_gen8.cpp b/runtime/gen8/linux/command_stream_receiver_gen8.cpp
index dec747679b..5924edc31c 100644
--- a/runtime/gen8/linux/command_stream_receiver_gen8.cpp
+++ b/runtime/gen8/linux/command_stream_receiver_gen8.cpp
@@ -29,4 +29,4 @@ namespace OCLRT {
 template class DeviceCommandStreamReceiver<BDWFamily>;
 template class DrmCommandStreamReceiver<BDWFamily>;
 template class CommandStreamReceiverWithAUBDump<DrmCommandStreamReceiver<BDWFamily>>;
-}
+} // namespace OCLRT
diff --git a/runtime/gen8/reg_configs.h b/runtime/gen8/reg_configs.h
index f9b2034809..259383eca8 100644
--- a/runtime/gen8/reg_configs.h
+++ b/runtime/gen8/reg_configs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -36,4 +36,4 @@ template <>
 struct L3CNTLRegisterOffset<BDWFamily> {
     static const uint32_t registerOffset = 0x7034;
 };
-}
+} // namespace OCLRT
diff --git a/runtime/gen8/sampler_gen8.cpp b/runtime/gen8/sampler_gen8.cpp
index e063485577..5551f508bb 100644
--- a/runtime/gen8/sampler_gen8.cpp
+++ b/runtime/gen8/sampler_gen8.cpp
@@ -30,4 +30,4 @@ typedef BDWFamily Family;
 static auto gfxCore = IGFX_GEN8_CORE;
 
 #include "runtime/sampler/sampler_factory_init.inl"
-}
+} // namespace OCLRT
diff --git a/runtime/gen8/scheduler_igdrcl_built_in.inl b/runtime/gen8/scheduler_igdrcl_built_in.inl
index e5722cef2d..f4e946162b 100644
--- a/runtime/gen8/scheduler_igdrcl_built_in.inl
+++ b/runtime/gen8/scheduler_igdrcl_built_in.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,29 +20,23 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-uint GetPatchValueForSLMSize( uint slMsize )
-{
-   uint PatchValue;
-   if( slMsize == 0 )
-   {
-       PatchValue = 0;
-   }
-   else
-   {
-       uint count4KB = slMsize / 4096;
-       if( slMsize % 4096 != 0 )
-       {
-           count4KB++;
-       }
-       PatchValue = GetNextPowerof2( count4KB );
-   }
+uint GetPatchValueForSLMSize(uint slMsize) {
+    uint PatchValue;
+    if (slMsize == 0) {
+        PatchValue = 0;
+    } else {
+        uint count4KB = slMsize / 4096;
+        if (slMsize % 4096 != 0) {
+            count4KB++;
+        }
+        PatchValue = GetNextPowerof2(count4KB);
+    }
 
-   return PatchValue;
+    return PatchValue;
 }
 
 //on BDW we have only 1 pipe control
-void NOOPCSStallPipeControl(__global uint* secondaryBatchBuffer, uint dwordOffset, uint pipeControlOffset)
-{
+void NOOPCSStallPipeControl(__global uint *secondaryBatchBuffer, uint dwordOffset, uint pipeControlOffset) {
     dwordOffset += pipeControlOffset;
     secondaryBatchBuffer[dwordOffset] = 0;
     dwordOffset++;
@@ -58,8 +52,7 @@ void NOOPCSStallPipeControl(__global uint* secondaryBatchBuffer, uint dwordOffse
     dwordOffset++;
 }
 
-void PutCSStallPipeControl( __global uint* secondaryBatchBuffer, uint dwordOffset, uint pipeControlOffset )
-{
+void PutCSStallPipeControl(__global uint *secondaryBatchBuffer, uint dwordOffset, uint pipeControlOffset) {
     dwordOffset += pipeControlOffset;
     secondaryBatchBuffer[dwordOffset] = PIPE_CONTROL_CSTALL_DWORD0;
     dwordOffset++;
diff --git a/runtime/gen8/tbx_command_stream_receiver_gen8.cpp b/runtime/gen8/tbx_command_stream_receiver_gen8.cpp
index 59b33d1078..63235ceab4 100644
--- a/runtime/gen8/tbx_command_stream_receiver_gen8.cpp
+++ b/runtime/gen8/tbx_command_stream_receiver_gen8.cpp
@@ -41,4 +41,4 @@ void populateFactoryTable<TbxCommandStreamReceiverHw<Family>>() {
 
 template class TbxCommandStreamReceiverHw<Family>;
 template class CommandStreamReceiverWithAUBDump<TbxCommandStreamReceiverHw<Family>>;
-}
+} // namespace OCLRT
diff --git a/runtime/gen8/windows/command_stream_receiver_gen8.cpp b/runtime/gen8/windows/command_stream_receiver_gen8.cpp
index 475e5c3017..ab5eaa859d 100644
--- a/runtime/gen8/windows/command_stream_receiver_gen8.cpp
+++ b/runtime/gen8/windows/command_stream_receiver_gen8.cpp
@@ -29,4 +29,4 @@ namespace OCLRT {
 template class DeviceCommandStreamReceiver<BDWFamily>;
 template class WddmCommandStreamReceiver<BDWFamily>;
 template class CommandStreamReceiverWithAUBDump<WddmCommandStreamReceiver<BDWFamily>>;
-}
+} // namespace OCLRT
diff --git a/runtime/gen9/aub_mapper.h b/runtime/gen9/aub_mapper.h
index 23f9e8ae2b..9c28f04419 100644
--- a/runtime/gen9/aub_mapper.h
+++ b/runtime/gen9/aub_mapper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -39,4 +39,4 @@ struct AUBFamilyMapper<SKLFamily> {
 
     typedef AubMemDump::AubDump<AubTraits> AUB;
 };
-}
+} // namespace OCLRT
diff --git a/runtime/gen9/buffer_gen9.cpp b/runtime/gen9/buffer_gen9.cpp
index 22c396ff26..16bf9297c3 100644
--- a/runtime/gen9/buffer_gen9.cpp
+++ b/runtime/gen9/buffer_gen9.cpp
@@ -29,4 +29,4 @@ typedef SKLFamily Family;
 static auto gfxCore = IGFX_GEN9_CORE;
 
 #include "runtime/mem_obj/buffer_factory_init.inl"
-}
+} // namespace OCLRT
diff --git a/runtime/gen9/image_gen9.cpp b/runtime/gen9/image_gen9.cpp
index fc2524ba4e..749b352c69 100644
--- a/runtime/gen9/image_gen9.cpp
+++ b/runtime/gen9/image_gen9.cpp
@@ -53,4 +53,4 @@ void ImageHw<GfxFamily>::setSurfaceMemoryObjectControlStateIndexToMocsTable(void
 }
 
 #include "runtime/mem_obj/image_factory_init.inl"
-}
+} // namespace OCLRT
diff --git a/runtime/gen9/kernel_commands_gen9.cpp b/runtime/gen9/kernel_commands_gen9.cpp
index 2461a93274..f37dd54538 100644
--- a/runtime/gen9/kernel_commands_gen9.cpp
+++ b/runtime/gen9/kernel_commands_gen9.cpp
@@ -31,4 +31,4 @@ template <>
 bool KernelCommandsHelper<SKLFamily>::isPipeControlWArequired() { return true; }
 
 template struct KernelCommandsHelper<SKLFamily>;
-}
+} // namespace OCLRT
diff --git a/runtime/gen9/linux/command_stream_receiver_gen9.cpp b/runtime/gen9/linux/command_stream_receiver_gen9.cpp
index 38a6aabd38..cf2a2a7750 100644
--- a/runtime/gen9/linux/command_stream_receiver_gen9.cpp
+++ b/runtime/gen9/linux/command_stream_receiver_gen9.cpp
@@ -29,4 +29,4 @@ namespace OCLRT {
 template class DeviceCommandStreamReceiver<SKLFamily>;
 template class DrmCommandStreamReceiver<SKLFamily>;
 template class CommandStreamReceiverWithAUBDump<DrmCommandStreamReceiver<SKLFamily>>;
-}
+} // namespace OCLRT
diff --git a/runtime/gen9/sampler_gen9.cpp b/runtime/gen9/sampler_gen9.cpp
index 9ff420ba62..71ad58465b 100644
--- a/runtime/gen9/sampler_gen9.cpp
+++ b/runtime/gen9/sampler_gen9.cpp
@@ -30,4 +30,4 @@ typedef SKLFamily Family;
 static auto gfxCore = IGFX_GEN9_CORE;
 
 #include "runtime/sampler/sampler_factory_init.inl"
-}
+} // namespace OCLRT
diff --git a/runtime/gen9/tbx_command_stream_receiver_gen9.cpp b/runtime/gen9/tbx_command_stream_receiver_gen9.cpp
index 55ed83f310..f0584af2f9 100644
--- a/runtime/gen9/tbx_command_stream_receiver_gen9.cpp
+++ b/runtime/gen9/tbx_command_stream_receiver_gen9.cpp
@@ -41,4 +41,4 @@ void populateFactoryTable<TbxCommandStreamReceiverHw<Family>>() {
 
 template class TbxCommandStreamReceiverHw<Family>;
 template class CommandStreamReceiverWithAUBDump<TbxCommandStreamReceiverHw<Family>>;
-}
+} // namespace OCLRT
diff --git a/runtime/gen9/windows/command_stream_receiver_gen9.cpp b/runtime/gen9/windows/command_stream_receiver_gen9.cpp
index 1c7b5d5739..105464830a 100644
--- a/runtime/gen9/windows/command_stream_receiver_gen9.cpp
+++ b/runtime/gen9/windows/command_stream_receiver_gen9.cpp
@@ -29,4 +29,4 @@ namespace OCLRT {
 template class DeviceCommandStreamReceiver<SKLFamily>;
 template class WddmCommandStreamReceiver<SKLFamily>;
 template class CommandStreamReceiverWithAUBDump<WddmCommandStreamReceiver<SKLFamily>>;
-}
+} // namespace OCLRT
diff --git a/runtime/gtpin/gtpin_callback_stubs.cpp b/runtime/gtpin/gtpin_callback_stubs.cpp
index 2ede6b62a2..44c878ef67 100644
--- a/runtime/gtpin/gtpin_callback_stubs.cpp
+++ b/runtime/gtpin/gtpin_callback_stubs.cpp
@@ -55,4 +55,4 @@ void gtpinNotifyUpdateResidencyList(void *pKernel, void *pResidencyVector) {
 
 void gtpinNotifyPlatformShutdown() {
 }
-}
+} // namespace OCLRT
diff --git a/runtime/gtpin/gtpin_defs.h b/runtime/gtpin/gtpin_defs.h
index 395301b63a..6f26e2b083 100644
--- a/runtime/gtpin/gtpin_defs.h
+++ b/runtime/gtpin/gtpin_defs.h
@@ -48,4 +48,4 @@ struct GTPinKernelExec {
 };
 typedef struct GTPinKernelExec gtpinkexec_t;
 
-} // OCLRT
+} // namespace OCLRT
diff --git a/runtime/gtpin/gtpin_helpers.h b/runtime/gtpin/gtpin_helpers.h
index 394ccaeba2..a91f0e5fcf 100644
--- a/runtime/gtpin/gtpin_helpers.h
+++ b/runtime/gtpin/gtpin_helpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -27,4 +27,4 @@ gtpin::GTPIN_DI_STATUS gtpinCreateBuffer(gtpin::context_handle_t context, uint32
 gtpin::GTPIN_DI_STATUS gtpinFreeBuffer(gtpin::context_handle_t context, gtpin::resource_handle_t resource);
 gtpin::GTPIN_DI_STATUS gtpinMapBuffer(gtpin::context_handle_t context, gtpin::resource_handle_t resource, uint8_t **pAddress);
 gtpin::GTPIN_DI_STATUS gtpinUnmapBuffer(gtpin::context_handle_t context, gtpin::resource_handle_t resource);
-}
+} // namespace OCLRT
diff --git a/runtime/gtpin/gtpin_init.cpp b/runtime/gtpin/gtpin_init.cpp
index b1824c17d6..d4eed06285 100644
--- a/runtime/gtpin/gtpin_init.cpp
+++ b/runtime/gtpin/gtpin_init.cpp
@@ -33,7 +33,7 @@ using namespace OCLRT;
 namespace OCLRT {
 bool isGTPinInitialized = false;
 gtpin::ocl::gtpin_events_t GTPinCallbacks = {0};
-}
+} // namespace OCLRT
 
 GTPIN_DI_STATUS GTPin_Init(gtpin::ocl::gtpin_events_t *pGtpinEvents, driver_services_t *pDriverServices,
                            uint32_t *pDriverVersion) {
diff --git a/runtime/gtpin/gtpin_notify.h b/runtime/gtpin/gtpin_notify.h
index 8d874f76cb..5b8a2633dd 100644
--- a/runtime/gtpin/gtpin_notify.h
+++ b/runtime/gtpin/gtpin_notify.h
@@ -36,4 +36,4 @@ void gtpinNotifyMakeResident(void *pKernel, void *pCommandStreamReceiver);
 void gtpinNotifyUpdateResidencyList(void *pKernel, void *pResidencyVector);
 void gtpinNotifyPlatformShutdown();
 inline bool gtpinIsGTPinInitialized() { return isGTPinInitialized; }
-}
+} // namespace OCLRT
diff --git a/runtime/helpers/abort.cpp b/runtime/helpers/abort.cpp
index 0749681878..a107bd3686 100644
--- a/runtime/helpers/abort.cpp
+++ b/runtime/helpers/abort.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -28,4 +28,4 @@ namespace OCLRT {
 void abortExecution() {
     abort();
 }
-}
+} // namespace OCLRT
diff --git a/runtime/helpers/base_object.cpp b/runtime/helpers/base_object.cpp
index d10148a872..d959402546 100644
--- a/runtime/helpers/base_object.cpp
+++ b/runtime/helpers/base_object.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -26,4 +26,4 @@ namespace OCLRT {
 
 std::thread::id invalidThreadID;
 
-} // OCLRT
+} // namespace OCLRT
diff --git a/runtime/helpers/base_object_allocator.cpp b/runtime/helpers/base_object_allocator.cpp
index 22cc93a291..f8b686a721 100644
--- a/runtime/helpers/base_object_allocator.cpp
+++ b/runtime/helpers/base_object_allocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -71,4 +71,4 @@ template class BaseObject<_cl_mem>;
 template class BaseObject<_cl_platform_id>;
 template class BaseObject<_cl_program>;
 template class BaseObject<_cl_sampler>;
-}
+} // namespace OCLRT
diff --git a/runtime/helpers/cache_policy.h b/runtime/helpers/cache_policy.h
index aced7c1471..d6c60c4a18 100644
--- a/runtime/helpers/cache_policy.h
+++ b/runtime/helpers/cache_policy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -27,6 +27,6 @@ namespace CacheSettings {
 constexpr uint32_t l3CacheOn = GMM_RESOURCE_USAGE_OCL_BUFFER;
 constexpr uint32_t l3CacheOff = GMM_RESOURCE_USAGE_OCL_BUFFER_CACHELINE_MISALIGNED;
 constexpr uint32_t unknownMocs = GMM_RESOURCE_USAGE_UNKNOWN;
-}
+} // namespace CacheSettings
 
 bool isL3Capable(void *ptr, size_t size);
\ No newline at end of file
diff --git a/runtime/helpers/dispatch_info.cpp b/runtime/helpers/dispatch_info.cpp
index b625258d75..98411b7315 100644
--- a/runtime/helpers/dispatch_info.cpp
+++ b/runtime/helpers/dispatch_info.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -35,4 +35,4 @@ bool DispatchInfo::usesStatelessPrintfSurface() const {
 uint32_t DispatchInfo::getRequiredScratchSize() const {
     return (kernel == nullptr) ? 0 : kernel->getScratchSize();
 }
-}
+} // namespace OCLRT
diff --git a/runtime/helpers/flat_batch_buffer_helper.cpp b/runtime/helpers/flat_batch_buffer_helper.cpp
index bb61840004..6223e37aa8 100644
--- a/runtime/helpers/flat_batch_buffer_helper.cpp
+++ b/runtime/helpers/flat_batch_buffer_helper.cpp
@@ -75,4 +75,4 @@ void FlatBatchBufferHelper::fixCrossThreadDataInfo(std::vector<PatchInfoData> &d
         }
     }
 }
-};
\ No newline at end of file
+}; // namespace OCLRT
\ No newline at end of file
diff --git a/runtime/helpers/hash.h b/runtime/helpers/hash.h
index 11d7f177bc..ee3e8ffc5f 100644
--- a/runtime/helpers/hash.h
+++ b/runtime/helpers/hash.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -119,4 +119,4 @@ class Hash {
   protected:
     uint32_t a, hi, lo;
 };
-}
+} // namespace OCLRT
diff --git a/runtime/helpers/per_thread_data.cpp b/runtime/helpers/per_thread_data.cpp
index 0f558c3059..522362e51e 100644
--- a/runtime/helpers/per_thread_data.cpp
+++ b/runtime/helpers/per_thread_data.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -53,4 +53,4 @@ uint32_t PerThreadDataHelper::getThreadPayloadSize(const iOpenCL::SPatchThreadPa
     threadPayloadSize += (threadPayload.UnusedPerThreadConstantPresent) ? (sizeof(GRF)) : 0;
     return threadPayloadSize;
 }
-}
+} // namespace OCLRT
diff --git a/runtime/helpers/per_thread_data.h b/runtime/helpers/per_thread_data.h
index 5b18885f6e..115a5ff25a 100644
--- a/runtime/helpers/per_thread_data.h
+++ b/runtime/helpers/per_thread_data.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -57,4 +57,4 @@ struct PerThreadDataHelper {
 
     static uint32_t getThreadPayloadSize(const iOpenCL::SPatchThreadPayload &threadPayload, uint32_t simd);
 };
-}
+} // namespace OCLRT
diff --git a/runtime/helpers/pipeline_select_helper.h b/runtime/helpers/pipeline_select_helper.h
index c497af7c0a..03e83f9231 100644
--- a/runtime/helpers/pipeline_select_helper.h
+++ b/runtime/helpers/pipeline_select_helper.h
@@ -26,4 +26,4 @@
 namespace OCLRT {
 const uint32_t pipelineSelectEnablePipelineSelectMaskBits = 0x3;
 const uint32_t pipelineSelectMediaSamplerDopClockGateMaskBits = 0x10;
-}
+} // namespace OCLRT
diff --git a/runtime/helpers/queue_helpers.h b/runtime/helpers/queue_helpers.h
index 424899f0f7..372b58e697 100644
--- a/runtime/helpers/queue_helpers.h
+++ b/runtime/helpers/queue_helpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -117,4 +117,4 @@ returnType getCmdQueueProperties(const cl_queue_properties *properties,
     }
     return retVal;
 }
-}
+} // namespace OCLRT
diff --git a/runtime/helpers/state_base_address.h b/runtime/helpers/state_base_address.h
index cab38ae9ae..4ae358f67a 100644
--- a/runtime/helpers/state_base_address.h
+++ b/runtime/helpers/state_base_address.h
@@ -39,4 +39,4 @@ struct StateBaseAddressHelper {
         uint32_t statelessMocsIndex,
         uint64_t internalHeapBase);
 };
-}
+} // namespace OCLRT
diff --git a/runtime/helpers/surface_formats.cpp b/runtime/helpers/surface_formats.cpp
index ac7538d9bf..4e7388ec55 100644
--- a/runtime/helpers/surface_formats.cpp
+++ b/runtime/helpers/surface_formats.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -218,4 +218,4 @@ const size_t numWriteOnlySurfaceFormats = ARRAY_COUNT(writeOnlySurfaceFormats);
 const size_t numReadWriteSurfaceFormats = ARRAY_COUNT(readWriteSurfaceFormats);
 
 // clang-format on
-}
+} // namespace OCLRT
diff --git a/runtime/helpers/uint16_avx2.h b/runtime/helpers/uint16_avx2.h
index d511897a9e..c06eb974c1 100644
--- a/runtime/helpers/uint16_avx2.h
+++ b/runtime/helpers/uint16_avx2.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -123,4 +123,4 @@ struct uint16x16_t {
     }
 };
 #endif // __AVX2__
-}
+} // namespace OCLRT
diff --git a/runtime/helpers/uint16_sse4.h b/runtime/helpers/uint16_sse4.h
index d875d520e6..daa4227343 100644
--- a/runtime/helpers/uint16_sse4.h
+++ b/runtime/helpers/uint16_sse4.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -121,4 +121,4 @@ struct uint16x8_t {
         return result;
     }
 };
-}
+} // namespace OCLRT
diff --git a/runtime/indirect_heap/indirect_heap.cpp b/runtime/indirect_heap/indirect_heap.cpp
index cc5f1251a2..779896b533 100644
--- a/runtime/indirect_heap/indirect_heap.cpp
+++ b/runtime/indirect_heap/indirect_heap.cpp
@@ -32,4 +32,4 @@ IndirectHeap::IndirectHeap(GraphicsAllocation *gfxAllocation, bool canBeUtilized
 
 IndirectHeap::IndirectHeap(void *buffer, size_t bufferSize) : BaseClass(buffer, bufferSize) {
 }
-}
+} // namespace OCLRT
diff --git a/runtime/indirect_heap/indirect_heap.h b/runtime/indirect_heap/indirect_heap.h
index de55c10d38..ce05ec6389 100644
--- a/runtime/indirect_heap/indirect_heap.h
+++ b/runtime/indirect_heap/indirect_heap.h
@@ -87,4 +87,4 @@ inline uint32_t IndirectHeap::getHeapSizeInPages() const {
         return (static_cast<uint32_t>(getMaxAvailableSpace()) + MemoryConstants::pageMask) / MemoryConstants::pageSize;
     }
 }
-}
+} // namespace OCLRT
diff --git a/runtime/kernel/image_transformer.cpp b/runtime/kernel/image_transformer.cpp
index eec1cdfdf2..758dfb56ed 100644
--- a/runtime/kernel/image_transformer.cpp
+++ b/runtime/kernel/image_transformer.cpp
@@ -57,4 +57,4 @@ bool ImageTransformer::didTransform() const {
 bool ImageTransformer::hasRegisteredImages3d() const {
     return !argIndexes.empty();
 }
-}
+} // namespace OCLRT
diff --git a/runtime/kernel/image_transformer.h b/runtime/kernel/image_transformer.h
index d0d0f4c148..3f0e0a0a3d 100644
--- a/runtime/kernel/image_transformer.h
+++ b/runtime/kernel/image_transformer.h
@@ -37,4 +37,4 @@ class ImageTransformer {
     bool transformed = false;
     std::vector<uint32_t> argIndexes;
 };
-}
+} // namespace OCLRT
diff --git a/runtime/kernel/kernel.cpp b/runtime/kernel/kernel.cpp
index 90b82db582..4dd85cab7e 100644
--- a/runtime/kernel/kernel.cpp
+++ b/runtime/kernel/kernel.cpp
@@ -1434,7 +1434,7 @@ void Kernel::createReflectionSurface() {
         uint32_t parentSamplerCount = objectCount.samplerCount;
         size_t maxConstantBufferSize = 0;
 
-        std::vector<IGIL_KernelCurbeParams> *curbeParamsForBlocks = new std::vector<IGIL_KernelCurbeParams>[ blockCount ];
+        std::vector<IGIL_KernelCurbeParams> *curbeParamsForBlocks = new std::vector<IGIL_KernelCurbeParams>[blockCount];
 
         uint64_t *tokenMask = new uint64_t[blockCount];
         uint32_t *sshTokenOffsetsFromKernelData = new uint32_t[blockCount];
diff --git a/runtime/memory_manager/address_mapper.cpp b/runtime/memory_manager/address_mapper.cpp
index e4a9698207..324c62c2c5 100644
--- a/runtime/memory_manager/address_mapper.cpp
+++ b/runtime/memory_manager/address_mapper.cpp
@@ -78,4 +78,4 @@ void AddressMapper::unmap(void *vm) {
         mapping.erase(it);
     }
 }
-}
+} // namespace OCLRT
diff --git a/runtime/memory_manager/address_mapper.h b/runtime/memory_manager/address_mapper.h
index ec6eb8eb18..4d705c0752 100644
--- a/runtime/memory_manager/address_mapper.h
+++ b/runtime/memory_manager/address_mapper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -45,4 +45,4 @@ class AddressMapper {
     std::vector<MapInfo *> mapping;
     std::atomic<uint32_t> nextPage;
 };
-}
+} // namespace OCLRT
diff --git a/runtime/memory_manager/deferrable_deletion.h b/runtime/memory_manager/deferrable_deletion.h
index 595d4d0741..641cf95de9 100644
--- a/runtime/memory_manager/deferrable_deletion.h
+++ b/runtime/memory_manager/deferrable_deletion.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -30,4 +30,4 @@ class DeferrableDeletion : public IDNode<DeferrableDeletion> {
     virtual void apply() = 0;
     virtual ~DeferrableDeletion() = default;
 };
-}
+} // namespace OCLRT
diff --git a/runtime/memory_manager/memory_constants.h b/runtime/memory_manager/memory_constants.h
index bde85a8aa4..807da57434 100644
--- a/runtime/memory_manager/memory_constants.h
+++ b/runtime/memory_manager/memory_constants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -43,7 +43,7 @@ static const uintptr_t page64kMask = (pageSize64k - 1);
 static const uint64_t max32BitAppAddress = ((1ULL << 31) - 1);
 static const uint64_t max64BitAppAddress = ((1ULL << 47) - 1);
 static const uint32_t sizeOf4GBinPageEntities = (MemoryConstants::gigaByte * 4 - MemoryConstants::pageSize) / MemoryConstants::pageSize;
-}
+} // namespace MemoryConstants
 
 const bool is32bit = (sizeof(void *) == 4) ? true : false;
 const bool is64bit = (sizeof(void *) == 8) ? true : false;
diff --git a/runtime/memory_manager/page_table.cpp b/runtime/memory_manager/page_table.cpp
index 211248408d..573d92738d 100644
--- a/runtime/memory_manager/page_table.cpp
+++ b/runtime/memory_manager/page_table.cpp
@@ -146,4 +146,4 @@ PageTable<T, level, bits>::~PageTable() {
 
 template class PageTable<class PDP, 3, 9>;
 template class PageTable<class PDE, 2, 2>;
-}
+} // namespace OCLRT
diff --git a/runtime/memory_manager/page_table.h b/runtime/memory_manager/page_table.h
index 90cfcac6e3..15d72719ae 100644
--- a/runtime/memory_manager/page_table.h
+++ b/runtime/memory_manager/page_table.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -72,4 +72,4 @@ class PML4 : public PageTable<class PDP, 3> {
 };
 class PDPE : public PageTable<class PDE, 2, 2> {
 };
-}
+} // namespace OCLRT
diff --git a/runtime/os_interface/device_factory.h b/runtime/os_interface/device_factory.h
index bcaf64953b..4b65ad278d 100644
--- a/runtime/os_interface/device_factory.h
+++ b/runtime/os_interface/device_factory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -36,4 +36,4 @@ class DeviceFactory {
     static size_t numDevices;
     static HardwareInfo *hwInfos;
 };
-}
+} // namespace OCLRT
diff --git a/runtime/os_interface/linux/debug_env_reader.cpp b/runtime/os_interface/linux/debug_env_reader.cpp
index 50aad97870..4ca5bce1b2 100644
--- a/runtime/os_interface/linux/debug_env_reader.cpp
+++ b/runtime/os_interface/linux/debug_env_reader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -54,4 +54,4 @@ std::string EnvironmentVariableReader::getSetting(const char *settingName, const
     }
     return keyValue;
 }
-}
+} // namespace OCLRT
diff --git a/runtime/os_interface/linux/device_command_stream.inl b/runtime/os_interface/linux/device_command_stream.inl
index 8a8eaab340..77a23de6e6 100644
--- a/runtime/os_interface/linux/device_command_stream.inl
+++ b/runtime/os_interface/linux/device_command_stream.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -36,4 +36,4 @@ CommandStreamReceiver *DeviceCommandStreamReceiver<GfxFamily>::create(const Hard
         return new DrmCommandStreamReceiver<GfxFamily>(hwInfo, nullptr);
     }
 };
-}
+} // namespace OCLRT
diff --git a/runtime/os_interface/linux/drm_allocation.h b/runtime/os_interface/linux/drm_allocation.h
index 0e5262aca5..431796118c 100644
--- a/runtime/os_interface/linux/drm_allocation.h
+++ b/runtime/os_interface/linux/drm_allocation.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -49,4 +49,4 @@ class DrmAllocation : public GraphicsAllocation {
   protected:
     BufferObject *bo;
 };
-}
+} // namespace OCLRT
diff --git a/runtime/os_interface/linux/drm_gem_close_worker.cpp b/runtime/os_interface/linux/drm_gem_close_worker.cpp
index 1506777f78..2ecae32cd8 100644
--- a/runtime/os_interface/linux/drm_gem_close_worker.cpp
+++ b/runtime/os_interface/linux/drm_gem_close_worker.cpp
@@ -117,4 +117,4 @@ void *DrmGemCloseWorker::worker(void *arg) {
     self->workerDone.store(true);
     return nullptr;
 }
-}
+} // namespace OCLRT
diff --git a/runtime/os_interface/linux/drm_gem_close_worker.h b/runtime/os_interface/linux/drm_gem_close_worker.h
index c523266990..fb9bf6bedb 100644
--- a/runtime/os_interface/linux/drm_gem_close_worker.h
+++ b/runtime/os_interface/linux/drm_gem_close_worker.h
@@ -69,4 +69,4 @@ class DrmGemCloseWorker {
     std::condition_variable condition;
     std::atomic<bool> workerDone{false};
 };
-}
+} // namespace OCLRT
diff --git a/runtime/os_interface/linux/drm_neo_create.cpp b/runtime/os_interface/linux/drm_neo_create.cpp
index d18f173173..8c4cd02399 100644
--- a/runtime/os_interface/linux/drm_neo_create.cpp
+++ b/runtime/os_interface/linux/drm_neo_create.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -38,4 +38,4 @@ Drm *Drm::create(int32_t deviceOrdinal) {
 void Drm::closeDevice(int32_t deviceOrdinal) {
     return;
 }
-}
+} // namespace OCLRT
diff --git a/runtime/os_interface/linux/drm_null_device.h b/runtime/os_interface/linux/drm_null_device.h
index f3498e6ef0..7544e4b7ce 100644
--- a/runtime/os_interface/linux/drm_null_device.h
+++ b/runtime/os_interface/linux/drm_null_device.h
@@ -59,4 +59,4 @@ class DrmNullDevice : public Drm {
 
     uint64_t gpuTimestamp;
 };
-}
+} // namespace OCLRT
diff --git a/runtime/os_interface/linux/gmm_interface_linux.cpp b/runtime/os_interface/linux/gmm_interface_linux.cpp
index 199b660e72..d691d9c9bd 100644
--- a/runtime/os_interface/linux/gmm_interface_linux.cpp
+++ b/runtime/os_interface/linux/gmm_interface_linux.cpp
@@ -36,4 +36,4 @@ void Gmm::loadLib() {
     Gmm::deleteClientContextFunc = GmmDeleteClientContext;
     isLoaded = true;
 }
-}
+} // namespace OCLRT
diff --git a/runtime/os_interface/linux/os_inc.h b/runtime/os_interface/linux/os_inc.h
index 03d66c66b1..1e3bcb421a 100644
--- a/runtime/os_interface/linux/os_inc.h
+++ b/runtime/os_interface/linux/os_inc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -27,4 +27,4 @@
 namespace OCLRT {
 class PerfProfiler;
 extern thread_local PerfProfiler *gPerfProfiler;
-};
+}; // namespace OCLRT
diff --git a/runtime/os_interface/linux/os_library.cpp b/runtime/os_interface/linux/os_library.cpp
index 3360f75077..fcce52698a 100644
--- a/runtime/os_interface/linux/os_library.cpp
+++ b/runtime/os_interface/linux/os_library.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -63,5 +63,5 @@ void *OsLibrary::getProcAddress(const std::string &procName) {
 
     return dlsym(this->handle, procName.c_str());
 }
-}
-}
+} // namespace Linux
+} // namespace OCLRT
diff --git a/runtime/os_interface/linux/os_library.h b/runtime/os_interface/linux/os_library.h
index 9ba30f9434..79cca9c1c3 100644
--- a/runtime/os_interface/linux/os_library.h
+++ b/runtime/os_interface/linux/os_library.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -37,5 +37,5 @@ class OsLibrary : public OCLRT::OsLibrary {
     bool isLoaded() override;
     void *getProcAddress(const std::string &procName) override;
 };
-}
-}
+} // namespace Linux
+} // namespace OCLRT
diff --git a/runtime/os_interface/linux/os_thread_linux.cpp b/runtime/os_interface/linux/os_thread_linux.cpp
index 90df18981a..abb8a45cb2 100644
--- a/runtime/os_interface/linux/os_thread_linux.cpp
+++ b/runtime/os_interface/linux/os_thread_linux.cpp
@@ -34,4 +34,4 @@ std::unique_ptr<Thread> Thread::create(void *(*func)(void *), void *arg) {
 void ThreadLinux::join() {
     pthread_join(threadId, nullptr);
 }
-}
+} // namespace OCLRT
diff --git a/runtime/os_interface/linux/os_thread_linux.h b/runtime/os_interface/linux/os_thread_linux.h
index cec0f5995f..c18af34f10 100644
--- a/runtime/os_interface/linux/os_thread_linux.h
+++ b/runtime/os_interface/linux/os_thread_linux.h
@@ -32,4 +32,4 @@ class ThreadLinux : public Thread {
   protected:
     pthread_t threadId;
 };
-}
+} // namespace OCLRT
diff --git a/runtime/os_interface/os_inc_base.h b/runtime/os_interface/os_inc_base.h
index 8f0c354585..0a24a0b90d 100644
--- a/runtime/os_interface/os_inc_base.h
+++ b/runtime/os_interface/os_inc_base.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -33,4 +33,4 @@ extern const char *testDllName;
 extern const char *fileSeparator;
 // Pci Path
 extern const char *sysFsPciPath;
-};
+}; // namespace Os
diff --git a/runtime/os_interface/os_library.h b/runtime/os_interface/os_library.h
index 4747d16f3b..6c38d6e304 100644
--- a/runtime/os_interface/os_library.h
+++ b/runtime/os_interface/os_library.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -37,4 +37,4 @@ class OsLibrary {
     virtual void *getProcAddress(const std::string &procName) = 0;
     virtual bool isLoaded() = 0;
 };
-}
+} // namespace OCLRT
diff --git a/runtime/os_interface/os_thread.h b/runtime/os_interface/os_thread.h
index 71bfe57ea7..a5cbba05f7 100644
--- a/runtime/os_interface/os_thread.h
+++ b/runtime/os_interface/os_thread.h
@@ -30,4 +30,4 @@ class Thread {
     virtual void join() = 0;
     virtual ~Thread() = default;
 };
-}
+} // namespace OCLRT
diff --git a/runtime/os_interface/windows/device_command_stream.inl b/runtime/os_interface/windows/device_command_stream.inl
index 8fced0a953..cb0314d9e6 100644
--- a/runtime/os_interface/windows/device_command_stream.inl
+++ b/runtime/os_interface/windows/device_command_stream.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -40,4 +40,4 @@ CommandStreamReceiver *DeviceCommandStreamReceiver<GfxFamily>::create(const Hard
         return new WddmCommandStreamReceiver<GfxFamily>(hwInfo, nullptr);
     }
 }
-}
+} // namespace OCLRT
diff --git a/runtime/os_interface/windows/gmm_interface_dynamic_win.cpp b/runtime/os_interface/windows/gmm_interface_dynamic_win.cpp
index 8e991e2517..039f56b799 100644
--- a/runtime/os_interface/windows/gmm_interface_dynamic_win.cpp
+++ b/runtime/os_interface/windows/gmm_interface_dynamic_win.cpp
@@ -58,4 +58,4 @@ void Gmm::loadLib() {
     }
     UNRECOVERABLE_IF(!isLoaded);
 }
-}
+} // namespace OCLRT
diff --git a/runtime/os_interface/windows/gmm_interface_static_win.cpp b/runtime/os_interface/windows/gmm_interface_static_win.cpp
index 82688f3447..dd4abce0dd 100644
--- a/runtime/os_interface/windows/gmm_interface_static_win.cpp
+++ b/runtime/os_interface/windows/gmm_interface_static_win.cpp
@@ -36,7 +36,7 @@ void Gmm::loadLib() {
     Gmm::deleteClientContextFunc = GmmDeleteClientContext;
     isLoaded = true;
 }
-}
+} // namespace OCLRT
 extern "C" {
 void GMMDebugBreak(const char *file, const char *function, const int line) {
 }
diff --git a/runtime/os_interface/windows/kmdaf_listener.cpp b/runtime/os_interface/windows/kmdaf_listener.cpp
index 9366e90155..e9b39434f3 100644
--- a/runtime/os_interface/windows/kmdaf_listener.cpp
+++ b/runtime/os_interface/windows/kmdaf_listener.cpp
@@ -52,4 +52,4 @@ void KmDafListener::notifyEvict(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_H
 void KmDafListener::notifyWriteTarget(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_HANDLE hDevice, const D3DKMT_HANDLE hAllocation, PFND3DKMT_ESCAPE pfnEscape) {
     KM_DAF_NOTIFY_WRITE_TARGET(ftrKmdDaf, hAdapter, hDevice, hAllocation, pfnEscape);
 }
-}
+} // namespace OCLRT
diff --git a/runtime/os_interface/windows/kmdaf_listener.h b/runtime/os_interface/windows/kmdaf_listener.h
index c874e22427..f78aba087b 100644
--- a/runtime/os_interface/windows/kmdaf_listener.h
+++ b/runtime/os_interface/windows/kmdaf_listener.h
@@ -42,4 +42,4 @@ struct KmDafListener {
 
     MOCKABLE_VIRTUAL void notifyWriteTarget(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_HANDLE hDevice, const D3DKMT_HANDLE hAllocation, PFND3DKMT_ESCAPE pfnEscape);
 };
-}
+} // namespace OCLRT
diff --git a/runtime/os_interface/windows/kmdaf_listener_stub.cpp b/runtime/os_interface/windows/kmdaf_listener_stub.cpp
index a4be2b3b81..793781c79f 100644
--- a/runtime/os_interface/windows/kmdaf_listener_stub.cpp
+++ b/runtime/os_interface/windows/kmdaf_listener_stub.cpp
@@ -44,4 +44,4 @@ void KmDafListener::notifyEvict(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_H
 
 void KmDafListener::notifyWriteTarget(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_HANDLE hDevice, const D3DKMT_HANDLE hAllocation, PFND3DKMT_ESCAPE pfnEscape) {
 }
-}
+} // namespace OCLRT
diff --git a/runtime/os_interface/windows/os_inc.h b/runtime/os_interface/windows/os_inc.h
index f6c851a957..64446b2b7a 100644
--- a/runtime/os_interface/windows/os_inc.h
+++ b/runtime/os_interface/windows/os_inc.h
@@ -26,11 +26,11 @@
 namespace OCLRT {
 class PerfProfiler;
 extern __declspec(thread) PerfProfiler *gPerfProfiler;
-};
+}; // namespace OCLRT
 // For now we need to keep this file clean of OS specific #includes.
 // Only issues to address portability should be covered here.
 
 namespace Os {
 // OS GDI name
 extern const char *gdiDllName;
-};
+}; // namespace Os
diff --git a/runtime/os_interface/windows/os_library.cpp b/runtime/os_interface/windows/os_library.cpp
index 10361afd18..bc51ce94c5 100644
--- a/runtime/os_interface/windows/os_library.cpp
+++ b/runtime/os_interface/windows/os_library.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -81,5 +81,5 @@ bool OsLibrary::isLoaded() {
 void *OsLibrary::getProcAddress(const std::string &procName) {
     return ::GetProcAddress(this->handle, procName.c_str());
 }
-}
-}
+} // namespace Windows
+} // namespace OCLRT
diff --git a/runtime/os_interface/windows/os_library.h b/runtime/os_interface/windows/os_library.h
index 55b6edfb45..2eb7259607 100644
--- a/runtime/os_interface/windows/os_library.h
+++ b/runtime/os_interface/windows/os_library.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -46,5 +46,5 @@ class OsLibrary : public OCLRT::OsLibrary {
     static decltype(&LoadLibraryExA) loadLibraryExA;
     static decltype(&GetModuleFileNameA) getModuleFileNameA;
 };
-}
-}
+} // namespace Windows
+} // namespace OCLRT
diff --git a/runtime/os_interface/windows/os_thread_win.cpp b/runtime/os_interface/windows/os_thread_win.cpp
index 42f169408f..33b491721f 100644
--- a/runtime/os_interface/windows/os_thread_win.cpp
+++ b/runtime/os_interface/windows/os_thread_win.cpp
@@ -33,4 +33,4 @@ std::unique_ptr<Thread> Thread::create(void *(*func)(void *), void *arg) {
 void ThreadWin::join() {
     thread->join();
 }
-}
+} // namespace OCLRT
diff --git a/runtime/os_interface/windows/os_thread_win.h b/runtime/os_interface/windows/os_thread_win.h
index 38bf425ca8..f9822aa8bd 100644
--- a/runtime/os_interface/windows/os_thread_win.h
+++ b/runtime/os_interface/windows/os_thread_win.h
@@ -32,4 +32,4 @@ class ThreadWin : public Thread {
   protected:
     std::unique_ptr<std::thread> thread;
 };
-}
+} // namespace OCLRT
diff --git a/runtime/program/create.cpp b/runtime/program/create.cpp
index 3ee604a170..fef38bd0d8 100644
--- a/runtime/program/create.cpp
+++ b/runtime/program/create.cpp
@@ -28,4 +28,4 @@ template Program *Program::create<Program>(cl_context, cl_uint, const cl_device_
 template Program *Program::create<Program>(cl_context, cl_uint, const char **, const size_t *, cl_int &);
 template Program *Program::create<Program>(const char *, Context *, Device &, bool, cl_int *);
 template Program *Program::createFromIL<Program>(Context *, const void *, size_t length, cl_int &);
-}
+} // namespace OCLRT
diff --git a/runtime/program/patch_info.h b/runtime/program/patch_info.h
index df20d3b0ba..fbf67ffe68 100644
--- a/runtime/program/patch_info.h
+++ b/runtime/program/patch_info.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -27,36 +27,36 @@
 #include <map>
 
 namespace OCLRT {
-using iOpenCL::SPatchMediaInterfaceDescriptorLoad;
-using iOpenCL::SPatchAllocateLocalSurface;
-using iOpenCL::SPatchMediaVFEState;
-using iOpenCL::SPatchInterfaceDescriptorData;
-using iOpenCL::SPatchSamplerStateArray;
-using iOpenCL::SPatchBindingTableState;
-using iOpenCL::SPatchDataParameterBuffer;
-using iOpenCL::SPatchStatelessGlobalMemoryObjectKernelArgument;
-using iOpenCL::SPatchGlobalMemoryObjectKernelArgument;
-using iOpenCL::SPatchStatelessConstantMemoryObjectKernelArgument;
-using iOpenCL::SPatchStatelessDeviceQueueKernelArgument;
-using iOpenCL::SPatchImageMemoryObjectKernelArgument;
-using iOpenCL::SPatchSamplerKernelArgument;
-using iOpenCL::SPatchDataParameterStream;
-using iOpenCL::SPatchThreadPayload;
-using iOpenCL::SPatchExecutionEnvironment;
-using iOpenCL::SPatchKernelAttributesInfo;
-using iOpenCL::SPatchKernelArgumentInfo;
 using iOpenCL::SKernelBinaryHeaderCommon;
-using iOpenCL::SProgramBinaryHeader;
-using iOpenCL::SPatchAllocateStatelessPrivateSurface;
+using iOpenCL::SPatchAllocateLocalSurface;
 using iOpenCL::SPatchAllocateStatelessConstantMemorySurfaceWithInitialization;
+using iOpenCL::SPatchAllocateStatelessDefaultDeviceQueueSurface;
+using iOpenCL::SPatchAllocateStatelessEventPoolSurface;
 using iOpenCL::SPatchAllocateStatelessGlobalMemorySurfaceWithInitialization;
 using iOpenCL::SPatchAllocateStatelessPrintfSurface;
-using iOpenCL::SPatchAllocateStatelessEventPoolSurface;
-using iOpenCL::SPatchAllocateStatelessDefaultDeviceQueueSurface;
-using iOpenCL::SPatchString;
-using iOpenCL::SPatchGtpinFreeGRFInfo;
-using iOpenCL::SPatchStateSIP;
+using iOpenCL::SPatchAllocateStatelessPrivateSurface;
 using iOpenCL::SPatchAllocateSystemThreadSurface;
+using iOpenCL::SPatchBindingTableState;
+using iOpenCL::SPatchDataParameterBuffer;
+using iOpenCL::SPatchDataParameterStream;
+using iOpenCL::SPatchExecutionEnvironment;
+using iOpenCL::SPatchGlobalMemoryObjectKernelArgument;
+using iOpenCL::SPatchGtpinFreeGRFInfo;
+using iOpenCL::SPatchImageMemoryObjectKernelArgument;
+using iOpenCL::SPatchInterfaceDescriptorData;
+using iOpenCL::SPatchKernelArgumentInfo;
+using iOpenCL::SPatchKernelAttributesInfo;
+using iOpenCL::SPatchMediaInterfaceDescriptorLoad;
+using iOpenCL::SPatchMediaVFEState;
+using iOpenCL::SPatchSamplerKernelArgument;
+using iOpenCL::SPatchSamplerStateArray;
+using iOpenCL::SPatchStatelessConstantMemoryObjectKernelArgument;
+using iOpenCL::SPatchStatelessDeviceQueueKernelArgument;
+using iOpenCL::SPatchStatelessGlobalMemoryObjectKernelArgument;
+using iOpenCL::SPatchStateSIP;
+using iOpenCL::SPatchString;
+using iOpenCL::SPatchThreadPayload;
+using iOpenCL::SProgramBinaryHeader;
 
 typedef struct TagPrintfStringInfo {
     size_t SizeInBytes;
diff --git a/runtime/program/process_elf_binary.cpp b/runtime/program/process_elf_binary.cpp
index dbaa9d9de0..62e2ae7903 100644
--- a/runtime/program/process_elf_binary.cpp
+++ b/runtime/program/process_elf_binary.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -264,4 +264,4 @@ cl_int Program::resolveProgramBinary() {
     }
     return retVal;
 }
-}
+} // namespace OCLRT
diff --git a/runtime/program/process_spir_binary.cpp b/runtime/program/process_spir_binary.cpp
index d394fa9676..4993ec534e 100644
--- a/runtime/program/process_spir_binary.cpp
+++ b/runtime/program/process_spir_binary.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -54,4 +54,4 @@ cl_int Program::processSpirBinary(
 
     return CL_SUCCESS;
 }
-}
+} // namespace OCLRT
diff --git a/runtime/sampler/sampler.h b/runtime/sampler/sampler.h
index c818a0f5c2..16a6759614 100644
--- a/runtime/sampler/sampler.h
+++ b/runtime/sampler/sampler.h
@@ -146,4 +146,4 @@ typedef Sampler *(*SamplerCreateFunc)(Context *context,
                                       float lodMax);
 
 typedef size_t (*getSamplerStateSizeHwFunc)();
-}
+} // namespace OCLRT
diff --git a/runtime/sampler/sampler.inl b/runtime/sampler/sampler.inl
index 12ede5840a..8a30a50182 100644
--- a/runtime/sampler/sampler.inl
+++ b/runtime/sampler/sampler.inl
@@ -115,4 +115,4 @@ size_t SamplerHw<GfxFamily>::getSamplerStateSize() {
     using SAMPLER_STATE = typename GfxFamily::SAMPLER_STATE;
     return sizeof(SAMPLER_STATE);
 }
-}
+} // namespace OCLRT
diff --git a/runtime/sharings/d3d/cl_d3d_api.h b/runtime/sharings/d3d/cl_d3d_api.h
index 91a9477b59..520092e78e 100644
--- a/runtime/sharings/d3d/cl_d3d_api.h
+++ b/runtime/sharings/d3d/cl_d3d_api.h
@@ -22,7 +22,6 @@
 
 #pragma once
 
-
 #include "CL/cl.h"
 #include <d3d10_1.h>
 #include "CL/cl_dx9_media_sharing.h"
diff --git a/runtime/sharings/d3d/enable_d3d.cpp b/runtime/sharings/d3d/enable_d3d.cpp
index 83db74c690..feba405858 100644
--- a/runtime/sharings/d3d/enable_d3d.cpp
+++ b/runtime/sharings/d3d/enable_d3d.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -171,5 +171,5 @@ void *D3DSharingBuilderFactory<D3DTypesHelper::D3D11>::getExtensionFunctionAddre
 static SharingFactory::RegisterSharing<D3DSharingBuilderFactory<D3DTypesHelper::D3D9>, D3DSharingFunctions<D3DTypesHelper::D3D9>> D3D9Sharing;
 static SharingFactory::RegisterSharing<D3DSharingBuilderFactory<D3DTypesHelper::D3D10>, D3DSharingFunctions<D3DTypesHelper::D3D10>> D3D10Sharing;
 static SharingFactory::RegisterSharing<D3DSharingBuilderFactory<D3DTypesHelper::D3D11>, D3DSharingFunctions<D3DTypesHelper::D3D11>> D3D11Sharing;
-}
+} // namespace OCLRT
 #endif
diff --git a/runtime/sharings/d3d/enable_d3d.h b/runtime/sharings/d3d/enable_d3d.h
index 4e44975522..63b0da920b 100644
--- a/runtime/sharings/d3d/enable_d3d.h
+++ b/runtime/sharings/d3d/enable_d3d.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -53,4 +53,4 @@ class D3DSharingBuilderFactory : public SharingBuilderFactory {
     void fillGlobalDispatchTable() override;
     void *getExtensionFunctionAddress(const std::string &functionName) override;
 };
-}
\ No newline at end of file
+} // namespace OCLRT
\ No newline at end of file
diff --git a/runtime/sharings/sharing.cpp b/runtime/sharings/sharing.cpp
index 80e8ecd464..ad45477fb8 100644
--- a/runtime/sharings/sharing.cpp
+++ b/runtime/sharings/sharing.cpp
@@ -63,4 +63,4 @@ void SharingHandler::release(MemObj *memObject) {
         releaseResource(memObject);
     }
 }
-}
+} // namespace OCLRT
diff --git a/runtime/sharings/sharing_factory.cpp b/runtime/sharings/sharing_factory.cpp
index b0b42e0713..bde0c82e99 100644
--- a/runtime/sharings/sharing_factory.cpp
+++ b/runtime/sharings/sharing_factory.cpp
@@ -85,4 +85,4 @@ SharingBuilderFactory *SharingFactory::sharingContextBuilder[SharingType::MAX_SH
     nullptr,
 };
 SharingFactory sharingFactory;
-}
+} // namespace OCLRT
diff --git a/runtime/sharings/sharing_factory.h b/runtime/sharings/sharing_factory.h
index 5629ae65e3..91155dafba 100644
--- a/runtime/sharings/sharing_factory.h
+++ b/runtime/sharings/sharing_factory.h
@@ -76,4 +76,4 @@ class SharingFactory {
 };
 
 extern SharingFactory sharingFactory;
-}
+} // namespace OCLRT
diff --git a/runtime/sharings/sharing_factory.inl b/runtime/sharings/sharing_factory.inl
index c5114b1ff7..28d746b20d 100644
--- a/runtime/sharings/sharing_factory.inl
+++ b/runtime/sharings/sharing_factory.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -28,4 +28,4 @@ template <typename F, typename T>
 SharingFactory::RegisterSharing<F, T>::RegisterSharing() {
     sharingContextBuilder[T::sharingId] = new F;
 };
-}
+} // namespace OCLRT
diff --git a/runtime/sharings/va/enable_va.h b/runtime/sharings/va/enable_va.h
index a823752afd..1c12ed016e 100644
--- a/runtime/sharings/va/enable_va.h
+++ b/runtime/sharings/va/enable_va.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -50,4 +50,4 @@ class VaSharingBuilderFactory : public SharingBuilderFactory {
     void fillGlobalDispatchTable() override;
     void *getExtensionFunctionAddress(const std::string &functionName) override;
 };
-}
+} // namespace OCLRT
diff --git a/runtime/sharings/va/va_sharing.cpp b/runtime/sharings/va/va_sharing.cpp
index 7eccb7c117..a9db4ba4d6 100644
--- a/runtime/sharings/va/va_sharing.cpp
+++ b/runtime/sharings/va/va_sharing.cpp
@@ -29,4 +29,4 @@ namespace OCLRT {
 const uint32_t VASharingFunctions::sharingId = SharingType::VA_SHARING;
 
 template VASharingFunctions *Context::getSharing<VASharingFunctions>();
-}
+} // namespace OCLRT
diff --git a/runtime/sharings/va/va_sharing.h b/runtime/sharings/va/va_sharing.h
index 5f25a934ea..4db5020912 100644
--- a/runtime/sharings/va/va_sharing.h
+++ b/runtime/sharings/va/va_sharing.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -37,4 +37,4 @@ class VASharing : public SharingHandler {
     VASharingFunctions *sharingFunctions = nullptr;
     VAImageID imageId;
 };
-}
+} // namespace OCLRT
diff --git a/runtime/sharings/va/va_sharing_functions.cpp b/runtime/sharings/va/va_sharing_functions.cpp
index bc71d51b56..095f78bf42 100644
--- a/runtime/sharings/va/va_sharing_functions.cpp
+++ b/runtime/sharings/va/va_sharing_functions.cpp
@@ -72,4 +72,4 @@ void VASharingFunctions::initFunctions() {
         }
     }
 }
-}
+} // namespace OCLRT
diff --git a/runtime/sharings/va/va_sharing_functions.h b/runtime/sharings/va/va_sharing_functions.h
index 8065ee58d5..a6f94db6db 100644
--- a/runtime/sharings/va/va_sharing_functions.h
+++ b/runtime/sharings/va/va_sharing_functions.h
@@ -80,4 +80,4 @@ class VASharingFunctions : public SharingFunctions {
     VAExtGetSurfaceHandlePFN vaExtGetSurfaceHandlePFN;
     VAGetLibFuncPFN vaGetLibFuncPFN;
 };
-}
+} // namespace OCLRT
diff --git a/runtime/sharings/va/va_surface.h b/runtime/sharings/va/va_surface.h
index 8cb6e0a769..eef47a7145 100644
--- a/runtime/sharings/va/va_surface.h
+++ b/runtime/sharings/va/va_surface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -47,4 +47,4 @@ class VASurface : VASharing {
     VASurfaceID *surfaceId;
     bool interopUserSync;
 };
-}
+} // namespace OCLRT
diff --git a/runtime/utilities/debug_file_reader.h b/runtime/utilities/debug_file_reader.h
index b474f1514f..24122b8de7 100644
--- a/runtime/utilities/debug_file_reader.h
+++ b/runtime/utilities/debug_file_reader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -44,4 +44,4 @@ class SettingsFileReader : public SettingsReader {
     std::map<std::string, int32_t> settingValueMap;
     std::map<std::string, std::string> settingStringMap;
 };
-};
\ No newline at end of file
+}; // namespace OCLRT
\ No newline at end of file
diff --git a/runtime/utilities/debug_settings_reader.cpp b/runtime/utilities/debug_settings_reader.cpp
index ad36a71f30..d1c02b32f4 100644
--- a/runtime/utilities/debug_settings_reader.cpp
+++ b/runtime/utilities/debug_settings_reader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -36,4 +36,4 @@ SettingsReader *SettingsReader::createFileReader() {
     }
     return nullptr;
 }
-};
+}; // namespace OCLRT
diff --git a/runtime/utilities/debug_settings_reader.h b/runtime/utilities/debug_settings_reader.h
index e371fa218e..f5b1e2d99b 100644
--- a/runtime/utilities/debug_settings_reader.h
+++ b/runtime/utilities/debug_settings_reader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -45,4 +45,4 @@ class SettingsReader {
 
     static const char *settingsFileName;
 };
-};
+}; // namespace OCLRT
diff --git a/runtime/utilities/directory.h b/runtime/utilities/directory.h
index e171affe23..e53f68b452 100644
--- a/runtime/utilities/directory.h
+++ b/runtime/utilities/directory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -30,4 +30,4 @@ class Directory {
   public:
     static std::vector<std::string> getFiles(std::string &path);
 };
-};
+}; // namespace OCLRT
diff --git a/runtime/utilities/heap_allocator.cpp b/runtime/utilities/heap_allocator.cpp
index 88693299a1..ac02fd0609 100644
--- a/runtime/utilities/heap_allocator.cpp
+++ b/runtime/utilities/heap_allocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -27,4 +27,4 @@ namespace OCLRT {
 bool operator<(const HeapChunk &hc1, const HeapChunk &hc2) {
     return hc1.ptr < hc2.ptr;
 }
-}
+} // namespace OCLRT
diff --git a/runtime/utilities/idlist.h b/runtime/utilities/idlist.h
index da2f8d4157..a35f2caa0b 100644
--- a/runtime/utilities/idlist.h
+++ b/runtime/utilities/idlist.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -483,4 +483,4 @@ class IDRefList : public IDList<IDNodeRef<NodeObjectType>, ThreadSafe, OwnsNodes
         refNode.release();
     }
 };
-}
+} // namespace OCLRT
diff --git a/runtime/utilities/iflist.h b/runtime/utilities/iflist.h
index 8921166e44..08a881eeb4 100644
--- a/runtime/utilities/iflist.h
+++ b/runtime/utilities/iflist.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -206,4 +206,4 @@ class IFRefList : public IFList<IFNodeRef<NodeObjectType>, ThreadSafe, OwnsNodes
         up.release();
     }
 };
-}
+} // namespace OCLRT
diff --git a/runtime/utilities/linux/debug_env_reader.h b/runtime/utilities/linux/debug_env_reader.h
index 206b5d9e41..088232e693 100644
--- a/runtime/utilities/linux/debug_env_reader.h
+++ b/runtime/utilities/linux/debug_env_reader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -33,4 +33,4 @@ class EnvironmentVariableReader : public SettingsReader {
     bool getSetting(const char *settingName, bool defaultValue) override;
     std::string getSetting(const char *settingName, const std::string &value) override;
 };
-}
+} // namespace OCLRT
diff --git a/runtime/utilities/linux/directory.cpp b/runtime/utilities/linux/directory.cpp
index bf4560f930..b4c40a2fd2 100644
--- a/runtime/utilities/linux/directory.cpp
+++ b/runtime/utilities/linux/directory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -51,4 +51,4 @@ std::vector<std::string> Directory::getFiles(std::string &path) {
     closedir(dir);
     return files;
 }
-};
+}; // namespace OCLRT
diff --git a/runtime/utilities/linux/timer_util.cpp b/runtime/utilities/linux/timer_util.cpp
index 2ed7a48286..3e60208d67 100644
--- a/runtime/utilities/linux/timer_util.cpp
+++ b/runtime/utilities/linux/timer_util.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -108,4 +108,4 @@ Timer &Timer::operator=(const Timer &t) {
 void Timer::setFreq() {
     TimerImpl::setFreq();
 }
-};
+}; // namespace OCLRT
diff --git a/runtime/utilities/numeric.h b/runtime/utilities/numeric.h
index 97119faaba..d5fadfb727 100644
--- a/runtime/utilities/numeric.h
+++ b/runtime/utilities/numeric.h
@@ -102,4 +102,4 @@ struct UnsignedFixedPointValue {
 };
 
 using FixedU4D8 = UnsignedFixedPointValue<4, 8>;
-}
+} // namespace OCLRT
diff --git a/runtime/utilities/perf_profiler.cpp b/runtime/utilities/perf_profiler.cpp
index 33a897b611..82360d4b1c 100644
--- a/runtime/utilities/perf_profiler.cpp
+++ b/runtime/utilities/perf_profiler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -188,4 +188,4 @@ void PerfProfiler::logTimes(long long start, long long end, long long span, unsi
 void PerfProfiler::logSysTimes(long long start, unsigned long long time, unsigned int id) {
     systemLogs.emplace_back(SystemLog{id, start, time});
 }
-}
+} // namespace OCLRT
diff --git a/runtime/utilities/range.h b/runtime/utilities/range.h
index 817d0e647c..0e00db87a5 100644
--- a/runtime/utilities/range.h
+++ b/runtime/utilities/range.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -46,4 +46,4 @@ template <typename T>
 Range<T> CreateRange(T *base, size_t count) {
     return Range<T>(base, count);
 }
-}
\ No newline at end of file
+} // namespace OCLRT
\ No newline at end of file
diff --git a/runtime/utilities/reference_tracked_object.h b/runtime/utilities/reference_tracked_object.h
index 479c339ac1..9b8c8cb3d7 100644
--- a/runtime/utilities/reference_tracked_object.h
+++ b/runtime/utilities/reference_tracked_object.h
@@ -190,4 +190,4 @@ template <typename DerivedClass>
 inline ReferenceTrackedObject<DerivedClass>::~ReferenceTrackedObject() {
     DEBUG_BREAK_IF(refInternal.peek() > 1);
 }
-}
+} // namespace OCLRT
diff --git a/runtime/utilities/spinlock.h b/runtime/utilities/spinlock.h
index 88259559b8..a49bfe930a 100644
--- a/runtime/utilities/spinlock.h
+++ b/runtime/utilities/spinlock.h
@@ -37,4 +37,4 @@ class SpinLock {
     }
 };
 
-} // OCLRT
+} // namespace OCLRT
diff --git a/runtime/utilities/tag_allocator.h b/runtime/utilities/tag_allocator.h
index 66bb1306f4..fc0bb5b66b 100644
--- a/runtime/utilities/tag_allocator.h
+++ b/runtime/utilities/tag_allocator.h
@@ -95,6 +95,7 @@ class TagAllocator {
         ((void)(usedNode));
         freeTags.pushFrontOne(*node);
     }
+
   protected:
     IDList<NodeType> freeTags;
     IDList<NodeType> usedTags;
diff --git a/runtime/utilities/timer_util.h b/runtime/utilities/timer_util.h
index 2d7bbd9711..fe92c2c308 100644
--- a/runtime/utilities/timer_util.h
+++ b/runtime/utilities/timer_util.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -49,4 +49,4 @@ class Timer {
     class TimerImpl;
     TimerImpl *timerImpl;
 };
-};
+}; // namespace OCLRT
diff --git a/runtime/utilities/vec.h b/runtime/utilities/vec.h
index 5ba78485de..7658dfb183 100644
--- a/runtime/utilities/vec.h
+++ b/runtime/utilities/vec.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -79,4 +79,4 @@ struct Vec3 {
     T y;
     T z;
 };
-}
+} // namespace OCLRT
diff --git a/runtime/utilities/windows/directory.cpp b/runtime/utilities/windows/directory.cpp
index 87eee62ad0..1f08e9dc9b 100644
--- a/runtime/utilities/windows/directory.cpp
+++ b/runtime/utilities/windows/directory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -51,4 +51,4 @@ std::vector<std::string> Directory::getFiles(std::string &path) {
     FindClose(hFind);
     return files;
 }
-};
+}; // namespace OCLRT
diff --git a/runtime/utilities/windows/timer_util.cpp b/runtime/utilities/windows/timer_util.cpp
index c2cd90e860..9103711240 100644
--- a/runtime/utilities/windows/timer_util.cpp
+++ b/runtime/utilities/windows/timer_util.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -124,4 +124,4 @@ Timer &Timer::operator=(const Timer &t) {
 void Timer::setFreq() {
     TimerImpl::setFreq();
 }
-};
+}; // namespace OCLRT
diff --git a/unit_tests/abort.cpp b/unit_tests/abort.cpp
index 9710dcac05..f709e251cb 100644
--- a/unit_tests/abort.cpp
+++ b/unit_tests/abort.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -28,4 +28,4 @@ namespace OCLRT {
 void abortExecution() {
     throw std::exception();
 }
-}
+} // namespace OCLRT
diff --git a/unit_tests/api/cl_create_image_tests.cpp b/unit_tests/api/cl_create_image_tests.cpp
index c10e6573e0..e95288c0fe 100644
--- a/unit_tests/api/cl_create_image_tests.cpp
+++ b/unit_tests/api/cl_create_image_tests.cpp
@@ -871,4 +871,4 @@ TEST_P(clCreateNon2dImageFromImageTest, givenImage2dWhenCreateImageFromNon2dImag
 INSTANTIATE_TEST_CASE_P(clCreateNon2dImageFromImageTests,
                         clCreateNon2dImageFromImageTest,
                         ::testing::ValuesIn(non2dImageTypes));
-}
+} // namespace ULT
diff --git a/unit_tests/api/cl_create_user_event_tests_mt.cpp b/unit_tests/api/cl_create_user_event_tests_mt.cpp
index 1d8cf491ce..84a41c3698 100644
--- a/unit_tests/api/cl_create_user_event_tests_mt.cpp
+++ b/unit_tests/api/cl_create_user_event_tests_mt.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -42,7 +42,6 @@ TEST_F(clCreateUserEventMtTests, WaitForUserEventThatIsCLSubmittedStalls) {
         ThreadStarted = true;
         clWaitForEvents(1, &userEvent);
         WaitForEventsCompleted = true;
-
     });
 
     //wait for the thread to start
diff --git a/unit_tests/api/cl_enqueue_native_kernel_tests.cpp b/unit_tests/api/cl_enqueue_native_kernel_tests.cpp
index bcbba00bfa..a03483ef55 100644
--- a/unit_tests/api/cl_enqueue_native_kernel_tests.cpp
+++ b/unit_tests/api/cl_enqueue_native_kernel_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -40,7 +40,7 @@ TEST_F(clEnqueueNativeKernelTests, notImplemented) {
         0,       // num_events
         nullptr, //event_list
         nullptr  // event
-        );
+    );
     EXPECT_EQ(CL_OUT_OF_HOST_MEMORY, retVal);
 }
 } // namespace ULT
diff --git a/unit_tests/api/cl_enqueue_svm_free_tests.cpp b/unit_tests/api/cl_enqueue_svm_free_tests.cpp
index 4e730ef96a..a99c3664f2 100644
--- a/unit_tests/api/cl_enqueue_svm_free_tests.cpp
+++ b/unit_tests/api/cl_enqueue_svm_free_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -41,7 +41,7 @@ TEST_F(clEnqueueSVMFreeTests, invalidCommandQueue) {
         0,       // cl_uint num_events_in_wait_list
         nullptr, // const cl_event *event_wait_list
         nullptr  // cl_event *event
-        );
+    );
     EXPECT_EQ(CL_INVALID_COMMAND_QUEUE, retVal);
 }
 
@@ -55,7 +55,7 @@ TEST_F(clEnqueueSVMFreeTests, invalidValue_SvmPointersAreNullAndNumSvmPointersIs
         0,             // cl_uint num_events_in_wait_list
         nullptr,       // const cl_event *event_wait_list
         nullptr        // cl_event *event
-        );
+    );
     EXPECT_EQ(CL_INVALID_VALUE, retVal);
 }
 
@@ -75,7 +75,7 @@ TEST_F(clEnqueueSVMFreeTests, invalidValue_NumSvmPointersIsZeroAndSvmPointersAre
             0,             // cl_uint num_events_in_wait_list
             nullptr,       // const cl_event *event_wait_list
             nullptr        // cl_event *event
-            );
+        );
         EXPECT_EQ(CL_INVALID_VALUE, retVal);
 
         clSVMFree(pContext, ptrSvm);
@@ -92,7 +92,7 @@ TEST_F(clEnqueueSVMFreeTests, invalidEventWaitList_EventWaitListIsNullAndNumEven
         1,             // cl_uint num_events_in_wait_list
         nullptr,       // const cl_event *event_wait_list
         nullptr        // cl_event *event
-        );
+    );
     EXPECT_EQ(CL_INVALID_EVENT_WAIT_LIST, retVal);
 }
 
@@ -108,7 +108,7 @@ TEST_F(clEnqueueSVMFreeTests, invalidEventWaitList_EventWaitListIsNotNullAndNumE
         0,             // cl_uint num_events_in_wait_list
         eventWaitList, // const cl_event *event_wait_list
         nullptr        // cl_event *event
-        );
+    );
     EXPECT_EQ(CL_INVALID_EVENT_WAIT_LIST, retVal);
 }
 
@@ -128,7 +128,7 @@ TEST_F(clEnqueueSVMFreeTests, success_NumSvmPointersIsNonZeroAndSvmPointersAreNo
             0,             // cl_uint num_events_in_wait_list
             nullptr,       // const cl_event *event_wait_list
             nullptr        // cl_event *event
-            );
+        );
         EXPECT_EQ(CL_SUCCESS, retVal);
 
         clSVMFree(pContext, ptrSvm);
@@ -147,7 +147,7 @@ TEST_F(clEnqueueSVMFreeTests, success_NumSvmPointersIsZeroAndSvmPointersAreNull)
             0,             // cl_uint num_events_in_wait_list
             nullptr,       // const cl_event *event_wait_list
             nullptr        // cl_event *event
-            );
+        );
         EXPECT_EQ(CL_SUCCESS, retVal);
     }
 }
diff --git a/unit_tests/api/cl_enqueue_svm_map_tests.cpp b/unit_tests/api/cl_enqueue_svm_map_tests.cpp
index f3b528a03a..1b3a3c1eee 100644
--- a/unit_tests/api/cl_enqueue_svm_map_tests.cpp
+++ b/unit_tests/api/cl_enqueue_svm_map_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -41,7 +41,7 @@ TEST_F(clEnqueueSVMMapTests, invalidCommandQueue) {
         0,           // cl_uint num_events_in_wait_list
         nullptr,     // const cL_event *event_wait_list
         nullptr      // cl_event *event
-        );
+    );
     EXPECT_EQ(CL_INVALID_COMMAND_QUEUE, retVal);
 }
 
@@ -55,7 +55,7 @@ TEST_F(clEnqueueSVMMapTests, invalidValue_SvmPtrIsNull) {
         0,             // cl_uint num_events_in_wait_list
         nullptr,       // const cL_event *event_wait_list
         nullptr        // cl_event *event
-        );
+    );
     EXPECT_EQ(CL_INVALID_VALUE, retVal);
 }
 
@@ -74,7 +74,7 @@ TEST_F(clEnqueueSVMMapTests, invalidValue_SizeIsZero) {
             0,             // cl_uint num_events_in_wait_list
             nullptr,       // const cL_event *event_wait_list
             nullptr        // cl_event *event
-            );
+        );
         EXPECT_EQ(CL_INVALID_VALUE, retVal);
 
         clSVMFree(pContext, ptrSvm);
@@ -91,7 +91,7 @@ TEST_F(clEnqueueSVMMapTests, invalidEventWaitList_EventWaitListIsNullAndNumEvent
         1,             // cl_uint num_events_in_wait_list
         nullptr,       // const cL_event *event_wait_list
         nullptr        // cl_event *event
-        );
+    );
     EXPECT_EQ(CL_INVALID_EVENT_WAIT_LIST, retVal);
 }
 
@@ -107,7 +107,7 @@ TEST_F(clEnqueueSVMMapTests, invalidEventWaitList_EventWaitListIsNotNullAndNumEv
         0,             // cl_uint num_events_in_wait_list
         eventWaitList, // const cL_event *event_wait_list
         nullptr        // cl_event *event
-        );
+    );
     EXPECT_EQ(CL_INVALID_EVENT_WAIT_LIST, retVal);
 }
 
@@ -126,7 +126,7 @@ TEST_F(clEnqueueSVMMapTests, success) {
             0,             // cl_uint num_events_in_wait_list
             nullptr,       // const cL_event *event_wait_list
             nullptr        // cl_event *event
-            );
+        );
         EXPECT_EQ(CL_SUCCESS, retVal);
 
         clSVMFree(pContext, ptrSvm);
diff --git a/unit_tests/api/cl_enqueue_svm_mem_fill_tests.cpp b/unit_tests/api/cl_enqueue_svm_mem_fill_tests.cpp
index a4168dfdbc..66133b6de4 100644
--- a/unit_tests/api/cl_enqueue_svm_mem_fill_tests.cpp
+++ b/unit_tests/api/cl_enqueue_svm_mem_fill_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -41,7 +41,7 @@ TEST_F(clEnqueueSVMMemFillTests, invalidCommandQueue) {
         0,       // cl_uint num_events_in_wait_list
         nullptr, // cl_evebt *event_wait_list
         nullptr  // cL_event *event
-        );
+    );
     EXPECT_EQ(CL_INVALID_COMMAND_QUEUE, retVal);
 }
 
@@ -55,7 +55,7 @@ TEST_F(clEnqueueSVMMemFillTests, invalidValue_SvmPtrIsNull) {
         0,             // cl_uint num_events_in_wait_list
         nullptr,       // cl_evebt *event_wait_list
         nullptr        // cL_event *event
-        );
+    );
     EXPECT_EQ(CL_INVALID_VALUE, retVal);
 }
 
@@ -74,7 +74,7 @@ TEST_F(clEnqueueSVMMemFillTests, invalidValue_SizeIsZero) {
             0,             // cl_uint num_events_in_wait_list
             nullptr,       // cl_evebt *event_wait_list
             nullptr        // cL_event *event
-            );
+        );
         EXPECT_EQ(CL_INVALID_VALUE, retVal);
 
         clSVMFree(pContext, ptrSvm);
@@ -91,7 +91,7 @@ TEST_F(clEnqueueSVMMemFillTests, invalidEventWaitList_EventWaitListIsNullAndNumE
         1,             // cl_uint num_events_in_wait_list
         nullptr,       // cl_evebt *event_wait_list
         nullptr        // cL_event *event
-        );
+    );
     EXPECT_EQ(CL_INVALID_EVENT_WAIT_LIST, retVal);
 }
 
@@ -107,7 +107,7 @@ TEST_F(clEnqueueSVMMemFillTests, invalidEventWaitList_EventWaitListIsNotNullAndN
         0,             // cl_uint num_events_in_wait_list
         eventWaitList, // cl_evebt *event_wait_list
         nullptr        // cL_event *event
-        );
+    );
     EXPECT_EQ(CL_INVALID_EVENT_WAIT_LIST, retVal);
 }
 
@@ -126,7 +126,7 @@ TEST_F(clEnqueueSVMMemFillTests, success) {
             0,             // cl_uint num_events_in_wait_list
             nullptr,       // cl_evebt *event_wait_list
             nullptr        // cL_event *event
-            );
+        );
         EXPECT_EQ(CL_SUCCESS, retVal);
 
         clSVMFree(pContext, ptrSvm);
diff --git a/unit_tests/api/cl_enqueue_svm_memcpy_tests.cpp b/unit_tests/api/cl_enqueue_svm_memcpy_tests.cpp
index dfeab35a9c..4974da2794 100644
--- a/unit_tests/api/cl_enqueue_svm_memcpy_tests.cpp
+++ b/unit_tests/api/cl_enqueue_svm_memcpy_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -41,7 +41,7 @@ TEST_F(clEnqueueSVMMemcpyTests, invalidCommandQueue) {
         0,        // cl_uint num_events_in_wait_list
         nullptr,  // const cl_event *event_wait_list
         nullptr   // cl_event *event
-        );
+    );
     EXPECT_EQ(CL_INVALID_COMMAND_QUEUE, retVal);
 }
 
@@ -60,7 +60,7 @@ TEST_F(clEnqueueSVMMemcpyTests, invalidValueDstPtrIsNull) {
             0,             // cl_uint num_events_in_wait_list
             nullptr,       // const cl_event *event_wait_list
             nullptr        // cl_event *event
-            );
+        );
         EXPECT_EQ(CL_INVALID_VALUE, retVal);
 
         clSVMFree(pContext, pSrcSvm);
@@ -82,7 +82,7 @@ TEST_F(clEnqueueSVMMemcpyTests, invalidValueSrcPtrIsNull) {
             0,             // cl_uint num_events_in_wait_list
             nullptr,       // const cl_event *event_wait_list
             nullptr        // cl_event *event
-            );
+        );
         EXPECT_EQ(CL_INVALID_VALUE, retVal);
 
         clSVMFree(pContext, pDstSvm);
@@ -99,7 +99,7 @@ TEST_F(clEnqueueSVMMemcpyTests, invalidEventWaitListEventWaitListIsNullAndNumEve
         1,             // cl_uint num_events_in_wait_list
         nullptr,       // const cl_event *event_wait_list
         nullptr        // cl_event *event
-        );
+    );
     EXPECT_EQ(CL_INVALID_EVENT_WAIT_LIST, retVal);
 }
 
@@ -115,7 +115,7 @@ TEST_F(clEnqueueSVMMemcpyTests, invalidEventWaitListEventWaitListIsNotNullAndNum
         0,             // cl_uint num_events_in_wait_list
         eventWaitList, // const cl_event *event_wait_list
         nullptr        // cl_event *event
-        );
+    );
     EXPECT_EQ(CL_INVALID_EVENT_WAIT_LIST, retVal);
 }
 
@@ -136,7 +136,7 @@ TEST_F(clEnqueueSVMMemcpyTests, successSizeIsNonZero) {
             0,             // cl_uint num_events_in_wait_list
             nullptr,       // const cl_event *event_wait_list
             nullptr        // cl_event *event
-            );
+        );
         EXPECT_EQ(CL_SUCCESS, retVal);
 
         clSVMFree(pContext, pDstSvm);
@@ -161,7 +161,7 @@ TEST_F(clEnqueueSVMMemcpyTests, successSizeIsZero) {
             0,             // cl_uint num_events_in_wait_list
             nullptr,       // const cl_event *event_wait_list
             nullptr        // cl_event *event
-            );
+        );
         EXPECT_EQ(CL_SUCCESS, retVal);
 
         clSVMFree(pContext, pDstSvm);
diff --git a/unit_tests/api/cl_enqueue_svm_migrate_mem_tests.cpp b/unit_tests/api/cl_enqueue_svm_migrate_mem_tests.cpp
index 111f5a7ab7..9d9d4463b6 100644
--- a/unit_tests/api/cl_enqueue_svm_migrate_mem_tests.cpp
+++ b/unit_tests/api/cl_enqueue_svm_migrate_mem_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -41,7 +41,7 @@ TEST_F(clEnqueueSVMMigrateMemTests, invalidCommandQueue) {
         0,       // cl_uint num_events_in_wait_list
         nullptr, // const cl_event *event_wait_list
         nullptr  // cl_event *event
-        );
+    );
     EXPECT_EQ(CL_INVALID_COMMAND_QUEUE, retVal);
 }
 
@@ -55,7 +55,7 @@ TEST_F(clEnqueueSVMMigrateMemTests, invalidValue_SvmPointersAreNull) {
         0,             // cl_uint num_events_in_wait_list
         nullptr,       // const cl_event *event_wait_list
         nullptr        // cl_event *event
-        );
+    );
     EXPECT_EQ(CL_INVALID_VALUE, retVal);
 }
 
@@ -75,7 +75,7 @@ TEST_F(clEnqueueSVMMigrateMemTests, invalidValue_NumSvmPointersIsZero) {
             0,             // cl_uint num_events_in_wait_list
             nullptr,       // const cl_event *event_wait_list
             nullptr        // cl_event *event
-            );
+        );
         EXPECT_EQ(CL_INVALID_VALUE, retVal);
 
         clSVMFree(pContext, ptrSvm);
@@ -96,7 +96,7 @@ TEST_F(clEnqueueSVMMigrateMemTests, invalidValue_SvmPointerIsHostPtr) {
         0,             // cl_uint num_events_in_wait_list
         nullptr,       // const cl_event *event_wait_list
         nullptr        // cl_event *event
-        );
+    );
     EXPECT_EQ(CL_INVALID_VALUE, retVal);
 
     delete[] ptrHost;
@@ -119,7 +119,7 @@ TEST_F(clEnqueueSVMMigrateMemTests, invalidValue_NonZeroSizeIsNotContainedWithin
             0,             // cl_uint num_events_in_wait_list
             nullptr,       // const cl_event *event_wait_list
             nullptr        // cl_event *event
-            );
+        );
         EXPECT_EQ(CL_INVALID_VALUE, retVal);
 
         clSVMFree(pContext, ptrSvm);
@@ -142,7 +142,7 @@ TEST_F(clEnqueueSVMMigrateMemTests, invalidValue_FlagsAreNeitherZeroNorSupported
             0,                  // cl_uint num_events_in_wait_list
             nullptr,            // const cl_event *event_wait_list
             nullptr             // cl_event *event
-            );
+        );
         EXPECT_EQ(CL_INVALID_VALUE, retVal);
 
         clSVMFree(pContext, ptrSvm);
@@ -159,7 +159,7 @@ TEST_F(clEnqueueSVMMigrateMemTests, invalidEventWaitList_EventWaitListIsNullAndN
         1,             // cl_uint num_events_in_wait_list
         nullptr,       // const cl_event *event_wait_list
         nullptr        // cl_event *event
-        );
+    );
     EXPECT_EQ(CL_INVALID_EVENT_WAIT_LIST, retVal);
 }
 
@@ -175,7 +175,7 @@ TEST_F(clEnqueueSVMMigrateMemTests, invalidEventWaitList_EventWaitListIsNotNullA
         0,             // cl_uint num_events_in_wait_list
         eventWaitList, // const cl_event *event_wait_list
         nullptr        // cl_event *event
-        );
+    );
     EXPECT_EQ(CL_INVALID_EVENT_WAIT_LIST, retVal);
 }
 
@@ -198,7 +198,7 @@ TEST_F(clEnqueueSVMMigrateMemTests, invalidEventWaitList_CommandQueueAndEventsCo
             1,             // cl_uint num_events_in_wait_list
             eventWaitList, // const cl_event *event_wait_list
             nullptr        // cl_event *event
-            );
+        );
         EXPECT_EQ(CL_INVALID_CONTEXT, retVal);
 
         clSVMFree(pContext, ptrSvm);
@@ -221,7 +221,7 @@ TEST_F(clEnqueueSVMMigrateMemTests, success_SizesAreNull) {
             0,             // cl_uint num_events_in_wait_list
             nullptr,       // const cl_event *event_wait_list
             nullptr        // cl_event *event
-            );
+        );
         EXPECT_EQ(CL_SUCCESS, retVal);
 
         clSVMFree(pContext, ptrSvm);
@@ -245,7 +245,7 @@ TEST_F(clEnqueueSVMMigrateMemTests, success_SizesContainZeroSize) {
             0,             // cl_uint num_events_in_wait_list
             nullptr,       // const cl_event *event_wait_list
             nullptr        // cl_event *event
-            );
+        );
         EXPECT_EQ(CL_SUCCESS, retVal);
 
         clSVMFree(pContext, ptrSvm);
@@ -269,7 +269,7 @@ TEST_F(clEnqueueSVMMigrateMemTests, success_SizesContainNonZeroSize) {
             0,             // cl_uint num_events_in_wait_list
             nullptr,       // const cl_event *event_wait_list
             nullptr        // cl_event *event
-            );
+        );
         EXPECT_EQ(CL_SUCCESS, retVal);
 
         clSVMFree(pContext, ptrSvm);
@@ -294,7 +294,7 @@ TEST_F(clEnqueueSVMMigrateMemTests, success_CommandQueueAndEventsContextsAreTheS
             1,             // cl_uint num_events_in_wait_list
             eventWaitList, // const cl_event *event_wait_list
             nullptr        // cl_event *event
-            );
+        );
         EXPECT_EQ(CL_SUCCESS, retVal);
 
         clSVMFree(pContext, ptrSvm);
diff --git a/unit_tests/api/cl_enqueue_svm_unmap_tests.cpp b/unit_tests/api/cl_enqueue_svm_unmap_tests.cpp
index 8a24ea732b..74b5e92256 100644
--- a/unit_tests/api/cl_enqueue_svm_unmap_tests.cpp
+++ b/unit_tests/api/cl_enqueue_svm_unmap_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -38,7 +38,7 @@ TEST_F(clEnqueueSVMUnmapTests, invalidCommandQueue) {
         0,       // cl_uint num_events_in_wait_list
         nullptr, // const cl_event *event_wait_list
         nullptr  // cl_event *event
-        );
+    );
     EXPECT_EQ(CL_INVALID_COMMAND_QUEUE, retVal);
 }
 
@@ -49,7 +49,7 @@ TEST_F(clEnqueueSVMUnmapTests, invalidValue) {
         0,             // cl_uint num_events_in_wait_list
         nullptr,       // const cl_event *event_wait_list
         nullptr        // cl_event *event
-        );
+    );
     EXPECT_EQ(CL_INVALID_VALUE, retVal);
 }
 
@@ -60,7 +60,7 @@ TEST_F(clEnqueueSVMUnmapTests, invalidEventWaitList_EventWaitListIsNullAndNumEve
         1,             // cl_uint num_events_in_wait_list
         nullptr,       // const cl_event *event_wait_list
         nullptr        // cl_event *event
-        );
+    );
     EXPECT_EQ(CL_INVALID_EVENT_WAIT_LIST, retVal);
 }
 
@@ -73,7 +73,7 @@ TEST_F(clEnqueueSVMUnmapTests, invalidEventWaitList_EventWaitListIsNotNullAndNum
         0,             // cl_uint num_events_in_wait_list
         eventWaitList, // const cl_event *event_wait_list
         nullptr        // cl_event *event
-        );
+    );
     EXPECT_EQ(CL_INVALID_EVENT_WAIT_LIST, retVal);
 }
 
@@ -92,7 +92,7 @@ TEST_F(clEnqueueSVMUnmapTests, success) {
             0,             // cl_uint num_events_in_wait_list
             nullptr,       // const cL_event *event_wait_list
             nullptr        // cl_event *event
-            );
+        );
         EXPECT_EQ(CL_SUCCESS, retVal);
 
         retVal = clEnqueueSVMUnmap(
@@ -101,7 +101,7 @@ TEST_F(clEnqueueSVMUnmapTests, success) {
             0,             // cl_uint num_events_in_wait_list
             nullptr,       // const cL_event *event_wait_list
             nullptr        // cl_event *event
-            );
+        );
         EXPECT_EQ(CL_SUCCESS, retVal);
 
         clSVMFree(pContext, ptrSvm);
diff --git a/unit_tests/api/cl_enqueue_wait_for_events_tests.cpp b/unit_tests/api/cl_enqueue_wait_for_events_tests.cpp
index ec84a17a93..843c9b297e 100644
--- a/unit_tests/api/cl_enqueue_wait_for_events_tests.cpp
+++ b/unit_tests/api/cl_enqueue_wait_for_events_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -33,7 +33,7 @@ TEST_F(clEnqueueWaitForEventsTests, invalidParams) {
         nullptr, // commandQueue
         0,       // num_events
         nullptr  //event_list
-        );
+    );
     EXPECT_EQ(CL_OUT_OF_HOST_MEMORY, retVal);
 }
 } // namespace ULT
diff --git a/unit_tests/api/cl_retain_mem_obj_tests.cpp b/unit_tests/api/cl_retain_mem_obj_tests.cpp
index c1af2bc914..c47db5bb30 100644
--- a/unit_tests/api/cl_retain_mem_obj_tests.cpp
+++ b/unit_tests/api/cl_retain_mem_obj_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -70,4 +70,4 @@ TEST_F(clRetainMemObjectTests, returnsSuccess) {
 
     delete[] hostMem;
 }
-}
+} // namespace ULT
diff --git a/unit_tests/api/cl_set_kernel_arg_svm_pointer_tests.cpp b/unit_tests/api/cl_set_kernel_arg_svm_pointer_tests.cpp
index d68584e629..ec96bcde68 100644
--- a/unit_tests/api/cl_set_kernel_arg_svm_pointer_tests.cpp
+++ b/unit_tests/api/cl_set_kernel_arg_svm_pointer_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -88,7 +88,7 @@ TEST_F(clSetKernelArgSVMPointer_, SetKernelArgSVMPointer_invalidKernel) {
         nullptr, // cl_kernel kernel
         0,       // cl_uint arg_index
         nullptr  // const void *arg_value
-        );
+    );
     EXPECT_EQ(CL_INVALID_KERNEL, retVal);
 }
 
@@ -97,7 +97,7 @@ TEST_F(clSetKernelArgSVMPointer_, SetKernelArgSVMPointer_invalidArgIndex) {
         pMockKernel, // cl_kernel kernel
         (cl_uint)-1, // cl_uint arg_index
         nullptr      // const void *arg_value
-        );
+    );
     EXPECT_EQ(CL_INVALID_ARG_INDEX, retVal);
 }
 
@@ -108,7 +108,7 @@ TEST_F(clSetKernelArgSVMPointer_, SetKernelArgSVMPointer_invalidArgAddressQualif
         pMockKernel, // cl_kernel kernel
         0,           // cl_uint arg_index
         nullptr      // const void *arg_value
-        );
+    );
     EXPECT_EQ(CL_INVALID_ARG_VALUE, retVal);
 }
 
@@ -120,7 +120,7 @@ TEST_F(clSetKernelArgSVMPointer_, SetKernelArgSVMPointer_invalidArgValue) {
         pMockKernel, // cl_kernel kernel
         0,           // cl_uint arg_index
         ptrHost      // const void *arg_value
-        );
+    );
     EXPECT_EQ(CL_INVALID_ARG_VALUE, retVal);
 
     free(ptrHost);
@@ -131,7 +131,7 @@ TEST_F(clSetKernelArgSVMPointer_, SetKernelArgSVMPointerWithNullArgValue_success
         pMockKernel, // cl_kernel kernel
         0,           // cl_uint arg_index
         nullptr      // const void *arg_value
-        );
+    );
     EXPECT_EQ(CL_SUCCESS, retVal);
 }
 
@@ -145,7 +145,7 @@ TEST_F(clSetKernelArgSVMPointer_, SetKernelArgSVMPointer_success) {
             pMockKernel, // cl_kernel kernel
             0,           // cl_uint arg_index
             ptrSvm       // const void *arg_value
-            );
+        );
         EXPECT_EQ(CL_SUCCESS, retVal);
 
         clSVMFree(pContext, ptrSvm);
@@ -164,7 +164,7 @@ TEST_F(clSetKernelArgSVMPointer_, SetKernelArgSVMPointerConst_success) {
             pMockKernel, // cl_kernel kernel
             0,           // cl_uint arg_index
             ptrSvm       // const void *arg_value
-            );
+        );
         EXPECT_EQ(CL_SUCCESS, retVal);
 
         clSVMFree(pContext, ptrSvm);
@@ -182,7 +182,7 @@ TEST_F(clSetKernelArgSVMPointer_, SetKernelArgSVMPointerWithOffset_success) {
             pMockKernel,            // cl_kernel kernel
             0,                      // cl_uint arg_index
             (char *)ptrSvm + offset // const void *arg_value
-            );
+        );
         EXPECT_EQ(CL_SUCCESS, retVal);
 
         clSVMFree(pContext, ptrSvm);
@@ -200,7 +200,7 @@ TEST_F(clSetKernelArgSVMPointer_, SetKernelArgSVMPointerWithOffset_invalidArgVal
             pMockKernel,            // cl_kernel kernel
             0,                      // cl_uint arg_index
             (char *)ptrSvm + offset // const void *arg_value
-            );
+        );
         EXPECT_EQ(CL_INVALID_ARG_VALUE, retVal);
 
         clSVMFree(pContext, ptrSvm);
diff --git a/unit_tests/api/cl_set_kernel_exec_info_tests.cpp b/unit_tests/api/cl_set_kernel_exec_info_tests.cpp
index 123006588f..e5bfa00e61 100644
--- a/unit_tests/api/cl_set_kernel_exec_info_tests.cpp
+++ b/unit_tests/api/cl_set_kernel_exec_info_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -70,7 +70,7 @@ TEST_F(clSetKernelExecInfoTests, invalidKernel) {
         CL_KERNEL_EXEC_INFO_SVM_PTRS, // cl_kernel_exec_info param_name
         0,                            // size_t param_value_size
         nullptr                       // const void *param_value
-        );
+    );
     EXPECT_EQ(CL_INVALID_KERNEL, retVal);
 }
 
@@ -83,7 +83,7 @@ TEST_F(clSetKernelExecInfoTests, invalidValue_ParamValueIsNull) {
         CL_KERNEL_EXEC_INFO_SVM_PTRS, // cl_kernel_exec_info param_name
         SvmPtrListSizeInBytes,        // size_t param_value_size
         pSvmPtrList                   // const void *param_value
-        );
+    );
     EXPECT_EQ(CL_INVALID_VALUE, retVal);
 }
 
@@ -96,7 +96,7 @@ TEST_F(clSetKernelExecInfoTests, invalidValue_ParamValueHasNullPointer) {
         CL_KERNEL_EXEC_INFO_SVM_PTRS, // cl_kernel_exec_info param_name
         SvmPtrListSizeInBytes,        // size_t param_value_size
         pSvmPtrList                   // const void *param_value
-        );
+    );
     EXPECT_EQ(CL_INVALID_VALUE, retVal);
 }
 
@@ -109,7 +109,7 @@ TEST_F(clSetKernelExecInfoTests, invalidValue_ParamSizeIsZero) {
         CL_KERNEL_EXEC_INFO_SVM_PTRS, // cl_kernel_exec_info param_name
         SvmPtrListSizeInBytes,        // size_t param_value_size
         pSvmPtrList                   // const void *param_value
-        );
+    );
     EXPECT_EQ(CL_INVALID_VALUE, retVal);
 }
 
@@ -122,7 +122,7 @@ TEST_F(clSetKernelExecInfoTests, invalidValue_ParamSizeIsNotValid) {
         CL_KERNEL_EXEC_INFO_SVM_PTRS, // cl_kernel_exec_info param_name
         SvmPtrListSizeInBytes,        // size_t param_value_size
         pSvmPtrList                   // const void *param_value
-        );
+    );
     EXPECT_EQ(CL_INVALID_VALUE, retVal);
 }
 
@@ -135,7 +135,7 @@ TEST_F(clSetKernelExecInfoTests, invalidValue_ParamNameIsNotValid) {
         0,                     // cl_kernel_exec_info param_name
         SvmPtrListSizeInBytes, // size_t param_value_size
         pSvmPtrList            // const void *param_value
-        );
+    );
     EXPECT_EQ(CL_INVALID_VALUE, retVal);
 }
 
@@ -148,7 +148,7 @@ TEST_F(clSetKernelExecInfoTests, invalidOperation) {
         CL_KERNEL_EXEC_INFO_SVM_FINE_GRAIN_SYSTEM, // cl_kernel_exec_info param_name
         SvmPtrListSizeInBytes,                     // size_t param_value_size
         pSvmPtrList                                // const void *param_value
-        );
+    );
     EXPECT_EQ(CL_INVALID_OPERATION, retVal);
 }
 
@@ -162,7 +162,7 @@ TEST_F(clSetKernelExecInfoTests, success_SvmPtrListWithSinglePointer) {
             CL_KERNEL_EXEC_INFO_SVM_PTRS, // cl_kernel_exec_info param_name
             SvmPtrListSizeInBytes,        // size_t param_value_size
             pSvmPtrList                   // const void *param_value
-            );
+        );
         EXPECT_EQ(CL_SUCCESS, retVal);
 
         EXPECT_EQ(1u, pMockKernel->getKernelSvmGfxAllocations().size());
@@ -185,7 +185,7 @@ TEST_F(clSetKernelExecInfoTests, success_SvmPtrListWithMultiplePointers) {
             CL_KERNEL_EXEC_INFO_SVM_PTRS, // cl_kernel_exec_info param_name
             SvmPtrListSizeInBytes,        // size_t param_value_size
             pSvmPtrList                   // const void *param_value
-            );
+        );
         EXPECT_EQ(CL_SUCCESS, retVal);
 
         EXPECT_EQ(3u, pMockKernel->getKernelSvmGfxAllocations().size());
@@ -205,7 +205,7 @@ TEST_F(clSetKernelExecInfoTests, success_MultipleSetKernelExecInfo) {
             CL_KERNEL_EXEC_INFO_SVM_PTRS, // cl_kernel_exec_info param_name
             SvmPtrListSizeInBytes,        // size_t param_value_size
             pSvmPtrList                   // const void *param_value
-            );
+        );
         EXPECT_EQ(CL_SUCCESS, retVal);
 
         EXPECT_EQ(1u, pMockKernel->getKernelSvmGfxAllocations().size());
@@ -215,7 +215,7 @@ TEST_F(clSetKernelExecInfoTests, success_MultipleSetKernelExecInfo) {
             CL_KERNEL_EXEC_INFO_SVM_PTRS, // cl_kernel_exec_info param_name
             SvmPtrListSizeInBytes,        // size_t param_value_size
             pSvmPtrList                   // const void *param_value
-            );
+        );
         EXPECT_EQ(CL_SUCCESS, retVal);
 
         EXPECT_EQ(1u, pMockKernel->getKernelSvmGfxAllocations().size());
diff --git a/unit_tests/api/cl_svm_free_tests.cpp b/unit_tests/api/cl_svm_free_tests.cpp
index 104999fbe1..25ca2f8c8c 100644
--- a/unit_tests/api/cl_svm_free_tests.cpp
+++ b/unit_tests/api/cl_svm_free_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,6 +32,6 @@ TEST_F(clSVMFreeTests, invalidParams) {
     clSVMFree(
         nullptr, // cl_context context
         nullptr  // void *svm_pointer
-        );
+    );
 }
 } // namespace ULT
diff --git a/unit_tests/aub_tests/aub_tests_configuration.cpp b/unit_tests/aub_tests/aub_tests_configuration.cpp
index d8af236f75..ecee4d7343 100644
--- a/unit_tests/aub_tests/aub_tests_configuration.cpp
+++ b/unit_tests/aub_tests/aub_tests_configuration.cpp
@@ -24,4 +24,4 @@ namespace OCLRT {
 // max time per single test iteration
 unsigned int ultIterationMaxTime = 180;
 bool useMockGmm = false;
-}
+} // namespace OCLRT
diff --git a/unit_tests/aub_tests/command_queue/command_enqueue_fixture.h b/unit_tests/aub_tests/command_queue/command_enqueue_fixture.h
index 55a110bd05..c85b674fc9 100644
--- a/unit_tests/aub_tests/command_queue/command_enqueue_fixture.h
+++ b/unit_tests/aub_tests/command_queue/command_enqueue_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -45,4 +45,4 @@ struct CommandEnqueueAUBFixture : public CommandEnqueueBaseFixture,
         CommandEnqueueBaseFixture::TearDown();
     }
 };
-}
+} // namespace OCLRT
diff --git a/unit_tests/aub_tests/fixtures/hello_world_fixture.h b/unit_tests/aub_tests/fixtures/hello_world_fixture.h
index d136b71164..5ddfe046e8 100644
--- a/unit_tests/aub_tests/fixtures/hello_world_fixture.h
+++ b/unit_tests/aub_tests/fixtures/hello_world_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -34,4 +34,4 @@ namespace OCLRT {
 struct AUBHelloWorldFixtureFactory : public HelloWorldFixtureFactory {
     typedef AUBCommandStreamFixture CommandStreamFixture;
 };
-}
+} // namespace OCLRT
diff --git a/unit_tests/aub_tests/fixtures/run_kernel_fixture.h b/unit_tests/aub_tests/fixtures/run_kernel_fixture.h
index 5e593bf074..1b884e5e7f 100644
--- a/unit_tests/aub_tests/fixtures/run_kernel_fixture.h
+++ b/unit_tests/aub_tests/fixtures/run_kernel_fixture.h
@@ -97,4 +97,4 @@ class RunKernelFixture : public CommandEnqueueAUBFixture {
         return pProgram;
     }
 };
-}
+} // namespace OCLRT
diff --git a/unit_tests/aub_tests/fixtures/simple_arg_fixture.h b/unit_tests/aub_tests/fixtures/simple_arg_fixture.h
index 802cf79828..43ae9ad4ac 100644
--- a/unit_tests/aub_tests/fixtures/simple_arg_fixture.h
+++ b/unit_tests/aub_tests/fixtures/simple_arg_fixture.h
@@ -56,11 +56,11 @@ struct SimpleArgFixture : public FixtureFactory::IndirectHeapFixture,
     typedef typename FixtureFactory::CommandQueueFixture CommandQueueFixture;
     typedef typename FixtureFactory::KernelFixture KernelFixture;
 
+    using AUBCommandStreamFixture::SetUp;
     using CommandQueueFixture::pCmdQ;
     using CommandStreamFixture::pCS;
-    using KernelFixture::pKernel;
     using IndirectHeapFixture::SetUp;
-    using AUBCommandStreamFixture::SetUp;
+    using KernelFixture::pKernel;
     using SimpleArgKernelFixture::SetUp;
 
     SimpleArgFixture()
@@ -112,4 +112,4 @@ struct SimpleArgFixture : public FixtureFactory::IndirectHeapFixture,
     void *pExpectedMemory;
     size_t sizeUserMemory;
 };
-}
+} // namespace OCLRT
diff --git a/unit_tests/base_object_allocator.cpp b/unit_tests/base_object_allocator.cpp
index 74042ed1b2..2cfb860e3b 100644
--- a/unit_tests/base_object_allocator.cpp
+++ b/unit_tests/base_object_allocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -86,4 +86,4 @@ template class BaseObject<_cl_mem>;
 template class BaseObject<_cl_platform_id>;
 template class BaseObject<_cl_program>;
 template class BaseObject<_cl_sampler>;
-}
+} // namespace OCLRT
diff --git a/unit_tests/built_ins/built_in_kernels_tests.cpp b/unit_tests/built_ins/built_in_kernels_tests.cpp
index c539490b61..bd32eb9afd 100644
--- a/unit_tests/built_ins/built_in_kernels_tests.cpp
+++ b/unit_tests/built_ins/built_in_kernels_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -138,4 +138,4 @@ TEST(BuiltInKernelTests, ReadImage) {
     delete[] ptrDst;
     delete[] ptrZero;
 }
-}
+} // namespace BuiltinKernelsSimulation
diff --git a/unit_tests/command_queue/buffer_operations_withAsyncGPU_fixture.h b/unit_tests/command_queue/buffer_operations_withAsyncGPU_fixture.h
index 4e741c8a6c..aa7d00b8d7 100644
--- a/unit_tests/command_queue/buffer_operations_withAsyncGPU_fixture.h
+++ b/unit_tests/command_queue/buffer_operations_withAsyncGPU_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -45,4 +45,4 @@ struct AsyncGPUoperations : public EnqueueWriteBufferTypeTest {
   protected:
     int storeInitHWTag;
 };
-}
+} // namespace OCLRT
diff --git a/unit_tests/command_queue/command_queue_fixture.cpp b/unit_tests/command_queue/command_queue_fixture.cpp
index 12cbd4e6c7..b77ccad441 100644
--- a/unit_tests/command_queue/command_queue_fixture.cpp
+++ b/unit_tests/command_queue/command_queue_fixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -102,4 +102,4 @@ void CommandQueueFixture::TearDown() {
     delete pCmdQ;
     pCmdQ = nullptr;
 }
-}
+} // namespace OCLRT
diff --git a/unit_tests/command_queue/enqueue_copy_buffer_fixture.h b/unit_tests/command_queue/enqueue_copy_buffer_fixture.h
index 194a3b9503..d39e9232fc 100644
--- a/unit_tests/command_queue/enqueue_copy_buffer_fixture.h
+++ b/unit_tests/command_queue/enqueue_copy_buffer_fixture.h
@@ -104,4 +104,4 @@ struct EnqueueCopyBufferTest : public CommandEnqueueFixture,
     Buffer *srcBuffer;
     Buffer *dstBuffer;
 };
-}
+} // namespace OCLRT
diff --git a/unit_tests/command_queue/enqueue_fill_buffer_event_tests.cpp b/unit_tests/command_queue/enqueue_fill_buffer_event_tests.cpp
index 111f996e21..b3eafe88a2 100644
--- a/unit_tests/command_queue/enqueue_fill_buffer_event_tests.cpp
+++ b/unit_tests/command_queue/enqueue_fill_buffer_event_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -116,4 +116,4 @@ HWTEST_F(FillBufferEventTests, eventReturnedShouldBeMaxOfInputEventsAndCmdQPlus1
 
     delete pEvent;
 }
-}
+} // namespace ULT
diff --git a/unit_tests/command_queue/enqueue_fill_buffer_fixture.h b/unit_tests/command_queue/enqueue_fill_buffer_fixture.h
index 661b953025..fcee8206d8 100644
--- a/unit_tests/command_queue/enqueue_fill_buffer_fixture.h
+++ b/unit_tests/command_queue/enqueue_fill_buffer_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -61,4 +61,4 @@ struct EnqueueFillBufferFixture : public CommandEnqueueFixture {
     MockContext context;
     Buffer *buffer;
 };
-}
+} // namespace OCLRT
diff --git a/unit_tests/command_queue/enqueue_fill_buffer_negative_tests.cpp b/unit_tests/command_queue/enqueue_fill_buffer_negative_tests.cpp
index 5e042253b0..1cdd654d80 100644
--- a/unit_tests/command_queue/enqueue_fill_buffer_negative_tests.cpp
+++ b/unit_tests/command_queue/enqueue_fill_buffer_negative_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -112,7 +112,7 @@ TEST_F(EnqueueFillBuffer, invalid_event_list_count) {
 
     EXPECT_EQ(CL_INVALID_EVENT_WAIT_LIST, retVal);
 }
-}
+} // namespace ULT
 
 namespace ULT {
 
@@ -156,4 +156,4 @@ TEST_P(InvalidPatternSize, returns_CL_INVALID_VALUE) {
 INSTANTIATE_TEST_CASE_P(EnqueueFillBuffer,
                         InvalidPatternSize,
                         ::testing::Values(0, 3, 5, 256, 512, 1024));
-}
+} // namespace ULT
diff --git a/unit_tests/command_queue/enqueue_fill_image_fixture.h b/unit_tests/command_queue/enqueue_fill_image_fixture.h
index 3fdd8e7e48..ee424d8efa 100644
--- a/unit_tests/command_queue/enqueue_fill_image_fixture.h
+++ b/unit_tests/command_queue/enqueue_fill_image_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -57,4 +57,4 @@ struct EnqueueFillImageTestFixture : public CommandEnqueueFixture {
     MockContext *context;
     Image *image;
 };
-}
+} // namespace OCLRT
diff --git a/unit_tests/command_queue/enqueue_map_buffer_fixture.h b/unit_tests/command_queue/enqueue_map_buffer_fixture.h
index bb3ca2c321..01ff99906a 100644
--- a/unit_tests/command_queue/enqueue_map_buffer_fixture.h
+++ b/unit_tests/command_queue/enqueue_map_buffer_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -66,4 +66,4 @@ struct EnqueueMapBufferTypeTest : public CommandEnqueueFixture,
 
     Buffer *srcBuffer;
 };
-}
+} // namespace OCLRT
diff --git a/unit_tests/command_queue/enqueue_svm_mem_copy_tests.cpp b/unit_tests/command_queue/enqueue_svm_mem_copy_tests.cpp
index af825f2de6..6ac1eddf72 100644
--- a/unit_tests/command_queue/enqueue_svm_mem_copy_tests.cpp
+++ b/unit_tests/command_queue/enqueue_svm_mem_copy_tests.cpp
@@ -88,7 +88,7 @@ HWTEST_F(EnqueueSvmMemCopyTest, givenEnqueueSVMMemcpyWhenUsingCopyBufferToBuffer
         0,         // cl_uint num_events_in_wait_list
         nullptr,   // cl_event *event_wait_list
         nullptr    // cL_event *event
-        );
+    );
     EXPECT_EQ(CL_SUCCESS, retVal);
 
     // restore original builder and retrieve mock builder
diff --git a/unit_tests/command_queue/enqueue_svm_mem_fill_tests.cpp b/unit_tests/command_queue/enqueue_svm_mem_fill_tests.cpp
index 46cf952177..f4279a284e 100644
--- a/unit_tests/command_queue/enqueue_svm_mem_fill_tests.cpp
+++ b/unit_tests/command_queue/enqueue_svm_mem_fill_tests.cpp
@@ -100,7 +100,7 @@ HWTEST_P(EnqueueSvmMemFillTest, givenEnqueueSVMMemFillWhenUsingFillBufferBuilder
         0,           // cl_uint num_events_in_wait_list
         nullptr,     // cl_event *event_wait_list
         nullptr      // cL_event *event
-        );
+    );
     EXPECT_EQ(CL_SUCCESS, retVal);
 
     // restore original builder and retrieve mock builder
diff --git a/unit_tests/command_queue/enqueue_svm_tests.cpp b/unit_tests/command_queue/enqueue_svm_tests.cpp
index 27c37a6126..c04743c2a7 100644
--- a/unit_tests/command_queue/enqueue_svm_tests.cpp
+++ b/unit_tests/command_queue/enqueue_svm_tests.cpp
@@ -70,7 +70,7 @@ TEST_F(EnqueueSvmTest, enqueueSVMMap_InvalidValue) {
         0,           // cl_uint num_events_in_wait_list
         nullptr,     // const cL_event *event_wait_list
         nullptr      // cl_event *event
-        );
+    );
     EXPECT_EQ(CL_INVALID_VALUE, retVal);
 }
 
@@ -83,7 +83,7 @@ TEST_F(EnqueueSvmTest, enqueueSVMMap_Success) {
         0,           // cl_uint num_events_in_wait_list
         nullptr,     // const cL_event *event_wait_list
         nullptr      // cl_event *event
-        );
+    );
     EXPECT_EQ(CL_SUCCESS, retVal);
 }
 
@@ -96,7 +96,7 @@ TEST_F(EnqueueSvmTest, enqueueSVMMapBlocking_Success) {
         0,           // cl_uint num_events_in_wait_list
         nullptr,     // const cL_event *event_wait_list
         nullptr      // cl_event *event
-        );
+    );
     EXPECT_EQ(CL_SUCCESS, retVal);
 }
 
@@ -111,7 +111,7 @@ TEST_F(EnqueueSvmTest, enqueueSVMMapBlockedOnEvent_Success) {
         1,             // cl_uint num_events_in_wait_list
         eventWaitList, // const cL_event *event_wait_list
         nullptr        // cl_event *event
-        );
+    );
     EXPECT_EQ(CL_SUCCESS, retVal);
 }
 
@@ -122,7 +122,7 @@ TEST_F(EnqueueSvmTest, enqueueSVMUnmap_InvalidValue) {
         0,       // cl_uint num_events_in_wait_list
         nullptr, // const cL_event *event_wait_list
         nullptr  // cl_event *event
-        );
+    );
     EXPECT_EQ(CL_INVALID_VALUE, retVal);
 }
 
@@ -132,7 +132,7 @@ TEST_F(EnqueueSvmTest, enqueueSVMUnmap_Success) {
         0,       // cl_uint num_events_in_wait_list
         nullptr, // const cL_event *event_wait_list
         nullptr  // cl_event *event
-        );
+    );
     EXPECT_EQ(CL_SUCCESS, retVal);
 }
 
@@ -144,7 +144,7 @@ TEST_F(EnqueueSvmTest, enqueueSVMUnmapBlockedOnEvent_Success) {
         1,             // cl_uint num_events_in_wait_list
         eventWaitList, // const cL_event *event_wait_list
         nullptr        // cl_event *event
-        );
+    );
     EXPECT_EQ(CL_SUCCESS, retVal);
 }
 
@@ -161,7 +161,7 @@ TEST_F(EnqueueSvmTest, enqueueSVMFreeWithoutCallback_Success) {
         0,       // cl_uint num_events_in_wait_list
         nullptr, // const cl_event *event_wait_list
         nullptr  // cl_event *event
-        );
+    );
     EXPECT_EQ(CL_SUCCESS, retVal);
     ASSERT_EQ(0U, this->context->getSVMAllocsManager()->getNumAllocs());
 }
@@ -191,7 +191,7 @@ TEST_F(EnqueueSvmTest, enqueueSVMFreeWithCallback_Success) {
         0,              // cl_uint num_events_in_wait_list
         nullptr,        // const cl_event *event_wait_list
         nullptr         // cl_event *event
-        );
+    );
     EXPECT_EQ(CL_SUCCESS, retVal);
     EXPECT_TRUE(callbackWasCalled);
 }
@@ -222,7 +222,7 @@ TEST_F(EnqueueSvmTest, enqueueSVMFreeWithCallbackAndEvent_Success) {
         0,              // cl_uint num_events_in_wait_list
         nullptr,        // const cl_event *event_wait_list
         &event          // cl_event *event
-        );
+    );
     EXPECT_EQ(CL_SUCCESS, retVal);
     EXPECT_TRUE(callbackWasCalled);
 
@@ -244,7 +244,7 @@ TEST_F(EnqueueSvmTest, enqueueSVMFreeBlockedOnEvent_Success) {
         1,             // cl_uint num_events_in_wait_list
         eventWaitList, // const cl_event *event_wait_list
         nullptr        // cl_event *event
-        );
+    );
     EXPECT_EQ(CL_SUCCESS, retVal);
 }
 
@@ -261,7 +261,7 @@ TEST_F(EnqueueSvmTest, enqueueSVMMemcpy_InvalidValueDstPtrIsNull) {
         0,       // cl_uint num_events_in_wait_list
         nullptr, // cl_evebt *event_wait_list
         nullptr  // cL_event *event
-        );
+    );
     EXPECT_EQ(CL_INVALID_VALUE, retVal);
     context->getSVMAllocsManager()->freeSVMAlloc(pSrcSVM);
 }
@@ -277,7 +277,7 @@ TEST_F(EnqueueSvmTest, enqueueSVMMemcpy_InvalidValueSrcPtrIsNull) {
         0,       // cl_uint num_events_in_wait_list
         nullptr, // cl_evebt *event_wait_list
         nullptr  // cL_event *event
-        );
+    );
     EXPECT_EQ(CL_INVALID_VALUE, retVal);
 }
 
@@ -292,7 +292,7 @@ TEST_F(EnqueueSvmTest, enqueueSVMMemcpy_Success) {
         0,       // cl_uint num_events_in_wait_list
         nullptr, // cl_evebt *event_wait_list
         nullptr  // cL_event *event
-        );
+    );
     EXPECT_EQ(CL_SUCCESS, retVal);
     context->getSVMAllocsManager()->freeSVMAlloc(pSrcSVM);
 }
@@ -308,7 +308,7 @@ TEST_F(EnqueueSvmTest, enqueueSVMMemcpyBlocking_Success) {
         0,       // cl_uint num_events_in_wait_list
         nullptr, // cl_evebt *event_wait_list
         nullptr  // cL_event *event
-        );
+    );
     EXPECT_EQ(CL_SUCCESS, retVal);
     context->getSVMAllocsManager()->freeSVMAlloc(pSrcSVM);
 }
@@ -326,7 +326,7 @@ TEST_F(EnqueueSvmTest, enqueueSVMMemcpyBlockedOnEvent_Success) {
         1,             // cl_uint num_events_in_wait_list
         eventWaitList, // cl_evebt *event_wait_list
         nullptr        // cL_event *event
-        );
+    );
     EXPECT_EQ(CL_SUCCESS, retVal);
     context->getSVMAllocsManager()->freeSVMAlloc(pSrcSVM);
 }
@@ -342,7 +342,7 @@ TEST_F(EnqueueSvmTest, enqueueSVMMemcpyCoherent_Success) {
         0,       // cl_uint num_events_in_wait_list
         nullptr, // cl_evebt *event_wait_list
         nullptr  // cL_event *event
-        );
+    );
     EXPECT_EQ(CL_SUCCESS, retVal);
     context->getSVMAllocsManager()->freeSVMAlloc(pSrcSVM);
 }
@@ -360,7 +360,7 @@ TEST_F(EnqueueSvmTest, enqueueSVMMemcpyCoherentBlockedOnEvent_Success) {
         1,             // cl_uint num_events_in_wait_list
         eventWaitList, // cl_evebt *event_wait_list
         nullptr        // cL_event *event
-        );
+    );
     EXPECT_EQ(CL_SUCCESS, retVal);
     context->getSVMAllocsManager()->freeSVMAlloc(pSrcSVM);
 }
@@ -377,7 +377,7 @@ TEST_F(EnqueueSvmTest, enqueueSVMMemFill_InvalidValue) {
         0,           // cl_uint num_events_in_wait_list
         nullptr,     // cl_evebt *event_wait_list
         nullptr      // cL_event *event
-        );
+    );
     EXPECT_EQ(CL_INVALID_VALUE, retVal);
 }
 
@@ -392,7 +392,7 @@ TEST_F(EnqueueSvmTest, enqueueSVMMemFill_Success) {
         0,           // cl_uint num_events_in_wait_list
         nullptr,     // cl_evebt *event_wait_list
         nullptr      // cL_event *event
-        );
+    );
     EXPECT_EQ(CL_SUCCESS, retVal);
 }
 
@@ -409,7 +409,7 @@ TEST_F(EnqueueSvmTest, enqueueSVMMemFillBlockedOnEvent_Success) {
         1,             // cl_uint num_events_in_wait_list
         eventWaitList, // cl_evebt *event_wait_list
         nullptr        // cL_event *event
-        );
+    );
     EXPECT_EQ(CL_SUCCESS, retVal);
 }
 
@@ -424,7 +424,7 @@ TEST_F(EnqueueSvmTest, enqueueSVMMemFillDoubleToReuseAllocation_Success) {
         0,           // cl_uint num_events_in_wait_list
         nullptr,     // cl_evebt *event_wait_list
         nullptr      // cL_event *event
-        );
+    );
     EXPECT_EQ(CL_SUCCESS, retVal);
     retVal = this->pCmdQ->enqueueSVMMemFill(
         ptrSVM,      // void *svm_ptr
@@ -434,7 +434,7 @@ TEST_F(EnqueueSvmTest, enqueueSVMMemFillDoubleToReuseAllocation_Success) {
         0,           // cl_uint num_events_in_wait_list
         nullptr,     // cl_evebt *event_wait_list
         nullptr      // cL_event *event
-        );
+    );
     EXPECT_EQ(CL_SUCCESS, retVal);
 }
 
@@ -588,6 +588,6 @@ TEST_F(EnqueueSvmTest, enqueueSVMMigrateMem_Success) {
         0,       // cl_uint num_events_in_wait_list
         nullptr, // cl_event *event_wait_list
         nullptr  // cL_event *event
-        );
+    );
     EXPECT_EQ(CL_SUCCESS, retVal);
 }
diff --git a/unit_tests/command_queue/enqueue_waitlist_tests.cpp b/unit_tests/command_queue/enqueue_waitlist_tests.cpp
index a315f6d672..47c5c1fb2a 100644
--- a/unit_tests/command_queue/enqueue_waitlist_tests.cpp
+++ b/unit_tests/command_queue/enqueue_waitlist_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -260,4 +260,4 @@ INSTANTIATE_TEST_CASE_P(
     TwoEnqueueMap,
     EnqueueWaitlistTestTwoMapEnqueues,
     ::testing::ValuesIn(TwoEnqueueMap));
-}
+} // namespace ULT
diff --git a/unit_tests/command_queue/flattened_id_tests.cpp b/unit_tests/command_queue/flattened_id_tests.cpp
index a3978c83db..5844bc775f 100644
--- a/unit_tests/command_queue/flattened_id_tests.cpp
+++ b/unit_tests/command_queue/flattened_id_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -31,6 +31,7 @@ union GRF {
     uint16_t wRegs[16];
 };
 
+// clang-format off
 uint16_t gFlattenedIDsSimD8[] =
     {
         0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -102,6 +103,7 @@ uint16_t gFlattenedIDsSimD1632[] =
         0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
         0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
 };
+// clang-format on
 
 size_t getSizeFlattenedIDs(uint32_t simd, uint32_t lwsX, uint32_t lwsY, uint32_t lwsZ) {
     auto lws = lwsX * lwsY * lwsZ;
diff --git a/unit_tests/command_queue/get_command_queue_info_tests.cpp b/unit_tests/command_queue/get_command_queue_info_tests.cpp
index 6ce1e06483..31cd8d51a0 100644
--- a/unit_tests/command_queue/get_command_queue_info_tests.cpp
+++ b/unit_tests/command_queue/get_command_queue_info_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -31,8 +31,8 @@ struct GetCommandQueueInfoTest : public DeviceFixture,
                                  public ContextFixture,
                                  public CommandQueueFixture,
                                  ::testing::TestWithParam<uint64_t /*cl_command_queue_properties*/> {
-    using ContextFixture::SetUp;
     using CommandQueueFixture::SetUp;
+    using ContextFixture::SetUp;
 
     GetCommandQueueInfoTest() {
     }
diff --git a/unit_tests/command_queue/oom_buffer_tests.cpp b/unit_tests/command_queue/oom_buffer_tests.cpp
index 555f85ef86..c90aebe906 100644
--- a/unit_tests/command_queue/oom_buffer_tests.cpp
+++ b/unit_tests/command_queue/oom_buffer_tests.cpp
@@ -52,8 +52,8 @@ struct OOMCommandQueueBufferTest : public MemoryManagementFixture,
                                    public ::testing::TestWithParam<OOMSetting> {
 
     using CommandQueueFixture::SetUp;
-    using SimpleArgKernelFixture::SetUp;
     using HelloWorldKernelFixture::SetUp;
+    using SimpleArgKernelFixture::SetUp;
 
     OOMCommandQueueBufferTest() {
     }
diff --git a/unit_tests/command_stream/command_stream_fixture.h b/unit_tests/command_stream/command_stream_fixture.h
index 7dffe46c60..675d27094e 100644
--- a/unit_tests/command_stream/command_stream_fixture.h
+++ b/unit_tests/command_stream/command_stream_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -43,4 +43,4 @@ struct CommandStreamFixture {
     LinearStream *pCS;
     void *pCmdBuffer;
 };
-}
+} // namespace OCLRT
diff --git a/unit_tests/command_stream/linear_stream_fixture.h b/unit_tests/command_stream/linear_stream_fixture.h
index d86f01c03e..5622e89ad7 100644
--- a/unit_tests/command_stream/linear_stream_fixture.h
+++ b/unit_tests/command_stream/linear_stream_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -44,4 +44,4 @@ struct LinearStreamFixture {
 };
 
 typedef Test<LinearStreamFixture> LinearStreamTest;
-}
+} // namespace OCLRT
diff --git a/unit_tests/context/context_get_info_tests.cpp b/unit_tests/context/context_get_info_tests.cpp
index eff2d63f26..62ce360f25 100644
--- a/unit_tests/context/context_get_info_tests.cpp
+++ b/unit_tests/context/context_get_info_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,8 +32,8 @@ struct ContextGetInfoTest : public PlatformFixture,
                             public ContextFixture,
                             public ::testing::Test {
 
-    using PlatformFixture::SetUp;
     using ContextFixture::SetUp;
+    using PlatformFixture::SetUp;
 
     ContextGetInfoTest() {
     }
diff --git a/unit_tests/event/user_events_tests_mt.cpp b/unit_tests/event/user_events_tests_mt.cpp
index 24e0dae20a..93eb6eeb67 100644
--- a/unit_tests/event/user_events_tests_mt.cpp
+++ b/unit_tests/event/user_events_tests_mt.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -53,7 +53,6 @@ TEST_F(EventTests, eventCreatedFromUserEventsThatIsNotSignaledDoesntFlushToCSR)
         //call WaitForEvents
         clWaitForEvents(1, &retEvent);
         WaitForEventsCompleted = true;
-
     });
     //wait for the thread to start
     while (!ThreadStarted)
diff --git a/unit_tests/fixtures/buffer_fixture.cpp b/unit_tests/fixtures/buffer_fixture.cpp
index 29cfa13e0e..41954b3dea 100644
--- a/unit_tests/fixtures/buffer_fixture.cpp
+++ b/unit_tests/fixtures/buffer_fixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,12 +25,15 @@
 
 using OCLRT::Context;
 
+// clang-format off
 static char bufferMemory[] = {
     0x00, 0x10, 0x20, 0x30,
     0x01, 0x11, 0x21, 0x31,
     0x02, 0x12, 0x22, 0x32,
     0x03, 0x13, 0x23, 0x33,
 };
+// clang-format on
+
 void *BufferDefaults::hostPtr = bufferMemory;
 const size_t BufferDefaults::sizeInBytes = sizeof(bufferMemory);
 Context *BufferDefaults::context = nullptr;
diff --git a/unit_tests/fixtures/context_fixture.h b/unit_tests/fixtures/context_fixture.h
index ab9e6bfc51..a5feb77f40 100644
--- a/unit_tests/fixtures/context_fixture.h
+++ b/unit_tests/fixtures/context_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -36,4 +36,4 @@ class ContextFixture {
 
     MockContext *pContext;
 };
-}
+} // namespace OCLRT
diff --git a/unit_tests/fixtures/device_fixture.cpp b/unit_tests/fixtures/device_fixture.cpp
index bfda594116..3537bd828b 100644
--- a/unit_tests/fixtures/device_fixture.cpp
+++ b/unit_tests/fixtures/device_fixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -28,9 +28,9 @@
 
 using OCLRT::Device;
 using OCLRT::HardwareInfo;
-using OCLRT::platformDevices;
-using OCLRT::OSTime;
 using OCLRT::MockOSTime;
+using OCLRT::OSTime;
+using OCLRT::platformDevices;
 
 void DeviceFixture::SetUp() {
     SetUpImpl(nullptr);
diff --git a/unit_tests/fixtures/device_host_queue_fixture.cpp b/unit_tests/fixtures/device_host_queue_fixture.cpp
index da72a3f5b4..c6bbaa9926 100644
--- a/unit_tests/fixtures/device_host_queue_fixture.cpp
+++ b/unit_tests/fixtures/device_host_queue_fixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -115,4 +115,4 @@ IGIL_CommandQueue getExpectedgilCmdQueueAfterReset(DeviceQueue *deviceQueue) {
 
     return expectedIgilCmdQueue;
 }
-}
+} // namespace DeviceHostQueue
diff --git a/unit_tests/fixtures/device_host_queue_fixture.h b/unit_tests/fixtures/device_host_queue_fixture.h
index ba30ee4a0d..1944d96175 100644
--- a/unit_tests/fixtures/device_host_queue_fixture.h
+++ b/unit_tests/fixtures/device_host_queue_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -98,4 +98,4 @@ class DeviceQueueHwTest : public DeviceHostQueueFixture<DeviceQueue> {
     DeviceQueue *deviceQueue;
     Device *device;
 };
-}
+} // namespace DeviceHostQueue
diff --git a/unit_tests/fixtures/hello_world_fixture.h b/unit_tests/fixtures/hello_world_fixture.h
index b803cc5d4b..db678e9bfd 100644
--- a/unit_tests/fixtures/hello_world_fixture.h
+++ b/unit_tests/fixtures/hello_world_fixture.h
@@ -57,12 +57,12 @@ struct HelloWorldFixture : public FixtureFactory::IndirectHeapFixture,
     typedef typename FixtureFactory::KernelFixture KernelFixture;
 
     using CommandQueueFixture::pCmdQ;
-    using CommandStreamFixture::pCS;
-    using KernelFixture::pKernel;
-    using IndirectHeapFixture::SetUp;
-    using HelloWorldKernelFixture::SetUp;
-    using CommandStreamFixture::SetUp;
     using CommandQueueFixture::SetUp;
+    using CommandStreamFixture::pCS;
+    using CommandStreamFixture::SetUp;
+    using HelloWorldKernelFixture::SetUp;
+    using IndirectHeapFixture::SetUp;
+    using KernelFixture::pKernel;
 
     HelloWorldFixture() : pSrcMemory(nullptr),
                           pDestMemory(nullptr),
@@ -140,4 +140,4 @@ struct HelloWorldTest : Test<HelloWorldFixture<FixtureFactory>> {
 template <typename FixtureFactory>
 struct HelloWorldTestWithParam : HelloWorldFixture<FixtureFactory> {
 };
-}
+} // namespace OCLRT
diff --git a/unit_tests/fixtures/kernel_arg_fixture.h b/unit_tests/fixtures/kernel_arg_fixture.h
index 32d842e448..5d94e0d314 100644
--- a/unit_tests/fixtures/kernel_arg_fixture.h
+++ b/unit_tests/fixtures/kernel_arg_fixture.h
@@ -33,7 +33,7 @@ class MockKernel;
 class MockProgram;
 class Image;
 struct KernelInfo;
-}
+} // namespace OCLRT
 
 namespace iOpenCL {
 struct SKernelBinaryHeaderCommon;
diff --git a/unit_tests/fixtures/media_kernel_fixture.h b/unit_tests/fixtures/media_kernel_fixture.h
index 10ae67a487..7dd2ba28f2 100644
--- a/unit_tests/fixtures/media_kernel_fixture.h
+++ b/unit_tests/fixtures/media_kernel_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -33,10 +33,10 @@ struct MediaKernelFixture : public HelloWorldFixture<FactoryType>,
                             public ::testing::Test {
     typedef HelloWorldFixture<FactoryType> Parent;
 
-    using Parent::pCS;
     using Parent::pCmdBuffer;
     using Parent::pCmdQ;
     using Parent::pContext;
+    using Parent::pCS;
     using Parent::pDevice;
     using Parent::pKernel;
     using Parent::pProgram;
@@ -105,4 +105,4 @@ struct MediaKernelFixture : public HelloWorldFixture<FactoryType>,
 
     Kernel *pVmeKernel = nullptr;
 };
-}
\ No newline at end of file
+} // namespace OCLRT
\ No newline at end of file
diff --git a/unit_tests/fixtures/platform_fixture.cpp b/unit_tests/fixtures/platform_fixture.cpp
index 1ce90351dc..d5db896cb2 100644
--- a/unit_tests/fixtures/platform_fixture.cpp
+++ b/unit_tests/fixtures/platform_fixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -59,4 +59,4 @@ void PlatformFixture::TearDown() {
     pPlatform->shutdown();
     delete[] devices;
 }
-}
+} // namespace OCLRT
diff --git a/unit_tests/fixtures/platform_fixture.h b/unit_tests/fixtures/platform_fixture.h
index cdb06124e8..a719d897f0 100644
--- a/unit_tests/fixtures/platform_fixture.h
+++ b/unit_tests/fixtures/platform_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -41,4 +41,4 @@ class PlatformFixture {
     cl_uint num_devices;
     cl_device_id *devices;
 };
-}
+} // namespace OCLRT
diff --git a/unit_tests/fixtures/preemption_fixture.h b/unit_tests/fixtures/preemption_fixture.h
index 32f108f8d1..639e5dcd79 100644
--- a/unit_tests/fixtures/preemption_fixture.h
+++ b/unit_tests/fixtures/preemption_fixture.h
@@ -50,7 +50,7 @@ struct WorkaroundTable;
 
 using PreemptionEnqueueKernelFixture = HelloWorldFixture<HelloWorldFixtureFactory>;
 using PreemptionEnqueueKernelTest = Test<PreemptionEnqueueKernelFixture>;
-}
+} // namespace OCLRT
 
 class DevicePreemptionTests : public ::testing::Test {
   public:
diff --git a/unit_tests/fixtures/program_fixture.cpp b/unit_tests/fixtures/program_fixture.cpp
index 42861eb0d4..0070ed9d16 100644
--- a/unit_tests/fixtures/program_fixture.cpp
+++ b/unit_tests/fixtures/program_fixture.cpp
@@ -33,4 +33,4 @@ template void ProgramFixture::CreateProgramFromBinary<Program>(cl_context, cl_de
 template void ProgramFixture::CreateProgramFromBinary<Program>(cl_context, cl_device_id *, const std::string &, cl_int &, const std::string &);
 template void ProgramFixture::CreateProgramFromBinary<MockProgram>(cl_context, cl_device_id *, const std::string &, const std::string &);
 template void ProgramFixture::CreateProgramFromBinary<MockProgram>(cl_context, cl_device_id *, const std::string &, cl_int &, const std::string &);
-}
+} // namespace OCLRT
diff --git a/unit_tests/fixtures/program_fixture.inl b/unit_tests/fixtures/program_fixture.inl
index f2a8b78721..318bfffca2 100644
--- a/unit_tests/fixtures/program_fixture.inl
+++ b/unit_tests/fixtures/program_fixture.inl
@@ -70,4 +70,4 @@ void ProgramFixture::CreateProgramFromBinary(cl_context pContext,
     ASSERT_NE(nullptr, pProgram);
     ASSERT_EQ(CL_SUCCESS, retVal);
 }
-}
+} // namespace OCLRT
diff --git a/unit_tests/fixtures/simple_arg_fixture.h b/unit_tests/fixtures/simple_arg_fixture.h
index 81f60d5664..5a9e127ee9 100644
--- a/unit_tests/fixtures/simple_arg_fixture.h
+++ b/unit_tests/fixtures/simple_arg_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -37,4 +37,4 @@ struct SimpleArgFixtureFactory {
     typedef OCLRT::CommandQueueHwFixture CommandQueueFixture;
     typedef OCLRT::SimpleArgKernelFixture KernelFixture;
 };
-}
+} // namespace OCLRT
diff --git a/unit_tests/fixtures/two_walker_fixture.h b/unit_tests/fixtures/two_walker_fixture.h
index 78f06c2077..5fca7e4b0f 100644
--- a/unit_tests/fixtures/two_walker_fixture.h
+++ b/unit_tests/fixtures/two_walker_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -34,10 +34,10 @@ struct TwoWalkerTest
       public HardwareParse {
     typedef HelloWorldTest<FactoryType> Parent;
 
+    using Parent::pCmdBuffer;
     using Parent::pCmdQ;
     using Parent::pCS;
     using Parent::pKernel;
-    using Parent::pCmdBuffer;
 
     template <typename FamilyType>
     void enqueueTwoKernels() {
@@ -79,4 +79,4 @@ struct TwoWalkerTest
     GenCmdList::iterator itorWalker1;
     GenCmdList::iterator itorWalker2;
 };
-}
+} // namespace OCLRT
diff --git a/unit_tests/helpers/base_object_tests_mt.cpp b/unit_tests/helpers/base_object_tests_mt.cpp
index ec05168049..dc0a92c4f1 100644
--- a/unit_tests/helpers/base_object_tests_mt.cpp
+++ b/unit_tests/helpers/base_object_tests_mt.cpp
@@ -78,4 +78,4 @@ TYPED_TEST(BaseObjectTestsMt, takeOwner) {
 
     object->release();
 }
-}
+} // namespace OCLRT
diff --git a/unit_tests/helpers/dispatch_info_builder_tests.cpp b/unit_tests/helpers/dispatch_info_builder_tests.cpp
index 6cdfae6f45..edfc35b0a4 100644
--- a/unit_tests/helpers/dispatch_info_builder_tests.cpp
+++ b/unit_tests/helpers/dispatch_info_builder_tests.cpp
@@ -1021,4 +1021,4 @@ TEST_F(DispatchInfoBuilderTest, setKernelArgNullKernel) {
     delete diBuilder;
     delete buffer;
 }
-}
+} // namespace OCLRT
diff --git a/unit_tests/helpers/memory_management.cpp b/unit_tests/helpers/memory_management.cpp
index 8c331a4ec2..e02459ac12 100644
--- a/unit_tests/helpers/memory_management.cpp
+++ b/unit_tests/helpers/memory_management.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -248,8 +248,8 @@ int detectLeaks() {
 }
 } // namespace MemoryManagement
 
-using MemoryManagement::AllocationEvent;
 using MemoryManagement::allocate;
+using MemoryManagement::AllocationEvent;
 using MemoryManagement::deallocate;
 
 NO_SANITIZE
diff --git a/unit_tests/helpers/memory_management.h b/unit_tests/helpers/memory_management.h
index ec15c7a19b..d5711f79d3 100644
--- a/unit_tests/helpers/memory_management.h
+++ b/unit_tests/helpers/memory_management.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -89,4 +89,4 @@ extern int fastLeakDetectionMode;
 extern void (*deleteCallback)(void *);
 
 int detectLeaks();
-}
+} // namespace MemoryManagement
diff --git a/unit_tests/helpers/memory_management_tests.cpp b/unit_tests/helpers/memory_management_tests.cpp
index a572360a30..f90e3f472b 100644
--- a/unit_tests/helpers/memory_management_tests.cpp
+++ b/unit_tests/helpers/memory_management_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,13 +24,13 @@
 #include "unit_tests/fixtures/memory_management_fixture.h"
 #include "gtest/gtest.h"
 
-using MemoryManagement::failingAllocation;
-using MemoryManagement::numAllocations;
-using MemoryManagement::indexAllocation;
-using MemoryManagement::indexDeallocation;
 using MemoryManagement::AllocationEvent;
 using MemoryManagement::eventsAllocated;
 using MemoryManagement::eventsDeallocated;
+using MemoryManagement::failingAllocation;
+using MemoryManagement::indexAllocation;
+using MemoryManagement::indexDeallocation;
+using MemoryManagement::numAllocations;
 
 TEST(allocation, nothrow_defaultShouldPass) {
     ASSERT_EQ(failingAllocation, static_cast<size_t>(-1));
diff --git a/unit_tests/indirect_heap/indirect_heap_fixture.cpp b/unit_tests/indirect_heap/indirect_heap_fixture.cpp
index 4d7d6d0863..faca577b20 100644
--- a/unit_tests/indirect_heap/indirect_heap_fixture.cpp
+++ b/unit_tests/indirect_heap/indirect_heap_fixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -30,4 +30,4 @@ void IndirectHeapFixture::SetUp(CommandQueue *pCmdQ) {
     pSSH = &pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE, 4096);
     pIOH = &pCmdQ->getIndirectHeap(IndirectHeap::INDIRECT_OBJECT, 4096);
 }
-}
+} // namespace OCLRT
diff --git a/unit_tests/indirect_heap/indirect_heap_fixture.h b/unit_tests/indirect_heap/indirect_heap_fixture.h
index 760a26f12e..d02b3993ba 100644
--- a/unit_tests/indirect_heap/indirect_heap_fixture.h
+++ b/unit_tests/indirect_heap/indirect_heap_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -42,4 +42,4 @@ struct IndirectHeapFixture {
     IndirectHeap *pIOH;
     IndirectHeap *pSSH;
 };
-}
+} // namespace OCLRT
diff --git a/unit_tests/libult/create_command_stream.cpp b/unit_tests/libult/create_command_stream.cpp
index 0f115e7400..bb3a396b6d 100644
--- a/unit_tests/libult/create_command_stream.cpp
+++ b/unit_tests/libult/create_command_stream.cpp
@@ -60,4 +60,4 @@ bool getDevices(HardwareInfo **hwInfo, size_t &numDevicesReturned) {
     }
     return getDevicesImpl(hwInfo, numDevicesReturned);
 }
-}
+} // namespace OCLRT
diff --git a/unit_tests/libult/create_command_stream.h b/unit_tests/libult/create_command_stream.h
index 4773a8e028..9dfb770d01 100644
--- a/unit_tests/libult/create_command_stream.h
+++ b/unit_tests/libult/create_command_stream.h
@@ -28,4 +28,4 @@ extern bool overrideDeviceWithNullHardwareInfo;
 
 extern CommandStreamReceiver *createCommandStream(const HardwareInfo *pHwInfo);
 extern bool getDevices(HardwareInfo **hwInfo, size_t &numDevicesReturned);
-}
+} // namespace OCLRT
diff --git a/unit_tests/mem_obj/get_mem_object_info_tests.cpp b/unit_tests/mem_obj/get_mem_object_info_tests.cpp
index c505b93077..56ac3be948 100644
--- a/unit_tests/mem_obj/get_mem_object_info_tests.cpp
+++ b/unit_tests/mem_obj/get_mem_object_info_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -33,8 +33,8 @@
 using namespace OCLRT;
 
 class GetMemObjectInfo : public ::testing::Test, public PlatformFixture, public DeviceFixture {
-    using PlatformFixture::SetUp;
     using DeviceFixture::SetUp;
+    using PlatformFixture::SetUp;
 
   public:
     void SetUp() override {
diff --git a/unit_tests/mem_obj/image_redescribe_tests.cpp b/unit_tests/mem_obj/image_redescribe_tests.cpp
index 6082a1cc28..c78da26a9d 100644
--- a/unit_tests/mem_obj/image_redescribe_tests.cpp
+++ b/unit_tests/mem_obj/image_redescribe_tests.cpp
@@ -48,16 +48,15 @@ class ImageRedescribeTest : public testing::TestWithParam<std::tuple<size_t, uin
         auto imageHeight = ImageType == CL_MEM_OBJECT_IMAGE1D_ARRAY ? 0 : 32;
         auto imageArrays = ImageType == CL_MEM_OBJECT_IMAGE1D_ARRAY || ImageType == CL_MEM_OBJECT_IMAGE2D_ARRAY ? 7 : 1;
 
-
-        imageDesc.image_type        = ImageType;
-        imageDesc.image_width       = 32;
-        imageDesc.image_height      = imageHeight;
-        imageDesc.image_depth       = 1;
-        imageDesc.image_array_size  = imageArrays;
-        imageDesc.image_row_pitch   = 0;
+        imageDesc.image_type = ImageType;
+        imageDesc.image_width = 32;
+        imageDesc.image_height = imageHeight;
+        imageDesc.image_depth = 1;
+        imageDesc.image_array_size = imageArrays;
+        imageDesc.image_row_pitch = 0;
         imageDesc.image_slice_pitch = 0;
-        imageDesc.num_mip_levels    = 0;
-        imageDesc.num_samples       = 0;
+        imageDesc.num_mip_levels = 0;
+        imageDesc.num_samples = 0;
         imageDesc.mem_object = NULL;
 
         retVal = CL_INVALID_VALUE;
diff --git a/unit_tests/mock_gmm/mock_gmm.cpp b/unit_tests/mock_gmm/mock_gmm.cpp
index 9ca2e39b58..e44284bc56 100644
--- a/unit_tests/mock_gmm/mock_gmm.cpp
+++ b/unit_tests/mock_gmm/mock_gmm.cpp
@@ -611,7 +611,7 @@ void GmmPageTableMgr::EvictPageTablePool(D3DKMT_HANDLE *BBQHandles, int NumBBFen
 void GmmPageTableMgr::__ReleaseUnusedPool(GMM_UMD_SYNCCONTEXT *UmdContext) {}
 GMM_PAGETABLEPool *GmmPageTableMgr::__GetFreePoolNode(uint32_t *FreePoolNodeIdx, POOL_TYPE PoolType) { return nullptr; }
 GmmPageTableMgr::~GmmPageTableMgr() {}
-}
+} // namespace GmmLib
 uint8_t GMM_STDCALL GmmIsPlanar(GMM_RESOURCE_FORMAT Format) {
     return 0;
 }
diff --git a/unit_tests/mocks/mock_32bitAllocator.h b/unit_tests/mocks/mock_32bitAllocator.h
index ef9019476f..f8d40ece3d 100644
--- a/unit_tests/mocks/mock_32bitAllocator.h
+++ b/unit_tests/mocks/mock_32bitAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -133,4 +133,4 @@ class mockAllocator32Bit : public Allocator32bit {
 
     OsInternals *getosInternal() { return this->osInternals.get(); }
 };
-}
\ No newline at end of file
+} // namespace OCLRT
\ No newline at end of file
diff --git a/unit_tests/mocks/mock_cif.cpp b/unit_tests/mocks/mock_cif.cpp
index 5c0fac499a..73c8062464 100644
--- a/unit_tests/mocks/mock_cif.cpp
+++ b/unit_tests/mocks/mock_cif.cpp
@@ -96,8 +96,8 @@ bool BufferSimple::PushBackRawBytes(const void *newData, size_t size) {
 bool BufferSimple::IsConst() const {
     return false;
 }
-}
-}
+} // namespace Builtins
+} // namespace CIF
 
 namespace OCLRT {
 
@@ -135,7 +135,7 @@ CIF::ICIF *MockCIFMain::CreateInterfaceImpl(CIF::InterfaceId_t intId, CIF::Versi
 
     return it->second(intId, version);
 }
-}
+} // namespace OCLRT
 
 extern CIF::CIFMain *CreateCIFMainImpl() {
     if (OCLRT::failCreateCifMain) {
diff --git a/unit_tests/mocks/mock_cif.h b/unit_tests/mocks/mock_cif.h
index 4c41355a19..28751ca61a 100644
--- a/unit_tests/mocks/mock_cif.h
+++ b/unit_tests/mocks/mock_cif.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -221,4 +221,4 @@ struct MockCIFBuffer : MockCIF<CIF::Builtins::BufferSimple> {
 
     std::vector<char> data;
 };
-}
+} // namespace OCLRT
diff --git a/unit_tests/mocks/mock_csr.h b/unit_tests/mocks/mock_csr.h
index 58e0632be7..241baf191c 100644
--- a/unit_tests/mocks/mock_csr.h
+++ b/unit_tests/mocks/mock_csr.h
@@ -153,11 +153,11 @@ class MockCsrHw2 : public CommandStreamReceiverHw<GfxFamily> {
     using CommandStreamReceiverHw<GfxFamily>::csrSizeRequestFlags;
     using CommandStreamReceiver::commandStream;
     using CommandStreamReceiver::dispatchMode;
+    using CommandStreamReceiver::isPreambleSent;
     using CommandStreamReceiver::lastSentCoherencyRequest;
     using CommandStreamReceiver::mediaVfeStateDirty;
     using CommandStreamReceiver::taskCount;
     using CommandStreamReceiver::taskLevel;
-    using CommandStreamReceiver::isPreambleSent;
 
     MockCsrHw2(const HardwareInfo &hwInfoIn) : CommandStreamReceiverHw<GfxFamily>(hwInfoIn) {}
 
diff --git a/unit_tests/mocks/mock_d3d_objects.h b/unit_tests/mocks/mock_d3d_objects.h
index caa537aa1b..d651f1ef46 100644
--- a/unit_tests/mocks/mock_d3d_objects.h
+++ b/unit_tests/mocks/mock_d3d_objects.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -23,8 +23,8 @@
 #pragma once
 #include "runtime/sharings/d3d/d3d_sharing.h"
 #include "gmock/gmock.h"
-using ::testing::NiceMock;
 using ::testing::_;
+using ::testing::NiceMock;
 using ::testing::SetArgPointee;
 
 namespace OCLRT {
diff --git a/unit_tests/mocks/mock_deferrable_deletion.cpp b/unit_tests/mocks/mock_deferrable_deletion.cpp
index f7bf11a854..9015717091 100644
--- a/unit_tests/mocks/mock_deferrable_deletion.cpp
+++ b/unit_tests/mocks/mock_deferrable_deletion.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -29,4 +29,4 @@ void MockDeferrableDeletion::apply() {
 MockDeferrableDeletion::~MockDeferrableDeletion() {
     EXPECT_EQ(1, applyCalled);
 }
-}
\ No newline at end of file
+} // namespace OCLRT
\ No newline at end of file
diff --git a/unit_tests/mocks/mock_deferrable_deletion.h b/unit_tests/mocks/mock_deferrable_deletion.h
index 6e2a7ec3c6..19e07cd81f 100644
--- a/unit_tests/mocks/mock_deferrable_deletion.h
+++ b/unit_tests/mocks/mock_deferrable_deletion.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,4 +32,4 @@ class MockDeferrableDeletion : public DeferrableDeletion {
     virtual ~MockDeferrableDeletion();
     int applyCalled = 0;
 };
-}
\ No newline at end of file
+} // namespace OCLRT
\ No newline at end of file
diff --git a/unit_tests/mocks/mock_device_factory.h b/unit_tests/mocks/mock_device_factory.h
index 9f182bc085..8e96bfcdc7 100644
--- a/unit_tests/mocks/mock_device_factory.h
+++ b/unit_tests/mocks/mock_device_factory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -28,4 +28,4 @@ class MockDeviceFactory : public DeviceFactory {
   public:
     size_t getNumDevices() { return numDevices; };
 };
-}
+} // namespace OCLRT
diff --git a/unit_tests/mocks/mock_event.h b/unit_tests/mocks/mock_event.h
index 9d3e8456d4..3a6256cbf6 100644
--- a/unit_tests/mocks/mock_event.h
+++ b/unit_tests/mocks/mock_event.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -69,4 +69,4 @@ struct MockEventBuilder : EventBuilder {
         return static_cast<EventType *>(mb.finalizeAndRelease());
     }
 };
-}
+} // namespace OCLRT
diff --git a/unit_tests/mocks/mock_image.h b/unit_tests/mocks/mock_image.h
index c5c6f39cf1..81bddb708c 100644
--- a/unit_tests/mocks/mock_image.h
+++ b/unit_tests/mocks/mock_image.h
@@ -26,8 +26,8 @@
 #include "unit_tests/mocks/mock_graphics_allocation.h"
 
 struct MockImageBase : public OCLRT::Image {
-    using Image::imageDesc;
     using Image::graphicsAllocation;
+    using Image::imageDesc;
 
     MockImageBase() : Image(nullptr, cl_mem_flags{}, 0, nullptr, cl_image_format{},
                             cl_image_desc{}, false, new OCLRT::MockGraphicsAllocation(nullptr, 0), false, false,
diff --git a/unit_tests/mocks/mock_ostime.h b/unit_tests/mocks/mock_ostime.h
index 987b61be02..df4e78f788 100644
--- a/unit_tests/mocks/mock_ostime.h
+++ b/unit_tests/mocks/mock_ostime.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -50,4 +50,4 @@ class MockOSTime : public OSTime {
         return std::unique_ptr<OSTime>(new MockOSTime());
     }
 };
-}
+} // namespace OCLRT
diff --git a/unit_tests/mocks/mock_ostime_win.h b/unit_tests/mocks/mock_ostime_win.h
index 8b34641078..eb0deafb59 100644
--- a/unit_tests/mocks/mock_ostime_win.h
+++ b/unit_tests/mocks/mock_ostime_win.h
@@ -34,4 +34,4 @@ class MockOSTimeWin : public OSTimeWin {
         return OSTimeWin::getDynamicDeviceTimerResolution(hwInfo);
     };
 };
-}
+} // namespace OCLRT
diff --git a/unit_tests/mt_tests/utilities/reference_tracked_object_tests_mt.cpp b/unit_tests/mt_tests/utilities/reference_tracked_object_tests_mt.cpp
index 8513ec033b..1dc58af86e 100644
--- a/unit_tests/mt_tests/utilities/reference_tracked_object_tests_mt.cpp
+++ b/unit_tests/mt_tests/utilities/reference_tracked_object_tests_mt.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -144,4 +144,4 @@ TEST(ReferenceTrackedObject, whenDecreasingInternalRefcountSimultaneouslyWillRet
 
     EXPECT_EQ(MockReferenceTrackedObjectDerivative::GetMarker(), marker);
 }
-}
+} // namespace OCLRT
diff --git a/unit_tests/offline_compiler/offline_compiler_tests.cpp b/unit_tests/offline_compiler/offline_compiler_tests.cpp
index f7d814037d..a6d471d6db 100644
--- a/unit_tests/offline_compiler/offline_compiler_tests.cpp
+++ b/unit_tests/offline_compiler/offline_compiler_tests.cpp
@@ -144,12 +144,14 @@ TEST_F(OfflineCompilerTests, GoodParseBinToCharArray) {
         gEnvironment->devicePrefix.c_str()};
 
     pOfflineCompiler = OfflineCompiler::create(ARRAY_COUNT(argv), argv, retVal);
+    // clang-format off
     uint8_t binary[] = {
         0x02, 0x23, 0x3, 0x40, 0x56, 0x7, 0x80, 0x90, 0x1, 0x03,
         0x34, 0x5, 0x60, 0x78, 0x9, 0x66, 0xff, 0x10, 0x10, 0x10,
         0x02, 0x23, 0x3, 0x40, 0x56, 0x7, 0x80, 0x90, 0x1, 0x03,
         0x34, 0x5, 0x60, 0x78, 0x9, 0x66, 0xff,
     };
+    // clang-format on
 
     std::string familyNameWithType = gEnvironment->familyNameWithType;
     std::string fileName = "scheduler";
diff --git a/unit_tests/os_interface/linux/debug_env_reader.cpp b/unit_tests/os_interface/linux/debug_env_reader.cpp
index da0f4316ed..9095a081cd 100644
--- a/unit_tests/os_interface/linux/debug_env_reader.cpp
+++ b/unit_tests/os_interface/linux/debug_env_reader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -83,4 +83,4 @@ TEST_F(DebugEnvReaderTests, CheckBoolEnvVariable) {
     ret = evr->getSetting("TestingVariable", defaultValue);
     EXPECT_EQ(defaultValue, ret);
 }
-}
+} // namespace OCLRT
diff --git a/unit_tests/os_interface/linux/drm_mock.h b/unit_tests/os_interface/linux/drm_mock.h
index 31300722cc..d4c2e2d804 100644
--- a/unit_tests/os_interface/linux/drm_mock.h
+++ b/unit_tests/os_interface/linux/drm_mock.h
@@ -57,7 +57,7 @@ class DrmMock : public Drm {
 #if defined(I915_PARAM_EU_COUNT)
                 || (gp->param == I915_PARAM_EU_COUNT)
 #endif
-                    ) {
+            ) {
                 if (0 == this->StoredRetValForEUVal) {
                     *((int *)(gp->value)) = this->StoredEUVal;
                 }
@@ -67,7 +67,7 @@ class DrmMock : public Drm {
 #if defined(I915_PARAM_SUBSLICE_TOTAL)
                 || (gp->param == I915_PARAM_SUBSLICE_TOTAL)
 #endif
-                    ) {
+            ) {
                 if (0 == this->StoredRetValForSSVal) {
                     *((int *)(gp->value)) = this->StoredSSVal;
                 }
@@ -77,7 +77,7 @@ class DrmMock : public Drm {
 #if defined(I915_PARAM_CHIPSET_ID)
                 || (gp->param == I915_PARAM_CHIPSET_ID)
 #endif
-                    ) {
+            ) {
                 if (0 == this->StoredRetValForDeviceID) {
                     *((int *)(gp->value)) = this->StoredDeviceID;
                 }
@@ -87,7 +87,7 @@ class DrmMock : public Drm {
 #if defined(I915_PARAM_REVISION)
                 || (gp->param == I915_PARAM_REVISION)
 #endif
-                    ) {
+            ) {
                 if (0 == this->StoredRetValForDeviceRevID) {
                     *((int *)(gp->value)) = this->StoredDeviceRevID;
                 }
@@ -97,7 +97,7 @@ class DrmMock : public Drm {
 #if defined(I915_PARAM_HAS_POOLED_EU)
                 || (gp->param == I915_PARAM_HAS_POOLED_EU)
 #endif
-                    ) {
+            ) {
                 if (0 == this->StoredRetValForPooledEU) {
                     *((int *)(gp->value)) = this->StoredHasPooledEU;
                 }
@@ -107,7 +107,7 @@ class DrmMock : public Drm {
 #if defined(I915_PARAM_MIN_EU_IN_POOL)
                 || (gp->param == I915_PARAM_MIN_EU_IN_POOL)
 #endif
-                    ) {
+            ) {
                 if (0 == this->StoredRetValForMinEUinPool) {
                     *((int *)(gp->value)) = this->StoredMinEUinPool;
                 }
diff --git a/unit_tests/os_interface/linux/options.cpp b/unit_tests/os_interface/linux/options.cpp
index 4cfc6f7d33..a2dc7d91a4 100644
--- a/unit_tests/os_interface/linux/options.cpp
+++ b/unit_tests/os_interface/linux/options.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -36,7 +36,7 @@ const char *libvaDllName = nullptr;
 const char *testDllName = "libtest_dynamic_lib.so";
 #endif
 const char *sysFsPciPath = "./test_files";
-}
+} // namespace Os
 
 OCLRT::OsLibrary *setAdapterInfo(const PLATFORM *platform, const GT_SYSTEM_INFO *gtSystemInfo) {
     return nullptr;
diff --git a/unit_tests/os_interface/os_library_tests.cpp b/unit_tests/os_interface/os_library_tests.cpp
index e0b63ce65a..c16db35499 100644
--- a/unit_tests/os_interface/os_library_tests.cpp
+++ b/unit_tests/os_interface/os_library_tests.cpp
@@ -36,7 +36,7 @@ namespace Os {
 extern const char *frontEndDllName;
 extern const char *igcDllName;
 extern const char *testDllName;
-}
+} // namespace Os
 const std::string fakeLibName = "_fake_library_name_";
 const std::string fnName = "testDynamicLibraryFunc";
 
diff --git a/unit_tests/os_interface/performance_counters_gen_tests.cpp b/unit_tests/os_interface/performance_counters_gen_tests.cpp
index 4d294c57e2..56fef1363f 100644
--- a/unit_tests/os_interface/performance_counters_gen_tests.cpp
+++ b/unit_tests/os_interface/performance_counters_gen_tests.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2017, Intel Corporation
+* Copyright (c) 2017 - 2018, Intel Corporation
 *
 * Permission is hereby granted, free of charge, to any person obtaining a
 * copy of this software and associated documentation files (the "Software"),
@@ -35,7 +35,7 @@ struct PerformanceCountersGenTest : public ::testing::Test {
 namespace OCLRT {
 extern decltype(&instrGetPerfCountersQueryData) getPerfCountersQueryDataFactory[IGFX_MAX_CORE];
 extern size_t perfCountersQuerySize[IGFX_MAX_CORE];
-}
+} // namespace OCLRT
 
 class MockPerformanceCountersGen : public PerformanceCounters {
   public:
@@ -67,15 +67,15 @@ HWTEST_F(PerformanceCountersGenTest, givenPerfCountersWhenInitializedWithGenSpec
     VariableBackup<decltype(&instrGetPerfCountersQueryData)> bkp(&getPerfCountersQueryDataFactory[platformDevices[0]->pPlatform->eRenderCoreFamily]);
 
     auto mockFn = [](
-        InstrEscCbData cbData,
-        GTDI_QUERY *pData,
-        HwPerfCounters *pLayout,
-        uint64_t cpuRawTimestamp,
-        void *pASInterface,
-        InstrPmRegsCfg *pPmRegsCfg,
-        bool useMiRPC,
-        bool resetASData = false,
-        const InstrAllowedContexts *pAllowedContexts = nullptr) -> void {
+                      InstrEscCbData cbData,
+                      GTDI_QUERY *pData,
+                      HwPerfCounters *pLayout,
+                      uint64_t cpuRawTimestamp,
+                      void *pASInterface,
+                      InstrPmRegsCfg *pPmRegsCfg,
+                      bool useMiRPC,
+                      bool resetASData = false,
+                      const InstrAllowedContexts *pAllowedContexts = nullptr) -> void {
     };
 
     bkp = mockFn;
diff --git a/unit_tests/os_interface/windows/mock_kmdaf_listener.h b/unit_tests/os_interface/windows/mock_kmdaf_listener.h
index 3130291207..30387cc8f0 100644
--- a/unit_tests/os_interface/windows/mock_kmdaf_listener.h
+++ b/unit_tests/os_interface/windows/mock_kmdaf_listener.h
@@ -149,4 +149,4 @@ struct KmDafListenerMock : public KmDafListener {
         PFND3DKMT_ESCAPE pfnEscape = nullptr;
     } notifyWriteTargetParametrization;
 };
-}
+} // namespace OCLRT
diff --git a/unit_tests/os_interface/windows/options.cpp b/unit_tests/os_interface/windows/options.cpp
index 5b7f5d8c7e..76f32208bf 100644
--- a/unit_tests/os_interface/windows/options.cpp
+++ b/unit_tests/os_interface/windows/options.cpp
@@ -34,7 +34,7 @@ const char *igcDllName = "mock_igc.dll";
 const char *gdiDllName = "gdi32_mock.dll";
 const char *gmmDllName = "mock_gmm.dll";
 const char *testDllName = "test_dynamic_lib.dll";
-}
+} // namespace Os
 
 OCLRT::OsLibrary *setAdapterInfo(const PLATFORM *platform, const GT_SYSTEM_INFO *gtSystemInfo) {
     OCLRT::OsLibrary *mockGdiDll;
diff --git a/unit_tests/perf_tests/api/api_tests.cpp b/unit_tests/perf_tests/api/api_tests.cpp
index 7c840ede5d..13c6f11421 100644
--- a/unit_tests/perf_tests/api/api_tests.cpp
+++ b/unit_tests/perf_tests/api/api_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -58,4 +58,4 @@ void api_fixture::TearDown() {
     DeviceFixture::TearDown();
     PlatformFixture::TearDown();
 }
-}
+} // namespace OCLRT
diff --git a/unit_tests/perf_tests/api/api_tests.h b/unit_tests/perf_tests/api/api_tests.h
index e19b0404fd..8fb7a1d080 100644
--- a/unit_tests/perf_tests/api/api_tests.h
+++ b/unit_tests/perf_tests/api/api_tests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -60,4 +60,4 @@ struct api_tests : public api_fixture,
         api_fixture::TearDown();
     }
 };
-}
+} // namespace OCLRT
diff --git a/unit_tests/perf_tests/api/context_tests.cpp b/unit_tests/perf_tests/api/context_tests.cpp
index 0e26dbe029..a9077d508e 100644
--- a/unit_tests/perf_tests/api/context_tests.cpp
+++ b/unit_tests/perf_tests/api/context_tests.cpp
@@ -129,4 +129,4 @@ TEST_F(ContextTest, clRetainContext) {
 
     updateTestRatio(hash, ratio);
 }
-}
+} // namespace ULT
diff --git a/unit_tests/perf_tests/fixtures/command_queue_fixture.cpp b/unit_tests/perf_tests/fixtures/command_queue_fixture.cpp
index 6335c27a2a..d55ea13ffe 100644
--- a/unit_tests/perf_tests/fixtures/command_queue_fixture.cpp
+++ b/unit_tests/perf_tests/fixtures/command_queue_fixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -91,4 +91,4 @@ void CommandQueueFixture::TearDown() {
     delete pCmdQ;
     pCmdQ = nullptr;
 }
-}
+} // namespace OCLRT
diff --git a/unit_tests/perf_tests/fixtures/command_queue_fixture.h b/unit_tests/perf_tests/fixtures/command_queue_fixture.h
index 0b84ca02a7..a612aa784e 100644
--- a/unit_tests/perf_tests/fixtures/command_queue_fixture.h
+++ b/unit_tests/perf_tests/fixtures/command_queue_fixture.h
@@ -67,4 +67,4 @@ static const cl_command_queue_properties DefaultCommandQueueProperties[] = {
     0,
     CL_QUEUE_PROFILING_ENABLE,
 };
-}
+} // namespace OCLRT
diff --git a/unit_tests/perf_tests/fixtures/device_fixture.h b/unit_tests/perf_tests/fixtures/device_fixture.h
index 063e5f5977..fb2d4f53fe 100644
--- a/unit_tests/perf_tests/fixtures/device_fixture.h
+++ b/unit_tests/perf_tests/fixtures/device_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -27,7 +27,7 @@
 namespace OCLRT {
 struct HardwareInfo;
 extern const HardwareInfo **platformDevices;
-}
+} // namespace OCLRT
 
 // Even though there aren't any defaults, this pattern is used
 // throughout testing.  Included here for consistency.
diff --git a/unit_tests/perf_tests/fixtures/platform_fixture.cpp b/unit_tests/perf_tests/fixtures/platform_fixture.cpp
index 2a1df8f118..a2d7c9baf5 100644
--- a/unit_tests/perf_tests/fixtures/platform_fixture.cpp
+++ b/unit_tests/perf_tests/fixtures/platform_fixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -58,4 +58,4 @@ void PlatformFixture::TearDown() {
     pPlatform->shutdown();
     delete[] devices;
 }
-}
+} // namespace OCLRT
diff --git a/unit_tests/perf_tests/fixtures/platform_fixture.h b/unit_tests/perf_tests/fixtures/platform_fixture.h
index 0cec343789..6ca7afa713 100644
--- a/unit_tests/perf_tests/fixtures/platform_fixture.h
+++ b/unit_tests/perf_tests/fixtures/platform_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -45,4 +45,4 @@ class PlatformFixture {
     cl_uint num_devices;
     cl_device_id *devices;
 };
-}
+} // namespace OCLRT
diff --git a/unit_tests/perf_tests/options.cpp b/unit_tests/perf_tests/options.cpp
index a67e54ed2a..4fdf29a108 100644
--- a/unit_tests/perf_tests/options.cpp
+++ b/unit_tests/perf_tests/options.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -42,6 +42,6 @@ static const HardwareInfo *DefaultPlatformDevices[] = {
 
 size_t numPlatformDevices = ARRAY_COUNT(DefaultPlatformDevices);
 const HardwareInfo **platformDevices = DefaultPlatformDevices;
-}
+} // namespace OCLRT
 
 bool printMemoryOpCallStack = true;
diff --git a/unit_tests/sharings/va/mock_va_sharing.cpp b/unit_tests/sharings/va/mock_va_sharing.cpp
index 2549d5483a..271e62df56 100644
--- a/unit_tests/sharings/va/mock_va_sharing.cpp
+++ b/unit_tests/sharings/va/mock_va_sharing.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -51,4 +51,4 @@ void VASharingFunctionsMock::initMembers() {
 
     acquiredVaHandle = 0;
 }
-}
+} // namespace OCLRT
diff --git a/unit_tests/sharings/va/mock_va_sharing.h b/unit_tests/sharings/va/mock_va_sharing.h
index c46afae53b..a811d5949a 100644
--- a/unit_tests/sharings/va/mock_va_sharing.h
+++ b/unit_tests/sharings/va/mock_va_sharing.h
@@ -93,4 +93,4 @@ class MockVaSharing {
     VASharingFunctionsMock m_sharingFunctions;
     osHandle sharingHandle = 0;
 };
-}
+} // namespace OCLRT
diff --git a/unit_tests/ult_configuration.cpp b/unit_tests/ult_configuration.cpp
index 5775665ccf..e50a816a51 100644
--- a/unit_tests/ult_configuration.cpp
+++ b/unit_tests/ult_configuration.cpp
@@ -23,4 +23,4 @@
 namespace OCLRT {
 unsigned int ultIterationMaxTime = 45;
 bool useMockGmm = true;
-}
+} // namespace OCLRT
diff --git a/unit_tests/utilities/reference_tracked_object_tests.cpp b/unit_tests/utilities/reference_tracked_object_tests.cpp
index 76d413d247..b2d610a7bf 100644
--- a/unit_tests/utilities/reference_tracked_object_tests.cpp
+++ b/unit_tests/utilities/reference_tracked_object_tests.cpp
@@ -267,4 +267,4 @@ TEST(ReferenceTrackedObject, whenNewReferenceTrackedObjectIsCreatedRefcountsAreZ
     EXPECT_EQ(0, obj.getRefApiCount());
     EXPECT_EQ(0, obj.getRefInternalCount());
 }
-}
+} // namespace OCLRT