Added missing #include directives