diff --git a/sfwl/core/stime.cpp b/sfwl/core/sfw_time.cpp
similarity index 100%
rename from sfwl/core/stime.cpp
rename to sfwl/core/sfw_time.cpp
diff --git a/sfwl/core/stime.h b/sfwl/core/sfw_time.h
similarity index 100%
rename from sfwl/core/stime.h
rename to sfwl/core/sfw_time.h
diff --git a/sfwl/core/thread.cpp b/sfwl/core/thread.cpp
index a761ccb..fc06c6b 100644
--- a/sfwl/core/thread.cpp
+++ b/sfwl/core/thread.cpp
@@ -3,12 +3,16 @@
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
+//--STRIP
 #include "thread.h"
+//--STRIP
 
 #if !defined(NO_THREADS)
 
+//--STRIP
 #include "core/error_macros.h"
 #include "core/safe_refcount.h"
+//--STRIP
 
 Error (*Thread::set_name_func)(const String &) = nullptr;
 void (*Thread::set_priority_func)(Thread::Priority) = nullptr;
@@ -107,4 +111,7 @@ Thread::ID Thread::get_caller_id() {
 		return caller_id;
 	}
 }
-#endif
+
+//--STRIP
+#endif // THREAD_H
+//--STRIP
diff --git a/sfwl/core/thread.h b/sfwl/core/thread.h
index a8b3276..97e4e13 100644
--- a/sfwl/core/thread.h
+++ b/sfwl/core/thread.h
@@ -1,15 +1,22 @@
+//--STRIP
 #ifndef THREAD_H
 #define THREAD_H
+//--STRIP
 
 /*************************************************************************/
 /*  thread.h                                                             */
 /*  From https://github.com/Relintai/pandemonium_engine (MIT)            */
 /*************************************************************************/
 
+//--STRIP
 #include "core/typedefs.h"
 
 #if !defined(NO_THREADS)
 #include "core/safe_refcount.h"
+#endif
+//--STRIP
+
+#if !defined(NO_THREADS)
 #include <thread>
 #endif
 
@@ -92,4 +99,6 @@ public:
 #endif
 };
 
+//--STRIP
 #endif // THREAD_H
+//--STRIP