diff --git a/aoapplication.cpp b/aoapplication.cpp
index 65dcd54..03679a7 100644
--- a/aoapplication.cpp
+++ b/aoapplication.cpp
@@ -7,10 +7,6 @@
 
 #include "aooptionsdialog.h"
 
-#include <QDebug>
-#include <QRect>
-#include <QDesktopWidget>
-
 AOApplication::AOApplication(int &argc, char **argv) : QApplication(argc, argv)
 {
   // Create the QSettings class that points to the config.ini.
diff --git a/aoapplication.h b/aoapplication.h
index 6e0ce8e..abac7b9 100644
--- a/aoapplication.h
+++ b/aoapplication.h
@@ -10,6 +10,19 @@
 #include <QFile>
 #include <QSettings>
 
+#include <QDebug>
+#include <QRect>
+#include <QDesktopWidget>
+
+#include <QCryptographicHash>
+
+#include <QDir>
+#include <QStandardPaths>
+
+#include <QTextStream>
+#include <QStringList>
+#include <QColor>
+
 class NetworkManager;
 class Lobby;
 class Courtroom;
diff --git a/aoblipplayer.cpp b/aoblipplayer.cpp
index 5669a12..ed8a8d7 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 4c0273f..2d134b1 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, bool is_taken) : QPushButton(parent)
 {
   m_parent = parent;
diff --git a/aocharbutton.h b/aocharbutton.h
index d3576fb..6e5e50e 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 3246fc2..f69128c 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/aooptionsdialog.cpp b/aooptionsdialog.cpp
index 3a4a34a..3d6d5d6 100644
--- a/aooptionsdialog.cpp
+++ b/aooptionsdialog.cpp
@@ -2,25 +2,6 @@
 #include "aoapplication.h"
 #include "bass.h"
 
-#include <QtCore/QVariant>
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QCheckBox>
-#include <QtWidgets/QComboBox>
-#include <QtWidgets/QDialog>
-#include <QtWidgets/QDialogButtonBox>
-#include <QtWidgets/QFormLayout>
-#include <QtWidgets/QFrame>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QLineEdit>
-#include <QtWidgets/QPlainTextEdit>
-#include <QtWidgets/QSpinBox>
-#include <QtWidgets/QTabWidget>
-#include <QtWidgets/QVBoxLayout>
-#include <QtWidgets/QWidget>
-
-#include <QDirIterator>
-#include <QTextStream>
-
 AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) : QDialog(parent)
 {
     ao_app = p_ao_app;
diff --git a/aooptionsdialog.h b/aooptionsdialog.h
index f43e7b7..7d09f21 100644
--- a/aooptionsdialog.h
+++ b/aooptionsdialog.h
@@ -20,6 +20,9 @@
 #include <QtWidgets/QVBoxLayout>
 #include <QtWidgets/QWidget>
 
+#include <QDirIterator>
+#include <QTextStream>
+
 class AOOptionsDialog: public QDialog
 {
     Q_OBJECT
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..a2e2cea 100644
--- a/aoscene.cpp
+++ b/aoscene.cpp
@@ -4,8 +4,6 @@
 
 #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 c090be1..667005d 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/charselect.cpp b/charselect.cpp
index 72b031c..a58225f 100644
--- a/charselect.cpp
+++ b/charselect.cpp
@@ -5,8 +5,6 @@
 #include "debug_functions.h"
 #include "hardware_functions.h"
 
-#include <QDebug>
-
 void Courtroom::construct_char_select()
 {
   ui_char_select_background = new AOImage(this, ao_app);
diff --git a/courtroom.cpp b/courtroom.cpp
index f8c7c8a..dce4186 100644
--- a/courtroom.cpp
+++ b/courtroom.cpp
@@ -7,14 +7,6 @@
 #include "datatypes.h"
 #include "debug_functions.h"
 
-#include <QDebug>
-#include <QScrollBar>
-#include <QRegExp>
-#include <QBrush>
-#include <QTextCharFormat>
-#include <QFont>
-#include <QInputDialog>
-
 Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
 {
   ao_app = p_ao_app;
diff --git a/courtroom.h b/courtroom.h
index 8dfa54a..d618862 100644
--- a/courtroom.h
+++ b/courtroom.h
@@ -33,6 +33,15 @@
 #include <QTextBrowser>
 #include <QSpinBox>
 
+#include <QDebug>
+#include <QScrollBar>
+#include <QRegExp>
+#include <QBrush>
+#include <QTextCharFormat>
+#include <QFont>
+#include <QInputDialog>
+#include <QFileDialog>
+
 #include <stack>
 
 class AOApplication;
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 dc06e12..af94f3a 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 35d5bec..fd2c481 100644
--- a/discord_rich_presence.h
+++ b/discord_rich_presence.h
@@ -4,6 +4,11 @@
 #include <string>
 #include <discord-rpc.h>
 
+#include <cstring>
+#include <ctime>
+
+#include <QDebug>
+
 namespace AttorneyOnline {
 
 class Discord
diff --git a/emotes.cpp b/emotes.cpp
index 27a1a4f..b6a217e 100644
--- a/emotes.cpp
+++ b/emotes.cpp
@@ -2,8 +2,6 @@
 
 #include "aoemotebutton.h"
 
-#include <QDebug>
-
 void Courtroom::construct_emotes()
 {
   ui_emotes = new QWidget(this);
diff --git a/encryption_functions.cpp b/encryption_functions.cpp
index 56b6e34..ffbe0cd 100644
--- a/encryption_functions.cpp
+++ b/encryption_functions.cpp
@@ -2,12 +2,6 @@
 
 #include "hex_functions.h"
 
-#include <cstddef>
-#include <stdlib.h>
-#include <sstream>
-#include <iomanip>
-#include <QVector>
-
 QString fanta_encrypt(QString temp_input, unsigned int p_key)
 {
   //using standard stdlib types is actually easier here because of implicit char<->int conversion
diff --git a/encryption_functions.h b/encryption_functions.h
index b6ea1d7..dc67d12 100644
--- a/encryption_functions.h
+++ b/encryption_functions.h
@@ -3,6 +3,12 @@
 
 #include <QString>
 
+#include <cstddef>
+#include <stdlib.h>
+#include <sstream>
+#include <iomanip>
+#include <QVector>
+
 QString fanta_encrypt(QString p_input, unsigned int key);
 QString fanta_decrypt(QString p_input, unsigned int key);
 
diff --git a/evidence.cpp b/evidence.cpp
index 19ffecf..e5ef490 100644
--- a/evidence.cpp
+++ b/evidence.cpp
@@ -1,8 +1,5 @@
 #include "courtroom.h"
 
-#include <QDebug>
-#include <QFileDialog>
-
 void Courtroom::construct_evidence()
 {
   ui_evidence = new AOImage(this, ao_app);
diff --git a/file_functions.cpp b/file_functions.cpp
index bc9185f..bf2a018 100644
--- a/file_functions.cpp
+++ b/file_functions.cpp
@@ -1,6 +1,3 @@
-#include <QFileInfo>
-#include <QDir>
-
 #include "file_functions.h"
 
 bool file_exists(QString file_path)
diff --git a/file_functions.h b/file_functions.h
index 81a90ed..77e1c20 100644
--- a/file_functions.h
+++ b/file_functions.h
@@ -1,6 +1,8 @@
 #ifndef FILE_FUNCTIONS_H
 #define FILE_FUNCTIONS_H
 
+#include <QFileInfo>
+#include <QDir>
 #include <QString>
 
 bool file_exists(QString file_path);
diff --git a/lobby.cpp b/lobby.cpp
index e642fae..5d2d6de 100644
--- a/lobby.cpp
+++ b/lobby.cpp
@@ -5,9 +5,6 @@
 #include "networkmanager.h"
 #include "aosfxplayer.h"
 
-#include <QDebug>
-#include <QScrollBar>
-
 Lobby::Lobby(AOApplication *p_ao_app) : QMainWindow()
 {
   ao_app = p_ao_app;
diff --git a/lobby.h b/lobby.h
index 2d3aee5..49d3d80 100644
--- a/lobby.h
+++ b/lobby.h
@@ -14,6 +14,9 @@
 #include <QProgressBar>
 #include <QTextBrowser>
 
+#include <QDebug>
+#include <QScrollBar>
+
 class AOApplication;
 
 class Lobby : public QMainWindow
diff --git a/misc_functions.cpp b/misc_functions.cpp
index e767b2e..2352055 100644
--- a/misc_functions.cpp
+++ b/misc_functions.cpp
@@ -1,8 +1,5 @@
 #include "misc_functions.h"
 
-#include <QTime>
-#include <QCoreApplication>
-
 void delay(int p_milliseconds)
 {
   QTime dieTime = QTime::currentTime().addMSecs(p_milliseconds);
diff --git a/misc_functions.h b/misc_functions.h
index 0de2d8a..026c635 100644
--- a/misc_functions.h
+++ b/misc_functions.h
@@ -1,6 +1,9 @@
 #ifndef MISC_FUNCTIONS_H
 #define MISC_FUNCTIONS_H
 
+#include <QTime>
+#include <QCoreApplication>
+
 void delay(int p_milliseconds);
 
 #endif // MISC_FUNCTIONS_H
diff --git a/networkmanager.cpp b/networkmanager.cpp
index 909c7da..d44c84c 100644
--- a/networkmanager.cpp
+++ b/networkmanager.cpp
@@ -4,9 +4,6 @@
 #include "debug_functions.h"
 #include "lobby.h"
 
-#include <cstring>
-
-
 NetworkManager::NetworkManager(AOApplication *parent) : QObject(parent)
 {
   ao_app = parent;
diff --git a/networkmanager.h b/networkmanager.h
index 797950a..ea64814 100644
--- a/networkmanager.h
+++ b/networkmanager.h
@@ -21,6 +21,7 @@
 #include <QDnsLookup>
 #include <QTime>
 #include <QTimer>
+#include <cstring>
 
 class NetworkManager : public QObject
 {
diff --git a/packet_distribution.cpp b/packet_distribution.cpp
index abc5848..d2bdcdd 100644
--- a/packet_distribution.cpp
+++ b/packet_distribution.cpp
@@ -7,9 +7,6 @@
 #include "hardware_functions.h"
 #include "debug_functions.h"
 
-#include <QDebug>
-#include <QCryptographicHash>
-
 void AOApplication::ms_packet_received(AOPacket *p_packet)
 {
   p_packet->net_decode();
diff --git a/path_functions.cpp b/path_functions.cpp
index 51ddcfd..5c3d7f3 100644
--- a/path_functions.cpp
+++ b/path_functions.cpp
@@ -1,9 +1,6 @@
 #include "aoapplication.h"
 #include "courtroom.h"
 #include "file_functions.h"
-#include <QDir>
-#include <QDebug>
-#include <QStandardPaths>
 
 #ifdef BASE_OVERRIDE
 #include "base_override.h"
diff --git a/text_file_functions.cpp b/text_file_functions.cpp
index c784d1f..175339d 100644
--- a/text_file_functions.cpp
+++ b/text_file_functions.cpp
@@ -2,12 +2,6 @@
 
 #include "file_functions.h"
 
-#include <QTextStream>
-#include <QStringList>
-#include <QVector>
-#include <QDebug>
-#include <QColor>
-
 /*
  * This may no longer be necessary, if we use the QSettings class.
  *