diff --git a/src/kits/package/solver/LibsolvSolver.cpp b/src/kits/package/solver/LibsolvSolver.cpp
index 604efc41f8..a3ecbb7062 100644
--- a/src/kits/package/solver/LibsolvSolver.cpp
+++ b/src/kits/package/solver/LibsolvSolver.cpp
@@ -38,7 +38,7 @@
 // abort()s. Obviously that isn't good behavior for a library.
 
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
+#ifdef __HAIKU__
 
 
 BSolver*
diff --git a/src/kits/package/solver/Solver.cpp b/src/kits/package/solver/Solver.cpp
index 3c164855e7..e6984cddf3 100644
--- a/src/kits/package/solver/Solver.cpp
+++ b/src/kits/package/solver/Solver.cpp
@@ -13,7 +13,7 @@
 typedef BPackageKit::BSolver* CreateSolverFunction();
 
 
-#if defined(HAIKU_TARGET_PLATFORM_HAIKU) || __GNUC__ == 2
+#ifdef __HAIKU__
 
 
 #include <dlfcn.h>
@@ -28,7 +28,7 @@ static pthread_once_t sLoadLibsolvSolverAddOnInitOnce = PTHREAD_ONCE_INIT;
 static void
 load_libsolv_solver_add_on()
 {
-#if defined(HAIKU_TARGET_PLATFORM_HAIKU) || __GNUC__ == 2
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
 	void* imageHandle = dlopen("libpackage-add-on-libsolv.so", 0);
 #else
 	void* imageHandle = dlopen("libpackage-add-on-libsolv_build.so", 0);
@@ -68,7 +68,7 @@ BSolver::~BSolver()
 /*static*/ status_t
 BSolver::Create(BSolver*& _solver)
 {
-#if defined(HAIKU_TARGET_PLATFORM_HAIKU) || __GNUC__ == 2
+#ifdef __HAIKU__
 	pthread_once(&sLoadLibsolvSolverAddOnInitOnce, &load_libsolv_solver_add_on);
 #endif
 	if (sCreateSolver == NULL)