diff --git a/aoapplication.cpp b/aoapplication.cpp
index 12e540c..73a72cc 100644
--- a/aoapplication.cpp
+++ b/aoapplication.cpp
@@ -5,10 +5,6 @@
 #include "networkmanager.h"
 #include "debug_functions.h"
 
-#include <QDebug>
-#include <QRect>
-#include <QDesktopWidget>
-
 AOApplication::AOApplication(int &argc, char **argv) : QApplication(argc, argv)
 {
   net_manager = new NetworkManager(this);
diff --git a/aoapplication.h b/aoapplication.h
index 2a5c436..8c0e741 100644
--- a/aoapplication.h
+++ b/aoapplication.h
@@ -8,6 +8,9 @@
 #include <QApplication>
 #include <QVector>
 #include <QFile>
+#include <QDebug>
+#include <QRect>
+#include <QDesktopWidget>
 
 class NetworkManager;
 class Lobby;
diff --git a/aoblipplayer.cpp b/aoblipplayer.cpp
index f212453..726c73f 100644
--- a/aoblipplayer.cpp
+++ b/aoblipplayer.cpp
@@ -1,9 +1,5 @@
 #include "aoblipplayer.h"
 
-#include <string.h>
-
-#include <QDebug>
-
 AOBlipPlayer::AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app)
 {
   m_parent = parent;
diff --git a/aoblipplayer.h b/aoblipplayer.h
index 430f702..aebba77 100644
--- a/aoblipplayer.h
+++ b/aoblipplayer.h
@@ -5,6 +5,8 @@
 #include "aoapplication.h"
 
 #include <QWidget>
+#include <string.h>
+#include <QDebug>
 
 class AOBlipPlayer
 {
diff --git a/aobutton.cpp b/aobutton.cpp
index 370eca9..ded35af 100644
--- a/aobutton.cpp
+++ b/aobutton.cpp
@@ -3,8 +3,6 @@
 #include "debug_functions.h"
 #include "file_functions.h"
 
-#include <QDebug>
-
 AOButton::AOButton(QWidget *parent, AOApplication *p_ao_app) : QPushButton(parent)
 {
   ao_app = p_ao_app;
diff --git a/aobutton.h b/aobutton.h
index 0492375..4b7209a 100644
--- a/aobutton.h
+++ b/aobutton.h
@@ -4,6 +4,7 @@
 #include "aoapplication.h"
 
 #include <QPushButton>
+#include <QDebug>
 
 class AOButton : public QPushButton
 {
diff --git a/aocharbutton.cpp b/aocharbutton.cpp
index b32be01..550e819 100644
--- a/aocharbutton.cpp
+++ b/aocharbutton.cpp
@@ -2,8 +2,6 @@
 
 #include "file_functions.h"
 
-#include <QFile>
-
 AOCharButton::AOCharButton(QWidget *parent, AOApplication *p_ao_app, int x_pos, int y_pos) : QPushButton(parent)
 {
   m_parent = parent;
diff --git a/aocharbutton.h b/aocharbutton.h
index f715416..6b80460 100644
--- a/aocharbutton.h
+++ b/aocharbutton.h
@@ -2,11 +2,12 @@
 #define AOCHARBUTTON_H
 
 #include "aoapplication.h"
+#include "aoimage.h"
 
 #include <QPushButton>
 #include <QString>
 #include <QWidget>
-#include "aoimage.h"
+#include <QFile>
 
 class AOCharButton : public QPushButton
 {
diff --git a/aocharmovie.cpp b/aocharmovie.cpp
index 6ad2969..b591c22 100644
--- a/aocharmovie.cpp
+++ b/aocharmovie.cpp
@@ -4,9 +4,6 @@
 #include "file_functions.h"
 #include "aoapplication.h"
 
-#include <QDebug>
-#include <QImageReader>
-
 AOCharMovie::AOCharMovie(QWidget *p_parent, AOApplication *p_ao_app) : QLabel(p_parent)
 {
   ao_app = p_ao_app;
diff --git a/aocharmovie.h b/aocharmovie.h
index 8bc0bc1..b26bada 100644
--- a/aocharmovie.h
+++ b/aocharmovie.h
@@ -4,6 +4,8 @@
 #include <QMovie>
 #include <QLabel>
 #include <QTimer>
+#include <QDebug>
+#include <QImageReader>
 
 class AOApplication;
 
diff --git a/aoemotebutton.cpp b/aoemotebutton.cpp
index d8f10c9..9e3c446 100644
--- a/aoemotebutton.cpp
+++ b/aoemotebutton.cpp
@@ -1,7 +1,6 @@
 #include "aoemotebutton.h"
 
 #include "file_functions.h"
-#include <QDebug>
 
 AOEmoteButton::AOEmoteButton(QWidget *p_parent, AOApplication *p_ao_app, int p_x, int p_y) : QPushButton(p_parent)
 {
diff --git a/aoemotebutton.h b/aoemotebutton.h
index cc3dfac..c99a73b 100644
--- a/aoemotebutton.h
+++ b/aoemotebutton.h
@@ -1,10 +1,11 @@
 #ifndef AOEMOTEBUTTON_H
 #define AOEMOTEBUTTON_H
 
-#include <QPushButton>
-
 #include "aoapplication.h"
 
+#include <QPushButton>
+#include <QDebug>
+
 class AOEmoteButton : public QPushButton
 {
   Q_OBJECT
diff --git a/aoevidencebutton.cpp b/aoevidencebutton.cpp
index 96bf553..573b8ef 100644
--- a/aoevidencebutton.cpp
+++ b/aoevidencebutton.cpp
@@ -2,8 +2,6 @@
 
 #include "file_functions.h"
 
-#include <QDebug>
-
 AOEvidenceButton::AOEvidenceButton(QWidget *p_parent, AOApplication *p_ao_app, int p_x, int p_y) : QPushButton(p_parent)
 {
   ao_app = p_ao_app;
diff --git a/aoevidencebutton.h b/aoevidencebutton.h
index ee0a0f6..27fb84b 100644
--- a/aoevidencebutton.h
+++ b/aoevidencebutton.h
@@ -6,6 +6,7 @@
 
 #include <QPushButton>
 #include <QString>
+#include <QDebug>
 
 class AOEvidenceButton : public QPushButton
 {
diff --git a/aoevidencedisplay.cpp b/aoevidencedisplay.cpp
index cbe37c0..5364ffb 100644
--- a/aoevidencedisplay.cpp
+++ b/aoevidencedisplay.cpp
@@ -1,5 +1,3 @@
-#include <QDebug>
-
 #include "aoevidencedisplay.h"
 
 #include "file_functions.h"
diff --git a/aoevidencedisplay.h b/aoevidencedisplay.h
index b973a29..13ca00d 100644
--- a/aoevidencedisplay.h
+++ b/aoevidencedisplay.h
@@ -1,12 +1,13 @@
 #ifndef AOEVIDENCEDISPLAY_H
 #define AOEVIDENCEDISPLAY_H
 
-#include <QLabel>
-#include <QMovie>
-
 #include "aoapplication.h"
 #include "aosfxplayer.h"
 
+#include <QLabel>
+#include <QMovie>
+#include <QDebug>
+
 class AOEvidenceDisplay : public QLabel
 {
   Q_OBJECT
diff --git a/aoimage.cpp b/aoimage.cpp
index 4710a1f..935ba74 100644
--- a/aoimage.cpp
+++ b/aoimage.cpp
@@ -2,8 +2,6 @@
 
 #include "aoimage.h"
 
-#include <QDebug>
-
 AOImage::AOImage(QWidget *parent, AOApplication *p_ao_app) : QLabel(parent)
 {
   m_parent = parent;
diff --git a/aoimage.h b/aoimage.h
index 3e87b1c..4713be0 100644
--- a/aoimage.h
+++ b/aoimage.h
@@ -6,6 +6,7 @@
 #include "aoapplication.h"
 
 #include <QLabel>
+#include <QDebug>
 
 class AOImage : public QLabel
 {
diff --git a/aomusicplayer.cpp b/aomusicplayer.cpp
index a9a9baf..bdb6632 100644
--- a/aomusicplayer.cpp
+++ b/aomusicplayer.cpp
@@ -1,9 +1,5 @@
 #include "aomusicplayer.h"
 
-#include <string.h>
-
-#include <QDebug>
-
 AOMusicPlayer::AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app)
 {
   m_parent = parent;
diff --git a/aomusicplayer.h b/aomusicplayer.h
index af8452b..560a7f9 100644
--- a/aomusicplayer.h
+++ b/aomusicplayer.h
@@ -5,6 +5,8 @@
 #include "aoapplication.h"
 
 #include <QWidget>
+#include <string.h>
+#include <QDebug>
 
 class AOMusicPlayer
 {
diff --git a/aopacket.cpp b/aopacket.cpp
index fa8f5be..b957efe 100644
--- a/aopacket.cpp
+++ b/aopacket.cpp
@@ -2,8 +2,6 @@
 
 #include "encryption_functions.h"
 
-#include <QDebug>
-
 AOPacket::AOPacket(QString p_packet_string)
 {
   QStringList packet_contents = p_packet_string.split("#");
diff --git a/aopacket.h b/aopacket.h
index 40dd3ec..21f6e0f 100644
--- a/aopacket.h
+++ b/aopacket.h
@@ -3,6 +3,7 @@
 
 #include <QString>
 #include <QStringList>
+#include <QDebug>
 
 class AOPacket
 {
diff --git a/aoscene.cpp b/aoscene.cpp
index 61cd342..5fe8304 100644
--- a/aoscene.cpp
+++ b/aoscene.cpp
@@ -1,11 +1,7 @@
 #include "aoscene.h"
-
 #include "courtroom.h"
-
 #include "file_functions.h"
 
-#include <QDebug>
-
 AOScene::AOScene(QWidget *parent, AOApplication *p_ao_app) : QLabel(parent)
 {
   m_parent = parent;
diff --git a/aoscene.h b/aoscene.h
index 8c96445..08c286e 100644
--- a/aoscene.h
+++ b/aoscene.h
@@ -2,6 +2,7 @@
 #define AOSCENE_H
 
 #include <QLabel>
+#include <QDebug>
 
 class Courtroom;
 class AOApplication;
diff --git a/aosfxplayer.cpp b/aosfxplayer.cpp
index 6ad59ba..35c7c4e 100644
--- a/aosfxplayer.cpp
+++ b/aosfxplayer.cpp
@@ -1,9 +1,5 @@
 #include "aosfxplayer.h"
 
-#include <string.h>
-
-#include <QDebug>
-
 AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app)
 {
   m_parent = parent;
diff --git a/aosfxplayer.h b/aosfxplayer.h
index 5065c61..4fd597c 100644
--- a/aosfxplayer.h
+++ b/aosfxplayer.h
@@ -5,6 +5,8 @@
 #include "aoapplication.h"
 
 #include <QWidget>
+#include <string.h>
+#include <QDebug>
 
 class AOSfxPlayer
 {
diff --git a/aotextarea.cpp b/aotextarea.cpp
index 40cc314..16add10 100644
--- a/aotextarea.cpp
+++ b/aotextarea.cpp
@@ -1,10 +1,5 @@
 #include "aotextarea.h"
 
-#include <QScrollBar>
-#include <QTextCursor>
-#include <QRegExp>
-#include <QDebug>
-
 AOTextArea::AOTextArea(QWidget *p_parent) : QTextBrowser(p_parent)
 {
 
diff --git a/aotextarea.h b/aotextarea.h
index 32635fd..9f01f15 100644
--- a/aotextarea.h
+++ b/aotextarea.h
@@ -2,6 +2,10 @@
 #define AOTEXTAREA_H
 
 #include <QTextBrowser>
+#include <QScrollBar>
+#include <QTextCursor>
+#include <QRegExp>
+#include <QDebug>
 
 class AOTextArea : public QTextBrowser
 {
diff --git a/courtroom.cpp b/courtroom.cpp
index ca94f43..a15e439 100644
--- a/courtroom.cpp
+++ b/courtroom.cpp
@@ -1,19 +1,5 @@
 #include "courtroom.h"
 
-#include "aoapplication.h"
-#include "lobby.h"
-#include "hardware_functions.h"
-#include "file_functions.h"
-#include "datatypes.h"
-#include "debug_functions.h"
-
-#include <QDebug>
-#include <QScrollBar>
-#include <QRegExp>
-#include <QBrush>
-#include <QTextCharFormat>
-#include <QFont>
-
 Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
 {
   ao_app = p_ao_app;
diff --git a/courtroom.h b/courtroom.h
index 85554a0..fe3895e 100644
--- a/courtroom.h
+++ b/courtroom.h
@@ -18,7 +18,19 @@
 #include "aotextedit.h"
 #include "aoevidencedisplay.h"
 #include "datatypes.h"
+#include "aoapplication.h"
+#include "lobby.h"
+#include "hardware_functions.h"
+#include "file_functions.h"
+#include "datatypes.h"
+#include "debug_functions.h"
 
+#include <QDebug>
+#include <QScrollBar>
+#include <QRegExp>
+#include <QBrush>
+#include <QTextCharFormat>
+#include <QFont>
 #include <QMainWindow>
 #include <QLineEdit>
 #include <QPlainTextEdit>
diff --git a/debug_functions.cpp b/debug_functions.cpp
index 848667d..77f2f35 100644
--- a/debug_functions.cpp
+++ b/debug_functions.cpp
@@ -1,5 +1,3 @@
-#include <QMessageBox>
-
 #include "debug_functions.h"
 
 void call_error(QString p_message)
diff --git a/debug_functions.h b/debug_functions.h
index 6feaf90..160274c 100644
--- a/debug_functions.h
+++ b/debug_functions.h
@@ -2,6 +2,7 @@
 #define DEBUG_FUNCTIONS_H
 
 #include <QString>
+#include <QMessageBox>
 
 void call_error(QString message);
 void call_notice(QString message);
diff --git a/discord_rich_presence.cpp b/discord_rich_presence.cpp
index bcc0d2a..10f5833 100644
--- a/discord_rich_presence.cpp
+++ b/discord_rich_presence.cpp
@@ -1,10 +1,5 @@
 #include "discord_rich_presence.h"
 
-#include <cstring>
-#include <ctime>
-
-#include <QDebug>
-
 namespace AttorneyOnline {
 
 Discord::Discord()
diff --git a/discord_rich_presence.h b/discord_rich_presence.h
index 3c9f2bd..348d36f 100644
--- a/discord_rich_presence.h
+++ b/discord_rich_presence.h
@@ -1,6 +1,9 @@
 #ifndef DISCORD_RICH_PRESENCE_H
 #define DISCORD_RICH_PRESENCE_H
 
+#include <cstring>
+#include <ctime>
+#include <QDebug>
 #include <string>
 #include <discord-rpc.h>