diff --git a/src/servers/app/drawing/interface/local/AccelerantHWInterface.cpp b/src/servers/app/drawing/interface/local/AccelerantHWInterface.cpp
index 1d27785a26..bbb52832e1 100644
--- a/src/servers/app/drawing/interface/local/AccelerantHWInterface.cpp
+++ b/src/servers/app/drawing/interface/local/AccelerantHWInterface.cpp
@@ -107,9 +107,6 @@ AccelerantHWInterface::AccelerantHWInterface()
 	fSyncToken(),
 
 	// required hooks
-	fAccAcquireEngine(NULL),
-	fAccReleaseEngine(NULL),
-	fAccSyncToToken(NULL),
 	fAccGetModeCount(NULL),
 	fAccGetModeList(NULL),
 	fAccGetFrameBufferConfig(NULL),
@@ -118,6 +115,9 @@ AccelerantHWInterface::AccelerantHWInterface()
 	fAccGetPixelClockLimits(NULL),
 
 	// optional accelerant hooks
+	fAccAcquireEngine(NULL),
+	fAccReleaseEngine(NULL),
+	fAccSyncToToken(NULL),
 	fAccGetTimingConstraints(NULL),
 	fAccProposeDisplayMode(NULL),
 	fAccFillRect(NULL),
@@ -353,9 +353,6 @@ status_t
 AccelerantHWInterface::_SetupDefaultHooks()
 {
 	// required
-	fAccAcquireEngine = (acquire_engine)fAccelerantHook(B_ACQUIRE_ENGINE, NULL);
-	fAccReleaseEngine = (release_engine)fAccelerantHook(B_RELEASE_ENGINE, NULL);
-	fAccSyncToToken = (sync_to_token)fAccelerantHook(B_SYNC_TO_TOKEN, NULL);
 	fAccGetModeCount
 		= (accelerant_mode_count)fAccelerantHook(B_ACCELERANT_MODE_COUNT, NULL);
 	fAccGetModeList = (get_mode_list)fAccelerantHook(B_GET_MODE_LIST, NULL);
@@ -368,13 +365,16 @@ AccelerantHWInterface::_SetupDefaultHooks()
 	fAccGetPixelClockLimits = (get_pixel_clock_limits)fAccelerantHook(
 		B_GET_PIXEL_CLOCK_LIMITS, NULL);
 
-	if (!fAccAcquireEngine || !fAccReleaseEngine || !fAccGetFrameBufferConfig
-		|| !fAccGetModeCount || !fAccGetModeList || !fAccSetDisplayMode
-		|| !fAccGetDisplayMode || !fAccGetPixelClockLimits) {
+	if (!fAccGetFrameBufferConfig || !fAccGetModeCount || !fAccGetModeList
+			|| !fAccSetDisplayMode || !fAccGetDisplayMode || !fAccGetPixelClockLimits) {
 		return B_ERROR;
 	}
 
 	// optional
+	fAccAcquireEngine = (acquire_engine)fAccelerantHook(B_ACQUIRE_ENGINE, NULL);
+	fAccReleaseEngine = (release_engine)fAccelerantHook(B_RELEASE_ENGINE, NULL);
+	fAccSyncToToken = (sync_to_token)fAccelerantHook(B_SYNC_TO_TOKEN, NULL);
+
 	fAccGetTimingConstraints = (get_timing_constraints)fAccelerantHook(
 		B_GET_TIMING_CONSTRAINTS, NULL);
 	fAccProposeDisplayMode = (propose_display_mode)fAccelerantHook(
diff --git a/src/servers/app/drawing/interface/local/AccelerantHWInterface.h b/src/servers/app/drawing/interface/local/AccelerantHWInterface.h
index 31562f5bff..305849d456 100644
--- a/src/servers/app/drawing/interface/local/AccelerantHWInterface.h
+++ b/src/servers/app/drawing/interface/local/AccelerantHWInterface.h
@@ -134,9 +134,6 @@ private:
 			sync_token			fSyncToken;
 
 			// required hooks - guaranteed to be valid
-			acquire_engine			fAccAcquireEngine;
-			release_engine			fAccReleaseEngine;
-			sync_to_token			fAccSyncToToken;
 			accelerant_mode_count	fAccGetModeCount;
 			get_mode_list			fAccGetModeList;
 			get_frame_buffer_config	fAccGetFrameBufferConfig;
@@ -145,6 +142,9 @@ private:
 			get_pixel_clock_limits	fAccGetPixelClockLimits;
 
 			// optional accelerant hooks
+			acquire_engine			fAccAcquireEngine;
+			release_engine			fAccReleaseEngine;
+			sync_to_token			fAccSyncToToken;
 			get_timing_constraints	fAccGetTimingConstraints;
 			propose_display_mode	fAccProposeDisplayMode;
 			get_preferred_display_mode fAccGetPreferredDisplayMode;