Move function definitions for output.c from util.h to new file output.h.

Also, sort the order of include files in the c files.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

1 files changed, 5 insertions, 4 deletions

diff --git a/src/apm.c b/src/apm.c
index 32d1f4b..b4b9ed9 100644
--- a/src/apm.c
+++ b/src/apm.c
@@ -6,14 +6,15 @@
 //
 // This file may be distributed under the terms of the GNU LGPLv3 license.
 
+#include "biosvar.h" // GET_GLOBAL
 #include "bregs.h" // struct bregs
-#include "ioport.h" // outb
-#include "util.h" // dprintf
 #include "config.h" // CONFIG_*
-#include "biosvar.h" // GET_GLOBAL
-#include "fw/paravirt.h" // runningOnQEMU
 #include "fw/acpi.h" // acpi_pm_ctl
+#include "fw/paravirt.h" // runningOnQEMU
+#include "ioport.h" // outb
+#include "output.h" // dprintf
 #include "stacks.h" // yield_toirq
+#include "util.h" // apm_shutdown
 
 static void
 out_str(const char *str_cs)