diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1d8df5c1d..6e58227b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1240,9 +1240,8 @@ if(WIN32 AND USE_DX9 AND NOT LIBRETRO AND NOT WINDOWS_STORE)
 		endif()
 	endif()
 
-	target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_D3D9)
-	target_link_libraries(${PROJECT_NAME} PUBLIC d3d9 d3dx9)
 	target_compile_definitions(${PROJECT_NAME} PRIVATE USE_DX9)
+	target_link_libraries(${PROJECT_NAME} PUBLIC d3d9 d3dx9)
 endif()
 
 if(WIN32 AND USE_DX11)
diff --git a/core/build.h b/core/build.h
index f992db969..20fa9e132 100755
--- a/core/build.h
+++ b/core/build.h
@@ -217,9 +217,6 @@
 #if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
 #define TARGET_UWP
 #endif
-#ifdef HAVE_D3D9
-#define USE_DX9
-#endif
 #ifdef HAVE_D3D11
 #define USE_DX11
 #endif
diff --git a/core/profiler/dc_profiler.h b/core/profiler/dc_profiler.h
index 9227f897c..0c18d2cbd 100644
--- a/core/profiler/dc_profiler.h
+++ b/core/profiler/dc_profiler.h
@@ -6,8 +6,8 @@
 void dc_prof_init();
 void dc_prof_periodical();
 #else
-static void dc_prof_init() {}
-static void dc_prof_periodical() {}
+inline static void dc_prof_init() {}
+inline static void dc_prof_periodical() {}
 #endif
 
 inline void print_array(const char* name, u32* arr,u32 size)
diff --git a/core/profiler/fc_profiler.h b/core/profiler/fc_profiler.h
index 1e3a745a0..67fe2a5ce 100644
--- a/core/profiler/fc_profiler.h
+++ b/core/profiler/fc_profiler.h
@@ -124,8 +124,8 @@ namespace fc_profiler
 
 namespace fc_profiler
 {
-	static void startThread(const std::string& threadName) {}
-	static void endThread(float warningTime = 0.0) {}
+	inline static void startThread(const std::string& threadName) {}
+	inline static void endThread(float warningTime = 0.0) {}
 }
 
 #define FC_PROFILE_SCOPE