  static const int BSP = 0;
  
  static cpuset_t cpumask;
-@@ -119,49 +114,6 @@ static struct mt_vmm_info {
- 
- static uint64_t (*fw_func)(void);
- 
+@@ -117,50 +112,7 @@ static struct mt_vmm_info {
+ } mt_vmm_info[VM_MAXCPU];
+ #pragma clang diagnostic pop
+ 
+-static uint64_t (*fw_func)(void);
+-
 -__attribute__ ((noreturn)) static void
 -usage(int code)
 -{

diff --git a/include/xhyve/xhyve.h b/include/xhyve/xhyve.h
index 4f85664..88039c2 100644
--- a/include/xhyve/xhyve.h
+++ b/include/xhyve/xhyve.h
@@ -78,3 +78,4 @@ void vcpu_add(int fromcpu, int newcpu, uint64_t rip);
 int fbsdrun_vmexit_on_hlt(void);
 int fbsdrun_vmexit_on_pause(void);
 int fbsdrun_virtio_msix(void);
+static uint64_t (*fw_func)(void);
diff --git a/src/xhyve.c b/src/xhyve.c
index 97fd41f..2152247 100644
--- a/src/xhyve.c
+++ b/src/xhyve.c
@@ -70,8 +70,6 @@

-		"License: BSD\n");
-		exit(0);
-}
+uint64_t (*fw_func)(void);
 
 void
 xh_vm_inject_fault(int vcpu, int vector, int errcode_valid,
@@ -628,324 +580,3 @@ vcpu_loop(int vcpu, uint64_t startrip)
 	}
 	fprintf(stderr, "vm_run error %d, errno %d\n", error, errno);
