git-svn-id: svn://db.shs.com.ru/pip@367 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

src/console/pikbdlistener.cpp

@@ -16,20 +16,13 @@
 	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 "piincludes_p.h"
 #include "pikbdlistener.h"
 #ifndef WINDOWS
 #  include <termios.h>
 #else
 #  include <wincon.h>
 #endif
-#ifdef CC_GCC
-#  include <unistd.h>
-#endif
 
 /** \class PIKbdListener
  * \brief Keyboard console input listener

src/console/piterminal.cpp

@@ -16,16 +16,9 @@
     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 "piincludes_p.h"
 #include "piterminal.h"
 # include "pisharedmemory.h"
-#ifdef CC_GCC
-#  include <unistd.h>
-#endif
 #ifdef WINDOWS
 #  include <windows.h>
 #  include <wincon.h>