From 7247a4c1e6a8a6ca9bd21b2fe5bb185fde5bb6b0 Mon Sep 17 00:00:00 2001
From: Brenden Matthews <brenden@brndn.io>
Date: Sat, 24 Dec 2022 09:58:21 -0500
Subject: [PATCH] Fix some include ordering/build stuff.

---
 src/gui.cc |  1 -
 src/gui.h  | 12 ++++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/gui.cc b/src/gui.cc
index ced7b655..1d71f736 100644
--- a/src/gui.cc
+++ b/src/gui.cc
@@ -26,7 +26,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
 #include "gui.h"
 #include "common.h"
 #include "config.h"
diff --git a/src/gui.h b/src/gui.h
index 7c71b14a..59e3563d 100644
--- a/src/gui.h
+++ b/src/gui.h
@@ -21,14 +21,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
-#ifdef BUILD_GUI
-#ifndef GUI_H_
-#define GUI_H_
+#include "config.h"
 
 #ifdef BUILD_X11
 #include "x11.h"
-#endif /*BUILD_X11*/
+#endif /* BUILD_X11 */
 
 #include "colours.h"
 #include "setting.hh"
@@ -40,7 +39,7 @@ extern bool have_argb_visual;
 
 #ifdef BUILD_X11
 extern Display *display;
-#endif
+#endif /* BUILD_X11 */
 extern int display_width;
 extern int display_height;
 extern int screen;
@@ -162,6 +161,3 @@ extern conky::range_config_setting<int> own_window_argb_value;
 #endif /*BUILD_ARGB*/
 #endif /*OWN_WINDOW*/
 extern priv::own_window_setting own_window;
-
-#endif /*GUI_H_*/
-#endif /* BUILD_GUI */