Cleanup import of headers

src/audio/alsa.c

@@ -17,7 +17,7 @@
  * along with Moonlight; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../audio.h"
+#include "audio.h"
 
 #include <stdio.h>
 #include <opus_multistream.h>

src/audio/omx.c

@@ -17,7 +17,7 @@
  * along with Moonlight; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../audio.h"
+#include "audio.h"
 
 #include <stdio.h>
 

src/audio/pulse.c

@@ -17,7 +17,7 @@
  * along with Moonlight; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../audio.h"
+#include "audio.h"
 
 #include <stdio.h>
 #include <stdlib.h>

src/audio/sdl.c

@@ -17,7 +17,7 @@
  * along with Moonlight; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../audio.h"
+#include "audio.h"
 
 #include <SDL.h>
 #include <SDL_audio.h>

src/config.c

@@ -17,9 +17,10 @@
  * along with Moonlight; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "input/evdev.h"
 #include "config.h"
-#include "audio.h"
+
+#include "input/evdev.h"
+#include "audio/audio.h"
 
 #include <stdio.h>
 #include <stdlib.h>

src/input/x11.c

@@ -19,6 +19,7 @@
 
 #include "x11.h"
 #include "keyboard.h"
+
 #include "../loop.h"
 
 #include <Limelight.h>

src/main.c

@@ -18,16 +18,15 @@
  */
 
 #include "loop.h"
-#include "client.h"
 #include "connection.h"
 #include "configuration.h"
-#include "audio.h"
-#include "video.h"
-#include "discover.h"
 #include "config.h"
 #include "platform.h"
 #include "sdl.h"
 
+#include "audio/audio.h"
+#include "video/video.h"
+
 #include "input/mapping.h"
 #include "input/evdev.h"
 #include "input/udev.h"
@@ -40,6 +39,9 @@
 
 #include <Limelight.h>
 
+#include <client.h>
+#include <discover.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>

src/platform.c

@@ -20,8 +20,9 @@
 #define _GNU_SOURCE
 
 #include "platform.h"
-#include "audio.h"
+
-#include "video.h"
+#include "audio/audio.h"
+#include "video/video.h"
 
 #include <stdlib.h>
 #include <string.h>

src/video/imx.c

@@ -17,9 +17,10 @@
  * along with Moonlight; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../loop.h"
 #include "imx_vpu.h"
 
+#include "../loop.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>

src/video/pi.c

@@ -28,10 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // Video decode on Raspberry Pi using OpenMAX IL though the ilcient helper library
 // Based upon video decode example from the Raspberry Pi firmware
 
-#include "sps.h"
-
 #include <Limelight.h>
 
+#include <sps.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

src/video/sdl.c

@@ -17,10 +17,11 @@
  * along with Moonlight; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../video.h"
+#include "video.h"
-#include "../sdl.h"
 #include "ffmpeg.h"
 
+#include "../sdl.h"
+
 #include <SDL.h>
 #include <SDL_thread.h>
 

src/video/x11.c

@@ -17,11 +17,12 @@
  * along with Moonlight; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../video.h"
+#include "video.h"
-#include "../input/x11.h"
 #include "egl.h"
 #include "ffmpeg.h"
 
+#include "../input/x11.h"
+
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>