Moved header's includes into separete header file.

bulls-and-cows-cpp/CGame.cpp

@@ -1,8 +1,6 @@
 // CGame.cpp
 //
 #include "CGame.h"
-#include "CUserInput.h"
-#include <random>
 
 void CGame::Init()
 {
@@ -43,7 +41,11 @@ void CGame::Start()
 		do
 		{
 			PrintGameHeader();
+#ifdef _DEBUG
+			ShowGuessedNumber(true);
+#else
 			ShowGuessedNumber(false);
+#endif // DEBUG
 			PrintSteps();
 			ret = GetNumber(step);
 			switch (ret)

bulls-and-cows-cpp/CGame.h

@@ -1,7 +1,7 @@
 // CGame.h
 //
 #pragma once
-#include "defines.h"
+#include "headers.h"
 #include "CUserInput.h"
 #include "CStep.h"
 

bulls-and-cows-cpp/CStep.h

@@ -1,7 +1,7 @@
 // CStep.h
 //
 #pragma once
-#include <vector>
+#include "headers.h"
 
 class CStep
 {

bulls-and-cows-cpp/CUserInput.h

@@ -1,11 +1,7 @@
 // CUserInput.h
 //
 #pragma once
-#include "defines.h"
+#include "headers.h"
-#include <iostream>
-#include <string>
-#include <vector>
-#include <cwctype>
 
 class CUserInput
 {

bulls-and-cows-cpp/bulls-and-cows-cpp.vcxproj

@@ -142,6 +142,7 @@
     <ClInclude Include="CStep.h" />
     <ClInclude Include="CUserInput.h" />
     <ClInclude Include="defines.h" />
+    <ClInclude Include="headers.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

bulls-and-cows-cpp/bulls-and-cows-cpp.vcxproj.filters

@@ -47,5 +47,8 @@
     <ClInclude Include="defines.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="headers.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

bulls-and-cows-cpp/bulls-and-cows.cpp

@@ -1,6 +1,6 @@
 // bulls-and-cows.cpp
 //
-#include <Windows.h>
+#include "headers.h"
 #include "..\..\..\MyFunctions\SetUserLocale.h"
 #include "CGame.h"
 

bulls-and-cows-cpp/defines.h

@@ -1,3 +1,5 @@
+// defines.h
+//
 #pragma once
 
 #define VERSION 0.3

bulls-and-cows-cpp/headers.h

@@ -0,0 +1,11 @@
+// headers.h
+//
+#pragma once
+#include <Windows.h>
+#include <iostream>
+#include <random>
+#include <string>
+#include <vector>
+#include <cwctype>
+
+#include "defines.h"