From 7982efd8ffa7007da192f029b4e378c62ed15d89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B9?= <andrey@signalmodelling.ru>
Date: Mon, 17 Apr 2017 13:56:50 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@393
 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

---
 src/auxiliary/piterminal/main.cpp | 6 +-----
 src/console/piconsole.cpp         | 2 +-
 src/console/piscreen.cpp          | 6 +-----
 3 files changed, 3 insertions(+), 11 deletions(-)

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>