diff --git a/src/auxiliary/piterminal/main.cpp b/src/auxiliary/piterminal/main.cpp
index ce227531..ad56a9ae 100644
--- a/src/auxiliary/piterminal/main.cpp
+++ b/src/auxiliary/piterminal/main.cpp
@@ -1,8 +1,4 @@
-#include "pibase.h"
-#ifdef WINDOWS
-#  include <windef.h>
-#  include <winbase.h>
-#endif
+#include "piincludes_p.h"
 #ifndef WINDOWS
 int main (int argc, char * argv[]) {
 	return 0;
diff --git a/src/console/piconsole.cpp b/src/console/piconsole.cpp
index df895280..fcd80ba8 100644
--- a/src/console/piconsole.cpp
+++ b/src/console/piconsole.cpp
@@ -16,8 +16,8 @@
 	You should have received a copy of the GNU General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "piincludes_p.h"
 #include "piconsole.h"
+#include "piincludes_p.h"
 #include "pipeer.h"
 #include "piprotocol.h"
 #include "pidiagnostics.h"
diff --git a/src/console/piscreen.cpp b/src/console/piscreen.cpp
index 16b26b15..3bcfe845 100644
--- a/src/console/piscreen.cpp
+++ b/src/console/piscreen.cpp
@@ -16,12 +16,8 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "pibase.h"
-#ifdef WINDOWS
-#  include <windef.h>
-#  include <winbase.h>
-#endif
 #include "piscreen.h"
+#include "piincludes_p.h"
 #ifndef WINDOWS
 #  include <sys/ioctl.h>
 #  include <fcntl.h>