diff --git a/cmake/FindPIP.cmake b/cmake/FindPIP.cmake
index 5f560cf1..3a628c48 100644
--- a/cmake/FindPIP.cmake
+++ b/cmake/FindPIP.cmake
@@ -72,7 +72,7 @@ if (NOT BUILDING_PIP)
 			find_library(PTHREAD_LIBRARY pthread)
 			find_library(UTIL_LIBRARY util)
 			set(_PIP_ADD_LIBS_ ${PTHREAD_LIBRARY} ${UTIL_LIBRARY})
-			if((NOT DEFINED ENV{QNX_HOST}) AND (NOT APPLE) AND (NOT PIP_MICRO))
+			if((NOT DEFINED ENV{QNX_HOST}) AND (NOT APPLE) AND (NOT PIP_EMBEDDED))
 				find_library(RT_LIBRARY rt)
 				list(APPEND _PIP_ADD_LIBS_ ${RT_LIBRARY})
 			endif()
diff --git a/libs/console/piscreendrawer.cpp b/libs/console/piscreendrawer.cpp
index 85a3c8c9..26655a51 100644
--- a/libs/console/piscreendrawer.cpp
+++ b/libs/console/piscreendrawer.cpp
@@ -21,77 +21,75 @@
 
 #if !defined(PICO_SDK)
 
-#if !defined(PICO_SDK)
-
 // comment for use ascii instead of unicode symbols
-#define USE_UNICODE
+#  define USE_UNICODE
 
 using namespace PIScreenTypes;
 
 
 PIScreenDrawer::PIScreenDrawer(PIVector<PIVector<Cell>> & c): cells(c) {
 	arts_[LineVertical] =
-#ifdef USE_UNICODE
+#  ifdef USE_UNICODE
 		PIChar::fromUTF8("│");
-#else
+#  else
 		PIChar('|');
-#endif
+#  endif
 
 	arts_[LineHorizontal] =
-#ifdef USE_UNICODE
+#  ifdef USE_UNICODE
 		PIChar::fromUTF8("─");
-#else
+#  else
 		PIChar('-');
-#endif
+#  endif
 
 	arts_[Cross] =
-#ifdef USE_UNICODE
+#  ifdef USE_UNICODE
 		PIChar::fromUTF8("┼");
-#else
+#  else
 		PIChar('+');
-#endif
+#  endif
 
 	arts_[CornerTopLeft] =
-#ifdef USE_UNICODE
+#  ifdef USE_UNICODE
 		PIChar::fromUTF8("┌");
-#else
+#  else
 		PIChar('+');
-#endif
+#  endif
 
 	arts_[CornerTopRight] =
-#ifdef USE_UNICODE
+#  ifdef USE_UNICODE
 		PIChar::fromUTF8("┐");
-#else
+#  else
 		PIChar('+');
-#endif
+#  endif
 
 	arts_[CornerBottomLeft] =
-#ifdef USE_UNICODE
+#  ifdef USE_UNICODE
 		PIChar::fromUTF8("└");
-#else
+#  else
 		PIChar('+');
-#endif
+#  endif
 
 	arts_[CornerBottomRight] =
-#ifdef USE_UNICODE
+#  ifdef USE_UNICODE
 		PIChar::fromUTF8("┘");
-#else
+#  else
 		PIChar('+');
-#endif
+#  endif
 
 	arts_[Unchecked] =
-#ifdef USE_UNICODE
+#  ifdef USE_UNICODE
 		PIChar::fromUTF8("☐");
-#else
+#  else
 		PIChar('O');
-#endif
+#  endif
 
 	arts_[Checked] =
-#ifdef USE_UNICODE
+#  ifdef USE_UNICODE
 		PIChar::fromUTF8("☑");
-#else
+#  else
 		PIChar('0');
-#endif
+#  endif
 }
 
 
@@ -270,5 +268,3 @@ void PIScreenDrawer::drawText(int x, int y, const PIString & s, Color col_char,
 }
 
 #endif // !PICO_SDK
-
-#endif // !PICO_SDK
diff --git a/libs/console/piscreentile.cpp b/libs/console/piscreentile.cpp
index 93c96159..67eb8eff 100644
--- a/libs/console/piscreentile.cpp
+++ b/libs/console/piscreentile.cpp
@@ -23,8 +23,6 @@
 
 #if !defined(PICO_SDK)
 
-#if !defined(PICO_SDK)
-
 
 using namespace PIScreenTypes;
 
@@ -261,5 +259,3 @@ void PIScreenTile::layout() {
 }
 
 #endif // !PICO_SDK
-
-#endif // !PICO_SDK
diff --git a/libs/console/piscreentiles.cpp b/libs/console/piscreentiles.cpp
index e80268eb..2c11655d 100644
--- a/libs/console/piscreentiles.cpp
+++ b/libs/console/piscreentiles.cpp
@@ -23,8 +23,6 @@
 
 #if !defined(PICO_SDK)
 
-#if !defined(PICO_SDK)
-
 
 using namespace PIScreenTypes;
 
@@ -698,5 +696,3 @@ void TileInput::reserCursor() {
 }
 
 #endif // !PICO_SDK
-
-#endif // !PICO_SDK
diff --git a/libs/main/thread/piconditionvar.h b/libs/main/thread/piconditionvar.h
index 44f748df..c5a96a5c 100644
--- a/libs/main/thread/piconditionvar.h
+++ b/libs/main/thread/piconditionvar.h
@@ -184,8 +184,6 @@ public:
 	void wait(PIMutex &, std::function<bool()>) {}
 	bool waitFor(PIMutex &, PISystemTime) { return false; }
 	bool waitFor(PIMutex &, PISystemTime, std::function<bool()>) { return false; }
-	bool wait(PIMutex &, PISystemTime) { return true; }
-	bool wait(PIMutex &, ullong) { return true; }
 	void notifyOne() {}
 	void notifyAll() {}
 };
diff --git a/libs/main/thread/pithread.h b/libs/main/thread/pithread.h
index 3576cf57..68cfc361 100644
--- a/libs/main/thread/pithread.h
+++ b/libs/main/thread/pithread.h
@@ -44,7 +44,6 @@
 class PIThread;
 
 #ifndef PIP_NO_THREADS
-#  ifndef PIP_NO_THREADS
 class PIIntrospectionThreads;
 
 class PIP_EXPORT __PIThreadCollection: public PIObject {
@@ -75,7 +74,6 @@ public:
 };
 
 static __PIThreadCollection_Initializer__ __PIThreadCollection_initializer__;
-#  endif // PIP_NO_THREADS
 
 //! \~english Callback executed by %PIThread with the current \a data() pointer.
 //! \~russian Обратный вызов, который %PIThread выполняет с текущим указателем \a data().