3 files changed, 2 insertions, 3 deletions
diff --git a/src/core/CSSParser.cpp b/src/core/CSSParser.cpp
index bad1862..3a86f45 100644
--- a/src/core/CSSParser.cpp
+++ b/src/core/CSSParser.cpp
@@ -16,9 +16,6 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "BufferedCharReader.hpp"
-#include "CodeTokenizer.hpp"
-
 #include "CSSParser.hpp"
 
 namespace ousia {
diff --git a/src/core/CSSParser.hpp b/src/core/CSSParser.hpp
index c1a4c0d..7dfc872 100644
--- a/src/core/CSSParser.hpp
+++ b/src/core/CSSParser.hpp
@@ -23,6 +23,7 @@
 #include <tuple>
 
 #include "BufferedCharReader.hpp"
+#include "CodeTokenizer.hpp"
 #include "CSS.hpp"
 #include "Exceptions.hpp"
 
diff --git a/src/core/Tokenizer.cpp b/src/core/Tokenizer.cpp
index f0cd944..b99d1ed 100644
--- a/src/core/Tokenizer.cpp
+++ b/src/core/Tokenizer.cpp
@@ -195,6 +195,7 @@ bool Tokenizer::peek(Token &t)
 		}
 	}
 	t = peeked[peekCursor];
+	peekCursor++;
 	return true;
 }