diff --git a/doc/doxygen.cfg.in b/doc/doxygen.cfg.in
index af7c46e..d0d38cf 100644
--- a/doc/doxygen.cfg.in
+++ b/doc/doxygen.cfg.in
@@ -1648,16 +1648,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1911,7 +1901,7 @@ INCLUDE_FILE_PATTERNS  =
 # recursively expanded use the := operator instead of the = operator.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-PREDEFINED             = M_DOXYGEN_DONT_EXTRACT
+PREDEFINED             = CFG_DOXYGEN_DONT_EXTRACT
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The
@@ -1981,15 +1971,6 @@ EXTERNAL_PAGES         = YES
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 
-# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram
-# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
-# NO turns the diagrams off. Note that this option also works with HAVE_DOT
-# disabled, but it is recommended to install and use dot, since it yields more
-# powerful graphs.
-# The default value is: YES.
-
-CLASS_DIAGRAMS         = YES
-
 # You can include diagrams made with dia in doxygen documentation. Doxygen will
 # then run dia to produce the diagram and insert it in the documentation. The
 # DIA_PATH tag allows you to specify the directory where the dia binary resides.
diff --git a/src/audout/backend/apple_coreaudio.cxx b/src/audout/backend/apple_coreaudio.cxx
index 9959a8e..c5eb565 100644
--- a/src/audout/backend/apple_coreaudio.cxx
+++ b/src/audout/backend/apple_coreaudio.cxx
@@ -44,7 +44,7 @@ class audio_backend : public utki::destructable{
 			//open the default audio device
 			AudioComponentDescription desc;
 			desc.componentType = kAudioUnitType_Output;
-#if M_OS_NAME == M_OS_NAME_IOS
+#if CFG_OS_NAME == CFG_OS_NAME_IOS
 			desc.componentSubType = kAudioUnitSubType_GenericOutput;
 #else
 			desc.componentSubType = kAudioUnitSubType_DefaultOutput;
diff --git a/src/audout/backend/direct_sound.cxx b/src/audout/backend/direct_sound.cxx
index a794222..057a988 100644
--- a/src/audout/backend/direct_sound.cxx
+++ b/src/audout/backend/direct_sound.cxx
@@ -34,7 +34,7 @@ SOFTWARE.
 
 #include <nitki/queue.hpp>
 
-#if M_OS != M_OS_WINDOWS
+#if CFG_OS != CFG_OS_WINDOWS
 #	error "compiling in non-Windows environment"
 #endif
 
diff --git a/src/audout/backend/opensl_es.cxx b/src/audout/backend/opensl_es.cxx
index 4d4c699..a9ce1a3 100644
--- a/src/audout/backend/opensl_es.cxx
+++ b/src/audout/backend/opensl_es.cxx
@@ -29,12 +29,13 @@ SOFTWARE.
 #include <vector>
 #include <array>
 
+#include <utki/config.hpp>
 #include <utki/util.hpp>
 #include <utki/destructable.hpp>
 
 #include <SLES/OpenSLES.h>
 
-#if M_OS_NAME == M_OS_NAME_ANDROID
+#if CFG_OS_NAME == CFG_OS_NAME_ANDROID
 #	include <SLES/OpenSLES_Android.h>
 #include <cstdint>
 
@@ -126,7 +127,7 @@ class audio_backend : public utki::destructable{
 		
 		SLObjectItf object;
 		SLPlayItf play;
-#if M_OS_NAME == M_OS_NAME_ANDROID
+#if CFG_OS_NAME == CFG_OS_NAME_ANDROID
 		SLAndroidSimpleBufferQueueItf
 #else
 		SLBufferQueueItf
@@ -137,7 +138,7 @@ class audio_backend : public utki::destructable{
 	
 		// this callback handler is called every time a buffer finishes playing
 		static void Callback(
-#if M_OS_NAME == M_OS_NAME_ANDROID
+#if CFG_OS_NAME == CFG_OS_NAME_ANDROID
 				SLAndroidSimpleBufferQueueItf queue,
 				void *context
 #else
@@ -155,7 +156,7 @@ class audio_backend : public utki::destructable{
 			ASSERT(context)
 			Player* player = static_cast<Player*>(context);
 			
-#if M_OS_NAME == M_OS_NAME_ANDROID
+#if CFG_OS_NAME == CFG_OS_NAME_ANDROID
 #else
 			ASSERT(buffer == &*player->bufs[0].begin())
 			ASSERT(bufferSize == player->bufs[0].size())
@@ -165,7 +166,7 @@ class audio_backend : public utki::destructable{
 			ASSERT(player->bufs.size() == 2)
 			std::swap(player->bufs[0], player->bufs[1]); // swap buffers, the 0th one is the buffer which is currently playing
 			
-#if M_OS_NAME == M_OS_NAME_ANDROID
+#if CFG_OS_NAME == CFG_OS_NAME_ANDROID
 			SLresult res = (*queue)->Enqueue(queue, &*player->bufs[0].begin(), player->bufs[0].size());
 #else
 			SLresult res = (*queue)->Enqueue(queue, &*player->bufs[0].begin(), player->bufs[0].size(), SL_BOOLEAN_FALSE);
@@ -198,7 +199,7 @@ class audio_backend : public utki::destructable{
 			
 			//========================
 			// configure audio source
-#if M_OS_NAME == M_OS_NAME_ANDROID
+#if CFG_OS_NAME == CFG_OS_NAME_ANDROID
 			SLDataLocator_AndroidSimpleBufferQueue bufferQueueStruct = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 2}; //2 buffers in queue
 #else
 			SLDataLocator_BufferQueue bufferQueueStruct = {SL_DATALOCATOR_BUFFERQUEUE, 2}; // 2 buffers in queue
@@ -329,7 +330,7 @@ class audio_backend : public utki::destructable{
 		this->setPaused(false);
 		
 		// enqueue the first buffer for playing, otherwise it will not start playing
-#if M_OS_NAME == M_OS_NAME_ANDROID
+#if CFG_OS_NAME == CFG_OS_NAME_ANDROID
 		SLresult res = (*this->player.bufferQueue)->Enqueue(
                 this->player.bufferQueue,
                 &*this->player.bufs[0].begin(),
diff --git a/src/audout/player.cpp b/src/audout/player.cpp
index 1855027..499abd8 100644
--- a/src/audout/player.cpp
+++ b/src/audout/player.cpp
@@ -26,16 +26,18 @@ SOFTWARE.
 
 #include "player.hpp"
 
-#if M_OS == M_OS_WINDOWS
+#include <utki/config.hpp>
+
+#if CFG_OS == CFG_OS_WINDOWS
 #	include "backend/direct_sound.cxx"
-#elif M_OS == M_OS_LINUX
-#	if M_OS_NAME == M_OS_NAME_ANDROID
+#elif CFG_OS == CFG_OS_LINUX
+#	if CFG_OS_NAME == CFG_OS_NAME_ANDROID
 #		include "backend/opensl_es.cxx"
 #	else
 #		include "backend/pulse_audio.cxx"
 // #		include "backend/alsa.cxx"
 #	endif
-#elif M_OS == M_OS_MACOSX
+#elif CFG_OS == CFG_OS_MACOSX
 #	include "backend/apple_coreaudio.cxx"
 #else
 #	error "Unknown OS"
diff --git a/src/audout/player.hpp b/src/audout/player.hpp
index 8a5e0df..3d6836e 100644
--- a/src/audout/player.hpp
+++ b/src/audout/player.hpp
@@ -26,7 +26,6 @@ SOFTWARE.
 
 #pragma once
 
-#include <utki/config.hpp>
 #include <utki/singleton.hpp>
 #include <utki/destructable.hpp>
 #include <utki/span.hpp>
diff --git a/tests/sinesynth/main.cpp b/tests/sinesynth/main.cpp
index 61c5243..9041027 100755
--- a/tests/sinesynth/main.cpp
+++ b/tests/sinesynth/main.cpp
@@ -4,7 +4,7 @@
 
 #include "../../src/audout/player.hpp"
 
-#if M_OS_NAME == M_OS_NAME_ANDROID
+#if CFG_OS_NAME == CFG_OS_NAME_ANDROID
 #	include <jni.h>
 #endif
 
@@ -90,7 +90,7 @@ void test(){
 	}
 }
 
-#if M_OS_NAME == M_OS_NAME_ANDROID
+#if CFG_OS_NAME == CFG_OS_NAME_ANDROID
 
 JNIEXPORT void JNICALL Java_cppfw_github_io_audouttests_MainActivity_test(
 		JNIEnv *env,