diff --git a/runtime/Server.cpp b/runtime/Server.cpp
index 7e0cc374e..c59fbcf4e 100644
--- a/runtime/Server.cpp
+++ b/runtime/Server.cpp
@@ -15,6 +15,8 @@
 #include <Python.h>
 
 // QT headers
+#include <QDebug>
+#include <QDir>
 #include <QMessageBox>
 
 // App headers
diff --git a/runtime/pgAdmin4.cpp b/runtime/pgAdmin4.cpp
index 74476183c..32b762164 100644
--- a/runtime/pgAdmin4.cpp
+++ b/runtime/pgAdmin4.cpp
@@ -21,6 +21,7 @@
 #include <QtWidgets>
 #else
 #include <QApplication>
+#include <QDebug>
 #endif
 
 // App headers
diff --git a/runtime/pgAdmin4.h b/runtime/pgAdmin4.h
index 6baefb42f..ec0c7e1b6 100644
--- a/runtime/pgAdmin4.h
+++ b/runtime/pgAdmin4.h
@@ -12,6 +12,10 @@
 #ifndef PGADMIN4_H
 #define PGADMIN4_H
 
+// Include the Python header here as it needs to appear before any QT 
+// headers anywhere in the app.
+#include <Python.h>
+
 // QT headers
 #include <QtGlobal>