diff --git a/sys/dev/ocs_fc/ocs_os.c b/sys/dev/ocs_fc/ocs_os.c
index 67f9a35c6d4d..c7e881e3123e 100644
--- a/sys/dev/ocs_fc/ocs_os.c
+++ b/sys/dev/ocs_fc/ocs_os.c
@@ -37,10 +37,6 @@
  */
 
 #include "ocs.h"
-#include "opt_stack.h"
-#include <sys/sysctl.h>
-#include <sys/malloc.h>
-#include <sys/linker.h>		/* for debug of memory allocations */
 
 static MALLOC_DEFINE(M_OCS, "OCS", "OneCore Storage data");
 
diff --git a/sys/dev/ocs_fc/ocs_os.h b/sys/dev/ocs_fc/ocs_os.h
index 9c18f46ac1a5..b59e242b3456 100644
--- a/sys/dev/ocs_fc/ocs_os.h
+++ b/sys/dev/ocs_fc/ocs_os.h
@@ -39,11 +39,11 @@
 #ifndef _OCS_OS_H
 #define _OCS_OS_H
 
-typedef struct ocs_softc ocs_t;
-
 /***************************************************************************
  * OS specific includes
  */
+#include "opt_stack.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
@@ -78,6 +78,8 @@ typedef struct ocs_softc ocs_t;
 #include <sys/ioccom.h>
 #include <sys/ctype.h>
 
+#include <sys/linker.h>		/* for debug of memory allocations */
+
 /* OCS_OS_MAX_ISR_TIME_MSEC -  maximum time driver code should spend in an interrupt
  * or kernel thread context without yielding
  */
@@ -152,6 +154,8 @@ typedef struct ocs_softc ocs_t;
  * Platform specific operations
  */
 
+typedef struct ocs_softc ocs_t;
+
 /**
  * @ingroup os
  * @typedef ocs_os_handle_t